pkg/50876: x11/py-qt5 needs rpath for X11BASE [with patch]

[rhialto%falu.nl@localhost]

>Number:         50876
>Category:       pkg
>Synopsis:       x11/py-qt5 needs rpath for X11BASE [with patch]
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Mar 01 17:35:00 +0000 2016
>Originator:     Rhialto
>Release:        NetBSD 7.0
>Organization:
	
>Environment:
	
	
System: NetBSD murthe.falu.nl 7.0 NetBSD 7.0 (GENERIC.201509250726Z) amd64
Architecture: x86_64
Machine: amd64
>Description:
	When packaging of x11/py-qt5 the "Checking for missing run-time search
	paths" check determines that various X11 related libraries are not
	found.
	This is probably only the case if you use native X.
>How-To-Repeat:
	cd /usr/pkgsrc/x11/py-qt5
	make package
>Fix:
	This is how I added -rpath options:

? patches/patch-designer_designer.pro-in
? patches/patch-qmlscene_qmlscene.pro-in
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-qt5/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	26 Oct 2015 21:40:39 -0000	1.7
+++ Makefile	1 Mar 2016 17:16:07 -0000
@@ -27,7 +27,7 @@
 PY_PATCHPLIST=		yes
 PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
-SUBST_CLASSES+=		install
+SUBST_CLASSES+=		install x11lib
 SUBST_STAGE.install=	post-configure
 SUBST_SED.install+=	-e 's,INSTALL_FILE  = ,INSTALL_FILE  = libtool --mode=install ,'
 SUBST_SED.install+=	-e 's,\(TARGET[A-Z ]*\)= lib,\1= ,'
@@ -56,6 +56,13 @@
 SUBST_FILES.install+=	QtXmlPatterns/Makefile
 SUBST_FILES.install+=	_QOpenGLFunctions_2_0/Makefile
 
+SUBST_STAGE.x11lib=     post-patch
+SUBST_SED.x11lib+=      -e 's,@X11LIB@,${X11BASE}/lib,'
+SUBST_MESSAGE.x11lib=   Fixing rpath for X11 libraries.
+SUBST_FILES.x11lib+=    configure.py
+SUBST_FILES.x11lib+=    designer/designer.pro-in
+SUBST_FILES.x11lib+=    qmlscene/qmlscene.pro-in
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} configure.py ${CONFIGURE_ARGS}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-qt5/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	26 Oct 2015 21:40:39 -0000	1.3
+++ distinfo	1 Mar 2016 17:16:07 -0000
@@ -4,4 +4,6 @@
 RMD160 (PyQt-gpl-5.5.1.tar.gz) = f0027899d9cef20d40dbcad01560edd25c6f7e4e
 SHA512 (PyQt-gpl-5.5.1.tar.gz) = ed9a4f30a50c0879f25b6a0841247f3f0de86942b55c1de9efea963bfbf64ee963a9e5c09be036ff2dec76164863b3b6235e45e8662776425f15378fa0abeab4
 Size (PyQt-gpl-5.5.1.tar.gz) = 3705749 bytes
-SHA1 (patch-configure.py) = 8cba68f76142df2ed61dec766f8c0e952210487e
+SHA1 (patch-configure.py) = 39e768576defc97653bc6106a9f06eeada3ad2fc
+SHA1 (patch-designer_designer.pro-in) = e1addedebb847042099e5542f381977982ede806
+SHA1 (patch-qmlscene_qmlscene.pro-in) = 1e550ff135d35350266e7f10737646cb341699ee
Index: patches/patch-configure.py
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-qt5/patches/patch-configure.py,v
retrieving revision 1.3
diff -u -r1.3 patch-configure.py
--- patches/patch-configure.py	26 Oct 2015 21:40:40 -0000	1.3
+++ patches/patch-configure.py	1 Mar 2016 17:16:07 -0000
@@ -17,7 +17,7 @@
  
      remove_file(platform_exe)
  
-@@ -2441,8 +2438,8 @@ win32 {
+@@ -2441,8 +2438,9 @@ win32 {
      target.files = %s%s.pyd
      LIBS += %s
  } else {
@@ -25,6 +25,7 @@
 -    target.files = %s.so
 +    PY_MODULE = %s.la
 +    target.files = %s.la
++    LIBS += -Wl,-rpath,@X11LIB@
  }
  ''' % (target_name, debug_suffix, target_name, debug_suffix, link, target_name, target_name)
  
patches/patch-designer_designer.pro-in:


$NetBSD$

--- 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

patches/patch-qmlscene_qmlscene.pro-in:

$NetBSD$

--- 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

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert  -- The Doctor: No, 'eureka' is Greek for
\X/ rhialto/at/xs4all.nl    -- 'this bath is too hot.'

>Unformatted: