pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/qt5-qscintilla qt5-qscintilla: update to 2.13.3.

details:   https://anonhg.NetBSD.org/pkgsrc/rev/19e809266ef3
branches:  trunk
changeset: 389230:19e809266ef3
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 02 15:39:01 2022 +0000

description:
qt5-qscintilla: update to 2.13.3.

v2.13.3 25th April 2022
  - Bug fixes.

v2.13.2 15th March 2022
  - Bug fixes that only affect iOS.

v2.13.1 12th October 2021
  - Documented how to build for multiple architectures on macOS.
  - Bug fixes.

v2.13.0 13th June 2021
  - Added the QsciPrinter::printRange() overload that uses a supplied QPainter
    to render the pages.
  - Improved the appearence of the auto-completion popup.
  - Bug fixes.

v2.12.1 4th March 2021
  - Packaging bug fixes.

v2.12.0 23rd February 2021
  - Added support for Qt6.
  - Removed support for Qt4 and Qt5 earlier than v5.11.0.
  - sdists are now provided.

v2.11.6 23rd November 2020
  - Added the --qsci-translations-dir option to sip-wheel.
  - Added the .api file for Python v3.9.
  - Build system changes.
  - Bug fixes.

diffstat:

 x11/qt5-qscintilla/Makefile                            |   9 +-
 x11/qt5-qscintilla/Makefile.common                     |   4 +-
 x11/qt5-qscintilla/PLIST                               |   7 +-
 x11/qt5-qscintilla/distinfo                            |  11 +--
 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 -----
 7 files changed, 14 insertions(+), 119 deletions(-)

diffs (200 lines):

diff -r 0e1c42569a75 -r 19e809266ef3 x11/qt5-qscintilla/Makefile
--- a/x11/qt5-qscintilla/Makefile       Fri Dec 02 15:36:14 2022 +0000
+++ b/x11/qt5-qscintilla/Makefile       Fri Dec 02 15:39:01 2022 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2022/11/23 16:19:12 adam Exp $
+# $NetBSD: Makefile,v 1.16 2022/12/02 15:39:01 wiz Exp $
 
-PKGREVISION= 5
 .include "../../x11/qt5-qscintilla/Makefile.common"
 
-PKGNAME=       qt5-${DISTNAME:tl}
+PKGNAME=       qt5-${DISTNAME:S/_src//:tl}
 COMMENT=       Scintilla C++ editor class for Qt5
 
-BUILD_DIRS=    Qt4Qt5
+BUILD_DIRS=    src
 
 USE_TOOLS+=    gmake
 
@@ -14,6 +13,6 @@
 INSTALL_ENV+=  INSTALL_ROOT=${DESTDIR}
 
 do-configure:
-       cd ${WRKSRC}/Qt4Qt5 && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro
+       cd ${WRKSRC}/src && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro
 
 .include "../../mk/bsd.pkg.mk"
diff -r 0e1c42569a75 -r 19e809266ef3 x11/qt5-qscintilla/Makefile.common
--- a/x11/qt5-qscintilla/Makefile.common        Fri Dec 02 15:36:14 2022 +0000
+++ b/x11/qt5-qscintilla/Makefile.common        Fri Dec 02 15:39:01 2022 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.2 2020/06/29 13:25:57 adam Exp $
+# $NetBSD: Makefile.common,v 1.3 2022/12/02 15:39:01 wiz Exp $
 #
 # used by x11/qt5-qscintilla/Makefile
 # used by x11/py-qt5-qscintilla/Makefile
 
-DISTNAME=      QScintilla-2.11.5
+DISTNAME=      QScintilla_src-2.13.3
 CATEGORIES=    x11
 MASTER_SITES=  https://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION_NOREV}/
 
diff -r 0e1c42569a75 -r 19e809266ef3 x11/qt5-qscintilla/PLIST
--- a/x11/qt5-qscintilla/PLIST  Fri Dec 02 15:36:14 2022 +0000
+++ b/x11/qt5-qscintilla/PLIST  Fri Dec 02 15:39:01 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/26 13:19:17 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/12/02 15:39:01 wiz Exp $
 qt5/include/Qsci/qsciabstractapis.h
 qt5/include/Qsci/qsciapis.h
 qt5/include/Qsci/qscicommand.h
@@ -54,8 +54,8 @@
 qt5/include/Qsci/qscistyledtext.h
 qt5/lib/libqscintilla2_qt5.so
 qt5/lib/libqscintilla2_qt5.so.15
-qt5/lib/libqscintilla2_qt5.so.15.0
-qt5/lib/libqscintilla2_qt5.so.15.0.0
+qt5/lib/libqscintilla2_qt5.so.15.1
+qt5/lib/libqscintilla2_qt5.so.15.1.1
 qt5/mkspecs/features/qscintilla2.prf
 qt5/qsci/api/python/Python-2.4.api
 qt5/qsci/api/python/Python-2.5.api
@@ -69,6 +69,7 @@
 qt5/qsci/api/python/Python-3.6.api
 qt5/qsci/api/python/Python-3.7.api
 qt5/qsci/api/python/Python-3.8.api
+qt5/qsci/api/python/Python-3.9.api
 qt5/translations/qscintilla_cs.qm
 qt5/translations/qscintilla_de.qm
 qt5/translations/qscintilla_es.qm
diff -r 0e1c42569a75 -r 19e809266ef3 x11/qt5-qscintilla/distinfo
--- a/x11/qt5-qscintilla/distinfo       Fri Dec 02 15:36:14 2022 +0000
+++ b/x11/qt5-qscintilla/distinfo       Fri Dec 02 15:39:01 2022 +0000
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 11:34:21 nia Exp $
+$NetBSD: distinfo,v 1.8 2022/12/02 15:39:01 wiz Exp $
 
-BLAKE2s (QScintilla-2.11.5.tar.gz) = abb084dfb02a77eb843b6682f983185abae49a69829fd66931ccd3d7c4c71e46
-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) = 8b9713355ccb6134cec98e5ce9ccfb532b1c7a8a
+BLAKE2s (QScintilla_src-2.13.3.tar.gz) = 64583b21ca4d836189c91f79e26e7e91ed954075b6f4fde57d4e613bf40577b7
+SHA512 (QScintilla_src-2.13.3.tar.gz) = be102fd6123fad0bc7f8de39080886369398889de48a4ec8873a0751890d7be1f238ae5194b71d31aac492e2881b6bf7885d9c06a2a47e36328780b47694f5b5
+Size (QScintilla_src-2.13.3.tar.gz) = 3060031 bytes
diff -r 0e1c42569a75 -r 19e809266ef3 x11/qt5-qscintilla/patches/patch-Python_configure.py
--- a/x11/qt5-qscintilla/patches/patch-Python_configure.py      Fri Dec 02 15:36:14 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-Python_configure.py,v 1.1 2020/06/29 13:25:57 adam 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 0e1c42569a75 -r 19e809266ef3 x11/qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp
--- a/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp      Fri Dec 02 15:36:14 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-$NetBSD: patch-Qt4Qt5_qsciapis.cpp,v 1.1 2020/06/29 13:25:57 adam 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 0e1c42569a75 -r 19e809266ef3 x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro
--- a/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro    Fri Dec 02 15:36:14 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$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.
-
---- 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 $$[QT_INSTALL_LIBS]/$(TARGET1) $(TARGET)
- }
- 
- INCLUDEPATH += . ../include ../lexlib ../src
Home | Main Index | Thread Index | Old Index