diff options
Diffstat (limited to 'arch/tde-devel/tde-tdewebdev')
| -rw-r--r-- | arch/tde-devel/tde-tdewebdev/PKGBUILD | 14 | ||||
| -rw-r--r-- | arch/tde-devel/tde-tdewebdev/bp000-kxsldbg-remove-sax1-initialization.diff | 26 |
2 files changed, 37 insertions, 3 deletions
diff --git a/arch/tde-devel/tde-tdewebdev/PKGBUILD b/arch/tde-devel/tde-tdewebdev/PKGBUILD index 70aefa28c..d844f0515 100644 --- a/arch/tde-devel/tde-tdewebdev/PKGBUILD +++ b/arch/tde-devel/tde-tdewebdev/PKGBUILD @@ -5,7 +5,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.1.2 +pkgver=14.1.3 pkgrel=1 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -18,11 +18,19 @@ provides=("${_mod}") conflicts=("trinity-${_mod}" "trinity-${_kdemod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('ec9794614c18a6a664d138e0dd1a84d8') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" + 'bp000-kxsldbg-remove-sax1-initialization.diff') +md5sums=('88bd4804ce6daf838d0f3679939ebee0' + '8a97f188b88a3e804b8814b32190812a') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +prepare() { + msg "Apply backported patches" + cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1 + patch -p1 < ${srcdir}/bp000-kxsldbg-remove-sax1-initialization.diff +} + build() { msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p ${srcdir}/build diff --git a/arch/tde-devel/tde-tdewebdev/bp000-kxsldbg-remove-sax1-initialization.diff b/arch/tde-devel/tde-tdewebdev/bp000-kxsldbg-remove-sax1-initialization.diff new file mode 100644 index 000000000..4073b194a --- /dev/null +++ b/arch/tde-devel/tde-tdewebdev/bp000-kxsldbg-remove-sax1-initialization.diff @@ -0,0 +1,26 @@ +commit 1fa52261f7255bf5e44b337d1605c48ea356eb7b +Author: Slávek Banko <slavek.banko@axis.cz> +Date: Thu Oct 24 02:18:46 2024 +0200 + + kxsldbg: Remove obsolete initialization of SAX1 parser. + The call does not do any operation and causes FTBFS with libxml2 >= 2.13.0. + + Signed-off-by: Slávek Banko <slavek.banko@axis.cz> + +diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp +index d05281f5..8b1e7063 100644 +--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp ++++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp +@@ -1220,12 +1220,6 @@ xsldbgInit() + xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc); + #endif + +- /* +- * disable CDATA from being built in the document tree +- */ +- xmlDefaultSAXHandlerInit(); +- xmlDefaultSAXHandler.cdataBlock = NULL; +- + if (getThreadStatus() != XSLDBG_MSG_THREAD_NOTUSED) { + initialized = 1; + return 1; /* this is all we need to do when running as a thread */ |