Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging / Packages / lib32-libxslt
Commits: 0f968c53 by Jan Alexander Steffens (heftig) at 2024-06-19T14:25:23+02:00 1.1.41-1 - - - - - 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 = 2 + pkgver = 1.1.41 + pkgrel = 1 url = https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home arch = x86_64 license = MIT @@ -14,12 +14,10 @@ pkgbase = lib32-libxslt depends = lib32-libxml2 depends = lib32-xz depends = libxslt - source = git+https://gitlab.gnome.org/GNOME/libxslt.git#tag=v1.1.40 + source = git+https://gitlab.gnome.org/GNOME/libxslt.git#tag=v1.1.41 source = 0001-runtest-Print-output-causing-failure.patch - source = 0002-tests-Fix-tests-for-libxml2-fix.patch - b2sums = 12737793c1b71c2336f4010dcd2b7c340c1b392962bc1cbf0211dd6bd19559d33db0a654177bad96530628fff286bb08c2fbb4ce8056543f008e118419b8b4ab - b2sums = db7e235868a4e605cd2d73ab7d24bed5d3944e85c04fae6978dd48449f64af5c38e28fe88c843bbfa24a6cbcab54fd79a8ee2cd024717d0f84a0c464b90dc286 - b2sums = 900909d96405d41fe424fce5641e9ef0f4d8291ddb4afbebc8fee7a3d40f7f2ca81b99fd46e38b53d2ece26d8f5ecac506683013ecdc357f4efa2142377d252c + b2sums = 6acf532a59cb6d2bfa1fee8c409f21f3b68caa2bc0362906e83e0fc133d4c946ee26eded171aad6a50f0c6efe7c8bf13ffbd16c6f3e3937c0cca47509bef1305 + b2sums = b63a1f2bf704d4561cc30734cee980534fb0586234b7b593d57d9c70fe59abd72610b6d825ab136d4d1dd7540bbfb6b8a6edc95618c15cc79e5a4bbd8f6341ee pkgname = lib32-libxslt provides = libxslt.so ===================================== 0001-runtest-Print-output-causing-failure.patch ===================================== @@ -8,10 +8,10 @@ Subject: [PATCH] runtest: Print output causing failure 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/runtest.c b/tests/runtest.c -index 56eb31f1dc8c..fea4bd3c61f4 100644 +index be6ccb0e2a4f..03d3c284fd3c 100644 --- a/tests/runtest.c +++ b/tests/runtest.c -@@ -668,17 +668,17 @@ xsltTest(const char *filename, int options) { +@@ -413,17 +413,17 @@ xsltTest(const char *filename, int options) { res = compareFileMem(outFilename, (char *) out, outSize); if (res != 0) { fprintf(stderr, "Result for %s failed\n", filename); ===================================== 0002-tests-Fix-tests-for-libxml2-fix.patch deleted ===================================== @@ -1,19 +0,0 @@ -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 ===================================== @@ -6,8 +6,8 @@ pkgbase=lib32-libxslt pkgname=( lib32-libxslt ) -pkgver=1.1.40 -pkgrel=2 +pkgver=1.1.41 +pkgrel=1 pkgdesc="XML stylesheet transformation library (32-bit)" url="https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home" arch=(x86_64) @@ -30,26 +30,16 @@ 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' - 'db7e235868a4e605cd2d73ab7d24bed5d3944e85c04fae6978dd48449f64af5c38e28fe88c843bbfa24a6cbcab54fd79a8ee2cd024717d0f84a0c464b90dc286' - '900909d96405d41fe424fce5641e9ef0f4d8291ddb4afbebc8fee7a3d40f7f2ca81b99fd46e38b53d2ece26d8f5ecac506683013ecdc357f4efa2142377d252c') +b2sums=('6acf532a59cb6d2bfa1fee8c409f21f3b68caa2bc0362906e83e0fc133d4c946ee26eded171aad6a50f0c6efe7c8bf13ffbd16c6f3e3937c0cca47509bef1305' + 'b63a1f2bf704d4561cc30734cee980534fb0586234b7b593d57d9c70fe59abd72610b6d825ab136d4d1dd7540bbfb6b8a6edc95618c15cc79e5a4bbd8f6341ee') 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/0f968c536465fa6a3f124aaf44ced47fccc7d426 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-libxslt/-/commit/0f968c536465fa6a3f124aaf44ced47fccc7d426 You're receiving this email because of your account on gitlab.archlinux.org.