cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak build after py-sip/py-qt4 updates

Browse Source 
(Upstream changeset 14988).

Tested in a bulk build by landry@
OK landry@, sthen@
This commit is contained in:
dcoppa 2011-05-17 08:53:50 +00:00
parent 4512af26fa
commit b7ae534a02
3 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
geo/qgis/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.19 2011/03/13 18:19:32 dcoppa Exp $ # $OpenBSD: Makefile,v 1.20 2011/05/17 08:53:50 dcoppa Exp $
COMMENT = desktop geographical information system COMMENT = desktop geographical information system
ONLY_FOR_ARCHS = ${GCC4_ARCHS} ONLY_FOR_ARCHS = ${GCC4_ARCHS}
DISTNAME = qgis-1.6.0 DISTNAME = qgis-1.6.0
REVISION = 0 REVISION = 1
EXTRACT_SUFX = .tar.bz2 EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11 CATEGORIES = geo x11
@ -30,17 +30,17 @@ MODULES = devel/cmake \
devel/gettext \ devel/gettext \
lang/python lang/python
BUILD_DEPENDS = x11/py-qt4 \ BUILD_DEPENDS = x11/py-qt4>=4.8.4 \
geo/gdal,-python \ geo/gdal,-python \
devel/bison devel/bison
RUN_DEPENDS = x11/py-qt4 \ RUN_DEPENDS = x11/py-qt4>=4.8.4 \
geo/gdal,-python \ geo/gdal,-python \
devel/desktop-file-utils devel/desktop-file-utils
LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
devel/proj \ devel/proj \
x11/qt4 \ x11/qt4>=4.7.2 \
x11/qwt \ x11/qwt \
www/fcgi \ www/fcgi \
geo/gdal \ geo/gdal \

17
geo/qgis/patches/patch-python_CMakeLists_txt Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-python_CMakeLists_txt,v 1.3 2011/05/17 08:53:50 dcoppa Exp $
Fix build with newer PySIP/PyQt
--- python/CMakeLists.txt.orig Mon Oct 4 22:05:12 2010
+++ python/CMakeLists.txt Mon May 16 11:14:35 2011
@@ -43,6 +43,10 @@ IF(NOT PYQT4_VERSION_NUM LESS 263941) # 0x040705
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
+IF(NOT PYQT4_VERSION_NUM LESS 264194) # 0x040802
+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
+ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
+
# core module
FILE(GLOB sip_files_core core/*.sip)
set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})

33
geo/qgis/patches/patch-python_core_conversions_sip Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-python_core_conversions_sip,v 1.3 2011/05/17 08:53:50 dcoppa Exp $
Fix build with newer PySIP/PyQt
--- python/core/conversions.sip.orig Sun Oct 3 11:11:28 2010
+++ python/core/conversions.sip Mon May 16 11:14:35 2011
@@ -15,6 +15,7 @@ which are not wrapped by PyQt:
*/
%Feature QSETINT_CONVERSION
+%Feature QSETTYPE_CONVERSION
%ModuleHeaderCode
// From Python 2.5, some functions use Py_ssize_t instead of int
@@ -320,7 +321,7 @@ template <TYPE>
};
%End
-
+%If (QSETTYPE_CONVERSION)
template <TYPE>
%MappedType QSet<TYPE>
{
@@ -394,8 +395,7 @@ template <TYPE>
%End
};
-
-
+%End
template<TYPE>
%MappedType QMap<int, QMap<int, TYPE> >