From c90b7ab16396bae18c1eb22aab2e63428189f4db Mon Sep 17 00:00:00 2001 From: karliss Date: Tue, 7 Apr 2020 09:55:05 +0300 Subject: [PATCH] Switch to qt 5.14.2 (#6) --- .appveyor.yml | 6 ++++-- .travis.yml | 8 ++++++-- Makefile | 24 ++++++++++++------------ patch/pyside-5.12.5/CMakeLists.txt.patch | 22 ---------------------- patch/pyside-5.14.1/CMakeLists.txt.patch | 12 ++++++++++++ 5 files changed, 34 insertions(+), 38 deletions(-) delete mode 100644 patch/pyside-5.12.5/CMakeLists.txt.patch create mode 100644 patch/pyside-5.14.1/CMakeLists.txt.patch diff --git a/.appveyor.yml b/.appveyor.yml index 52da3d8..d7df2c4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,9 +15,11 @@ build_script: wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip && 7z x ninja-win.zip && cd \"%APPVEYOR_BUILD_FOLDER%\" && - export PATH=\"$PWD/ninja:/c/Qt/5.12/msvc2017_64/bin:$PATH\" && + export PATH=\"$PWD/ninja:$PWD/qt/bin:$PATH\" && export LLVM_INSTALL_DIR=\"C:\Program Files\LLVM\" && - make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12\msvc2017_64\"" + make PYTHON_WINDOWS=\"C:\Python36-x64\"" + # make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12\msvc2017_64\"" + # export PATH=\"$PWD/ninja:/c/Qt/5.12/msvc2017_64/bin:$PATH\" && artifacts: - path: "%ARTIFACT_PATH%" diff --git a/.travis.yml b/.travis.yml index 0526059..95d4c93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: c -dist: xenial osx_image: xcode10.1 cache: ccache @@ -8,6 +7,7 @@ matrix: include: - os: linux env: DEPLOY_FILE=cutter-deps-linux.tar.gz + dist: xenial - os: osx env: DEPLOY_FILE=cutter-deps-macos.tar.gz @@ -16,6 +16,7 @@ addons: packages: - llvm - ccache + update: true apt: update: true @@ -24,7 +25,10 @@ addons: - libglu1-mesa-dev - libegl1-mesa-dev -install: if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=/usr/local/opt/llvm/bin:$PATH; fi +install: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + export PATH=/usr/local/opt/llvm/bin:$PATH; + fi script: make diff --git a/Makefile b/Makefile index 1968c3c..393c3bb 100644 --- a/Makefile +++ b/Makefile @@ -57,11 +57,12 @@ ${PATCHELF_SRC_DIR}_target=PATCHELF_SRC #QT_SRC_URL=https://download.qt.io/official_releases/qt/5.12/5.12.1/single/qt-everywhere-src-5.12.1.tar.xz ifeq (${QT_PREFIX},) -QT_BIN_FILE=cutter-deps-qt.tar.gz -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_FILE=cutter-deps-qt-${PLATFORM}.tar.gz +PACKAGE_FILE=cutter-deps-${PLATFORM}.tar.gz +QT_BIN_URL=https://github.com/radareorg/cutter-deps-qt/releases/download/v9/${QT_BIN_FILE} +QT_BIN_MD5_linux=06ec8a1a89cbae078ca9a84579e8c9ce +QT_BIN_MD5_macos=2975208b05ce617e71844d1b3ba41221 +QT_BIN_MD5_win=e1ba0fdfcdebe48bd255e01ddd794339 QT_BIN_MD5=${QT_BIN_MD5_${PLATFORM}} QT_BIN_DIR=qt QT_PREFIX:=${ROOT_DIR}/${QT_BIN_DIR} @@ -74,17 +75,16 @@ QT_OPENGL_ENABLED:=1 QT_DEPS= endif -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 +QT_VERSION=5.14.2 +PYSIDE_SRC_FILE=pyside-setup-opensource-src-${QT_VERSION}.tar.xz +PYSIDE_SRC_MD5=e81aefb22c8584d6420ccdf3cb86673c +PYSIDE_SRC_URL=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${QT_VERSION}-src/pyside-setup-opensource-src-${QT_VERSION}.tar.xz +PYSIDE_SRC_DIR=pyside-setup-opensource-src-${QT_VERSION} #PYSIDE_SRC_DIR=pyside-src #PYSIDE_SRC_GIT=https://code.qt.io/pyside/pyside-setup.git #PYSIDE_SRC_GIT_COMMIT=7a7952fc2e0809ef7f12a726376cec457897c364 PYSIDE_PREFIX=${ROOT_DIR}/pyside -PACKAGE_FILE=cutter-deps-${PLATFORM}.tar.gz - BUILD_THREADS=4 ifeq (${PLATFORM},linux) @@ -264,7 +264,7 @@ ${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.5/CMakeLists.txt.patch + patch "${PYSIDE_SRC_DIR}/sources/pyside2/CMakeLists.txt" patch/pyside-5.14.1/CMakeLists.txt.patch echo "" > "${PYSIDE_SRC_DIR}/sources/pyside2/cmake/Macros/FindQt5Extra.cmake" ifneq (${QT_OPENGL_ENABLED},1) diff --git a/patch/pyside-5.12.5/CMakeLists.txt.patch b/patch/pyside-5.12.5/CMakeLists.txt.patch deleted file mode 100644 index bc6c443..0000000 --- a/patch/pyside-5.12.5/CMakeLists.txt.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 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() -@@ -407,7 +408,8 @@ - endif() - - add_subdirectory(libpyside) --find_package(Qt5Designer) -+#find_package(Qt5Designer) -+set(Qt5Designer_FOUND FALSE) - if(Qt5UiTools_FOUND AND Qt5Designer_FOUND) - add_subdirectory(plugins) - endif() \ No newline at end of file diff --git a/patch/pyside-5.14.1/CMakeLists.txt.patch b/patch/pyside-5.14.1/CMakeLists.txt.patch new file mode 100644 index 0000000..71d75d5 --- /dev/null +++ b/patch/pyside-5.14.1/CMakeLists.txt.patch @@ -0,0 +1,12 @@ +--- 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 +@@ -241,7 +242,8 @@ + ##################################################################### + + add_subdirectory(libpyside) +-find_package(Qt5Designer) ++#find_package(Qt5Designer) ++set(Qt5Designer_FOUND FALSE) + if(Qt5UiTools_FOUND AND Qt5Designer_FOUND) + add_subdirectory(plugins) + endif()