So, here goes another try.
This patch updates the ports mentioned in the subject.
py-qt4 needs to be updated in order to build with the newer py-sip.
I have tested it by building and running an application using py-qt4
(puddletag).
py-qscintilla and py-kde were build-tested, as well, with the sip update
and seem to work.
py-qt4 seems to have introduced GNUisms in at least one of their
Makefiles so I set the port to use gmake.
The dbus patch is required, because dbus_watch_get_fd is deprecated and
dbus_watch_get_unix_fd is now used on UNIX platforms. Otherwise a
warning occurs with aborts the build.
Thoughts? OK?
Index: devel/py-sip/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-sip/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- devel/py-sip/Makefile 8 Nov 2013 22:37:16 -0000 1.27
+++ devel/py-sip/Makefile 2 Jan 2015 17:22:25 -0000
@@ -6,7 +6,7 @@ SHARED_ONLY= Yes
COMMENT= automatically generate Python bindings for C and C++ libs
-DISTNAME= sip-4.15.3
+DISTNAME= sip-4.16.5
PKGNAME= py-${DISTNAME}
CATEGORIES= devel
Index: devel/py-sip/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-sip/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- devel/py-sip/distinfo 8 Nov 2013 22:37:16 -0000 1.13
+++ devel/py-sip/distinfo 2 Jan 2015 17:22:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (sip-4.15.3.tar.gz) = RvJFJShm29t/tayhlL2pkcyEuoCQ1ehkdl7n5RGgU9Q=
-SIZE (sip-4.15.3.tar.gz) = 773818
+SHA256 (sip-4.16.5.tar.gz) = oAujTDC+3A9hkW6xC9EoZ7R1SRCnZmR+Plj4i9APHoc=
+SIZE (sip-4.16.5.tar.gz) = 859672
Index: devel/py-sip/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-sip/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- devel/py-sip/pkg/PLIST 8 Nov 2013 22:37:17 -0000 1.5
+++ devel/py-sip/pkg/PLIST 2 Jan 2015 17:22:25 -0000
@@ -9,7 +9,6 @@ lib/python${MODPY_VERSION}/site-packages
share/doc/${MODPY_PY_PREFIX}sip/
share/doc/${MODPY_PY_PREFIX}sip/annotations.txt
share/doc/${MODPY_PY_PREFIX}sip/build_system.txt
-share/doc/${MODPY_PY_PREFIX}sip/builtin.txt
share/doc/${MODPY_PY_PREFIX}sip/c_api.txt
share/doc/${MODPY_PY_PREFIX}sip/command_line.txt
share/doc/${MODPY_PY_PREFIX}sip/directives.txt
Index: x11/py-qt4/Makefile
===================================================================
RCS file: /cvs/ports/x11/py-qt4/Makefile,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 Makefile
--- x11/py-qt4/Makefile 8 Nov 2013 22:37:43 -0000 1.41
+++ x11/py-qt4/Makefile 2 Jan 2015 17:22:58 -0000
@@ -5,12 +5,11 @@ SHARED_ONLY= Yes
COMMENT-main= python Qt4 bindings
COMMENT-docs= py-qt4 documentation
-V= 4.10.3
+V= 4.11.3
DISTNAME= PyQt-x11-gpl-${V}
PKGNAME= py-qt4-${V}
PKGNAME-main= py-qt4-${V}
PKGNAME-docs= py-qt4-docs-${V}
-EPOCH= 0
CATEGORIES= x11 devel
@@ -46,6 +45,7 @@ MODULES= devel/gettext \
lang/python \
x11/qt4
+USE_GMAKE= Yes
CONFIGURE_STYLE=simple
CONFIGURE_SCRIPT=${MODPY_BIN} configure.py
CONFIGURE_ARGS= --verbose \
Index: x11/py-qt4/distinfo
===================================================================
RCS file: /cvs/ports/x11/py-qt4/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- x11/py-qt4/distinfo 8 Nov 2013 22:37:43 -0000 1.16
+++ x11/py-qt4/distinfo 2 Jan 2015 17:22:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.10.3.tar.gz) =
pxO+vvOUITssnh/gytVpm4adw1a7pQdm4GkBPrqL9jA=
-SIZE (PyQt-x11-gpl-4.10.3.tar.gz) = 11187362
+SHA256 (PyQt-x11-gpl-4.11.3.tar.gz) =
hTeA3Nvi5rp4XXA9BZsJbh/Ek2nT6NQaBgvodLh0VoY=
+SIZE (PyQt-x11-gpl-4.11.3.tar.gz) = 11120237
Index: x11/py-qt4/patches/patch-configure_py
===================================================================
RCS file: /cvs/ports/x11/py-qt4/patches/patch-configure_py,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-configure_py
--- x11/py-qt4/patches/patch-configure_py 8 Nov 2013 22:37:43 -0000
1.12
+++ x11/py-qt4/patches/patch-configure_py 2 Jan 2015 17:22:58 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_py,v 1.12 2013/11/08 22:37:43 sthen Exp $
---- configure.py.orig Wed Aug 21 06:50:47 2013
-+++ configure.py Fri Nov 8 08:58:17 2013
-@@ -1159,6 +1159,17 @@ def run_command(cmd, envvars=None):
+--- configure.py.orig Sun Nov 9 17:47:54 2014
++++ configure.py Wed Dec 31 17:32:11 2014
+@@ -1164,6 +1164,17 @@ def run_command(cmd, envvars=None):
cmd is the command to run.
"""
@@ -19,7 +19,7 @@ $OpenBSD: patch-configure_py,v 1.12 2013
if opts.verbose:
sys.stdout.write(cmd + "\n")
-@@ -1841,7 +1852,7 @@ Type 'no' to decline the terms of the license.
+@@ -1778,7 +1789,7 @@ Type 'no' to decline the terms of the license.
sys.stdout.flush()
try:
Index: x11/py-qt4/patches/patch-dbus_dbus_cpp
===================================================================
RCS file: x11/py-qt4/patches/patch-dbus_dbus_cpp
diff -N x11/py-qt4/patches/patch-dbus_dbus_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/py-qt4/patches/patch-dbus_dbus_cpp 2 Jan 2015 17:22:58 -0000
@@ -0,0 +1,39 @@
+$OpenBSD$
+--- dbus/dbus.cpp.orig Sun Nov 9 17:48:01 2014
++++ dbus/dbus.cpp Wed Dec 31 18:29:52 2014
+@@ -36,7 +36,7 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *d
+ {
+ pyqtDBusHelper *hlp = reinterpret_cast<pyqtDBusHelper *>(data);
+
+- int fd = dbus_watch_get_fd(watch);
++ int fd = dbus_watch_get_unix_fd(watch);
+ unsigned int flags = dbus_watch_get_flags(watch);
+ dbus_bool_t enabled = dbus_watch_get_enabled(watch);
+
+@@ -69,7 +69,7 @@ static void remove_watch(DBusWatch *watch, void *data)
+ {
+ pyqtDBusHelper *hlp = reinterpret_cast<pyqtDBusHelper *>(data);
+
+- int fd = dbus_watch_get_fd(watch);
++ int fd = dbus_watch_get_unix_fd(watch);
+
+ pyqtDBusHelper::Watchers::iterator it = hlp->watchers.find(fd);
+
+@@ -101,7 +101,7 @@ static void toggle_watch(DBusWatch *watch, void *data)
+ {
+ pyqtDBusHelper *hlp = reinterpret_cast<pyqtDBusHelper *>(data);
+
+- int fd = dbus_watch_get_fd(watch);
++ int fd = dbus_watch_get_unix_fd(watch);
+ unsigned int flags = dbus_watch_get_flags(watch);
+ dbus_bool_t enabled = dbus_watch_get_enabled(watch);
+
+@@ -349,7 +349,7 @@ static PyObject *DBusQtMainLoop(PyObject *, PyObject *
+ }
+
+ int set_as_default = 0;
+- static char *argnames[] = {"set_as_default", 0};
++ static char *argnames[] = {(char*)"set_as_default", 0};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i", argnames,
&set_as_default))
+ return 0;
Index: x11/py-qt4/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/py-qt4/pkg/PLIST-main,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 PLIST-main
--- x11/py-qt4/pkg/PLIST-main 8 Nov 2013 22:37:43 -0000 1.15
+++ x11/py-qt4/pkg/PLIST-main 2 Jan 2015 17:22:58 -0000
@@ -262,6 +264,7 @@ share/sip/QtDesigner/qpydesignertaskmenu
share/sip/QtDesigner/taskmenu.sip
share/sip/QtGui/
share/sip/QtGui/QtGuimod.sip
+share/sip/QtGui/opengl_types.sip
share/sip/QtGui/qabstractbutton.sip
share/sip/QtGui/qabstractitemdelegate.sip
share/sip/QtGui/qabstractitemview.sip
@@ -523,7 +526,6 @@ share/sip/QtNetwork/qudpsocket.sip
share/sip/QtNetwork/qurlinfo.sip
share/sip/QtOpenGL/
share/sip/QtOpenGL/QtOpenGLmod.sip
-share/sip/QtOpenGL/opengl_types.sip
share/sip/QtOpenGL/qgl.sip
share/sip/QtOpenGL/qglbuffer.sip
share/sip/QtOpenGL/qglcolormap.sip
