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


Commits:
4fa2d98a by Christian Heusel at 2024-04-20T11:04:19+02:00
enable support for less supported image formats

This enables xpm support from the related ticket.
Since this triggered a bug in the build system we also patch the
typo out with the attached patch.

Fixes 
https://gitlab.archlinux.org/archlinux/packaging/packages/gdk-pixbuf2/-/issues/1

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- + gdk-pixbuf-2_3_11-3-fix_build.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -25,8 +25,10 @@ pkgbase = gdk-pixbuf2
        optdepends = webp-pixbuf-loader: Load .webp
        source = git+https://gitlab.gnome.org/GNOME/gdk-pixbuf.git#tag=2.42.11
        source = gdk-pixbuf-query-loaders.hook
+       source = gdk-pixbuf-2_3_11-3-fix_build.patch
        b2sums = 
23af2f9f3cd542e6d6d14203a8037400df1e22e89884bddfc1439195e5c788ceec532a7bdda2c1685bb2355ea1303484872b836fdb6827cd448b57c36e6786a6
        b2sums = 
5a00d34888e207d70d02369015d029f4c0450fc5a02b4b257de8e5df04380dc550723f351433859224c96c3c6390896f2166673af65e8a09eb57024f5a34301b
+       b2sums = 
71ae07b0d5c6731c076a10ae58953a69c59eb12b340ab3755148a9fe3d9c5b8b51328f98fe8ff6ac7a6b237f47931b9112b33a57040b6a42eaf442a7ab96c014
 
 pkgname = gdk-pixbuf2
        install = gdk-pixbuf2.install


=====================================
PKGBUILD
=====================================
@@ -39,12 +39,15 @@ optdepends=(
 source=(
   "git+https://gitlab.gnome.org/GNOME/gdk-pixbuf.git#tag=$pkgver";
   gdk-pixbuf-query-loaders.hook
+  gdk-pixbuf-2_3_11-3-fix_build.patch
 )
 
b2sums=('23af2f9f3cd542e6d6d14203a8037400df1e22e89884bddfc1439195e5c788ceec532a7bdda2c1685bb2355ea1303484872b836fdb6827cd448b57c36e6786a6'
-        
'5a00d34888e207d70d02369015d029f4c0450fc5a02b4b257de8e5df04380dc550723f351433859224c96c3c6390896f2166673af65e8a09eb57024f5a34301b')
+        
'5a00d34888e207d70d02369015d029f4c0450fc5a02b4b257de8e5df04380dc550723f351433859224c96c3c6390896f2166673af65e8a09eb57024f5a34301b'
+        
'71ae07b0d5c6731c076a10ae58953a69c59eb12b340ab3755148a9fe3d9c5b8b51328f98fe8ff6ac7a6b237f47931b9112b33a57040b6a42eaf442a7ab96c014')
 
 prepare() {
   cd gdk-pixbuf
+  patch -Np1 < ../gdk-pixbuf-2_3_11-3-fix_build.patch
 }
 
 build() {
@@ -54,6 +57,7 @@ build() {
     -D installed_tests=false
     -D introspection=enabled
     -D man=true
+    -D others=enabled
   )
 
   arch-meson gdk-pixbuf build "${meson_options[@]}"


=====================================
gdk-pixbuf-2_3_11-3-fix_build.patch
=====================================
@@ -0,0 +1,13 @@
+diff --git a/tests/meson.build b/tests/meson.build
+index 78d0ad92e..78ae43af1 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -71,7 +71,7 @@ installed_tests = {
+   'pixbuf-construction': { 'suites': ['conform'], },
+   'animation': {
+     'suites': ['format'],
+-    'skip': not (enabled_loaders.contains('ani') and 
enabled_loaders_contains('gif')),
++    'skip': not (enabled_loaders.contains('ani') and 
enabled_loaders.contains('gif')),
+   },
+   'cve-2015-4491': {
+     'suites': ['security'],



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/gdk-pixbuf2/-/commit/4fa2d98a197781354b66a9710c9d596d502c961b

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/gdk-pixbuf2/-/commit/4fa2d98a197781354b66a9710c9d596d502c961b
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to