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


Commits:
8373718f by Jan Alexander Steffens (heftig) at 2024-05-16T00:28:28+02:00
2.42.12-1

- - - - -


3 changed files:

- .SRCINFO
- − 0001-fix-build-failure-due-to-typo-in-the-build-script.patch
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = gdk-pixbuf2
        pkgdesc = An image loading library
-       pkgver = 2.42.11
-       pkgrel = 2
+       pkgver = 2.42.12
+       pkgrel = 1
        url = https://wiki.gnome.org/Projects/GdkPixbuf
        arch = x86_64
        license = LGPL-2.0-or-later
@@ -23,12 +23,10 @@ pkgbase = gdk-pixbuf2
        optdepends = libjxl: Load .jxl
        optdepends = librsvg: Load .svg, .svgz, and .svg.gz
        optdepends = webp-pixbuf-loader: Load .webp
-       source = git+https://gitlab.gnome.org/GNOME/gdk-pixbuf.git#tag=2.42.11
+       source = git+https://gitlab.gnome.org/GNOME/gdk-pixbuf.git#tag=2.42.12
        source = gdk-pixbuf-query-loaders.hook
-       source = 0001-fix-build-failure-due-to-typo-in-the-build-script.patch
-       b2sums = 
23af2f9f3cd542e6d6d14203a8037400df1e22e89884bddfc1439195e5c788ceec532a7bdda2c1685bb2355ea1303484872b836fdb6827cd448b57c36e6786a6
+       b2sums = 
f44a114c98aba2a3ff0e7435dd85e8e3bde579e96cb059ead733ed2e8b28b857e8c66e72360b40ca07237c98fa9904948886bf78980c6deccf58b29e48988790
        b2sums = 
5a00d34888e207d70d02369015d029f4c0450fc5a02b4b257de8e5df04380dc550723f351433859224c96c3c6390896f2166673af65e8a09eb57024f5a34301b
-       b2sums = 
16e5b72b2a50c1c733a1688c2ff6b55b6a920530bacc28e8e60dfe62c0b40c875611186c4962b2d183ef2e3ab26ea0a5108f3bbe20c1059fef0dbf4f16891f23
 
 pkgname = gdk-pixbuf2
        install = gdk-pixbuf2.install


=====================================
0001-fix-build-failure-due-to-typo-in-the-build-script.patch deleted
=====================================
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Christian Heusel <christ...@heusel.eu>
-Date: Sat, 20 Apr 2024 11:07:32 +0200
-Subject: [PATCH] fix build failure due to typo in the build script
-
-The fixed commit had a typo where it would try to call a nonexistant
-function instead of the .contains method of the relevant array.
-This was only made visible when the "other" loaders were enabled so it
-is triggered all the time.
-
-This was made visible when working on
-https://gitlab.archlinux.org/archlinux/packaging/packages/gdk-pixbuf2/-/merge_requests/1
-
-Fixes: 81a77399a ("Update the testsuite")
-Signed-off-by: Christian Heusel <christ...@heusel.eu>
----
- tests/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 78d0ad92e5e2..78ae43af17f9 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'],


=====================================
PKGBUILD
=====================================
@@ -6,8 +6,8 @@ pkgname=(
   gdk-pixbuf2
   gdk-pixbuf2-docs
 )
-pkgver=2.42.11
-pkgrel=2
+pkgver=2.42.12
+pkgrel=1
 pkgdesc="An image loading library"
 url="https://wiki.gnome.org/Projects/GdkPixbuf";
 arch=(x86_64)
@@ -39,18 +39,12 @@ optdepends=(
 source=(
   "git+https://gitlab.gnome.org/GNOME/gdk-pixbuf.git#tag=$pkgver";
   gdk-pixbuf-query-loaders.hook
-  0001-fix-build-failure-due-to-typo-in-the-build-script.patch
 )
-b2sums=('23af2f9f3cd542e6d6d14203a8037400df1e22e89884bddfc1439195e5c788ceec532a7bdda2c1685bb2355ea1303484872b836fdb6827cd448b57c36e6786a6'
-        
'5a00d34888e207d70d02369015d029f4c0450fc5a02b4b257de8e5df04380dc550723f351433859224c96c3c6390896f2166673af65e8a09eb57024f5a34301b'
-        
'16e5b72b2a50c1c733a1688c2ff6b55b6a920530bacc28e8e60dfe62c0b40c875611186c4962b2d183ef2e3ab26ea0a5108f3bbe20c1059fef0dbf4f16891f23')
+b2sums=('f44a114c98aba2a3ff0e7435dd85e8e3bde579e96cb059ead733ed2e8b28b857e8c66e72360b40ca07237c98fa9904948886bf78980c6deccf58b29e48988790'
+        
'5a00d34888e207d70d02369015d029f4c0450fc5a02b4b257de8e5df04380dc550723f351433859224c96c3c6390896f2166673af65e8a09eb57024f5a34301b')
 
 prepare() {
   cd gdk-pixbuf
-
-  # 
https://gitlab.archlinux.org/archlinux/packaging/packages/gdk-pixbuf2/-/issues/1
-  # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/165
-  git apply -3 ../0001-fix-build-failure-due-to-typo-in-the-build-script.patch
 }
 
 build() {



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

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


Reply via email to