From owner-svn-ports-head@FreeBSD.ORG Sun Jul 20 19:00:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 826843D4; Sun, 20 Jul 2014 19:00:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6F80B20D6; Sun, 20 Jul 2014 19:00:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6KJ0eo7010369; Sun, 20 Jul 2014 19:00:40 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6KJ0enc010367; Sun, 20 Jul 2014 19:00:40 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407201900.s6KJ0enc010367@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 20 Jul 2014 19:00:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362348 - in head/devel/py-pykde4: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jul 2014 19:00:40 -0000 Author: rakuco Date: Sun Jul 20 19:00:39 2014 New Revision: 362348 URL: http://svnweb.freebsd.org/changeset/ports/362348 QAT: https://qat.redports.org/buildarchive/r362348/ Log: Add patch to make the port build with PyQt >= 4.11. The PyQt4 update is coming soon, so let's prepare the ground for it. Added: head/devel/py-pykde4/files/patch-git_1e9817f9 (contents, props changed) Modified: head/devel/py-pykde4/Makefile Modified: head/devel/py-pykde4/Makefile ============================================================================== --- head/devel/py-pykde4/Makefile Sun Jul 20 18:56:11 2014 (r362347) +++ head/devel/py-pykde4/Makefile Sun Jul 20 19:00:39 2014 (r362348) @@ -2,6 +2,7 @@ PORTNAME= pykde4 PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde python MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Added: head/devel/py-pykde4/files/patch-git_1e9817f9 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-pykde4/files/patch-git_1e9817f9 Sun Jul 20 19:00:39 2014 (r362348) @@ -0,0 +1,67 @@ +commit 1e9817f99b405a66199fe9f62de31d3870e3ad12 +Author: Luca Beltrame +Date: Fri Jun 20 11:08:31 2014 +0200 + + Fix building with PyQt >= 4.11 + + PyQt 4.11 adds new typedefs for GLuint, and these clash with the ones + defined in PyKDE4. Using a conditional in the sip file, the old + definitions are only kept if PyQt's version is lower than 4.11. + + Checks have been added also for the Python 3 definitions. + + CCMAIL: kde-packager@kde.org + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cf133d7..5233da8 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -113,15 +113,27 @@ set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) + # Use an extra option when compiling on Python 3. + if (PYTHON_VERSION_MAJOR GREATER 2) + if(PYQT4_VERSION STRGREATER "040904") +- # Disable for newer PyQt +- set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) ++ # Disable for features in newer Qt ++ if (PYQT4_VERSION STRGREATER "040a04") ++ # GLuint + QVector (PyQt > 4.11) ++ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x PyKDE_GLuint) ++ else () ++ # QVector (PyQt < 4.11) ++ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) ++ endif () + else () + set(SIP_EXTRA_OPTIONS -g) + endif() + else (PYTHON_VERSION_MAJOR GREATER 2) + if(PYQT4_VERSION STRGREATER "040904") + # Disable for newer PyQt +- set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) ++ if (PYQT4_VERSION STRGREATER "040a04") ++ # GLuint + QVector (PyQt > 4.11) ++ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3 -x PyKDE_GLuint) ++ else () ++ # QVector (PyQt < 4.11) ++ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) ++ endif () + else () + set(SIP_EXTRA_OPTIONS -g -x Py_v3) + endif() +diff --git a/sip/plasma/glapplet.sip b/sip/plasma/glapplet.sip +index ab35ccb..15dbd47 100644 +--- sip/plasma/glapplet.sip ++++ sip/plasma/glapplet.sip +@@ -18,8 +18,13 @@ + // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + //force ++ ++%Feature PyKDE_GLuint ++ ++%If (PyKDE_GLuint) + typedef unsigned int GLuint; + typedef unsigned int GLenum; ++%End + + namespace Plasma + {