CVS commit: pkgsrc/x11/qt5-qscintilla

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jul 20 17:09:15 UTC 2020

Modified Files:
        pkgsrc/x11/qt5-qscintilla: distinfo
        pkgsrc/x11/qt5-qscintilla/patches: patch-Qt4Qt5_qscintilla.pro

Log Message:
qt5-qscintilla: better patch for install_name


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/qt5-qscintilla/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qscintilla/distinfo
diff -u pkgsrc/x11/qt5-qscintilla/distinfo:1.4 pkgsrc/x11/qt5-qscintilla/distinfo:1.5
--- pkgsrc/x11/qt5-qscintilla/distinfo:1.4      Mon Jun 29 13:25:57 2020
+++ pkgsrc/x11/qt5-qscintilla/distinfo  Mon Jul 20 17:09:15 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2020/06/29 13:25:57 adam Exp $
+$NetBSD: distinfo,v 1.5 2020/07/20 17:09:15 adam Exp $
 
 SHA1 (QScintilla-2.11.5.tar.gz) = 1719d557f21375e04c11bd4ecf09a4d2ef87d2d0
 RMD160 (QScintilla-2.11.5.tar.gz) = bf0596f336fe888fd3d08d9ce816231533233bdb
@@ -6,4 +6,4 @@ SHA512 (QScintilla-2.11.5.tar.gz) = 46bc
 Size (QScintilla-2.11.5.tar.gz) = 3007564 bytes
 SHA1 (patch-Python_configure.py) = c447d37537924272a632a76a32ab3b2afc690bb4
 SHA1 (patch-Qt4Qt5_qsciapis.cpp) = 00466d4b0fe635c55566aa4b07a3de52e63274bd
-SHA1 (patch-Qt4Qt5_qscintilla.pro) = b798a34cdde64789db0e1cf2b9c28c5698027f95
+SHA1 (patch-Qt4Qt5_qscintilla.pro) = 8b9713355ccb6134cec98e5ce9ccfb532b1c7a8a

Index: pkgsrc/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro
diff -u pkgsrc/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro:1.1 pkgsrc/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro:1.2
--- pkgsrc/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro:1.1   Mon Jun 29 13:25:57 2020
+++ pkgsrc/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro       Mon Jul 20 17:09:15 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-Qt4Qt5_qscintilla.pro,v 1.1 2020/06/29 13:25:57 adam Exp $
+$NetBSD: patch-Qt4Qt5_qscintilla.pro,v 1.2 2020/07/20 17:09:15 adam Exp $
 
 Add full path to installed library names on Darwin.
 
@@ -9,7 +9,7 @@ Add full path to installed library names
  
  macx:!CONFIG(staticlib) {
 -    QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET)
-+    QMAKE_POST_LINK += install_name_tool -id $$target.path/$(TARGET1) $(TARGET)
++    QMAKE_POST_LINK += install_name_tool -id $$[QT_INSTALL_LIBS]/$(TARGET1) $(TARGET)
  }
  
  INCLUDEPATH += . ../include ../lexlib ../src