Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging 
/ Packages / lib32-libxml2


Commits:
bc770379 by Jan Alexander Steffens (heftig) at 2024-06-18T18:00:57+02:00
2.13.0-5: Cherry-pick all the fixes

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = lib32-libxml2
        pkgdesc = XML C parser and toolkit (32-bit)
        pkgver = 2.13.0
-       pkgrel = 4
+       pkgrel = 5
        url = https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home
        arch = x86_64
        license = MIT


=====================================
PKGBUILD
=====================================
@@ -9,7 +9,7 @@ pkgname=(
   lib32-libxml2
 )
 pkgver=2.13.0
-pkgrel=4
+pkgrel=5
 pkgdesc="XML C parser and toolkit (32-bit)"
 url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home";
 arch=(x86_64)
@@ -40,21 +40,14 @@ prepare() {
   # Use xmlconf from conformance test suite
   ln -s ../xmlconf
 
-  # https://gitlab.gnome.org/GNOME/libxml2/-/issues/732
-  git cherry-pick -n 8322eef39d775b1c16a5895a77da53d82653a04e
-
+  # Cherry-pick fixes from 2.13 branch
   # https://gitlab.gnome.org/GNOME/libxml2/-/issues/731
-  git cherry-pick -n 9ecabe1c2461dc4aa28a75bb9c889f82e37a5786
-
-  # Fix gambas
-  git cherry-pick -n 599ceaffad97faff9e77a3237d319f18cdc2984a
-
+  # https://gitlab.gnome.org/GNOME/libxml2/-/issues/732
   # https://gitlab.gnome.org/GNOME/libxml2/-/issues/733
-  # https://github.com/systemd/systemd/issues/33302
-  git cherry-pick -n aa90cb0c578bd189089cd1fe195faf85040ac98b \
-                     c04d9b1b87eaf5c12f70173762f8c81c34e59aeb \
-                     1ff484339e98b9adc992478f2786c3db174c8a32 \
-                     3c7c831c7c10ee3b68a039da138abf38ec4ab994
+  # https://gitlab.gnome.org/GNOME/libxml2/-/issues/734
+  # https://gitlab.gnome.org/GNOME/libxml2/-/issues/737
+  # https://gitlab.gnome.org/GNOME/libxml2/-/issues/738
+  git cherry-pick -n v2.13.0..def06f376e1fefcc666a4daef687f87ad25f6793
 
   # Do not run fuzzing tests
   git apply -3 ../0001-HACK-Don-t-run-fuzzing-tests.patch



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-libxml2/-/commit/bc7703791decdc7d3c7038158dc29a32e90e9a5a

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-libxml2/-/commit/bc7703791decdc7d3c7038158dc29a32e90e9a5a
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to