From a292e59b55a0d44ec2c58c78289aef0916763618 Mon Sep 17 00:00:00 2001 From: karliss Date: Thu, 31 Oct 2019 23:19:24 +0200 Subject: [PATCH] Update to Qt 5.12.5 Remove LD_LIBRARY_PATH patch, it was fixed upstream. --- Makefile | 19 ++++++++---------- patch/pyside-5.12.3/PySideModules.cmake.patch | 20 ------------------- .../CMakeLists.txt.patch | 12 +++++------ 3 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 patch/pyside-5.12.3/PySideModules.cmake.patch rename patch/{pyside-5.12.3 => pyside-5.12.5}/CMakeLists.txt.patch (53%) diff --git a/Makefile b/Makefile index 8c40ef5..1968c3c 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,9 @@ ${PATCHELF_SRC_DIR}_target=PATCHELF_SRC ifeq (${QT_PREFIX},) QT_BIN_FILE=cutter-deps-qt.tar.gz -QT_BIN_URL=https://github.com/radareorg/cutter-deps-qt/releases/download/v8/cutter-deps-qt-${PLATFORM}.tar.gz -QT_BIN_MD5_linux=63283f310e444c6a8a639c4f33077f93 -QT_BIN_MD5_macos=57342f7f5e2aaa5a418ff296214beb07 +QT_BIN_URL=https://github.com/radareorg/cutter-deps-qt/releases/download/v9/cutter-deps-qt-${PLATFORM}.tar.gz +QT_BIN_MD5_linux=7c6c4a40b26208860ad9f11b17422990 +QT_BIN_MD5_macos=618eb84f477a11c6e491556a72d41bd5 QT_BIN_MD5_win=TODO QT_BIN_MD5=${QT_BIN_MD5_${PLATFORM}} QT_BIN_DIR=qt @@ -74,10 +74,10 @@ QT_OPENGL_ENABLED:=1 QT_DEPS= endif -PYSIDE_SRC_FILE=pyside-setup-everywhere-src-5.12.3.tar.xz -PYSIDE_SRC_MD5=8f2026cf831936b15069cb3169f96fbf -PYSIDE_SRC_URL=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.12.3-src/pyside-setup-everywhere-src-5.12.3.tar.xz -PYSIDE_SRC_DIR=pyside-setup-everywhere-src-5.12.3 +PYSIDE_SRC_FILE=pyside-setup-everywhere-src-5.12.5.tar.xz +PYSIDE_SRC_MD5=b5053919d8f870975c1570eeeb07336b +PYSIDE_SRC_URL=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.12.5-src/pyside-setup-everywhere-src-5.12.5.tar.xz +PYSIDE_SRC_DIR=pyside-setup-everywhere-src-5.12.5 #PYSIDE_SRC_DIR=pyside-src #PYSIDE_SRC_GIT=https://code.qt.io/pyside/pyside-setup.git #PYSIDE_SRC_GIT_COMMIT=7a7952fc2e0809ef7f12a726376cec457897c364 @@ -264,12 +264,9 @@ ${PYSIDE_SRC_DIR}: # Patch needed, so the PySide2 CMakeLists.txt doesn't search for Qt5UiTools and other stuff, # which would mess up finding the actual modules later. - patch "${PYSIDE_SRC_DIR}/sources/pyside2/CMakeLists.txt" patch/pyside-5.12.3/CMakeLists.txt.patch + patch "${PYSIDE_SRC_DIR}/sources/pyside2/CMakeLists.txt" patch/pyside-5.12.5/CMakeLists.txt.patch echo "" > "${PYSIDE_SRC_DIR}/sources/pyside2/cmake/Macros/FindQt5Extra.cmake" - # Patch to prevent complete overriding of LD_LIBRARY_PATH - patch "${PYSIDE_SRC_DIR}/sources/pyside2/cmake/Macros/PySideModules.cmake" patch/pyside-5.12.3/PySideModules.cmake.patch - ifneq (${QT_OPENGL_ENABLED},1) # Patches to remove OpenGL-related source files. patch "${PYSIDE_SRC_DIR}/sources/pyside2/PySide2/QtGui/CMakeLists.txt" patch/pyside-5.12.1/QtGui-CMakeLists.txt.patch diff --git a/patch/pyside-5.12.3/PySideModules.cmake.patch b/patch/pyside-5.12.3/PySideModules.cmake.patch deleted file mode 100644 index f287ba4..0000000 --- a/patch/pyside-5.12.3/PySideModules.cmake.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pyside-src/sources/pyside2/cmake/Macros/PySideModules.cmake 2019-02-23 22:34:05.751151414 +0100 -+++ patch/PySideModules.cmake 2019-02-23 23:22:56.324976710 +0100 -@@ -162,13 +162,13 @@ - # Need to set the LD_ env vars before invoking the script, because it might use build-time - # libraries instead of install time libraries. - if (WIN32) -- set(ld_prefix "PATH=") -+ set(ld_prefix "PATH") - elseif(APPLE) -- set(ld_prefix "DYLD_LIBRARY_PATH=") -+ set(ld_prefix "DYLD_LIBRARY_PATH") - else() -- set(ld_prefix "LD_LIBRARY_PATH=") -+ set(ld_prefix "LD_LIBRARY_PATH") - endif() -- set(ld_prefix "${ld_prefix}${pysidebindings_BINARY_DIR}/libpyside${PATH_SEP}${SHIBOKEN_SHARED_LIBRARY_DIR}") -+ set(ld_prefix "${ld_prefix}=${pysidebindings_BINARY_DIR}/libpyside${PATH_SEP}${SHIBOKEN_SHARED_LIBRARY_DIR}${PATH_SEP}$ENV{${ld_prefix}}") - set(generate_pyi_options run --skip --sys-path - "${pysidebindings_BINARY_DIR}" - "${SHIBOKEN_PYTHON_MODULE_DIR}") diff --git a/patch/pyside-5.12.3/CMakeLists.txt.patch b/patch/pyside-5.12.5/CMakeLists.txt.patch similarity index 53% rename from patch/pyside-5.12.3/CMakeLists.txt.patch rename to patch/pyside-5.12.5/CMakeLists.txt.patch index 3c60f3a..bc6c443 100644 --- a/patch/pyside-5.12.3/CMakeLists.txt.patch +++ b/patch/pyside-5.12.5/CMakeLists.txt.patch @@ -1,16 +1,16 @@ ---- pyside-setup-everywhere-src-5.12.3/sources/pyside2/CMakeLists.txt 2019-04-29 08:50:05.000000000 +0200 -+++ CMakeLists.txt 2019-05-20 12:45:20.173557543 +0200 -@@ -257,7 +257,8 @@ +--- pyside-setup-everywhere-src-5.12.5/sources/pyside2/CMakeLists.txt 2019-09-11 08:23:10.000000000 +0300 ++++ CMakeLists.txt 2019-10-31 22:25:22.373319664 +0200 +@@ -260,7 +260,8 @@ # Collect all optional modules. set(ALL_OPTIONAL_MODULES Xml XmlPatterns Help Multimedia - MultimediaWidgets OpenGL Positioning Location Qml Quick QuickWidgets RemoteObjects Scxml Script ScriptTools Sensors TextToSpeech Charts Svg DataVisualization) + MultimediaWidgets OpenGL OpenGLFunctions Positioning Location Qml Quick QuickWidgets RemoteObjects Scxml Script ScriptTools Sensors TextToSpeech Charts Svg DataVisualization) -find_package(Qt5UiTools) +#find_package(Qt5UiTools) +set(Qt5UiTools_FOUND FALSE) if(Qt5UiTools_FOUND) list(APPEND ALL_OPTIONAL_MODULES UiTools) else() -@@ -404,7 +405,8 @@ +@@ -407,7 +408,8 @@ endif() add_subdirectory(libpyside) @@ -19,4 +19,4 @@ +set(Qt5Designer_FOUND FALSE) if(Qt5UiTools_FOUND AND Qt5Designer_FOUND) add_subdirectory(plugins) - endif() + endif() \ No newline at end of file