* [gentoo-commits] gentoo-x86 commit in kde-base/pykde4/files: pykde4-4.9.2-pyqt45.patch
@ 2012-10-05 20:26 Markos Chandras (hwoarang)
0 siblings, 0 replies; 2+ messages in thread
From: Markos Chandras (hwoarang) @ 2012-10-05 20:26 UTC (permalink / raw
To: gentoo-commits
hwoarang 12/10/05 20:26:35
Added: pykde4-4.9.2-pyqt45.patch
Log:
Revbump to fix building with PyQt4-4.9.5. Bug #436578
(Portage version: 2.1.11.23/cvs/Linux x86_64)
Revision Changes Path
1.1 kde-base/pykde4/files/pykde4-4.9.2-pyqt45.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/files/pykde4-4.9.2-pyqt45.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/files/pykde4-4.9.2-pyqt45.patch?rev=1.1&content-type=text/plain
Index: pykde4-4.9.2-pyqt45.patch
===================================================================
Index: pykde4-4.9.2/CMakeLists.txt
===================================================================
--- pykde4-4.9.2.orig/CMakeLists.txt
+++ pykde4-4.9.2/CMakeLists.txt
@@ -33,7 +33,7 @@ INCLUDE(SIPMacros)
FIND_PACKAGE(PyQt4 REQUIRED)
IF(PYQT4_VERSION STRLESS "040900") # These version numbers also appear in ../CMakeLists.txt
- MESSAGE(FATAL_ERROR "The version of PyQt found is too old. 4.9 or later is required.")
+ MESSAGE(FATAL_ERROR "The version of PyQt found is too old. 4.9.5 or later is required.")
ENDIF(PYQT4_VERSION STRLESS "040900")
@@ -95,9 +95,19 @@ SET(SIP_DISABLE_FEATURES VendorID PyQt_N
# Use an extra option when compiling on Python 3.
IF (PYTHON_3)
- SET(SIP_EXTRA_OPTIONS -g -x Py_v3)
+ IF(PYQT4_VERSION STRGREATER "040904")
+ #Disable for newer PyQt
+ SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3)
+ ELSE(PYQT4_VERSION STRGREATER "040904")
+ SET(SIP_EXTRA_OPTIONS -g -x Py_v3)
+ ENDIF(PYQT4_VERSION STRGREATER "040904")
ELSE (PYTHON_3)
- SET(SIP_EXTRA_OPTIONS -g)
+ IF(PYQT4_VERSION STRGREATER "040904")
+ #Disable for newer PyQt
+ SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector)
+ ELSE(PYQT4_VERSION STRGREATER "040904")
+ SET(SIP_EXTRA_OPTIONS -g -x Py_v3)
+ ENDIF(PYQT4_VERSION STRGREATER "040904")
ENDIF (PYTHON_3)
ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
Index: pykde4-4.9.2/sip/kdecore/typedefs.sip
===================================================================
--- pykde4-4.9.2.orig/sip/kdecore/typedefs.sip
+++ pykde4-4.9.2/sip/kdecore/typedefs.sip
@@ -951,6 +951,9 @@ template <TYPE1>
%End
};
+%Feature PyKDE_QVector
+
+%If(PyKDE_QVector)
%MappedType QVector<int>
{
%TypeHeaderCode
@@ -1025,3 +1028,4 @@ template <TYPE1>
return sipGetState(sipTransferObj);
%End
};
+%End
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/pykde4/files: pykde4-4.9.2-pyqt45.patch
@ 2013-01-08 12:52 Michael Palimaka (kensington)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka (kensington) @ 2013-01-08 12:52 UTC (permalink / raw
To: gentoo-commits
kensington 13/01/08 12:52:53
Removed: pykde4-4.9.2-pyqt45.patch
Log:
Remove unused patches.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-08 12:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-08 12:52 [gentoo-commits] gentoo-x86 commit in kde-base/pykde4/files: pykde4-4.9.2-pyqt45.patch Michael Palimaka (kensington)
-- strict thread matches above, loose matches on Subject: below --
2012-10-05 20:26 Markos Chandras (hwoarang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox