Mon Jul 20 17:09:15 2020 UTC ()
qt5-qscintilla: better patch for install_name


(adam)
diff -r1.4 -r1.5 pkgsrc/x11/qt5-qscintilla/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro
cvs diff -r1.4 -r1.5 pkgsrc/x11/qt5-qscintilla/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qscintilla/distinfo 2020/06/29 13:25:57 1.4
+++ pkgsrc/x11/qt5-qscintilla/distinfo 2020/07/20 17:09:15 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2020/06/29 13:25:57 adam Exp $ 1$NetBSD: distinfo,v 1.5 2020/07/20 17:09:15 adam Exp $
2 2
3SHA1 (QScintilla-2.11.5.tar.gz) = 1719d557f21375e04c11bd4ecf09a4d2ef87d2d0 3SHA1 (QScintilla-2.11.5.tar.gz) = 1719d557f21375e04c11bd4ecf09a4d2ef87d2d0
4RMD160 (QScintilla-2.11.5.tar.gz) = bf0596f336fe888fd3d08d9ce816231533233bdb 4RMD160 (QScintilla-2.11.5.tar.gz) = bf0596f336fe888fd3d08d9ce816231533233bdb
5SHA512 (QScintilla-2.11.5.tar.gz) = 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b 5SHA512 (QScintilla-2.11.5.tar.gz) = 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
6Size (QScintilla-2.11.5.tar.gz) = 3007564 bytes 6Size (QScintilla-2.11.5.tar.gz) = 3007564 bytes
7SHA1 (patch-Python_configure.py) = c447d37537924272a632a76a32ab3b2afc690bb4 7SHA1 (patch-Python_configure.py) = c447d37537924272a632a76a32ab3b2afc690bb4
8SHA1 (patch-Qt4Qt5_qsciapis.cpp) = 00466d4b0fe635c55566aa4b07a3de52e63274bd 8SHA1 (patch-Qt4Qt5_qsciapis.cpp) = 00466d4b0fe635c55566aa4b07a3de52e63274bd
9SHA1 (patch-Qt4Qt5_qscintilla.pro) = b798a34cdde64789db0e1cf2b9c28c5698027f95 9SHA1 (patch-Qt4Qt5_qscintilla.pro) = 8b9713355ccb6134cec98e5ce9ccfb532b1c7a8a
cvs diff -r1.1 -r1.2 pkgsrc/x11/qt5-qscintilla/patches/Attic/patch-Qt4Qt5_qscintilla.pro (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qscintilla/patches/Attic/patch-Qt4Qt5_qscintilla.pro 2020/06/29 13:25:57 1.1
+++ pkgsrc/x11/qt5-qscintilla/patches/Attic/patch-Qt4Qt5_qscintilla.pro 2020/07/20 17:09:15 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-Qt4Qt5_qscintilla.pro,v 1.1 2020/06/29 13:25:57 adam Exp $ 1$NetBSD: patch-Qt4Qt5_qscintilla.pro,v 1.2 2020/07/20 17:09:15 adam Exp $
2 2
3Add full path to installed library names on Darwin. 3Add full path to installed library names on Darwin.
4 4
5--- Qt4Qt5/qscintilla.pro.orig 2020-06-09 14:28:23.000000000 +0000 5--- Qt4Qt5/qscintilla.pro.orig 2020-06-09 14:28:23.000000000 +0000
6+++ Qt4Qt5/qscintilla.pro 6+++ Qt4Qt5/qscintilla.pro
7@@ -38,7 +38,7 @@ CONFIG(debug, debug|release) { 7@@ -38,7 +38,7 @@ CONFIG(debug, debug|release) {
8 } 8 }
9  9
10 macx:!CONFIG(staticlib) { 10 macx:!CONFIG(staticlib) {
11- QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET) 11- QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET)
12+ QMAKE_POST_LINK += install_name_tool -id $$target.path/$(TARGET1) $(TARGET) 12+ QMAKE_POST_LINK += install_name_tool -id $$[QT_INSTALL_LIBS]/$(TARGET1) $(TARGET)
13 } 13 }
14  14
15 INCLUDEPATH += . ../include ../lexlib ../src 15 INCLUDEPATH += . ../include ../lexlib ../src