Commit 67dc5c93 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Use pyqt snapshots

The official release cannot be built:

" There is a bug (fixed in the current PyQt5 snapshot) that happens if you
are building PyQt5 for the very first time. The workaround is to create
an empty __init__.py file in the same directory containing sip.pyd."

And we're always building for the very first time, of course.
parent 27e0b1d8
......@@ -7,10 +7,10 @@ if (UNIX)
endif()
ExternalProject_Add( ext_pyqt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://files.kde.org/krita/build/dependencies/PyQt5_gpl-5.11.2.tar.gz
URL_MD5 78837d77c42a2f177da771df6584ee91
URL https://files.kde.org/krita/build/dependencies/PyQt5_gpl-5.11.3.dev1809141810.tar.gz
URL_MD5 cfea580f9a84efa6fa7b37d0c6043141
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE_PATH} <SOURCE_DIR>/configure.py --confirm-license --qmake ${PREFIX_ext_pyqt}/bin/qmake --sip ${PREFIX_ext_pyqt}/bin/sip --sip-incdir ${PREFIX_ext_pyqt}/include --sipdir ${PREFIX_ext_pyqt}/share/sip
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE_PATH} <SOURCE_DIR>/configure.py --confirm-license --sip ${PREFIX_ext_pyqt}/bin/sip --sip-incdir ${PREFIX_ext_pyqt}/include --sipdir ${PREFIX_ext_pyqt}/share/sip
BUILD_COMMAND make
INSTALL_COMMAND make install
......@@ -36,8 +36,8 @@ elseif(MINGW)
)
ExternalProject_Add( ext_pyqt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://files.kde.org/krita/build/dependencies/PyQt5_gpl-5.11.2.zip
URL_MD5 f588cd6eda3bc2233074a739b36552b6
URL https://files.kde.org/krita/build/dependencies/PyQt5_gpl-5.11.3.dev1809141810.zip
URL_MD5 a81e032dc9e9f502b363edd2f4f54bb3
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/pyqt-configure-fix.patch
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE} <SOURCE_DIR>/configure.py ${_PYQT_conf}
......
......@@ -8,10 +8,10 @@ if (UNIX)
ExternalProject_Add( ext_sip
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://files.kde.org/krita/build/dependencies/sip-4.19.12.tar.gz
URL_MD5 e28b0790dfe4962ce6bbd7c4772f40c9
URL https://files.kde.org/krita/build/dependencies/sip-4.19.13.dev1809181320.tar.gz
URL_MD5 71792a1900a57977a1e5aed315be10ea
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE_PATH} <SOURCE_DIR>/configure.py -b ${PREFIX_ext_sip}/bin -d ${PREFIX_ext_sip}/sip -e ${PREFIX_ext_sip}/include --sipdir ${PREFIX_ext_sip}/sip --target-py-version 3.5 --sip-module PyQt5.sip
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE_PATH} <SOURCE_DIR>/configure.py --sip-module PyQt5.sip -b ${PREFIX_ext_sip}/bin -d ${PREFIX_ext_sip}/sip -e ${PREFIX_ext_sip}/include --sipdir ${PREFIX_ext_sip}/sip --target-py-version 3.5
BUILD_COMMAND make
INSTALL_COMMAND make install
......@@ -27,12 +27,12 @@ elseif (MINGW)
-e ${PREFIX_ext_sip}/include
--sipdir ${PREFIX_ext_sip}/share/sip
--target-py-version 3.6
--sip-module PyQt5.sip
--sip-module PyQt5.sip
)
ExternalProject_Add( ext_sip
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://files.kde.org/krita/build/dependencies/sip-4.19.12.zip
URL_MD5 6be7fb646a862cb0c3340e99475700c3
URL https://files.kde.org/krita/build/dependencies/sip-4.19.13.dev1809181320.zip
URL_MD5 45ab63b9d7ff35d4f57d26d242643e48
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE} <SOURCE_DIR>/configure.py ${_SIP_conf}
BUILD_COMMAND mingw32-make -j${SUBMAKE_JOBS} LDFLAGS=${SECURITY_SHARED_LINKER_FLAGS}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment