From 62c2ec366b849e02c601fa786f071739f2e4caf4 Mon Sep 17 00:00:00 2001 From: karliss Date: Thu, 17 Dec 2020 23:52:47 +0200 Subject: [PATCH] Build cutter-deps on GHA , update qt and Python (#10) * Move cutter deps from Travis to GHA due to more open source friendly plan * Ensure that resulting Linux libs can be used for building Cutter release package on GHA and don't depend on Travis specific library versions * Use latest cutter-deps-qt with qt 5.15.2 see radareorg/cutter-deps-qt#3 * lib_isntall_path.patch applied upstream https://bugreports.qt.io/browse/PYSIDE-1299 * Update Python to 3.9.1 * https://bugreports.qt.io/browse/PYSIDE-1299 fixed paths for libs but introduced absolute path for shibokken executable --- .github/workflows/package-build.yml | 78 +++++++++++++++++++ .travis.yml => .travis-disabled.yml | 0 Makefile | 40 ++++++---- patch/lib_install_path.patch | 11 --- patch/pyside-5.14.1/CMakeLists.txt.patch | 12 --- patch/pyside-5.15.2/CMakeLists.txt.patch | 12 +++ .../shiboken_executable_install.patch | 16 ++++ patch/pyside-7a7952f/CMakeLists.txt.patch | 22 ------ .../pyside-7a7952f/PySideModules.cmake.patch | 20 ----- .../pyside-7a7952f/QtGui-CMakeLists.txt.patch | 67 ---------------- .../QtWidgets-CMakeLists.txt.patch | 10 --- 11 files changed, 129 insertions(+), 159 deletions(-) create mode 100644 .github/workflows/package-build.yml rename .travis.yml => .travis-disabled.yml (100%) delete mode 100644 patch/lib_install_path.patch delete mode 100644 patch/pyside-5.14.1/CMakeLists.txt.patch create mode 100644 patch/pyside-5.15.2/CMakeLists.txt.patch create mode 100644 patch/pyside-5.15.2/shiboken_executable_install.patch delete mode 100644 patch/pyside-7a7952f/CMakeLists.txt.patch delete mode 100644 patch/pyside-7a7952f/PySideModules.cmake.patch delete mode 100644 patch/pyside-7a7952f/QtGui-CMakeLists.txt.patch delete mode 100644 patch/pyside-7a7952f/QtWidgets-CMakeLists.txt.patch diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml new file mode 100644 index 0000000..b8c4678 --- /dev/null +++ b/.github/workflows/package-build.yml @@ -0,0 +1,78 @@ +name: package build + +on: + push: + branches: + - master + tags: + - v* + pull_request: + branches: + - master + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-16.04, macos-10.15] + fail-fast: false + steps: + - uses: actions/checkout@v2 + - name: build linux + if: contains(matrix.os, 'ubuntu') + run: | + set -euo pipefail + sudo apt remove llvm-9 + sudo apt install libclang-8-dev llvm-8 mesa-common-dev libgl1-mesa-dev + make + echo UPLOAD_FILE=cutter-deps-linux.tar.gz >> $GITHUB_ENV + echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV + - name: build macos + if: contains(matrix.os, 'macos') + run: | + set -euo pipefail + brew install llvm ccache + export PATH=/usr/local/opt/llvm/bin:$PATH; + xcode-select -print-path + ls /Applications + sudo xcode-select -s /Applications/Xcode_11.2.1.app/Contents/Developer + # sudo xcode-select -s /Applications/Xcode_11.5.app/Contents/Developer + xcode-select -print-path + which llvm-config + llvm-config --version + make + echo UPLOAD_FILE=cutter-deps-macos.tar.gz >> $GITHUB_ENV + echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV + - name: build windows + if: contains(matrix.os, 'windows') + shell: cmd + run: | + call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 + C:\msys64\usr\bin\bash -lc " + wget https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe && + 7z x -oLLVM LLVM-10.0.0-win64.exe && + export LLVM_INSTALL_DIR=\"$PWD/LLVM\" && + cd \"%APPVEYOR_BUILD_FOLDER%\" && + export PATH=\"$PWD/qt/bin:$LLVM_INSTALL_DIR/bin:$PATH\" && + make PYTHON_WINDOWS=\"C:\Python36-x64\"" + - uses: actions/upload-artifact@v2 + with: + name: ${{ env.UPLOAD_FILE }} + path: ${{ env.UPLOAD_FILE }} + - name: Get release + if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') + id: get_release + uses: karliss/get-release@bee343636450eb2e9b85d9f1592d8d73c408dc74 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Upload release assets + if: false && steps.get_release.outputs.upload_url != null + uses: actions/upload-release-asset@v1.0.2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.get_release.outputs.upload_url }} + asset_path: ${{ env.UPLOAD_FILE }} + asset_name: ${{ env.UPLOAD_FILE }} + asset_content_type: ${{ env.UPLOAD_ASSET_TYPE }} \ No newline at end of file diff --git a/.travis.yml b/.travis-disabled.yml similarity index 100% rename from .travis.yml rename to .travis-disabled.yml diff --git a/Makefile b/Makefile index 43c499b..e0628f1 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,16 @@ endif PKG_FILES=pyside ifeq (${PYTHON_WINDOWS},) -PYTHON_SRC_FILE=Python-3.6.4.tar.xz -PYTHON_SRC_MD5=1325134dd525b4a2c3272a1a0214dd54 -PYTHON_SRC_URL=https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz -PYTHON_SRC_DIR=Python-3.6.4 +PYTHON_VERSION=3.9.1 +PYTHON_VERSION_MAJOR_MINOR=3.9 +PYTHON_SRC_FILE=Python-${PYTHON_VERSION}.tar.xz +# 3.6.12 +#PYTHON_SRC_MD5=9ca8ca6f206e9ac0f0726ecb4ebb6e2c +# 3.9.1 +PYTHON_SRC_MD5=61981498e75ac8f00adcb908281fadb6 + +PYTHON_SRC_URL=https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz +PYTHON_SRC_DIR=Python-${PYTHON_VERSION} PYTHON_DEPS=python PKG_FILES+=python ifeq (${PLATFORM},macos) @@ -34,7 +40,7 @@ else endif ${PYTHON_SRC_DIR}_target=PYTHON_SRC PYTHON_LIBRARY=${PYTHON_PREFIX}/lib/libpython3.so -PYTHON_INCLUDE_DIR=${PYTHON_PREFIX}/include/python3.6m +PYTHON_INCLUDE_DIR=${PYTHON_PREFIX}/include/python${PYTHON_VERSION_MAJOR_MINOR} PYTHON_EXECUTABLE=${PYTHON_PREFIX}/bin/python3 else PYTHON_PREFIX=${PYTHON_WINDOWS} @@ -59,10 +65,10 @@ ${PATCHELF_SRC_DIR}_target=PATCHELF_SRC ifeq (${QT_PREFIX},) 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_URL=https://github.com/rizinorg/cutter-deps-qt/releases/download/v10/${QT_BIN_FILE} +QT_BIN_MD5_linux=e64ca2b9fb89b10349bbfd832554090e +QT_BIN_MD5_macos=887c0e4ac0924f751badff0646f12bb6 +QT_BIN_MD5_win=226a052638521057a60385b9d547f242 QT_BIN_MD5=${QT_BIN_MD5_${PLATFORM}} QT_BIN_DIR=qt QT_PREFIX:=${ROOT_DIR}/${QT_BIN_DIR} @@ -75,9 +81,9 @@ QT_OPENGL_ENABLED:=1 QT_DEPS= endif -QT_VERSION=5.14.2 +QT_VERSION=5.15.2 PYSIDE_SRC_FILE=pyside-setup-opensource-src-${QT_VERSION}.tar.xz -PYSIDE_SRC_MD5=e81aefb22c8584d6420ccdf3cb86673c +PYSIDE_SRC_MD5=e9bb6b57d39eb6cf1720cd3589a8b76a 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 @@ -126,6 +132,7 @@ ifeq (${PLATFORM},macos) @echo "Checking MD5 for $1" @if [ "`md5 -r \"$1\"`" != "$2 $1" ]; then \ echo "MD5 mismatch for file $1"; \ + md5 -r "$1";\ exit 1; \ else \ echo "$1 OK"; \ @@ -190,7 +197,7 @@ else endif ifeq (${PLATFORM},linux) - for lib in "${PYTHON_PREFIX}/lib/python3.6/lib-dynload"/*.so ; do \ + for lib in "${PYTHON_PREFIX}/lib/python${PYTHON_VERSION_MAJOR_MINOR}/lib-dynload"/*.so ; do \ echo " patching $$lib" && \ "${PATCHELF_EXECUTABLE}" --set-rpath '$$ORIGIN/../..' "$$lib" || exit 1 ; \ done @@ -264,13 +271,12 @@ ${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.14.1/CMakeLists.txt.patch + patch "${PYSIDE_SRC_DIR}/sources/pyside2/CMakeLists.txt" patch/pyside-5.15.2/CMakeLists.txt.patch echo "" > "${PYSIDE_SRC_DIR}/sources/pyside2/cmake/Macros/FindQt5Extra.cmake" - -ifeq (${PLATFORM},win) - patch "${PYSIDE_SRC_DIR}/sources/shiboken2/ApiExtractor/CMakeLists.txt" patch/lib_install_path.patch -endif +# ifeq (${PLATFORM},win) + patch "${PYSIDE_SRC_DIR}/sources/shiboken2/generator/CMakeLists.txt" patch/pyside-5.15.2/shiboken_executable_install.patch +#endif ifneq (${QT_OPENGL_ENABLED},1) # Patches to remove OpenGL-related source files. diff --git a/patch/lib_install_path.patch b/patch/lib_install_path.patch deleted file mode 100644 index ad7d5e1..0000000 --- a/patch/lib_install_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sources/shiboken2/ApiExtractor/CMakeLists.txt 2020-08-26 17:37:19.411334400 +0300 -+++ sources/shiboken2/ApiExtractor/CMakeLists.txt 2020-08-26 17:36:55.459967400 +0300 -@@ -84,7 +84,7 @@ - - target_compile_definitions(apiextractor PRIVATE CMAKE_CXX_COMPILER="${CMAKE_CXX_COMPILER}") - --set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE) -+set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE) - - if (BUILD_TESTS) - find_package(Qt5Test 5.12 REQUIRED) diff --git a/patch/pyside-5.14.1/CMakeLists.txt.patch b/patch/pyside-5.14.1/CMakeLists.txt.patch deleted file mode 100644 index 71d75d5..0000000 --- a/patch/pyside-5.14.1/CMakeLists.txt.patch +++ /dev/null @@ -1,12 +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 -@@ -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() diff --git a/patch/pyside-5.15.2/CMakeLists.txt.patch b/patch/pyside-5.15.2/CMakeLists.txt.patch new file mode 100644 index 0000000..4340f8f --- /dev/null +++ b/patch/pyside-5.15.2/CMakeLists.txt.patch @@ -0,0 +1,12 @@ +--- sources/pyside2/CMakeLists.txt 2020-11-11 14:51:30.000000000 +0200 ++++ sources/pyside2/CMakeListsAfter.txt 2020-12-07 22:48:36.144247404 +0200 +@@ -252,7 +252,8 @@ + ##################################################################### + + add_subdirectory(libpyside) +-find_package(Qt${QT_MAJOR_VERSION}Designer) ++#find_package(Qt${QT_MAJOR_VERSION}Designer) ++set(Qt${QT_MAJOR_VERSION}Designer_FOUND FALSE) + if(${QT_MAJOR_VERSION} LESS 6 AND Qt${QT_MAJOR_VERSION}UiTools_FOUND + AND Qt${QT_MAJOR_VERSION}Designer_FOUND) + add_subdirectory(plugins) diff --git a/patch/pyside-5.15.2/shiboken_executable_install.patch b/patch/pyside-5.15.2/shiboken_executable_install.patch new file mode 100644 index 0000000..393b38d --- /dev/null +++ b/patch/pyside-5.15.2/shiboken_executable_install.patch @@ -0,0 +1,16 @@ +Using CMAKE_INSTALL_PREFIX is unnecesarry and causes generated target cmake file to contain absolute path. +When us just "bin" CMake generates correct relative paths making resulting package relocatable. + +diff --git a/sources/shiboken2/generator/CMakeLists.txt b/sources/shiboken2/generator/CMakeLists.txt +index 1a3f4e5c4..a44489b03 100644 +--- a/sources/shiboken2/generator/CMakeLists.txt ++++ b/sources/shiboken2/generator/CMakeLists.txt +@@ -30,7 +30,7 @@ configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h + + install(TARGETS shiboken2 + EXPORT Shiboken2Targets +- DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") ++ DESTINATION "bin") + + set(shiboken_generator_package_name "shiboken2_generator") + diff --git a/patch/pyside-7a7952f/CMakeLists.txt.patch b/patch/pyside-7a7952f/CMakeLists.txt.patch deleted file mode 100644 index aacfbab..0000000 --- a/patch/pyside-7a7952f/CMakeLists.txt.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- pyside-src/sources/pyside2/CMakeLists.txt 2019-02-23 18:37:21.121196736 +0100 -+++ patch/CMakeLists.txt 2019-02-23 18:41:11.604800243 +0100 -@@ -257,7 +257,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) --find_package(Qt5UiTools) -+#find_package(Qt5UiTools) -+set(Qt5UiTools_FOUND FALSE) - if(Qt5UiTools_FOUND) - list(APPEND ALL_OPTIONAL_MODULES UiTools) - else() -@@ -404,7 +405,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() diff --git a/patch/pyside-7a7952f/PySideModules.cmake.patch b/patch/pyside-7a7952f/PySideModules.cmake.patch deleted file mode 100644 index f287ba4..0000000 --- a/patch/pyside-7a7952f/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-7a7952f/QtGui-CMakeLists.txt.patch b/patch/pyside-7a7952f/QtGui-CMakeLists.txt.patch deleted file mode 100644 index 50918b7..0000000 --- a/patch/pyside-7a7952f/QtGui-CMakeLists.txt.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- pyside-setup-everywhere-src-5.12.1/sources/pyside2/PySide2/QtGui/CMakeLists.txt 2019-01-31 15:05:01.000000000 +0100 -+++ patch/CMakeLists.txt 2019-02-17 18:03:09.839233464 +0100 -@@ -7,7 +7,6 @@ - get_property(QtGui_enabled_features TARGET Qt5::Gui PROPERTY INTERFACE_QT_ENABLED_FEATURES) - - set(QtGui_SRC --${QtGui_GEN_DIR}/qabstractopenglfunctions_wrapper.cpp - ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_paintcontext_wrapper.cpp - ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_selection_wrapper.cpp - ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_wrapper.cpp -@@ -89,21 +88,6 @@ - ${QtGui_GEN_DIR}/qmovie_wrapper.cpp - ${QtGui_GEN_DIR}/qnativegestureevent_wrapper.cpp - ${QtGui_GEN_DIR}/qoffscreensurface_wrapper.cpp --${QtGui_GEN_DIR}/qopenglcontextgroup_wrapper.cpp --${QtGui_GEN_DIR}/qopengldebuglogger_wrapper.cpp --${QtGui_GEN_DIR}/qopengldebugmessage_wrapper.cpp --${QtGui_GEN_DIR}/qopenglextrafunctions_wrapper.cpp --${QtGui_GEN_DIR}/qopenglframebufferobjectformat_wrapper.cpp --${QtGui_GEN_DIR}/qopenglfunctions_wrapper.cpp --# Compile error on Windows: ${QtGui_GEN_DIR}/qopenglpaintdevice_wrapper.cpp --${QtGui_GEN_DIR}/qopenglpixeltransferoptions_wrapper.cpp --${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp --${QtGui_GEN_DIR}/qopengltexture_wrapper.cpp --${QtGui_GEN_DIR}/qopengltextureblitter_wrapper.cpp --${QtGui_GEN_DIR}/qopenglversionprofile_wrapper.cpp --${QtGui_GEN_DIR}/qopenglvertexarrayobject_wrapper.cpp --${QtGui_GEN_DIR}/qopenglvertexarrayobject_binder_wrapper.cpp --${QtGui_GEN_DIR}/qopenglwindow_wrapper.cpp - ${QtGui_GEN_DIR}/qpagedpaintdevice_margins_wrapper.cpp - ${QtGui_GEN_DIR}/qpagedpaintdevice_wrapper.cpp - ${QtGui_GEN_DIR}/qpagelayout_wrapper.cpp -@@ -142,14 +126,9 @@ - ${QtGui_GEN_DIR}/qstandarditem_wrapper.cpp - ${QtGui_GEN_DIR}/qstandarditemmodel_wrapper.cpp - ${QtGui_GEN_DIR}/qstatustipevent_wrapper.cpp --${QtGui_GEN_DIR}/qopenglbuffer_wrapper.cpp --${QtGui_GEN_DIR}/qopenglcontext_wrapper.cpp - ${QtGui_GEN_DIR}/qaccessible_state_wrapper.cpp - ${QtGui_GEN_DIR}/qaccessibleinterface_wrapper.cpp - ${QtGui_GEN_DIR}/qscreen_wrapper.cpp --${QtGui_GEN_DIR}/qopenglshader_wrapper.cpp --#${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp --${QtGui_GEN_DIR}/qopenglframebufferobject_wrapper.cpp - ${QtGui_GEN_DIR}/qrasterwindow_wrapper.cpp - ${QtGui_GEN_DIR}/qrawfont_wrapper.cpp - ${QtGui_GEN_DIR}/qscrollevent_wrapper.cpp -@@ -209,19 +188,6 @@ - ${QtGui_GEN_DIR}/qtgui_module_wrapper.cpp - ) - --# cf qtbase/src/gui/opengl/opengl.pri --list(FIND QtGui_enabled_features "opengles2" _opengles2Index) --# ### fixme: For cmake >= 3.3: if(opengles2 IN_LIST QtGui_enabled_features) --if(_opengles2Index GREATER -1) -- list(APPEND QtGui_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery) -- message(STATUS "Qt5Gui: Dropping Desktop OpenGL classes (GLES2)") --else() -- list(APPEND QtGui_SRC -- ${QtGui_GEN_DIR}/qopengltimemonitor_wrapper.cpp -- ${QtGui_GEN_DIR}/qopengltimerquery_wrapper.cpp) -- message(STATUS "Qt5Gui: Adding Desktop OpenGL classes") --endif() -- - configure_file("${QtGui_SOURCE_DIR}/typesystem_gui.xml.in" - "${QtGui_BINARY_DIR}/typesystem_gui.xml" @ONLY) - diff --git a/patch/pyside-7a7952f/QtWidgets-CMakeLists.txt.patch b/patch/pyside-7a7952f/QtWidgets-CMakeLists.txt.patch deleted file mode 100644 index 420ecca..0000000 --- a/patch/pyside-7a7952f/QtWidgets-CMakeLists.txt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- pyside-setup-everywhere-src-5.12.1/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt 2019-01-31 15:05:01.000000000 +0100 -+++ patch/CMakeLists.txt 2019-02-17 18:07:57.867778449 +0100 -@@ -109,7 +109,6 @@ - ${QtWidgets_GEN_DIR}/qmenubar_wrapper.cpp - ${QtWidgets_GEN_DIR}/qmessagebox_wrapper.cpp - ${QtWidgets_GEN_DIR}/qmouseeventtransition_wrapper.cpp --${QtWidgets_GEN_DIR}/qopenglwidget_wrapper.cpp - ${QtWidgets_GEN_DIR}/qpangesture_wrapper.cpp - ${QtWidgets_GEN_DIR}/qpinchgesture_wrapper.cpp - ${QtWidgets_GEN_DIR}/qplaintextdocumentlayout_wrapper.cpp