CVS commit: pkgsrc/x11

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 24 Mar 2024 12:44:57 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Mar 24 12:44:57 UTC 2024

Modified Files:
        pkgsrc/x11: Makefile
Added Files:
        pkgsrc/x11/py-qt6-qscintilla: DESCR Makefile PLIST
        pkgsrc/x11/qt6-qscintilla: DESCR Makefile Makefile.common PLIST
            buildlink3.mk distinfo

Log Message:
[py-]qt6-qscintilla: added version 2.14.1; same functionality as qt5 version, but linked against qt6


To generate a diff of this commit:
cvs rdiff -u -r1.1015 -r1.1016 pkgsrc/x11/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/py-qt6-qscintilla/DESCR \
    pkgsrc/x11/py-qt6-qscintilla/Makefile pkgsrc/x11/py-qt6-qscintilla/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/qt6-qscintilla/DESCR \
    pkgsrc/x11/qt6-qscintilla/Makefile \
    pkgsrc/x11/qt6-qscintilla/Makefile.common pkgsrc/x11/qt6-qscintilla/PLIST \
    pkgsrc/x11/qt6-qscintilla/buildlink3.mk \
    pkgsrc/x11/qt6-qscintilla/distinfo

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

Modified files:

Index: pkgsrc/x11/Makefile
diff -u pkgsrc/x11/Makefile:1.1015 pkgsrc/x11/Makefile:1.1016
--- pkgsrc/x11/Makefile:1.1015  Thu Mar 21 14:40:07 2024
+++ pkgsrc/x11/Makefile Sun Mar 24 12:44:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1015 2024/03/21 14:40:07 mef Exp $
+# $NetBSD: Makefile,v 1.1016 2024/03/24 12:44:56 adam Exp $
 #
 
 COMMENT=       Packages to support the X Window System
@@ -288,6 +288,7 @@ SUBDIR+=    py-qt5
 SUBDIR+=       py-qt5-qscintilla
 SUBDIR+=       py-qt5-webengine
 SUBDIR+=       py-qt6
+SUBDIR+=       py-qt6-qscintilla
 SUBDIR+=       py-qtgraph-qt5
 SUBDIR+=       py-qwt-qt5
 SUBDIR+=       py-sip-qt5
@@ -346,6 +347,7 @@ SUBDIR+=    qt5-qtx11extras
 SUBDIR+=       qt5-qtxmlpatterns
 SUBDIR+=       qt5-styleplugins
 SUBDIR+=       qt5ct
+SUBDIR+=       qt6-qscintilla
 SUBDIR+=       qt6-qtbase
 SUBDIR+=       qt6-qtserialport
 SUBDIR+=       qt6ct

Added files:

Index: pkgsrc/x11/py-qt6-qscintilla/DESCR
diff -u /dev/null pkgsrc/x11/py-qt6-qscintilla/DESCR:1.1
--- /dev/null   Sun Mar 24 12:44:57 2024
+++ pkgsrc/x11/py-qt6-qscintilla/DESCR  Sun Mar 24 12:44:57 2024
@@ -0,0 +1,3 @@
+This package contains python bindings for QScintilla
+(x11/qt6-qscintilla).  (Qscintilla is a Qt port of Neil Hodgson's
+scintilla(devel/scintilla) C++ editor control.)
Index: pkgsrc/x11/py-qt6-qscintilla/Makefile
diff -u /dev/null pkgsrc/x11/py-qt6-qscintilla/Makefile:1.1
--- /dev/null   Sun Mar 24 12:44:57 2024
+++ pkgsrc/x11/py-qt6-qscintilla/Makefile       Sun Mar 24 12:44:57 2024
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1 2024/03/24 12:44:57 adam Exp $
+
+.include "../../x11/qt6-qscintilla/Makefile.common"
+
+PKGNAME=       ${PYPKGPREFIX}-qt6-${DISTNAME:S/_src//:tl}
+COMMENT=       QScintilla -- Python bindings
+
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6>=6.0.2:../../x11/py-sip6
+TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder>=1.6:../../x11/py-qt-builder
+DEPENDS+=      ${PYPKGPREFIX}-qt6-[0-9]*:../../x11/py-qt6
+
+WRKSRC=                ${WRKDIR}/${DISTNAME}/Python
+
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+WHEEL_NAME=    PyQt6_${DISTNAME:S/_src//}
+
+post-extract:
+       cd ${WRKSRC} && ${CP} pyproject-qt6.toml pyproject.toml
+
+pre-configure:
+       ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+post-install:
+       install_name_tool -id ${PREFIX}/${PYSITELIB}/PyQt6/Qsci.abi3.so \
+       ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt6/Qsci.abi3.so
+.endif
+
+.include "../../lang/python/wheel.mk"
+BUILDLINK_API_DEPENDS.qt6-qscintilla+= qt6-qscintilla>=${PKGVERSION_NOREV}
+.include "../../x11/qt6-qscintilla/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/py-qt6-qscintilla/PLIST
diff -u /dev/null pkgsrc/x11/py-qt6-qscintilla/PLIST:1.1
--- /dev/null   Sun Mar 24 12:44:57 2024
+++ pkgsrc/x11/py-qt6-qscintilla/PLIST  Sun Mar 24 12:44:57 2024
@@ -0,0 +1,66 @@
+@comment $NetBSD: PLIST,v 1.1 2024/03/24 12:44:57 adam Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/PyQt6/Qsci.abi3.so
+${PYSITELIB}/PyQt6/bindings/Qsci/Qsci.toml
+${PYSITELIB}/PyQt6/bindings/Qsci/qsciabstractapis.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qsciapis.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscicommand.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscicommandset.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscidocument.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexer.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerasm.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexeravs.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerbash.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerbatch.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexercmake.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexercoffeescript.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexercpp.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexercsharp.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexercss.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexercustom.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerd.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerdiff.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerfortran.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerfortran77.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerhex.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerhtml.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexeridl.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerintelhex.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerjava.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerjavascript.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerjson.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerlua.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexermakefile.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexermarkdown.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexermasm.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexermatlab.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexernasm.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexeroctave.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerpascal.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerperl.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerpo.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerpostscript.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerpov.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerproperties.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerpython.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerruby.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerspice.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexersql.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexersrec.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexertcl.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexertekhex.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexertex.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerverilog.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexervhdl.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexerxml.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscilexeryaml.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscimacro.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscimod6.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscimodcommon.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qsciprinter.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qsciscintilla.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qsciscintillabase.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscistyle.sip
+${PYSITELIB}/PyQt6/bindings/Qsci/qscistyledtext.sip

Index: pkgsrc/x11/qt6-qscintilla/DESCR
diff -u /dev/null pkgsrc/x11/qt6-qscintilla/DESCR:1.1
--- /dev/null   Sun Mar 24 12:44:57 2024
+++ pkgsrc/x11/qt6-qscintilla/DESCR     Sun Mar 24 12:44:57 2024
@@ -0,0 +1,2 @@
+Qscintilla is a Qt port of Neil Hodgson's scintilla(devel/scintilla)
+C++ editor control.
Index: pkgsrc/x11/qt6-qscintilla/Makefile
diff -u /dev/null pkgsrc/x11/qt6-qscintilla/Makefile:1.1
--- /dev/null   Sun Mar 24 12:44:57 2024
+++ pkgsrc/x11/qt6-qscintilla/Makefile  Sun Mar 24 12:44:57 2024
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2024/03/24 12:44:57 adam Exp $
+
+.include "../../x11/qt6-qscintilla/Makefile.common"
+
+PKGNAME=       qt6-${DISTNAME:S/_src//:tl}
+COMMENT=       Scintilla C++ editor class for Qt5
+
+BUILD_DIRS=    src
+
+USE_TOOLS+=    gmake
+
+MAKE_ENV+=     QTPREFIX=${QTDIR}
+INSTALL_ENV+=  INSTALL_ROOT=${DESTDIR}
+
+do-configure:
+       cd ${WRKSRC}/src && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+post-install:
+       install_name_tool -id ${QTDIR}/lib/libqscintilla2_qt6.15.2.1.dylib \
+       ${DESTDIR}${QTDIR}/lib/libqscintilla2_qt6.15.2.1.dylib
+.endif
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/qt6-qscintilla/Makefile.common
diff -u /dev/null pkgsrc/x11/qt6-qscintilla/Makefile.common:1.1
--- /dev/null   Sun Mar 24 12:44:57 2024
+++ pkgsrc/x11/qt6-qscintilla/Makefile.common   Sun Mar 24 12:44:57 2024
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile.common,v 1.1 2024/03/24 12:44:57 adam Exp $
+#
+# used by x11/qt6-qscintilla/Makefile
+# used by x11/py-qt6-qscintilla/Makefile
+
+DISTNAME=      QScintilla_src-2.14.1
+CATEGORIES=    x11
+MASTER_SITES=  https://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION_NOREV}/
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://riverbankcomputing.com/software/qscintilla/intro
+LICENSE=       gnu-gpl-v3
+
+USE_LANGUAGES= c++
+USE_LIBTOOL=   yes
+
+DISTINFO_FILE= ${.CURDIR}/../../x11/qt6-qscintilla/distinfo
+PATCHDIR=      ${.CURDIR}/../../x11/qt6-qscintilla/patches
+
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../x11/qt6-qtbase/buildlink3.mk"
Index: pkgsrc/x11/qt6-qscintilla/PLIST
diff -u /dev/null pkgsrc/x11/qt6-qscintilla/PLIST:1.1
--- /dev/null   Sun Mar 24 12:44:57 2024
+++ pkgsrc/x11/qt6-qscintilla/PLIST     Sun Mar 24 12:44:57 2024
@@ -0,0 +1,86 @@
+@comment $NetBSD: PLIST,v 1.1 2024/03/24 12:44:57 adam Exp $
+qt6/include/Qsci/qsciabstractapis.h
+qt6/include/Qsci/qsciapis.h
+qt6/include/Qsci/qscicommand.h
+qt6/include/Qsci/qscicommandset.h
+qt6/include/Qsci/qscidocument.h
+qt6/include/Qsci/qsciglobal.h
+qt6/include/Qsci/qscilexer.h
+qt6/include/Qsci/qscilexerasm.h
+qt6/include/Qsci/qscilexeravs.h
+qt6/include/Qsci/qscilexerbash.h
+qt6/include/Qsci/qscilexerbatch.h
+qt6/include/Qsci/qscilexercmake.h
+qt6/include/Qsci/qscilexercoffeescript.h
+qt6/include/Qsci/qscilexercpp.h
+qt6/include/Qsci/qscilexercsharp.h
+qt6/include/Qsci/qscilexercss.h
+qt6/include/Qsci/qscilexercustom.h
+qt6/include/Qsci/qscilexerd.h
+qt6/include/Qsci/qscilexerdiff.h
+qt6/include/Qsci/qscilexeredifact.h
+qt6/include/Qsci/qscilexerfortran.h
+qt6/include/Qsci/qscilexerfortran77.h
+qt6/include/Qsci/qscilexerhex.h
+qt6/include/Qsci/qscilexerhtml.h
+qt6/include/Qsci/qscilexeridl.h
+qt6/include/Qsci/qscilexerintelhex.h
+qt6/include/Qsci/qscilexerjava.h
+qt6/include/Qsci/qscilexerjavascript.h
+qt6/include/Qsci/qscilexerjson.h
+qt6/include/Qsci/qscilexerlua.h
+qt6/include/Qsci/qscilexermakefile.h
+qt6/include/Qsci/qscilexermarkdown.h
+qt6/include/Qsci/qscilexermasm.h
+qt6/include/Qsci/qscilexermatlab.h
+qt6/include/Qsci/qscilexernasm.h
+qt6/include/Qsci/qscilexeroctave.h
+qt6/include/Qsci/qscilexerpascal.h
+qt6/include/Qsci/qscilexerperl.h
+qt6/include/Qsci/qscilexerpo.h
+qt6/include/Qsci/qscilexerpostscript.h
+qt6/include/Qsci/qscilexerpov.h
+qt6/include/Qsci/qscilexerproperties.h
+qt6/include/Qsci/qscilexerpython.h
+qt6/include/Qsci/qscilexerruby.h
+qt6/include/Qsci/qscilexerspice.h
+qt6/include/Qsci/qscilexersql.h
+qt6/include/Qsci/qscilexersrec.h
+qt6/include/Qsci/qscilexertcl.h
+qt6/include/Qsci/qscilexertekhex.h
+qt6/include/Qsci/qscilexertex.h
+qt6/include/Qsci/qscilexerverilog.h
+qt6/include/Qsci/qscilexervhdl.h
+qt6/include/Qsci/qscilexerxml.h
+qt6/include/Qsci/qscilexeryaml.h
+qt6/include/Qsci/qscimacro.h
+qt6/include/Qsci/qsciprinter.h
+qt6/include/Qsci/qsciscintilla.h
+qt6/include/Qsci/qsciscintillabase.h
+qt6/include/Qsci/qscistyle.h
+qt6/include/Qsci/qscistyledtext.h
+qt6/lib/libqscintilla2_qt6.so
+qt6/lib/libqscintilla2_qt6.so.15
+qt6/lib/libqscintilla2_qt6.so.15.2
+qt6/lib/libqscintilla2_qt6.so.15.2.1
+qt6/mkspecs/features/qscintilla2.prf
+qt6/qsci/api/python/Python-2.4.api
+qt6/qsci/api/python/Python-2.5.api
+qt6/qsci/api/python/Python-2.6.api
+qt6/qsci/api/python/Python-2.7.api
+qt6/qsci/api/python/Python-3.1.api
+qt6/qsci/api/python/Python-3.10.api
+qt6/qsci/api/python/Python-3.11.api
+qt6/qsci/api/python/Python-3.2.api
+qt6/qsci/api/python/Python-3.3.api
+qt6/qsci/api/python/Python-3.4.api
+qt6/qsci/api/python/Python-3.5.api
+qt6/qsci/api/python/Python-3.6.api
+qt6/qsci/api/python/Python-3.7.api
+qt6/qsci/api/python/Python-3.8.api
+qt6/qsci/api/python/Python-3.9.api
+qt6/translations/qscintilla_cs.qm
+qt6/translations/qscintilla_de.qm
+qt6/translations/qscintilla_es.qm
+qt6/translations/qscintilla_fr.qm
+qt6/translations/qscintilla_pt_br.qm
Index: pkgsrc/x11/qt6-qscintilla/buildlink3.mk
diff -u /dev/null pkgsrc/x11/qt6-qscintilla/buildlink3.mk:1.1
--- /dev/null   Sun Mar 24 12:44:57 2024
+++ pkgsrc/x11/qt6-qscintilla/buildlink3.mk     Sun Mar 24 12:44:57 2024
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2024/03/24 12:44:57 adam Exp $
+
+BUILDLINK_TREE+=       qt6-qscintilla
+
+.if !defined(QT6_QSCINTILLA_BUILDLINK3_MK)
+QT6_QSCINTILLA_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.qt6-qscintilla+= qt6-qscintilla>=2.14.1
+BUILDLINK_ABI_DEPENDS.qt6-qscintilla+= qt6-qscintilla>=2.14.1
+BUILDLINK_PKGSRCDIR.qt6-qscintilla?=   ../../x11/qt6-qscintilla
+
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.endif # QT6_QSCINTILLA_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -qt6-qscintilla
Index: pkgsrc/x11/qt6-qscintilla/distinfo
diff -u /dev/null pkgsrc/x11/qt6-qscintilla/distinfo:1.1
--- /dev/null   Sun Mar 24 12:44:57 2024
+++ pkgsrc/x11/qt6-qscintilla/distinfo  Sun Mar 24 12:44:57 2024
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2024/03/24 12:44:57 adam Exp $
+
+BLAKE2s (QScintilla_src-2.14.1.tar.gz) = 356f4eb5d49f0a81eb10a28da6353ff2ba61a770cba6c190ed6993f7576c1081
+SHA512 (QScintilla_src-2.14.1.tar.gz) = 19e2f9e0a14947501c575018df368d24eb7f8c74e74faa5246db36415bf28dc0beee507ed0e73107c02b36a99bbaf55f0ef3349f479d2332e1b92b2c4a32788a
+Size (QScintilla_src-2.14.1.tar.gz) = 3233610 bytes

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/math/octave
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/math/octave
Indexes:

Home | Main Index | Thread Index | Old Index