Sat May 7 19:02:18 2016 UTC ()
Pullup ticket #4968 - requested by wiz
x11/py-qt5: build fix

Revisions pulled up:
- x11/py-qt5/Makefile                                           1.11
- x11/py-qt5/distinfo                                           1.4
- x11/py-qt5/patches/patch-configure.py                         1.4
- x11/py-qt5/patches/patch-designer_designer.pro-in             1.1
- x11/py-qt5/patches/patch-qmlscene_qmlscene.pro-in             1.1

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Sat Apr 23 07:38:38 UTC 2016

   Modified Files:
   	pkgsrc/x11/py-qt5: Makefile distinfo
   	pkgsrc/x11/py-qt5/patches: patch-configure.py
   Added Files:
   	pkgsrc/x11/py-qt5/patches: patch-designer_designer.pro-in
   	    patch-qmlscene_qmlscene.pro-in

   Log Message:
   Fix rpath for X11=native case.

   From Olaf 'Rhialto' Seibert in PR 50876.

   Bump PKGREVISION.


(bsiegert)
diff -r1.9 -r1.9.2.1 pkgsrc/x11/py-qt5/Makefile
diff -r1.3 -r1.3.4.1 pkgsrc/x11/py-qt5/distinfo
diff -r1.3 -r1.3.4.1 pkgsrc/x11/py-qt5/patches/patch-configure.py
diff -r0 -r1.1.2.2 pkgsrc/x11/py-qt5/patches/patch-designer_designer.pro-in
diff -r0 -r1.1.2.2 pkgsrc/x11/py-qt5/patches/patch-qmlscene_qmlscene.pro-in
cvs diff -r1.9 -r1.9.2.1 pkgsrc/x11/py-qt5/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-qt5/Makefile 2016/03/05 11:29:47 1.9
+++ pkgsrc/x11/py-qt5/Makefile 2016/05/07 19:02:17 1.9.2.1
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: Makefile,v 1.9 2016/03/05 11:29:47 jperkin Exp $ 1# $NetBSD: Makefile,v 1.9.2.1 2016/05/07 19:02:17 bsiegert Exp $
2 2
3DISTNAME= PyQt-gpl-${PYQT_VERSION} 3DISTNAME= PyQt-gpl-${PYQT_VERSION}
4PKGNAME= ${PYPKGPREFIX}-qt5-${PYQT_VERSION} 4PKGNAME= ${PYPKGPREFIX}-qt5-${PYQT_VERSION}
5PKGREVISION= 2 5PKGREVISION= 4
6PYQT_VERSION= 5.5.1 6PYQT_VERSION= 5.5.1
7CATEGORIES= x11 python 7CATEGORIES= x11 python
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyqt/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyqt/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11COMMENT= Python binding for Qt5 11COMMENT= Python binding for Qt5
12HOMEPAGE= http://www.riverbankcomputing.com/software/pyqt/intro 12HOMEPAGE= http://www.riverbankcomputing.com/software/pyqt/intro
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= gmake pkg-config 15USE_TOOLS+= gmake pkg-config
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17 17
18CONFIGURE_ARGS+= -b ${PREFIX}/bin 18CONFIGURE_ARGS+= -b ${PREFIX}/bin
19CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB} 19CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB}
20CONFIGURE_ARGS+= -q ${QTDIR}/bin/qmake 20CONFIGURE_ARGS+= -q ${QTDIR}/bin/qmake
21CONFIGURE_ARGS+= --confirm-license 21CONFIGURE_ARGS+= --confirm-license
22CONFIGURE_ARGS+= --qsci-api 22CONFIGURE_ARGS+= --qsci-api
23CONFIGURE_ARGS+= --sip ${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX} 23CONFIGURE_ARGS+= --sip ${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
24CONFIGURE_ARGS+= --verbose 24CONFIGURE_ARGS+= --verbose
25 25
26INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 26INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
27 27
28PY_PATCHPLIST= yes 28PY_PATCHPLIST= yes
29PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} 29PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
30 30
31SUBST_CLASSES+= install 31SUBST_CLASSES+= install x11lib
32SUBST_STAGE.install= post-configure 32SUBST_STAGE.install= post-configure
33SUBST_SED.install+= -e 's,INSTALL_FILE = ,INSTALL_FILE = libtool --mode=install ,' 33SUBST_SED.install+= -e 's,INSTALL_FILE = ,INSTALL_FILE = libtool --mode=install ,'
34SUBST_SED.install+= -e 's,\(TARGET[A-Z ]*\)= lib,\1= ,' 34SUBST_SED.install+= -e 's,\(TARGET[A-Z ]*\)= lib,\1= ,'
35SUBST_MESSAGE.install= Fixing installation target and file name. 35SUBST_MESSAGE.install= Fixing installation target and file name.
36SUBST_FILES.install+= Qt/Makefile 36SUBST_FILES.install+= Qt/Makefile
37SUBST_FILES.install+= QtCore/Makefile 37SUBST_FILES.install+= QtCore/Makefile
38SUBST_FILES.install+= QtDBus/Makefile 38SUBST_FILES.install+= QtDBus/Makefile
39SUBST_FILES.install+= QtDesigner/Makefile 39SUBST_FILES.install+= QtDesigner/Makefile
40SUBST_FILES.install+= QtGui/Makefile 40SUBST_FILES.install+= QtGui/Makefile
41SUBST_FILES.install+= QtHelp/Makefile 41SUBST_FILES.install+= QtHelp/Makefile
42SUBST_FILES.install+= QtMultimedia/Makefile 42SUBST_FILES.install+= QtMultimedia/Makefile
43SUBST_FILES.install+= QtMultimediaWidgets/Makefile 43SUBST_FILES.install+= QtMultimediaWidgets/Makefile
44SUBST_FILES.install+= QtNetwork/Makefile 44SUBST_FILES.install+= QtNetwork/Makefile
@@ -47,26 +47,34 @@ SUBST_FILES.install+= QtPositioning/Make @@ -47,26 +47,34 @@ SUBST_FILES.install+= QtPositioning/Make
47SUBST_FILES.install+= QtPrintSupport/Makefile 47SUBST_FILES.install+= QtPrintSupport/Makefile
48SUBST_FILES.install+= QtQml/Makefile 48SUBST_FILES.install+= QtQml/Makefile
49SUBST_FILES.install+= QtQuick/Makefile 49SUBST_FILES.install+= QtQuick/Makefile
50SUBST_FILES.install+= QtSensors/Makefile 50SUBST_FILES.install+= QtSensors/Makefile
51SUBST_FILES.install+= QtSql/Makefile 51SUBST_FILES.install+= QtSql/Makefile
52SUBST_FILES.install+= QtSvg/Makefile 52SUBST_FILES.install+= QtSvg/Makefile
53SUBST_FILES.install+= QtTest/Makefile 53SUBST_FILES.install+= QtTest/Makefile
54SUBST_FILES.install+= QtWebKit/Makefile 54SUBST_FILES.install+= QtWebKit/Makefile
55SUBST_FILES.install+= QtWebKitWidgets/Makefile 55SUBST_FILES.install+= QtWebKitWidgets/Makefile
56SUBST_FILES.install+= QtWidgets/Makefile 56SUBST_FILES.install+= QtWidgets/Makefile
57SUBST_FILES.install+= QtXmlPatterns/Makefile 57SUBST_FILES.install+= QtXmlPatterns/Makefile
58SUBST_FILES.install+= _QOpenGLFunctions_2_0/Makefile 58SUBST_FILES.install+= _QOpenGLFunctions_2_0/Makefile
59 59
 60SUBST_STAGE.x11lib= post-patch
 61SUBST_SED.x11lib+= -e 's,@X11LIB@,${X11BASE}/lib,'
 62SUBST_SED.x11lib+= -e 's,@PREFIX@,${PREFIX},'
 63SUBST_MESSAGE.x11lib= Fixing rpath for X11 and pulseaudio libraries.
 64SUBST_FILES.x11lib+= configure.py
 65SUBST_FILES.x11lib+= designer/designer.pro-in
 66SUBST_FILES.x11lib+= qmlscene/qmlscene.pro-in
 67
60do-configure: 68do-configure:
61 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ 69 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
62 ${PYTHONBIN} configure.py ${CONFIGURE_ARGS} 70 ${PYTHONBIN} configure.py ${CONFIGURE_ARGS}
63 71
64.include "../../lang/python/extension.mk" 72.include "../../lang/python/extension.mk"
65.include "../../sysutils/dbus-python-common/buildlink3.mk" 73.include "../../sysutils/dbus-python-common/buildlink3.mk"
66BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.16.4 74BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.16.4
67.include "../../x11/py-sip/buildlink3.mk" 75.include "../../x11/py-sip/buildlink3.mk"
68.include "../../x11/qt5-qtbase/buildlink3.mk" 76.include "../../x11/qt5-qtbase/buildlink3.mk"
69.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 77.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
70.include "../../x11/qt5-qtlocation/buildlink3.mk" 78.include "../../x11/qt5-qtlocation/buildlink3.mk"
71.include "../../x11/qt5-qtmultimedia/buildlink3.mk" 79.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
72.include "../../x11/qt5-qtsensors/buildlink3.mk" 80.include "../../x11/qt5-qtsensors/buildlink3.mk"
cvs diff -r1.3 -r1.3.4.1 pkgsrc/x11/py-qt5/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/py-qt5/distinfo 2015/10/26 21:40:39 1.3
+++ pkgsrc/x11/py-qt5/distinfo 2016/05/07 19:02:17 1.3.4.1
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1$NetBSD: distinfo,v 1.3 2015/10/26 21:40:39 adam Exp $ 1$NetBSD: distinfo,v 1.3.4.1 2016/05/07 19:02:17 bsiegert Exp $
2 2
3SHA1 (PyQt-gpl-5.5.1.tar.gz) = d54cd7cf26b10f0b59fddce4a6a742f9697a94ff 3SHA1 (PyQt-gpl-5.5.1.tar.gz) = d54cd7cf26b10f0b59fddce4a6a742f9697a94ff
4RMD160 (PyQt-gpl-5.5.1.tar.gz) = f0027899d9cef20d40dbcad01560edd25c6f7e4e 4RMD160 (PyQt-gpl-5.5.1.tar.gz) = f0027899d9cef20d40dbcad01560edd25c6f7e4e
5SHA512 (PyQt-gpl-5.5.1.tar.gz) = ed9a4f30a50c0879f25b6a0841247f3f0de86942b55c1de9efea963bfbf64ee963a9e5c09be036ff2dec76164863b3b6235e45e8662776425f15378fa0abeab4 5SHA512 (PyQt-gpl-5.5.1.tar.gz) = ed9a4f30a50c0879f25b6a0841247f3f0de86942b55c1de9efea963bfbf64ee963a9e5c09be036ff2dec76164863b3b6235e45e8662776425f15378fa0abeab4
6Size (PyQt-gpl-5.5.1.tar.gz) = 3705749 bytes 6Size (PyQt-gpl-5.5.1.tar.gz) = 3705749 bytes
7SHA1 (patch-configure.py) = 8cba68f76142df2ed61dec766f8c0e952210487e 7SHA1 (patch-configure.py) = 5b447f906b05dace1068fc5126b3c40a2e6c9452
 8SHA1 (patch-designer_designer.pro-in) = 8b7d885c4a5c5336dbdbead2bd88a4da02026ee2
 9SHA1 (patch-qmlscene_qmlscene.pro-in) = fbc19d909b9174b26c9b81898e3843c8a3521492
cvs diff -r1.3 -r1.3.4.1 pkgsrc/x11/py-qt5/patches/Attic/patch-configure.py (expand / switch to unified diff)

--- pkgsrc/x11/py-qt5/patches/Attic/patch-configure.py 2015/10/26 21:40:40 1.3
+++ pkgsrc/x11/py-qt5/patches/Attic/patch-configure.py 2016/05/07 19:02:18 1.3.4.1
@@ -1,40 +1,42 @@ @@ -1,40 +1,42 @@
1$NetBSD: patch-configure.py,v 1.3 2015/10/26 21:40:40 adam Exp $ 1$NetBSD: patch-configure.py,v 1.3.4.1 2016/05/07 19:02:18 bsiegert Exp $
2 2
3On Darwin, do not expect application bundle. 3On Darwin, do not expect application bundle.
4Adapt for pkgsrc change to make qmake create libtool files. 4Adapt for pkgsrc change to make qmake create libtool files.
5 5
6--- configure.py.orig 2015-10-25 11:42:16.000000000 +0000 6--- configure.py.orig 2015-10-25 11:42:16.000000000 +0000
7+++ configure.py 7+++ configure.py
8@@ -1932,10 +1932,7 @@ def run_make(target_config, verbose, exe 8@@ -1932,10 +1932,7 @@ def run_make(target_config, verbose, exe
9 make = 'make' 9 make = 'make'
10 makefile_target = '' 10 makefile_target = ''
11  11
12- if target_config.py_platform == 'darwin': 12- if target_config.py_platform == 'darwin':
13- platform_exe = os.path.join(exe + '.app', 'Contents', 'MacOS', exe) 13- platform_exe = os.path.join(exe + '.app', 'Contents', 'MacOS', exe)
14- else: 14- else:
15- platform_exe = os.path.join('.', exe) 15- platform_exe = os.path.join('.', exe)
16+ platform_exe = os.path.join('.', exe) 16+ platform_exe = os.path.join('.', exe)
17  17
18 remove_file(platform_exe) 18 remove_file(platform_exe)
19  19
20@@ -2441,8 +2438,8 @@ win32 { 20@@ -2441,8 +2438,10 @@ win32 {
21 target.files = %s%s.pyd 21 target.files = %s%s.pyd
22 LIBS += %s 22 LIBS += %s
23 } else { 23 } else {
24- PY_MODULE = %s.so 24- PY_MODULE = %s.so
25- target.files = %s.so 25- target.files = %s.so
26+ PY_MODULE = %s.la 26+ PY_MODULE = %s.la
27+ target.files = %s.la 27+ target.files = %s.la
 28+ LIBS += -Wl,-rpath,@X11LIB@
 29+ LIBS += -Wl,-rpath,@PREFIX@/lib/pulseaudio
28 } 30 }
29 ''' % (target_name, debug_suffix, target_name, debug_suffix, link, target_name, target_name) 31 ''' % (target_name, debug_suffix, target_name, debug_suffix, link, target_name, target_name)
30  32
31@@ -2517,9 +2514,6 @@ win32 { 33@@ -2517,9 +2514,6 @@ win32 {
32 # common case where the PyQt configuration reflects the Qt 34 # common case where the PyQt configuration reflects the Qt
33 # configuration. 35 # configuration.
34 fwks = [] 36 fwks = []
35- for m in ('QtPrintSupport', 'QtDBus', 'QtWidgets'): 37- for m in ('QtPrintSupport', 'QtDBus', 'QtWidgets'):
36- if m in target_config.pyqt_modules: 38- if m in target_config.pyqt_modules:
37- fwks.append('-framework ' + m) 39- fwks.append('-framework ' + m)
38  40
39 if len(fwks) != 0: 41 if len(fwks) != 0:
40 extra_lflags = 'QMAKE_LFLAGS += "%s"\n ' % ' '.join(fwks) 42 extra_lflags = 'QMAKE_LFLAGS += "%s"\n ' % ' '.join(fwks)
File Added: pkgsrc/x11/py-qt5/patches/patch-designer_designer.pro-in
$NetBSD: patch-designer_designer.pro-in,v 1.1.2.2 2016/05/07 19:02:18 bsiegert Exp $

Add rpath to X11 libraries.

--- designer/designer.pro-in.orig	2014-12-25 10:18:22.000000000 +0000
+++ designer/designer.pro-in
@@ -9,6 +9,7 @@ TEMPLATE    = lib
 
 INCLUDEPATH += @PYINCDIR@
 LIBS        += @PYLINK@
+LIBS        += -Wl,-rpath,@X11LIB@
 DEFINES     += PYTHON_LIB=\\\"@PYSHLIB@\\\"
 
 SOURCES     = pluginloader.cpp
File Added: pkgsrc/x11/py-qt5/patches/patch-qmlscene_qmlscene.pro-in
$NetBSD: patch-qmlscene_qmlscene.pro-in,v 1.1.2.2 2016/05/07 19:02:18 bsiegert Exp $

Add rpath to X11 libraries.

--- qmlscene/qmlscene.pro-in.orig	2014-12-25 10:18:22.000000000 +0000
+++ qmlscene/qmlscene.pro-in
@@ -9,6 +9,7 @@ TEMPLATE    = lib
 
 INCLUDEPATH += @PYINCDIR@ @SIPINCDIR@
 LIBS        += @PYLINK@
+LIBS        += -Wl,-rpath,@X11LIB@
 
 SOURCES     = pluginloader.cpp
 HEADERS     = pluginloader.h