From d085a71c817af0e6bcdb148f6c85dd70643875cd Mon Sep 17 00:00:00 2001 From: ormorph Date: Sun, 24 Mar 2024 16:12:16 +0300 Subject: [PATCH] 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 --- .../kxsldbg/files/kxsldbg-add-headers.patch | 65 +++++++++++++++++++ trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild | 4 ++ trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild | 4 ++ trinity-base/quanta/files/quanta-xml2.patch | 30 +++++++++ trinity-base/quanta/quanta-14.1.0.ebuild | 4 ++ trinity-base/quanta/quanta-14.1.1.ebuild | 4 ++ 6 files changed, 111 insertions(+) create mode 100644 trinity-base/kxsldbg/files/kxsldbg-add-headers.patch create mode 100644 trinity-base/quanta/files/quanta-xml2.patch diff --git a/trinity-base/kxsldbg/files/kxsldbg-add-headers.patch b/trinity-base/kxsldbg/files/kxsldbg-add-headers.patch new file mode 100644 index 00000000..95a2828e --- /dev/null +++ b/trinity-base/kxsldbg/files/kxsldbg-add-headers.patch @@ -0,0 +1,65 @@ +--- a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp 2024-03-24 15:56:49.245591213 +0300 ++++ b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp 2024-03-24 15:57:57.025588378 +0300 +@@ -34,9 +34,12 @@ + #include "xsldbgthread.h" + #ifdef WIN32 + #include ++#else ++#include + #endif + + #endif /* BUILD_DOCS */ ++#include + + + /* top xml document */ +--- a/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp 2024-03-24 15:56:49.247591213 +0300 ++++ b/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp 2024-03-24 15:57:57.027588378 +0300 +@@ -21,6 +21,7 @@ + #include "files.h" + #include "utils.h" + #include "options.h" ++#include + + static char *tempNames[2] = { NULL, NULL }; + +--- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp 2024-03-24 15:56:49.250591212 +0300 ++++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp 2024-03-24 15:57:57.028588378 +0300 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + + /* keep track of our integer/boolean options */ +--- a/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp 2024-03-24 15:56:49.252591212 +0300 ++++ b/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp 2024-03-24 15:57:57.029588378 +0300 +@@ -19,6 +19,7 @@ + #include "xsldbg.h" + #include "debugXSL.h" + #include "files.h" ++#include + + /* ----------------------------------------- + +--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp 2024-03-24 15:56:49.260591212 +0300 ++++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp 2024-03-24 15:57:57.030588378 +0300 +@@ -39,6 +39,7 @@ + #include "files.h" + #include "breakpoint.h" + #include "debugXSL.h" ++#include + + #include + #include "xsldbgmsg.h" +--- a/kxsldbg/xsldbgmain.cpp 2024-03-24 15:56:49.290591211 +0300 ++++ b/kxsldbg/xsldbgmain.cpp 2024-03-24 15:57:57.032588378 +0300 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + /* Forward delare private functions */ + static int notifyXsldbgAppSimple(XsldbgMessageEnum type, const void *data); + static int notifyStateXsldbgAppSimple(XsldbgMessageEnum type, int commandId, diff --git a/trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild b/trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild index 2a501aac..e75bb2bd 100644 --- a/trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild +++ b/trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild @@ -24,6 +24,10 @@ DEPEND=" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-add-headers.patch" +) + src_configure() { append-cxxflags "-std=c++11" trinity-meta-2_src_configure diff --git a/trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild b/trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild index 2a501aac..e75bb2bd 100644 --- a/trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild +++ b/trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild @@ -24,6 +24,10 @@ DEPEND=" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-add-headers.patch" +) + src_configure() { append-cxxflags "-std=c++11" trinity-meta-2_src_configure diff --git a/trinity-base/quanta/files/quanta-xml2.patch b/trinity-base/quanta/files/quanta-xml2.patch new file mode 100644 index 00000000..6aee1c2f --- /dev/null +++ b/trinity-base/quanta/files/quanta-xml2.patch @@ -0,0 +1,30 @@ +diff -urN tdewebdev-trinity-14.1.1.orig/quanta/parsers/dtd/dtdparser.cpp tdewebdev-trinity-14.1.1/quanta/parsers/dtd/dtdparser.cpp +--- tdewebdev-trinity-14.1.1.orig/quanta/parsers/dtd/dtdparser.cpp 2024-03-24 16:56:37.726441132 +0300 ++++ tdewebdev-trinity-14.1.1/quanta/parsers/dtd/dtdparser.cpp 2024-03-24 16:59:52.765432975 +0300 +@@ -38,6 +38,7 @@ + //other includes + #include + #include ++#include + + //own includes + #include "dtepeditdlg.h" +@@ -82,7 +83,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 +100,7 @@ + if (!s.isEmpty()) + errorStr += "
" + s; + errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2); +- xmlResetError(errorPtr); ++ xmlResetLastError(); + } + KMessageBox::error(0, i18n("Error while parsing the DTD.
The error message is:
%1").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