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>
ormorph 2 months ago
parent 7a92246547
commit d085a71c81
No known key found for this signature in database
GPG Key ID: 30407D7656623DFD

@ -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 <direct.h>
+#else
+#include <unistd.h>
#endif
#endif /* BUILD_DOCS */
+#include <cstdlib>
/* 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 <cstdlib>
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 <kstandarddirs.h>
#include <tqfileinfo.h>
#include <tqstringlist.h>
+#include <cstdlib>
/* 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 <cstdlib>
/* -----------------------------------------
--- 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 <cstdlib>
#include <libxml/xmlerror.h>
#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 <tdelocale.h>
#include <tdeglobal.h>
#include <kdebug.h>
+#include <cstdlib>
/* Forward delare private functions */
static int notifyXsldbgAppSimple(XsldbgMessageEnum type, const void *data);
static int notifyStateXsldbgAppSimple(XsldbgMessageEnum type, int commandId,

@ -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

@ -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

@ -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 <libxml/parser.h>
#include <libxml/valid.h>
+#include <unistd.h>
//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 += "<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;

@ -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

@ -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

Loading…
Cancel
Save