Skip to content

Commit

Permalink
Update to Qt 5.12.5
Browse files Browse the repository at this point in the history
Remove LD_LIBRARY_PATH patch, it was fixed upstream.
  • Loading branch information
karliss authored Oct 31, 2019
1 parent 52fcae1 commit a292e59
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 37 deletions.
19 changes: 8 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
20 changes: 0 additions & 20 deletions patch/pyside-5.12.3/PySideModules.cmake.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -19,4 +19,4 @@
+set(Qt5Designer_FOUND FALSE)
if(Qt5UiTools_FOUND AND Qt5Designer_FOUND)
add_subdirectory(plugins)
endif()
endif()

0 comments on commit a292e59

Please sign in to comment.