diff options
author | ormorph <roma251078@mail.ru> | 2024-03-24 16:12:16 +0300 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2024-03-26 03:31:03 +0100 |
commit | dce40bcbeecf6170c3979a09750e4200ccc65e3b (patch) | |
tree | 0567a61d4cad27c6999060106581459ed2a2af79 /trinity-base/quanta | |
parent | 1d4896e65ae2e640b8ecd32958c4a90d3d3b4e4c (diff) | |
download | tde-packaging-gentoo-dce40bcbeecf6170c3979a09750e4200ccc65e3b.tar.gz tde-packaging-gentoo-dce40bcbeecf6170c3979a09750e4200ccc65e3b.zip |
Added support for libxml2-2.12 and later, as well as the necessary header files
Solution to issue TDE/tdewebdev#42
Signed-off-by: ormorph <roma251078@mail.ru>
(cherry picked from commit 3f16574bad46f8fe9f4768ac60492c21dc9e5169)
Diffstat (limited to 'trinity-base/quanta')
-rw-r--r-- | trinity-base/quanta/files/quanta-xml2.patch | 21 | ||||
-rw-r--r-- | trinity-base/quanta/quanta-14.1.0.ebuild | 4 | ||||
-rw-r--r-- | trinity-base/quanta/quanta-14.1.1.ebuild | 4 |
3 files changed, 29 insertions, 0 deletions
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/quanta-14.1.0.ebuild b/trinity-base/quanta/quanta-14.1.0.ebuild index 91207251..e587c136 100644 --- a/trinity-base/quanta/quanta-14.1.0.ebuild +++ b/trinity-base/quanta/quanta-14.1.0.ebuild @@ -35,6 +35,10 @@ DEPEND=" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-xml2.patch" +) + src_unpack() { trinity-meta-2_src_unpack unpack php_manual_en_20030401.tar.bz2 diff --git a/trinity-base/quanta/quanta-14.1.1.ebuild b/trinity-base/quanta/quanta-14.1.1.ebuild index 91207251..e587c136 100644 --- a/trinity-base/quanta/quanta-14.1.1.ebuild +++ b/trinity-base/quanta/quanta-14.1.1.ebuild @@ -35,6 +35,10 @@ DEPEND=" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-xml2.patch" +) + src_unpack() { trinity-meta-2_src_unpack unpack php_manual_en_20030401.tar.bz2 |