amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: python-shiboken-2, python-pyside-2: Update to 5.14.2.3.

Browse source 
* gnu/packages/patches/qtbase-absolute-runpath.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/qt.scm (qtbase/next): New variable.
* gnu/packages/qt.scm (python-shiboken-2): Update to 5.14.2.3.
[source](uri): Adjust for tarball rename.
[inputs]: Use the default CLANG-TOOLCHAIN.
(python-pyside-2)[inputs]: Likewise.
(python-pyside-2-tools)[inputs]: Change from QTBASE to QTBASE/NEXT.
This commit is contained in:
Marius Bakke 2020-07-15 20:08:10 +02:00
parent b514478cb9
commit dec0217f6e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/patches/qtbase-absolute-runpath.patch Normal file
View file

@ -0,0 +1,17 @@
Do not use $ORIGIN in RUNPATH so that executables can be copied elsewhere and
still be expected to work (needed for python-pyside-2-tools).
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -10,8 +10,8 @@ QMAKE_CFLAGS_THREAD += -D_REENTRANT
QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
-QMAKE_LFLAGS_REL_RPATH = -Wl,-z,origin
-QMAKE_REL_RPATH_BASE = $ORIGIN
+QMAKE_LFLAGS_REL_RPATH =
+QMAKE_REL_RPATH_BASE =
QMAKE_INCDIR =
QMAKE_LIBDIR =