Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2020Q2]: pkgsrc/x11 Pullup ticket #6255 - requested by gdt
details: https://anonhg.NetBSD.org/pkgsrc/rev/aab88baebf64
branches: pkgsrc-2020Q2
changeset: 435261:aab88baebf64
user: bsiegert <bsiegert%pkgsrc.org@localhost>
date: Fri Jul 03 10:29:50 2020 +0000
description:
Pullup ticket #6255 - requested by gdt
x11/qt5-qscintilla, x11/py-qt5-qscintilla: build fix
Revisions pulled up:
- x11/py-qt5-qscintilla/Makefile 1.9
- x11/qt5-qscintilla/Makefile 1.10
- x11/qt5-qscintilla/Makefile.common 1.2
- x11/qt5-qscintilla/buildlink3.mk 1.6
- x11/qt5-qscintilla/distinfo 1.4
- x11/qt5-qscintilla/patches/patch-Python_configure.py 1.1
- x11/qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp 1.1
- x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro 1.1
- x11/qt5-qscintilla/patches/patch-qsciapis.cpp deleted
- x11/qt5-qscintilla/patches/patch-qscintilla.pro deleted
---
Module Name: pkgsrc
Committed By: adam
Date: Mon Jun 29 13:25:57 UTC 2020
Modified Files:
pkgsrc/x11/py-qt5-qscintilla: Makefile
pkgsrc/x11/qt5-qscintilla: Makefile Makefile.common buildlink3.mk
distinfo
Added Files:
pkgsrc/x11/qt5-qscintilla/patches: patch-Python_configure.py
patch-Qt4Qt5_qsciapis.cpp patch-Qt4Qt5_qscintilla.pro
Removed Files:
pkgsrc/x11/qt5-qscintilla/patches: patch-qsciapis.cpp
patch-qscintilla.pro
Log Message:
qt5-qscintilla py-qt5-qscintilla: updated to 2.11.5
QScintilla v2.11.5 has been released. This is a minor bug-fix release.
diffstat:
x11/py-qt5-qscintilla/Makefile | 26 ++++-----
x11/qt5-qscintilla/Makefile | 16 +----
x11/qt5-qscintilla/Makefile.common | 13 +++-
x11/qt5-qscintilla/buildlink3.mk | 7 ++-
x11/qt5-qscintilla/distinfo | 15 +++--
x11/qt5-qscintilla/patches/patch-Python_configure.py | 40 +++++++++++++++
x11/qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp | 47 ++++++++++++++++++
x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro | 15 +++++
x11/qt5-qscintilla/patches/patch-qsciapis.cpp | 47 ------------------
x11/qt5-qscintilla/patches/patch-qscintilla.pro | 17 ------
10 files changed, 141 insertions(+), 102 deletions(-)
diffs (truncated from 339 to 300 lines):
diff -r c5c621f6f2a8 -r aab88baebf64 x11/py-qt5-qscintilla/Makefile
--- a/x11/py-qt5-qscintilla/Makefile Mon Jun 29 11:33:57 2020 +0000
+++ b/x11/py-qt5-qscintilla/Makefile Fri Jul 03 10:29:50 2020 +0000
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2020/06/02 08:23:07 adam Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2020/07/03 10:29:50 bsiegert Exp $
.include "../../x11/qt5-qscintilla/Makefile.common"
-
-PKGNAME= ${PYPKGPREFIX}-qt5-${DISTNAME:tl:S/_gpl-/-/}
+PKGNAME= ${PYPKGPREFIX}-qt5-${DISTNAME:tl}
COMMENT= QScintilla -- Python bindings
-PKGREVISION= 7
-WRKSRC= ${WRKDIR}/${DISTNAME}/Python
-
-PY_PATCHPLIST= yes
+BUILD_DIRS= Python
+PY_PATCHPLIST= yes
MAKE_FLAGS+= TARGET=Qsci.la TARGETD=Qsci.la TARGETL=Qsci.la
INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
@@ -17,13 +14,14 @@
MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}\ ${LIBS:Q}
do-configure:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} configure.py \
- --pyqt PyQt5 \
- --qmake=${QTDIR}/bin/qmake --sip=${PREFIX}/bin/sip${PYVERSSUFFIX} \
- --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
- --qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
- --qsci-libdir=${QTDIR}/lib \
- --apidir=${QTDIR}/qsci${PYVERSSUFFIX}
+ cd ${WRKSRC}/Python && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} configure.py \
+ --pyqt PyQt5 \
+ --qmake=${QTDIR}/bin/qmake \
+ --sip=${PREFIX}/bin/sip${PYVERSSUFFIX} \
+ --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
+ --qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
+ --qsci-libdir=${QTDIR}/lib \
+ --apidir=${QTDIR}/qsci${PYVERSSUFFIX}
.include "../../lang/python/extension.mk"
.include "../../x11/py-sip/buildlink3.mk"
diff -r c5c621f6f2a8 -r aab88baebf64 x11/qt5-qscintilla/Makefile
--- a/x11/qt5-qscintilla/Makefile Mon Jun 29 11:33:57 2020 +0000
+++ b/x11/qt5-qscintilla/Makefile Fri Jul 03 10:29:50 2020 +0000
@@ -1,26 +1,18 @@
-# $NetBSD: Makefile,v 1.9 2020/04/12 08:28:14 adam Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2020/07/03 10:29:50 bsiegert Exp $
-PKGREVISION= 5
.include "../../x11/qt5-qscintilla/Makefile.common"
-PKGNAME= qt5-${DISTNAME:tl:S/_gpl-/-/}
+PKGNAME= qt5-${DISTNAME:tl}
COMMENT= Scintilla C++ editor class for Qt5
-WRKSRC= ${WRKDIR}/${DISTNAME}/Qt4Qt5
+BUILD_DIRS= Qt4Qt5
USE_TOOLS+= gmake
-USE_LIBTOOL= yes
-USE_LANGUAGES= c++
MAKE_ENV+= QTPREFIX=${QTDIR}
INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
do-configure:
- (cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro)
-
-.include "../../mk/bsd.prefs.mk"
+ cd ${WRKSRC}/Qt4Qt5 && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro
-.if ${OPSYS} == "Darwin"
-.include "../../x11/qt5-qtmacextras/buildlink3.mk"
-.endif
.include "../../mk/bsd.pkg.mk"
diff -r c5c621f6f2a8 -r aab88baebf64 x11/qt5-qscintilla/Makefile.common
--- a/x11/qt5-qscintilla/Makefile.common Mon Jun 29 11:33:57 2020 +0000
+++ b/x11/qt5-qscintilla/Makefile.common Fri Jul 03 10:29:50 2020 +0000
@@ -1,20 +1,25 @@
-# $NetBSD: Makefile.common,v 1.1 2019/10/29 17:45:24 kamil Exp $
+# $NetBSD: Makefile.common,v 1.1.6.1 2020/07/03 10:29:50 bsiegert Exp $
#
# used by x11/qt5-qscintilla/Makefile
# used by x11/py-qt5-qscintilla/Makefile
-DISTNAME= QScintilla_gpl-2.11.2
+DISTNAME= QScintilla-2.11.5
CATEGORIES= x11
MASTER_SITES= https://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION_NOREV}/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.riverbankcomputing.co.uk/software/qscintilla/intro
+HOMEPAGE= https://riverbankcomputing.com/software/qscintilla/intro
LICENSE= gnu-gpl-v3
USE_LANGUAGES= c++
USE_LIBTOOL= yes
DISTINFO_FILE= ${.CURDIR}/../../x11/qt5-qscintilla/distinfo
-#PATCHDIR= ${.CURDIR}/../../x11/qt5-qscintilla/patches
+PATCHDIR= ${.CURDIR}/../../x11/qt5-qscintilla/patches
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+.include "../../x11/qt5-qtmacextras/buildlink3.mk"
+.endif
.include "../../x11/qt5-qtbase/buildlink3.mk"
diff -r c5c621f6f2a8 -r aab88baebf64 x11/qt5-qscintilla/buildlink3.mk
--- a/x11/qt5-qscintilla/buildlink3.mk Mon Jun 29 11:33:57 2020 +0000
+++ b/x11/qt5-qscintilla/buildlink3.mk Fri Jul 03 10:29:50 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2020/04/12 08:28:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5.2.1 2020/07/03 10:29:50 bsiegert Exp $
BUILDLINK_TREE+= qt5-qscintilla
@@ -9,6 +9,11 @@
BUILDLINK_ABI_DEPENDS.qt5-qscintilla+= qt5-qscintilla>=2.11.2nb5
BUILDLINK_PKGSRCDIR.qt5-qscintilla?= ../../x11/qt5-qscintilla
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+.include "../../x11/qt5-qtmacextras/buildlink3.mk"
+.endif
.include "../../x11/qt5-qtbase/buildlink3.mk"
.endif # QT5_QSCINTILLA_BUILDLINK3_MK
diff -r c5c621f6f2a8 -r aab88baebf64 x11/qt5-qscintilla/distinfo
--- a/x11/qt5-qscintilla/distinfo Mon Jun 29 11:33:57 2020 +0000
+++ b/x11/qt5-qscintilla/distinfo Fri Jul 03 10:29:50 2020 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2020/03/19 14:00:14 brook Exp $
+$NetBSD: distinfo,v 1.3.4.1 2020/07/03 10:29:50 bsiegert Exp $
-SHA1 (QScintilla_gpl-2.11.2.tar.gz) = 1815040576bfb62bedb0dd48a39e36a13bd0f5e9
-RMD160 (QScintilla_gpl-2.11.2.tar.gz) = fb0631db0fa228eb2d4c35db69f085a67d7d8036
-SHA512 (QScintilla_gpl-2.11.2.tar.gz) = de4eb9fb8d13c1a8f1acb6e941a8e751e0f0df02b59eb1a32bcdbedc1cc62ad3a1b778d45541ea048710349db827323a07aaede415712d6c9ac6acc07f0c160f
-Size (QScintilla_gpl-2.11.2.tar.gz) = 2986600 bytes
-SHA1 (patch-qsciapis.cpp) = bd595be57ea39acba021ba0dd662c872005bc407
-SHA1 (patch-qscintilla.pro) = c15b8604994b204f60041076584441188b4fd887
+SHA1 (QScintilla-2.11.5.tar.gz) = 1719d557f21375e04c11bd4ecf09a4d2ef87d2d0
+RMD160 (QScintilla-2.11.5.tar.gz) = bf0596f336fe888fd3d08d9ce816231533233bdb
+SHA512 (QScintilla-2.11.5.tar.gz) = 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
+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
diff -r c5c621f6f2a8 -r aab88baebf64 x11/qt5-qscintilla/patches/patch-Python_configure.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qscintilla/patches/patch-Python_configure.py Fri Jul 03 10:29:50 2020 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-Python_configure.py,v 1.1.2.2 2020/07/03 10:29:50 bsiegert Exp $
+
+Avoid app bundles and use proper dylib id on Darwin.
+
+--- Python/configure.py.orig 2020-06-09 14:28:23.000000000 +0000
++++ Python/configure.py
+@@ -1470,7 +1470,7 @@ def _generate_pro(target_config, opts, m
+ pro.write('QT += %s\n' % qt)
+
+ pro.write('CONFIG += %s\n' % ('debug' if target_config.debug else 'release'))
+- pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin plugin_bundle'))
++ pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin'))
+
+ config = qmake_config.get('CONFIG')
+ if config:
+@@ -1511,7 +1511,7 @@ win32 {
+ PY_MODULE = %s.so
+
+ macx {
+- PY_MODULE_SRC = $(TARGET).plugin/Contents/MacOS/$(TARGET)
++ PY_MODULE_SRC = $(TARGET)
+
+ QMAKE_LFLAGS += "-undefined dynamic_lookup"
+
+@@ -1621,12 +1621,11 @@ INSTALLS += sip
+ if not opts.static:
+ dylib = module_config.get_mac_wrapped_library_file(target_config)
+
+- if dylib:
+- pro.write('''
++ pro.write('''
+ macx {
+- QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\\\n\\\\t)$$quote(install_name_tool -change %s %s $$PY_MODULE)
++ QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\\\n\\\\t)$$quote(install_name_tool -id $$target.path/$$PY_MODULE $$PY_MODULE)
+ }
+-''' % (os.path.basename(dylib), dylib))
++''')
+
+ pro.write('\n')
+ pro.write('HEADERS = sipAPI%s.h\n' % mname)
diff -r c5c621f6f2a8 -r aab88baebf64 x11/qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp Fri Jul 03 10:29:50 2020 +0000
@@ -0,0 +1,47 @@
+$NetBSD: patch-Qt4Qt5_qsciapis.cpp,v 1.1.2.2 2020/07/03 10:29:50 bsiegert Exp $
+
+Search in qt5/qsci*/api/.../*.api.
+
+--- Qt4Qt5/qsciapis.cpp.orig 2019-06-25 12:49:27.000000000 +0000
++++ Qt4Qt5/qsciapis.cpp
+@@ -982,6 +982,7 @@ QString QsciAPIs::prepName(const QString
+ // Return installed API files.
+ QStringList QsciAPIs::installedAPIFiles() const
+ {
++#if 0
+ QString qtdir = QLibraryInfo::location(QLibraryInfo::DataPath);
+
+ QDir apidir = QDir(QString("%1/qsci/api/%2").arg(qtdir).arg(lexer()->lexer()));
+@@ -996,4 +997,32 @@ QStringList QsciAPIs::installedAPIFiles(
+ filenames << fi.absoluteFilePath();
+
+ return filenames;
++#endif
++
++ QString datapath = QLibraryInfo::location(QLibraryInfo::DataPath);
++ QString lexerdir = lexer()->lexer();
++
++ QStringList filenames;
++
++ QStringList filters;
++ filters << "*.api";
++
++ QStringList qscifilters;
++ qscifilters << "qsci*";
++
++ // Find QTDIR/qsci*/api/LEXER/*.api
++ QDir datadir = QDir(datapath);
++ QFileInfoList dlist = datadir.entryInfoList(qscifilters, QDir::AllDirs, QDir::IgnoreCase);
++
++ foreach (QFileInfo di, dlist) {
++ QString qscidir = di.absoluteFilePath();
++ QDir apidir = QDir(QString("%1/api/%2").arg(qscidir).arg(lexerdir));
++
++ QFileInfoList flist = apidir.entryInfoList(filters, QDir::Files, QDir::IgnoreCase);
++
++ foreach (QFileInfo fi, flist)
++ filenames << fi.absoluteFilePath();
++ }
++
++ return filenames;
+ }
diff -r c5c621f6f2a8 -r aab88baebf64 x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro Fri Jul 03 10:29:50 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Qt4Qt5_qscintilla.pro,v 1.1.2.2 2020/07/03 10:29:50 bsiegert Exp $
+
+Add full path to installed library names on Darwin.
+
+--- Qt4Qt5/qscintilla.pro.orig 2020-06-09 14:28:23.000000000 +0000
++++ Qt4Qt5/qscintilla.pro
+@@ -38,7 +38,7 @@ CONFIG(debug, debug|release) {
+ }
+
+ macx:!CONFIG(staticlib) {
+- QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET)
++ QMAKE_POST_LINK += install_name_tool -id $$target.path/$(TARGET1) $(TARGET)
+ }
+
+ INCLUDEPATH += . ../include ../lexlib ../src
diff -r c5c621f6f2a8 -r aab88baebf64 x11/qt5-qscintilla/patches/patch-qsciapis.cpp
--- a/x11/qt5-qscintilla/patches/patch-qsciapis.cpp Mon Jun 29 11:33:57 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-$NetBSD: patch-qsciapis.cpp,v 1.1 2020/01/26 12:54:15 rhialto Exp $
-
-Search in qt5/qsci*/api/.../*.api.
-
---- qsciapis.cpp.orig 2019-06-25 12:49:27.000000000 +0000
-+++ qsciapis.cpp
-@@ -982,6 +982,7 @@ QString QsciAPIs::prepName(const QString
- // Return installed API files.
- QStringList QsciAPIs::installedAPIFiles() const
- {
-+#if 0
- QString qtdir = QLibraryInfo::location(QLibraryInfo::DataPath);
-
- QDir apidir = QDir(QString("%1/qsci/api/%2").arg(qtdir).arg(lexer()->lexer()));
-@@ -996,4 +997,32 @@ QStringList QsciAPIs::installedAPIFiles(
- filenames << fi.absoluteFilePath();
-
- return filenames;
-+#endif
-+
-+ QString datapath = QLibraryInfo::location(QLibraryInfo::DataPath);
-+ QString lexerdir = lexer()->lexer();
-+
-+ QStringList filenames;
-+
-+ QStringList filters;
-+ filters << "*.api";
-+
-+ QStringList qscifilters;
Home |
Main Index |
Thread Index |
Old Index