Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / lib32-libxslt
Commits:
6eecfa5b by Jan Alexander Steffens (heftig) at 2024-06-15T00:33:12+02:00
1.1.40-2
- - - - -
4 changed files:
- .SRCINFO
- + 0001-runtest-Print-output-causing-failure.patch
- + 0002-tests-Fix-tests-for-libxml2-fix.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = lib32-libxslt
pkgdesc = XML stylesheet transformation library (32-bit)
pkgver = 1.1.40
- pkgrel = 1
+ pkgrel = 2
url = https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home
arch = x86_64
license = MIT
@@ -15,7 +15,11 @@ pkgbase = lib32-libxslt
depends = lib32-xz
depends = libxslt
source = git+https://gitlab.gnome.org/GNOME/libxslt.git#tag=v1.1.40
+ source = 0001-runtest-Print-output-causing-failure.patch
+ source = 0002-tests-Fix-tests-for-libxml2-fix.patch
b2sums =
12737793c1b71c2336f4010dcd2b7c340c1b392962bc1cbf0211dd6bd19559d33db0a654177bad96530628fff286bb08c2fbb4ce8056543f008e118419b8b4ab
+ b2sums =
db7e235868a4e605cd2d73ab7d24bed5d3944e85c04fae6978dd48449f64af5c38e28fe88c843bbfa24a6cbcab54fd79a8ee2cd024717d0f84a0c464b90dc286
+ b2sums =
900909d96405d41fe424fce5641e9ef0f4d8291ddb4afbebc8fee7a3d40f7f2ca81b99fd46e38b53d2ece26d8f5ecac506683013ecdc357f4efa2142377d252c
pkgname = lib32-libxslt
provides = libxslt.so
=====================================
0001-runtest-Print-output-causing-failure.patch
=====================================
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org>
+Date: Sat, 15 Jun 2024 00:22:58 +0200
+Subject: [PATCH] runtest: Print output causing failure
+
+---
+ tests/runtest.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/runtest.c b/tests/runtest.c
+index 56eb31f1dc8c..fea4bd3c61f4 100644
+--- a/tests/runtest.c
++++ b/tests/runtest.c
+@@ -668,17 +668,17 @@ xsltTest(const char *filename, int options) {
+ res = compareFileMem(outFilename, (char *) out, outSize);
+ if (res != 0) {
+ fprintf(stderr, "Result for %s failed\n", filename);
+- /* printf("####\n%s####\n", out); */
++ printf("####\n%s####\n", out);
+ ret = -1;
+ }
+ free(outFilename);
+ xmlFree(out);
+
+ errFilename = changeSuffix(filename, errSuffix);
+ res = compareFileMem(errFilename, testErrors, testErrorsSize);
+ if (res != 0) {
+ fprintf(stderr, "Error for %s failed\n", filename);
+- /* printf("####\n%s####\n", testErrors); */
++ printf("####\n%s####\n", testErrors);
+ ret = -1;
+ }
+ free(errFilename);
=====================================
0002-tests-Fix-tests-for-libxml2-fix.patch
=====================================
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org>
+Date: Sat, 15 Jun 2024 00:23:04 +0200
+Subject: [PATCH] tests: Fix tests for libxml2 fix
+
+See:
https://gitlab.gnome.org/GNOME/libxml2/-/commit/aa90cb0c578bd189089cd1fe195faf85040ac98b
+---
+ tests/documents/test_bad.err | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/documents/test_bad.err b/tests/documents/test_bad.err
+index 91e5f4c79381..e6dd598716a1 100644
+--- a/tests/documents/test_bad.err
++++ b/tests/documents/test_bad.err
+@@ -1,2 +1,2 @@
+-I/O error : failed to load "foofile.xml": No such file or directory
+-I/O error : failed to load "foo_file.xml": No such file or directory
++I/O warning : failed to load "foofile.xml": No such file or directory
++I/O warning : failed to load "foo_file.xml": No such file or directory
=====================================
PKGBUILD
=====================================
@@ -7,7 +7,7 @@ pkgname=(
lib32-libxslt
)
pkgver=1.1.40
-pkgrel=1
+pkgrel=2
pkgdesc="XML stylesheet transformation library (32-bit)"
url="https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home";
arch=(x86_64)
@@ -29,11 +29,27 @@ checkdepends=(
)
source=(
"git+https://gitlab.gnome.org/GNOME/libxslt.git#tag=v$pkgver";
+ 0001-runtest-Print-output-causing-failure.patch
+ 0002-tests-Fix-tests-for-libxml2-fix.patch
)
-b2sums=('12737793c1b71c2336f4010dcd2b7c340c1b392962bc1cbf0211dd6bd19559d33db0a654177bad96530628fff286bb08c2fbb4ce8056543f008e118419b8b4ab')
+b2sums=('12737793c1b71c2336f4010dcd2b7c340c1b392962bc1cbf0211dd6bd19559d33db0a654177bad96530628fff286bb08c2fbb4ce8056543f008e118419b8b4ab'
+
'db7e235868a4e605cd2d73ab7d24bed5d3944e85c04fae6978dd48449f64af5c38e28fe88c843bbfa24a6cbcab54fd79a8ee2cd024717d0f84a0c464b90dc286'
+
'900909d96405d41fe424fce5641e9ef0f4d8291ddb4afbebc8fee7a3d40f7f2ca81b99fd46e38b53d2ece26d8f5ecac506683013ecdc357f4efa2142377d252c')
prepare() {
cd libxslt
+
+ #
https://gitlab.archlinux.org/archlinux/packaging/packages/openconnect/-/issues/1
+ # https://gitlab.gnome.org/GNOME/libxslt/-/issues/109
+ git cherry-pick -n 16f3d7c4954da41788a46e0b14baff2c5785d314
+
+ # Make test failures easier to fix
+ git apply -3 ../0001-runtest-Print-output-causing-failure.patch
+
+ # Fix for recent libxml2 change
+ #
https://gitlab.gnome.org/GNOME/libxml2/-/commit/aa90cb0c578bd189089cd1fe195faf85040ac98b
+ git apply -3 ../0002-tests-Fix-tests-for-libxml2-fix.patch
+
NOCONFIGURE=1 ./autogen.sh
}
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-libxslt/-/commit/6eecfa5b0d9f22f5dbef8ab66062aa84f2dfcbad
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-libxslt/-/commit/6eecfa5b0d9f22f5dbef8ab66062aa84f2dfcbad
You're receiving this email because of your account on gitlab.archlinux.org.
