Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / lib32-gdk-pixbuf2
Commits:
e142a468 by Jan Alexander Steffens (heftig) at 2024-04-20T13:28:17+02:00
2.42.11-2
- - - - -
3 changed files:
- .SRCINFO
- + 0001-fix-build-failure-due-to-typo-in-the-build-script.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = lib32-gdk-pixbuf2
pkgdesc = An image loading library (32-bit)
pkgver = 2.42.11
- pkgrel = 1
+ pkgrel = 2
url = https://wiki.gnome.org/Projects/GdkPixbuf
arch = x86_64
license = LGPL-2.0-or-later
@@ -17,8 +17,10 @@ pkgbase = lib32-gdk-pixbuf2
optdepends = lib32-librsvg: Load .svg, .svgz, and .svg.gz
source = git+https://gitlab.gnome.org/GNOME/gdk-pixbuf.git#tag=2.42.11
source = gdk-pixbuf-query-loaders-32.hook
+ source = 0001-fix-build-failure-due-to-typo-in-the-build-script.patch
b2sums =
23af2f9f3cd542e6d6d14203a8037400df1e22e89884bddfc1439195e5c788ceec532a7bdda2c1685bb2355ea1303484872b836fdb6827cd448b57c36e6786a6
b2sums =
0b432bdeb31acdd66c8a861551cabf4f83efd3c441614dbb64b7ac11fdbb97c76412b5706bb18ff1ed890de0a4c51bf02bb531eb4693e6d68021b5372cb5897a
+ b2sums =
16e5b72b2a50c1c733a1688c2ff6b55b6a920530bacc28e8e60dfe62c0b40c875611186c4962b2d183ef2e3ab26ea0a5108f3bbe20c1059fef0dbf4f16891f23
pkgname = lib32-gdk-pixbuf2
install = lib32-gdk-pixbuf2.install
=====================================
0001-fix-build-failure-due-to-typo-in-the-build-script.patch
=====================================
@@ -0,0 +1,32 @@
+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
=====================================
@@ -7,7 +7,7 @@ pkgname=(
lib32-gdk-pixbuf2
)
pkgver=2.42.11
-pkgrel=1
+pkgrel=2
pkgdesc="An image loading library (32-bit)"
url="https://wiki.gnome.org/Projects/GdkPixbuf";
arch=(x86_64)
@@ -31,12 +31,18 @@ optdepends=(
source=(
"git+https://gitlab.gnome.org/GNOME/gdk-pixbuf.git#tag=$pkgver";
gdk-pixbuf-query-loaders-32.hook
+ 0001-fix-build-failure-due-to-typo-in-the-build-script.patch
)
b2sums=('23af2f9f3cd542e6d6d14203a8037400df1e22e89884bddfc1439195e5c788ceec532a7bdda2c1685bb2355ea1303484872b836fdb6827cd448b57c36e6786a6'
-
'0b432bdeb31acdd66c8a861551cabf4f83efd3c441614dbb64b7ac11fdbb97c76412b5706bb18ff1ed890de0a4c51bf02bb531eb4693e6d68021b5372cb5897a')
+
'0b432bdeb31acdd66c8a861551cabf4f83efd3c441614dbb64b7ac11fdbb97c76412b5706bb18ff1ed890de0a4c51bf02bb531eb4693e6d68021b5372cb5897a'
+
'16e5b72b2a50c1c733a1688c2ff6b55b6a920530bacc28e8e60dfe62c0b40c875611186c4962b2d183ef2e3ab26ea0a5108f3bbe20c1059fef0dbf4f16891f23')
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() {
@@ -47,6 +53,7 @@ build() {
-D installed_tests=false
-D introspection=disabled
-D man=false
+ -D others=enabled
)
arch-meson gdk-pixbuf build "${meson_options[@]}"
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-gdk-pixbuf2/-/commit/e142a46888c378c32e773a72960f830bb642454b
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-gdk-pixbuf2/-/commit/e142a46888c378c32e773a72960f830bb642454b
You're receiving this email because of your account on gitlab.archlinux.org.
