guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

19/52: gnu: python-shiboken-6: Update to 6.6.2.


From: guix-commits
Subject: 19/52: gnu: python-shiboken-6: Update to 6.6.2.
Date: Sat, 30 Mar 2024 20:41:41 -0400 (EDT)

apteryx pushed a commit to branch qt-team
in repository guix.

commit 46bf663f140d0c240957631ea28bf49faad078b9
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Wed Mar 13 16:58:13 2024 +0800

    gnu: python-shiboken-6: Update to 6.6.2.
    
    * gnu/packages/qt.scm (python-shiboken-6, python-pyside-6): Update to 6.6.2.
    (python-shiboken-6)[properties]: Set upstream-name.
    (python-pyside-6)[arguments]<#:configure-flags>: Set CMAKE_INSTALL_RPATH.
    
    Change-Id: I098481f860c3bc97a629cca719305b2d00c3eace
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/qt.scm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 17fce7991f..dce4248325 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4543,7 +4543,7 @@ color-related widgets.")
   (package
     (inherit python-shiboken-2)
     (name "python-shiboken-6")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://qt/QtForPython/pyside6/PySide6-"
@@ -4551,7 +4551,7 @@ color-related widgets.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1a0v9mjlcjbffm4lf5cfg45hvqai9654p95ygj5cjhfd9z8z3nwh"))))
+                "1w690jpxrski7c71gx05q5fvl2117lnjj5ih8iwckx3s9mlhnqhl"))))
     (build-system cmake-build-system)
     (inputs
      (modify-inputs (package-inputs python-shiboken-2)
@@ -4571,7 +4571,8 @@ color-related widgets.")
            "-DCMAKE_SKIP_RPATH=TRUE"
            (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath="
                           #$output "/lib")
-           #$flags))))))
+           #$flags))))
+    (properties `((upstream-name . "pyside-setup")))))
 
 (define-public python-pyside-2
   (package
@@ -4707,12 +4708,16 @@ generate Python bindings for your C or C++ code.")
       #:configure-flags
       #~(list "-DBUILD_TESTS=FALSE"
               (string-append "-DPYTHON_EXECUTABLE="
-                             (search-input-file %build-inputs
-                                                "/bin/python")))
+                             (search-input-file %build-inputs "/bin/python")))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'go-to-source-dir
             (lambda _ (chdir "sources/pyside6")))
+          (add-after 'go-to-source-dir 'set-rpath
+            (lambda _
+              (substitute* "CMakeLists.txt"
+                (("CMAKE_INSTALL_RPATH")
+                 (string-append "CMAKE_INSTALL_RPATH " #$output "/lib")))))
           (add-after 'go-to-source-dir 'fix-qt-module-detection
             (lambda _
               (substitute* "cmake/PySideHelpers.cmake"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]