From f4cd9837201edd08b6e4b498c50d72ea91d8c0bc Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 18 Sep 2015 13:14:31 +0300 Subject: [PATCH] pyside-qt4: Rebuild with gcc-5.2.x --- mingw-w64-pyside-qt4/PKGBUILD | 37 ++++++++++++------------- mingw-w64-pyside-qt4/pyside.patch | 19 ------------- mingw-w64-pyside-tools-qt4/PKGBUILD | 27 ++++++++++--------- mingw-w64-shiboken-qt4/PKGBUILD | 39 ++++++++++++++------------- mingw-w64-shiboken-qt4/shiboken.patch | 24 ++++++++--------- 5 files changed, 65 insertions(+), 81 deletions(-) diff --git a/mingw-w64-pyside-qt4/PKGBUILD b/mingw-w64-pyside-qt4/PKGBUILD index 69ddfe2e66..d456f99b9f 100644 --- a/mingw-w64-pyside-qt4/PKGBUILD +++ b/mingw-w64-pyside-qt4/PKGBUILD @@ -2,7 +2,8 @@ # Contributor: Xin Sun _realname=pyside -pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-common ${MINGW_PACKAGE_PREFIX}-python{2,3}-${_realname}) +pkgbase=mingw-w64-${_realname}-qt4 +pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-common-qt4 ${MINGW_PACKAGE_PREFIX}-python{2,3}-${_realname}-qt4) pkgver=1.2.2 pkgrel=1 arch=('any') @@ -12,11 +13,11 @@ install=${_realname}-${CARCH}.install source=(https://pypi.python.org/packages/source/P/PySide/PySide-${pkgver}.tar.gz pyside.patch) md5sums=('c45bc400c8a86d6b35f34c29e379e44d' - 'c56a8aa26cb6c940f2bd992e58567e80') + 'c24be77f77fde7a4235e04b7b8af917a') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-python2-shiboken" - "${MINGW_PACKAGE_PREFIX}-python3-shiboken" + "${MINGW_PACKAGE_PREFIX}-python2-shiboken-qt4" + "${MINGW_PACKAGE_PREFIX}-python3-shiboken-qt4" "${MINGW_PACKAGE_PREFIX}-qt4") options=('staticlibs' 'strip') @@ -80,10 +81,10 @@ package_pyside-common() { package_python2-pyside() { pkgdesc="Provides LGPL Qt bindings for Python and related tools for binding generation (Python2)(mingw-w64)" - makedepends=("${MINGW_PACKAGE_PREFIX}-pyside-common" - "${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-python2-shiboken" - "${MINGW_PACKAGE_PREFIX}-qt4") + depends=("${MINGW_PACKAGE_PREFIX}-pyside-common-qt4" + "${MINGW_PACKAGE_PREFIX}-python2" + "${MINGW_PACKAGE_PREFIX}-python2-shiboken-qt4" + "${MINGW_PACKAGE_PREFIX}-qt4") cd ${srcdir}/build-${MINGW_CHOST}-python2/sources/pyside make DESTDIR=${pkgdir} install @@ -100,10 +101,10 @@ package_python2-pyside() { package_python3-pyside() { pkgdesc="Provides LGPL Qt bindings for Python and related tools for binding generation (Python3)(mingw-w64)" - makedepends=("${MINGW_PACKAGE_PREFIX}-pyside-common" - "${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-python3-shiboken" - "${MINGW_PACKAGE_PREFIX}-qt4") + depends=("${MINGW_PACKAGE_PREFIX}-pyside-common-qt4" + "${MINGW_PACKAGE_PREFIX}-python3" + "${MINGW_PACKAGE_PREFIX}-python3-shiboken-qt4" + "${MINGW_PACKAGE_PREFIX}-qt4") cd ${srcdir}/build-${MINGW_CHOST}-python3/sources/pyside make DESTDIR=${pkgdir} install @@ -116,26 +117,26 @@ package_python3-pyside() { } # Wrappers -package_mingw-w64-i686-pyside-common() { +package_mingw-w64-i686-pyside-common-qt4() { package_pyside-common } -package_mingw-w64-i686-python2-pyside() { +package_mingw-w64-i686-python2-pyside-qt4() { package_python2-pyside } -package_mingw-w64-i686-python3-pyside() { +package_mingw-w64-i686-python3-pyside-qt4() { package_python3-pyside } -package_mingw-w64-x86_64-pyside-common() { +package_mingw-w64-x86_64-pyside-common-qt4() { package_pyside-common } -package_mingw-w64-x86_64-python2-pyside() { +package_mingw-w64-x86_64-python2-pyside-qt4() { package_python2-pyside } -package_mingw-w64-x86_64-python3-pyside() { +package_mingw-w64-x86_64-python3-pyside-qt4() { package_python3-pyside } diff --git a/mingw-w64-pyside-qt4/pyside.patch b/mingw-w64-pyside-qt4/pyside.patch index c1a21fcdb8..d9d314c6f8 100644 --- a/mingw-w64-pyside-qt4/pyside.patch +++ b/mingw-w64-pyside-qt4/pyside.patch @@ -23,25 +23,6 @@ --output-directory=${CMAKE_CURRENT_BINARY_DIR} --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt ${typesystem_path} ---- PySide-1.2.2/sources/pyside/PySide/QtCore/CMakeLists.txt.orig 2015-06-26 18:45:26.695000000 +0300 -+++ PySide-1.2.2/sources/pyside/PySide/QtCore/CMakeLists.txt 2015-06-26 18:45:55.158800000 +0300 -@@ -42,7 +42,7 @@ - ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/point_wrapper.cpp - ) - else() -- set(SPECIFIC_OS_FILES "") -+ set(SPECIFIC_OS_FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsystemsemaphore_wrapper.cpp) - endif() - - set(QtCore_SRC -@@ -111,7 +111,6 @@ - ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsocketnotifier_wrapper.cpp - ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsysinfo_wrapper.cpp - ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsystemlocale_wrapper.cpp --${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsystemsemaphore_wrapper.cpp - ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qt_wrapper.cpp - ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtconcurrent_wrapper.cpp - ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtcore_module_wrapper.cpp --- PySide-1.2.2/sources/pyside/tests/pysidetest/CMakeLists.txt.orig 2015-06-26 12:32:49.376400000 +0300 +++ PySide-1.2.2/sources/pyside/tests/pysidetest/CMakeLists.txt 2015-06-26 12:33:01.903200000 +0300 @@ -36,8 +36,8 @@ diff --git a/mingw-w64-pyside-tools-qt4/PKGBUILD b/mingw-w64-pyside-tools-qt4/PKGBUILD index 531da63fb1..3ba17b9988 100644 --- a/mingw-w64-pyside-tools-qt4/PKGBUILD +++ b/mingw-w64-pyside-tools-qt4/PKGBUILD @@ -2,7 +2,8 @@ # Contributor: Xin Sun _realname=pyside-tools -pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-common ${MINGW_PACKAGE_PREFIX}-python{2,3}-${_realname}) +pkgbase=mingw-w64-${_realname}-qt4 +pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-common-qt4 ${MINGW_PACKAGE_PREFIX}-python{2,3}-${_realname}-qt4) pkgver=1.2.2 pkgrel=1 pkgdesc="Python bindings for Qt4 (mingw-w64)" @@ -13,8 +14,8 @@ source=(https://pypi.python.org/packages/source/P/PySide/PySide-${pkgver}.tar.gz md5sums=('c45bc400c8a86d6b35f34c29e379e44d') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-python2-pyside" - "${MINGW_PACKAGE_PREFIX}-python3-pyside" + "${MINGW_PACKAGE_PREFIX}-python2-pyside-qt4" + "${MINGW_PACKAGE_PREFIX}-python3-pyside-qt4" "${MINGW_PACKAGE_PREFIX}-qt4") options=('staticlibs' 'strip') @@ -60,8 +61,8 @@ package_pyside-tools-common() { package_python2-pyside-tools() { pkgdesc="PySide lupdate, rcc, and uic development tools (for Python 2) (mingw-w64)" - makedepends=("${MINGW_PACKAGE_PREFIX}-pyside-tools-common" - "${MINGW_PACKAGE_PREFIX}-python2-pyside") + depends=("${MINGW_PACKAGE_PREFIX}-pyside-tools-common-qt4" + "${MINGW_PACKAGE_PREFIX}-python2-pyside-qt4") cd ${srcdir}/build-${MINGW_CHOST}-python2/sources/pyside-tools make DESTDIR=${pkgdir} install @@ -83,8 +84,8 @@ package_python2-pyside-tools() { package_python3-pyside-tools() { pkgdesc="PySide lupdate, rcc, and uic development tools (for Python 3) (mingw-w64)" - makedepends=("${MINGW_PACKAGE_PREFIX}-pyside-tools-common" - "${MINGW_PACKAGE_PREFIX}-python3-pyside") + depends=("${MINGW_PACKAGE_PREFIX}-pyside-tools-common-qt4" + "${MINGW_PACKAGE_PREFIX}-python3-pyside-qt4") cd ${srcdir}/build-${MINGW_CHOST}-python3/sources/pyside-tools make DESTDIR=${pkgdir} install @@ -98,26 +99,26 @@ package_python3-pyside-tools() { } # Wrappers -package_mingw-w64-i686-pyside-tools-common() { +package_mingw-w64-i686-pyside-tools-common-qt4() { package_pyside-tools-common } -package_mingw-w64-i686-python2-pyside-tools() { +package_mingw-w64-i686-python2-pyside-tools-qt4() { package_python2-pyside-tools } -package_mingw-w64-i686-python3-pyside-tools() { +package_mingw-w64-i686-python3-pyside-tools-qt4() { package_python3-pyside-tools } -package_mingw-w64-x86_64-pyside-tools-common() { +package_mingw-w64-x86_64-pyside-tools-common-qt4() { package_pyside-tools-common } -package_mingw-w64-x86_64-python2-pyside-tools() { +package_mingw-w64-x86_64-python2-pyside-tools-qt4() { package_python2-pyside-tools } -package_mingw-w64-x86_64-python3-pyside-tools() { +package_mingw-w64-x86_64-python3-pyside-tools-qt4() { package_python3-pyside-tools } diff --git a/mingw-w64-shiboken-qt4/PKGBUILD b/mingw-w64-shiboken-qt4/PKGBUILD index 4384455730..bb69ac9b05 100644 --- a/mingw-w64-shiboken-qt4/PKGBUILD +++ b/mingw-w64-shiboken-qt4/PKGBUILD @@ -2,9 +2,10 @@ # Contributor: Xin Sun _realname=shiboken -pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname} ${MINGW_PACKAGE_PREFIX}-python{2,3}-${_realname}) +pkgbase=mingw-w64-${_realname}-qt4 +pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-qt4 ${MINGW_PACKAGE_PREFIX}-python{2,3}-${_realname}-qt4) pkgver=1.2.2 -pkgrel=1 +pkgrel=2 arch=('any') url="http://pyside.github.io/docs/pyside/" license=("LGPL") @@ -12,7 +13,7 @@ install=${_realname}-${CARCH}.install source=(https://pypi.python.org/packages/source/P/PySide/PySide-${pkgver}.tar.gz shiboken.patch) md5sums=('c45bc400c8a86d6b35f34c29e379e44d' - 'ae1f4fb9f824adb3246fbfda2e0e577e') + '79cbe9b06107a431693c401944e78c3b') makedepends=("${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-libxslt" "${MINGW_PACKAGE_PREFIX}-python2" @@ -90,11 +91,11 @@ package_shiboken() { package_python2-shiboken() { pkgdesc="Support library for Python2 bindings (mingw-w64)" - makedepends=("${MINGW_PACKAGE_PREFIX}-libxml2" - "${MINGW_PACKAGE_PREFIX}-libxslt" - "${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-shiboken" - "${MINGW_PACKAGE_PREFIX}-qt4") + depends=("${MINGW_PACKAGE_PREFIX}-libxml2" + "${MINGW_PACKAGE_PREFIX}-libxslt" + "${MINGW_PACKAGE_PREFIX}-python2" + "${MINGW_PACKAGE_PREFIX}-shiboken-qt4" + "${MINGW_PACKAGE_PREFIX}-qt4") cd ${srcdir}/build-${MINGW_CHOST}-python2/sources/shiboken make DESTDIR=${pkgdir} install @@ -113,11 +114,11 @@ package_python2-shiboken() { package_python3-shiboken() { pkgdesc="Support library for Python3 bindings (mingw-w64)" - makedepends=("${MINGW_PACKAGE_PREFIX}-libxml2" - "${MINGW_PACKAGE_PREFIX}-libxslt" - "${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-shiboken" - "${MINGW_PACKAGE_PREFIX}-qt4") + depends=("${MINGW_PACKAGE_PREFIX}-libxml2" + "${MINGW_PACKAGE_PREFIX}-libxslt" + "${MINGW_PACKAGE_PREFIX}-python3" + "${MINGW_PACKAGE_PREFIX}-shiboken-qt4" + "${MINGW_PACKAGE_PREFIX}-qt4") cd ${srcdir}/build-${MINGW_CHOST}-python3/sources/shiboken make DESTDIR=${pkgdir} install @@ -131,26 +132,26 @@ package_python3-shiboken() { } # Wrappers -package_mingw-w64-i686-shiboken() { +package_mingw-w64-i686-shiboken-qt4() { package_shiboken } -package_mingw-w64-i686-python2-shiboken() { +package_mingw-w64-i686-python2-shiboken-qt4() { package_python2-shiboken } -package_mingw-w64-i686-python3-shiboken() { +package_mingw-w64-i686-python3-shiboken-qt4() { package_python3-shiboken } -package_mingw-w64-x86_64-shiboken() { +package_mingw-w64-x86_64-shiboken-qt4() { package_shiboken } -package_mingw-w64-x86_64-python2-shiboken() { +package_mingw-w64-x86_64-python2-shiboken-qt4() { package_python2-shiboken } -package_mingw-w64-x86_64-python3-shiboken() { +package_mingw-w64-x86_64-python3-shiboken-qt4() { package_python3-shiboken } diff --git a/mingw-w64-shiboken-qt4/shiboken.patch b/mingw-w64-shiboken-qt4/shiboken.patch index b60a4fa2c7..5ff9bca1dc 100644 --- a/mingw-w64-shiboken-qt4/shiboken.patch +++ b/mingw-w64-shiboken-qt4/shiboken.patch @@ -10,6 +10,17 @@ if(CMAKE_HOST_UNIX AND NOT CYGWIN) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden -Wno-strict-aliasing") endif() +--- PySide-1.2.2/sources/shiboken/libshiboken/basewrapper.cpp.orig 2015-06-26 11:25:44.610800000 +0300 ++++ PySide-1.2.2/sources/shiboken/libshiboken/basewrapper.cpp 2015-06-26 11:27:46.225600000 +0300 +@@ -770,7 +770,7 @@ + Py_hash_t hash(PyObject* pyObj) + { + assert(Shiboken::Object::checkType(pyObj)); +- return reinterpret_cast(pyObj); ++ return reinterpret_cast(pyObj); + } + + static void setSequenceOwnership(PyObject* pyObj, bool owner) --- PySide-1.2.2/sources/shiboken/shibokenmodule/CMakeLists.txt.orig 2015-06-26 07:00:25.341400000 +0300 +++ PySide-1.2.2/sources/shiboken/shibokenmodule/CMakeLists.txt 2015-06-26 07:00:39.974200000 +0300 @@ -9,7 +9,7 @@ @@ -28,7 +39,7 @@ void setObjectName(const Str& name); - inline unsigned long identifier() const { return reinterpret_cast(this); } -+ inline uintptr_t identifier() const { return reinterpret_cast(this); } ++ inline unsigned long identifier() const { return reinterpret_cast(this); } bool causeEvent(Event::EventType eventType); @@ -43,17 +54,6 @@ +#endif #else #include - #endif ---- PySide-1.2.2/sources/shiboken/libshiboken/sbkpython.h.orig 2015-06-26 08:56:26.421800000 +0300 -+++ PySide-1.2.2/sources/shiboken/libshiboken/sbkpython.h 2015-06-26 08:56:29.666600000 +0300 -@@ -51,7 +51,7 @@ - #define SBK_STR_NAME "str" - #define SBK_PyMethod_New(X, Y) PyMethod_New(X, Y, (PyObject*)Py_TYPE(Y)) - -- #define Py_hash_t long -+ #define Py_hash_t Py_ssize_t - #endif - #endif --- PySide-1.2.2/sources/shiboken/generator/shiboken/overloaddata.cpp.orig 2015-06-26 10:00:46.779800000 +0300 +++ PySide-1.2.2/sources/shiboken/generator/shiboken/overloaddata.cpp 2015-06-26 10:02:01.441400000 +0300