pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/53594: [x11/py-sip] Fix sip Makefile generation for Qt5



>Number:         53594
>Category:       pkg
>Synopsis:       [x11/py-sip] Fix sip Makefile generation for Qt5
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Sep 11 15:45:01 +0000 2018
>Originator:     Anthony Mallet
>Release:        pkgsrc-2018Q2
>Organization:
>Environment:
NetBSD fluffy64-netbsd8 8.0 NetBSD 8.0 (FLUFFY) #2: Mon Sep  3 13:52:47 CEST 2018
>Description:
The Makefile generated by sip has a flaw when using Qt5.
The Qt5 libraries are named like Qt5Core, Qt5Gui
(while Qt4 libs which are QtCore, QtGui etc.).

This renaming is handled specifically by sip when it detects that Qt5
is in use.
However, the test implemented by sip does this only for Linux, which
is a bug, as all platforms supported by pkgsrc use the same Qt5 library names (and windows + darwin are already handled specifically by sip).

I suggest the attached patch.
I did not submit it upstream, I prefer that my fix is confirmed first.

>How-To-Repeat:
Generate a Makefile with sip for Qt5, see that it wants to link with QtCore instead of Qt5Core.

(sorry, I don't know sip myself, but I can provide a concrete test case
if needed).

>Fix:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-sip/distinfo,v
retrieving revision 1.42
diff -u -r1.42 distinfo
--- distinfo    14 Apr 2018 20:07:11 -0000      1.42
+++ distinfo    11 Sep 2018 15:40:59 -0000
@@ -6,4 +6,4 @@
 Size (sip-4.19.8.tar.gz) = 1024548 bytes
 SHA1 (patch-configure.py) = 813eeed9d8608a2049e3cc819d31876afdada3aa
 SHA1 (patch-sipgen_sipgen.sbf) = a331efb38a1fadd799e00be34f076c8b8f6e3071
-SHA1 (patch-siputils.py) = fa69e6b957697cdb9afb3c44d9d4b42ab8a604f3
+SHA1 (patch-siputils.py) = 39436983efbf6719b376084a14b8c71b708ed329
cvs diff: Diffing patches
Index: patches/patch-siputils.py
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-sip/patches/patch-siputils.py,v
retrieving revision 1.3
diff -u -r1.3 patch-siputils.py
--- patches/patch-siputils.py   26 Jan 2018 15:47:18 -0000      1.3
+++ patches/patch-siputils.py   11 Sep 2018 15:40:59 -0000
@@ -15,6 +15,15 @@
          # Make sure the destination directory is an absolute path.
          if dir:
              self.dir = os.path.abspath(dir)
+@@ -880,7 +883,7 @@
+                     qt5_rename = True
+                 else:
+                     lib = lib + "4"
+-        elif sys.platform.startswith("linux") and qt_version >= 0x050000:
++        elif qt_version >= 0x050000:
+             qt5_rename = True
+ 
+         if qt5_rename:
 @@ -1596,10 +1599,10 @@ class ModuleMakefile(Makefile):
                      if sys.platform[:5] == 'linux':
                          self.LFLAGS.extend(['-Wl,--version-script=%s.exp' % self._target])



Home | Main Index | Thread Index | Old Index