8 files changed, 89 insertions, 17 deletions
diff --git a/trinity-base/quanta/Manifest b/trinity-base/quanta/Manifest
index eb218f03..2f4563c5 100644
--- a/trinity-base/quanta/Manifest
+++ b/trinity-base/quanta/Manifest
@@ -2,5 +2,5 @@ DIST css.tar.bz2 121594 BLAKE2B d35e72ed4f9a17b9324aaca5bb3817ef6acbe46ca40be537
 DIST html.tar.bz2 93487 BLAKE2B e92e5d1266d465fab9a443bb190b5870bf3fae3a0e2a57265ff85d7f9db4e36275368f4c0b0e53de1ce413e994a6ac9178912ead3312ef2872a54f2bf0400f8e SHA512 b48b37efbd444bde4c1177ad5aeef0e95721d4d73b8b8b57d384c93932394d8e161ec2230ec8d2c83b66f00704cf66220c01dc0c53aecca3bfa22a77785ad18e
 DIST javascript.tar.bz2 331710 BLAKE2B 3cbd68a69efb2e549506ae0bdc211267ed27948fef23310d34c7a9a8da55d7c238f598a0532c0ac54a6efc399f95c99698a959b1e4663587473b81b120b80fbf SHA512 996a65e1f29ec8cda85ef06c6f56a4b7cceabf8ae82454ccd1e5caa36537b8c9a406992b60cc7ad9f29fcb5b2ffd63a82b4cf10ab73cd4b66ca2d7ec9c01a00b
 DIST php_manual_en_20030401.tar.bz2 1346608 BLAKE2B 298f8e95b1a4384d7f7393682b1bdbf797fae53a6ce4e258cf246529ff6faecf3fa92fd12ee6e9108684218f154f5079bcd7961747ce10dd81735946c9ac84b8 SHA512 b52ac0d7ef75ab6d13f28d1a77ed3975530be3cb2a1ac58b7bf45a4834b85cb832c8449e68a8c27d2f9c991cfb526c4206edc3598db957c36d620b7c81b77bb9
-DIST tdewebdev-trinity-14.0.11.tar.xz 4959612 BLAKE2B 4490ec3b18f9afdb083163c1abf1cfd758826ab6ae11e721e061f3a8c7cc25eb7a72d28e791bf4e557c1dd0a79d644e40594102ce33f043611587266b4333f9b SHA512 a19fae6682d70e33605a18666ee1de57517398c3039784adc5bbeb2f84f705e8d27510b8a751371fbc07c0a315cb95f72d0bc0bb2f7c3363fc15f6e6a601b2f4
-DIST tdewebdev-trinity-14.0.12.tar.xz 4976768 BLAKE2B 6a508b68e5efc1d423eb657b3a888ba20583ee1f23c3bab93ba8874b12320219a78e056e9e0fe8ad85c1ae476af0cdda9c4f9aa406431198f4ee56c1c206d7db SHA512 23d76a12f603db12f9378413106d32e181928221ea867b816f974d170f7424ea28640d10520a89d547af88ce6718519e598c877530f238c19dac048e1cd52ab5
+DIST tdewebdev-trinity-14.1.1.tar.xz 4136900 BLAKE2B c7d72ce08253bf94bf93bd6f1d9d41566e63f0629a7c07c872c899a9b563be4f41bd9ca092aa1f72a67f5b09e38998aec1bb019331e683cfb1353840c620d8c4 SHA512 f9c11514ccf36e638cef036994c4c3dc984387b0455ea392742a329de142a738575a0db54a0ac61adec9e5253a2f7d6fda95807f8aa6e5cee6edd868a99cb93f
+DIST tdewebdev-trinity-14.1.2.tar.xz 4136096 BLAKE2B f21256b842b3443876582adbc749e8f1be0461d6d54f99a406d8322c610feaefe7679a2109986572e664a31360515c85a172a33eb83047c42ad304d7479488ed SHA512 a8c37f5bfd637144a9baf303d86967796502b2572f0c918ba5891a609879f96738417a52a23f56978996a24e7cf4456a3a55cbf201528aa06234716e43e04a7c
diff --git a/trinity-base/quanta/files/externalpreview.sh b/trinity-base/quanta/files/externalpreview.sh
new file mode 100644
index 00000000..f01593ed
--- /dev/null
+++ b/trinity-base/quanta/files/externalpreview.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#Previews the current document in Mozilla/Netscape/Opera, depending
+#on the last two arguments (browsername, newtab command).
+#Might be adjusted in the feature to support more browsers.
+pid=$1
+currentURL=""
+if test $pid == "unique"
+then
+  currentURL=`dcop quanta WindowManagerIf saveCurrentFile`
+  shift
+else
+  currentURL=`dcop quanta-$pid WindowManagerIf saveCurrentFile`
+fi
+browser=$2
+newTab=$3
+if test $currentURL ; then
+  $browser $currentURL
+fi
diff --git a/trinity-base/quanta/files/quanta-xml2.patch b/trinity-base/quanta/files/quanta-xml2.patch
new file mode 100644
index 00000000..60678924
--- /dev/null
+++ b/trinity-base/quanta/files/quanta-xml2.patch
@@ -0,0 +1,21 @@
+--- a/quanta/parsers/dtd/dtdparser.cpp	2024-03-24 17:50:30.532305927 +0300
++++ b/quanta/parsers/dtd/dtdparser.cpp	2024-03-24 17:51:05.456304466 +0300
+@@ -82,7 +82,8 @@
+   if( DTD::dtd_ptr == NULL )
+   {
+     TQString errorStr = i18n("Unknown");
+-    xmlErrorPtr errorPtr = xmlGetLastError();
++    // The type used is either xmlErrorPtr or const xmlError*
++    auto errorPtr = xmlGetLastError();
+     if (errorPtr != NULL)
+     {
+       TQString s = TQString::fromLatin1(errorPtr->message);
+@@ -98,7 +99,7 @@
+       if (!s.isEmpty())
+         errorStr += "<br>" + s;
+       errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2);
+-      xmlResetError(errorPtr);
++      xmlResetLastError();
+     }
+     KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").arg(errorStr));
+     return false;
diff --git a/trinity-base/quanta/files/tdewebdev-ninja.patch b/trinity-base/quanta/files/tdewebdev-ninja.patch
new file mode 100644
index 00000000..1d2a04ba
--- /dev/null
+++ b/trinity-base/quanta/files/tdewebdev-ninja.patch
@@ -0,0 +1,10 @@
+--- a/ConfigureChecks.cmake	2024-03-24 21:40:09.165729665 +0300
++++ b/ConfigureChecks.cmake	2024-03-24 21:41:43.299725728 +0300
+@@ -59,6 +59,7 @@
+     tde_execute_process(
+         COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CXXFLAGS icu-uc
+         OUTPUT_VARIABLE ICU_CXXFLAGS
++        OUTPUT_STRIP_TRAILING_WHITESPACE
+     )
+ 
+ 
diff --git a/trinity-base/quanta/metadata.xml b/trinity-base/quanta/metadata.xml
index 7a38bb90..ef7d5590 100644
--- a/trinity-base/quanta/metadata.xml
+++ b/trinity-base/quanta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>team-gentoo@trinitydesktop.org</email>
+		<name>Trinity Gentoo ebuilds project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/trinity-base/quanta/quanta-14.0.11.ebuild b/trinity-base/quanta/quanta-14.1.1.ebuild
index 0caba6e4..75077812 100644
--- a/trinity-base/quanta/quanta-14.0.11.ebuild
+++ b/trinity-base/quanta/quanta-14.1.1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 1999-2023 Gentoo Authors
+# Copyright 2022-2023 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 TRINITY_MODULE_NAME="tdewebdev"
 TRINITY_MODULE_TYPE="core"
-TSM_EXTRACT_ALSO="lib translations"
+TRINITY_HANDBOOK="optional"
+TSM_EXTRACT_ALSO="lib"
 
 inherit flag-o-matic trinity-meta-2
 
@@ -22,7 +23,6 @@ SRC_URI+="
 if [[ ${PV} != *9999* ]] ; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
-IUSE=""
 
 DEPEND="
 	app-text/htmltidy
@@ -35,6 +35,11 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-xml2.patch"
+	"${FILESDIR}/tdewebdev-ninja.patch"
+)
+
 src_unpack() {
 	trinity-meta-2_src_unpack
 	unpack php_manual_en_20030401.tar.bz2
@@ -49,6 +54,11 @@ src_configure() {
 	trinity-meta-2_src_configure
 }
 
+src_prepare() {
+	cp "${FILESDIR}/externalpreview.sh" "${S}/quanta/scripts/externalpreview.sh" || die
+	trinity-meta-2_src_prepare
+}
+
 src_install() {
 	dodir ${TDEDIR}/share/apps/quanta/doc
 
diff --git a/trinity-base/quanta/quanta-14.0.12.ebuild b/trinity-base/quanta/quanta-14.1.2.ebuild
index 02f0f1c2..54476495 100644
--- a/trinity-base/quanta/quanta-14.0.12.ebuild
+++ b/trinity-base/quanta/quanta-14.1.2.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
-# Copyright 2022 The Trinity Desktop Project
+# Copyright 1999-2024 Gentoo Authors
+# Copyright 2022-2024 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdewebdev"
 TRINITY_MODULE_TYPE="core"
-TSM_EXTRACT_ALSO="lib translations"
+TRINITY_HANDBOOK="optional"
+TSM_EXTRACT_ALSO="lib"
 
 inherit flag-o-matic trinity-meta-2
 
@@ -22,7 +23,6 @@ SRC_URI+="
 if [[ ${PV} != *9999* ]] ; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
-IUSE=""
 
 DEPEND="
 	app-text/htmltidy
@@ -44,6 +44,11 @@ src_unpack() {
 	unpack html.tar.bz2
 }
 
+src_prepare() {
+	cp "${FILESDIR}/externalpreview.sh" "${S}/quanta/scripts/externalpreview.sh" || die
+	trinity-meta-2_src_prepare
+}
+
 src_configure() {
 	append-cxxflags "-std=c++11"
 	trinity-meta-2_src_configure
diff --git a/trinity-base/quanta/quanta-9999.ebuild b/trinity-base/quanta/quanta-9999.ebuild
index c2628fea..12476ef0 100644
--- a/trinity-base/quanta/quanta-9999.ebuild
+++ b/trinity-base/quanta/quanta-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
-# Copyright 2020 The Trinity Desktop Project
+# Copyright 1999-2022 Gentoo Authors
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdewebdev"
 TRINITY_MODULE_TYPE="core"
-TSM_EXTRACT_ALSO="lib translations"
+TRINITY_HANDBOOK="optional"
+TSM_EXTRACT_ALSO="lib"
 
 inherit flag-o-matic trinity-meta-2
 
@@ -20,9 +21,8 @@ SRC_URI+="
 	http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2"
 
 if [[ ${PV} != *9999* ]] ; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
-IUSE=""
 
 DEPEND="
 	app-text/htmltidy
@@ -44,6 +44,11 @@ src_unpack() {
 	unpack html.tar.bz2
 }
 
+src_prepare() {
+	cp "${FILESDIR}/externalpreview.sh" "${S}/quanta/scripts/externalpreview.sh" || die
+	trinity-meta-2_src_prepare
+}
+
 src_configure() {
 	append-cxxflags "-std=c++11"
 	trinity-meta-2_src_configure