qscintilla: Update to v2.14.1, build with Qt6

Signed-off-by: Reilly Brogan <reilly@reillybrogan.com>
getsolus · Mar 20, 2024 · f6338c4 · f6338c4
1 parent f64f0a5
commit f6338c4
Show file tree

Hide file tree

Showing 7 changed files with 2,930 additions and 46 deletions.
diff --git a/packages/q/qscintilla/abi_libs b/packages/q/qscintilla/abi_libs
@@ -1 +1,2 @@
 libqscintilla2_qt5.so.15
+libqscintilla2_qt6.so.15
diff --git a/packages/q/qscintilla/abi_symbols b/packages/q/qscintilla/abi_symbols
diff --git a/packages/q/qscintilla/abi_used_libs b/packages/q/qscintilla/abi_used_libs
@@ -2,6 +2,10 @@ libQt5Core.so.5
 libQt5Gui.so.5
 libQt5PrintSupport.so.5
 libQt5Widgets.so.5
+libQt6Core.so.6
+libQt6Gui.so.6
+libQt6PrintSupport.so.6
+libQt6Widgets.so.6
 libc.so.6
 libgcc_s.so.1
 libm.so.6

diff --git a/packages/q/qscintilla/abi_used_symbols b/packages/q/qscintilla/abi_used_symbols
diff --git a/packages/q/qscintilla/monitoring.yml b/packages/q/qscintilla/monitoring.yml
@@ -0,0 +1,6 @@
+releases:
+  id: 10082
+  rss: ~
+security:
+  # No known CPE, last checked 2024-03-20
+  cpe: ~
diff --git a/packages/q/qscintilla/package.yml b/packages/q/qscintilla/package.yml
@@ -1,8 +1,9 @@
 name       : qscintilla
-version    : 2.13.3
-release    : 11
+version    : 2.14.1
+release    : 13
 source     :
-    - https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.3/QScintilla_src-2.13.3.tar.gz : 711d28e37c8fccaa8229e8e39a5b3b2d97f3fffc63da10b71c71b84fa3649398
+    - https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.14.1/QScintilla_src-2.14.1.tar.gz#QScintilla.tar.gz : dfe13c6acc9d85dfcba76ccc8061e71a223957a6c02f3c343b30a9d43a4cdd4d
+extract    : no
 homepage   : https://www.riverbankcomputing.com/software/qscintilla/
 license    : GPL-3.0-only
 component  : programming
@@ -14,10 +15,26 @@ replaces   :
     - qscintilla-qt5
 builddeps  :
     - pkgconfig(Qt5UiTools)
+    - pkgconfig(Qt6UiTools)
+clang      : yes
 setup      : |
-    pushd src
+    mkdir qt5 qt6
+    tar --strip-components=1 -xf $sources/QScintilla.tar.gz -C qt5
+    tar --strip-components=1 -xf $sources/QScintilla.tar.gz -C qt6
+
+    pushd qt5/src
     %qmake
+    popd
+
+    pushd qt6/src
+    qmake6 QMAKE_CFLAGS_RELEASE="${CFLAGS}" QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}"
+    popd
 build      : |
-    %make -C src
+    %make -C qt5/src
+    %make -C qt6/src
 install    : |
-    %make_install -C src INSTALL_ROOT=$installdir
+    %make_install -C qt5/src INSTALL_ROOT=$installdir
+    %make_install -C qt6/src INSTALL_ROOT=$installdir
+patterns   :
+    - devel :
+        - /usr/lib64/qt*/mkspecs
diff --git a/packages/q/qscintilla/pspec_x86_64.xml b/packages/q/qscintilla/pspec_x86_64.xml
@@ -3,15 +3,15 @@
         <Name>qscintilla</Name>
         <Homepage>https://www.riverbankcomputing.com/software/qscintilla/</Homepage>
         <Packager>
-            <Name>Algent Albrahimi</Name>
-            <Email>algent@protonmail.com</Email>
+            <Name>Reilly Brogan</Name>
+            <Email>solus@reillybrogan.com</Email>
         </Packager>
         <License>GPL-3.0-only</License>
         <PartOf>programming</PartOf>
         <Summary xml:lang="en">QScintilla is a port to Qt of Neil Hodgson&apos;s Scintilla C++ editor control</Summary>
         <Description xml:lang="en">QScintilla is a port to Qt of Neil Hodgson&apos;s Scintilla C++ editor control.
 </Description>
-        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://sources.getsol.us/README.Solus</Archive>
     </Source>
     <Package>
         <Name>qscintilla</Name>
@@ -21,14 +21,18 @@
         <PartOf>programming</PartOf>
         <Files>
             <Path fileType="library">/usr/lib64/libqscintilla2_qt5.so.15</Path>
-            <Path fileType="library">/usr/lib64/libqscintilla2_qt5.so.15.1</Path>
-            <Path fileType="library">/usr/lib64/libqscintilla2_qt5.so.15.1.1</Path>
-            <Path fileType="library">/usr/lib64/qt5/mkspecs/features/qscintilla2.prf</Path>
+            <Path fileType="library">/usr/lib64/libqscintilla2_qt5.so.15.2</Path>
+            <Path fileType="library">/usr/lib64/libqscintilla2_qt5.so.15.2.1</Path>
+            <Path fileType="library">/usr/lib64/libqscintilla2_qt6.so.15</Path>
+            <Path fileType="library">/usr/lib64/libqscintilla2_qt6.so.15.2</Path>
+            <Path fileType="library">/usr/lib64/libqscintilla2_qt6.so.15.2.1</Path>
             <Path fileType="data">/usr/share/qt5/qsci/api/python/Python-2.4.api</Path>
             <Path fileType="data">/usr/share/qt5/qsci/api/python/Python-2.5.api</Path>
             <Path fileType="data">/usr/share/qt5/qsci/api/python/Python-2.6.api</Path>
             <Path fileType="data">/usr/share/qt5/qsci/api/python/Python-2.7.api</Path>
             <Path fileType="data">/usr/share/qt5/qsci/api/python/Python-3.1.api</Path>
+            <Path fileType="data">/usr/share/qt5/qsci/api/python/Python-3.10.api</Path>
+            <Path fileType="data">/usr/share/qt5/qsci/api/python/Python-3.11.api</Path>
             <Path fileType="data">/usr/share/qt5/qsci/api/python/Python-3.2.api</Path>
             <Path fileType="data">/usr/share/qt5/qsci/api/python/Python-3.3.api</Path>
             <Path fileType="data">/usr/share/qt5/qsci/api/python/Python-3.4.api</Path>
@@ -42,6 +46,26 @@
             <Path fileType="data">/usr/share/qt5/translations/qscintilla_es.qm</Path>
             <Path fileType="data">/usr/share/qt5/translations/qscintilla_fr.qm</Path>
             <Path fileType="data">/usr/share/qt5/translations/qscintilla_pt_br.qm</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-2.4.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-2.5.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-2.6.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-2.7.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-3.1.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-3.10.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-3.11.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-3.2.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-3.3.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-3.4.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-3.5.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-3.6.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-3.7.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-3.8.api</Path>
+            <Path fileType="data">/usr/share/qt6/qsci/api/python/Python-3.9.api</Path>
+            <Path fileType="data">/usr/share/qt6/translations/qscintilla_cs.qm</Path>
+            <Path fileType="data">/usr/share/qt6/translations/qscintilla_de.qm</Path>
+            <Path fileType="data">/usr/share/qt6/translations/qscintilla_es.qm</Path>
+            <Path fileType="data">/usr/share/qt6/translations/qscintilla_fr.qm</Path>
+            <Path fileType="data">/usr/share/qt6/translations/qscintilla_pt_br.qm</Path>
         </Files>
         <Replaces>
             <Package>qscintilla-qt5</Package>
@@ -54,7 +78,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="11">qscintilla</Dependency>
+            <Dependency release="13">qscintilla</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/Qsci/qsciabstractapis.h</Path>
@@ -64,6 +88,7 @@
             <Path fileType="header">/usr/include/Qsci/qscidocument.h</Path>
             <Path fileType="header">/usr/include/Qsci/qsciglobal.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexer.h</Path>
+            <Path fileType="header">/usr/include/Qsci/qscilexerasm.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexeravs.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerbash.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerbatch.h</Path>
@@ -78,15 +103,19 @@
             <Path fileType="header">/usr/include/Qsci/qscilexeredifact.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerfortran.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerfortran77.h</Path>
+            <Path fileType="header">/usr/include/Qsci/qscilexerhex.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerhtml.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexeridl.h</Path>
+            <Path fileType="header">/usr/include/Qsci/qscilexerintelhex.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerjava.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerjavascript.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerjson.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerlua.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexermakefile.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexermarkdown.h</Path>
+            <Path fileType="header">/usr/include/Qsci/qscilexermasm.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexermatlab.h</Path>
+            <Path fileType="header">/usr/include/Qsci/qscilexernasm.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexeroctave.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerpascal.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerperl.h</Path>
@@ -98,7 +127,9 @@
             <Path fileType="header">/usr/include/Qsci/qscilexerruby.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerspice.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexersql.h</Path>
+            <Path fileType="header">/usr/include/Qsci/qscilexersrec.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexertcl.h</Path>
+            <Path fileType="header">/usr/include/Qsci/qscilexertekhex.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexertex.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexerverilog.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscilexervhdl.h</Path>
@@ -110,19 +141,82 @@
             <Path fileType="header">/usr/include/Qsci/qsciscintillabase.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscistyle.h</Path>
             <Path fileType="header">/usr/include/Qsci/qscistyledtext.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qsciabstractapis.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qsciapis.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscicommand.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscicommandset.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscidocument.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qsciglobal.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexer.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerasm.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexeravs.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerbash.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerbatch.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexercmake.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexercoffeescript.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexercpp.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexercsharp.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexercss.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexercustom.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerd.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerdiff.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexeredifact.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerfortran.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerfortran77.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerhex.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerhtml.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexeridl.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerintelhex.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerjava.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerjavascript.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerjson.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerlua.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexermakefile.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexermarkdown.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexermasm.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexermatlab.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexernasm.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexeroctave.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerpascal.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerperl.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerpo.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerpostscript.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerpov.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerproperties.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerpython.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerruby.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerspice.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexersql.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexersrec.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexertcl.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexertekhex.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexertex.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerverilog.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexervhdl.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexerxml.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscilexeryaml.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscimacro.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qsciprinter.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qsciscintilla.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qsciscintillabase.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscistyle.h</Path>
+            <Path fileType="header">/usr/include/qt6/Qsci/qscistyledtext.h</Path>
             <Path fileType="library">/usr/lib64/libqscintilla2_qt5.so</Path>
+            <Path fileType="library">/usr/lib64/libqscintilla2_qt6.so</Path>
+            <Path fileType="library">/usr/lib64/qt5/mkspecs/features/qscintilla2.prf</Path>
+            <Path fileType="library">/usr/lib64/qt6/mkspecs/features/qscintilla2.prf</Path>
         </Files>
         <Replaces>
             <Package>qscintilla-qt5-devel</Package>
         </Replaces>
     </Package>
     <History>
-        <Update release="11">
-            <Date>2022-07-26</Date>
-            <Version>2.13.3</Version>
+        <Update release="13">
+            <Date>2024-03-20</Date>
+            <Version>2.14.1</Version>
             <Comment>Packaging update</Comment>
-            <Name>Algent Albrahimi</Name>
-            <Email>algent@protonmail.com</Email>
+            <Name>Reilly Brogan</Name>
+            <Email>solus@reillybrogan.com</Email>
         </Update>
     </History>
 </PISI>