[arch-commits] Commit in lib32-gdk-pixbuf2/repos/multilib-x86_64 (7 files)
Jan Steffens
heftig at gemini.archlinux.org
Tue Aug 9 21:13:18 UTC 2022
Date: Tuesday, August 9, 2022 @ 21:13:18
Author: heftig
Revision: 1264575
archrelease: copy trunk to multilib-x86_64
Added:
lib32-gdk-pixbuf2/repos/multilib-x86_64/PKGBUILD
(from rev 1264574, lib32-gdk-pixbuf2/trunk/PKGBUILD)
lib32-gdk-pixbuf2/repos/multilib-x86_64/gdk-pixbuf-query-loaders-32.hook
(from rev 1264574, lib32-gdk-pixbuf2/trunk/gdk-pixbuf-query-loaders-32.hook)
lib32-gdk-pixbuf2/repos/multilib-x86_64/lib32-gdk-pixbuf2.install
(from rev 1264574, lib32-gdk-pixbuf2/trunk/lib32-gdk-pixbuf2.install)
lib32-gdk-pixbuf2/repos/multilib-x86_64/multilib.diff
(from rev 1264574, lib32-gdk-pixbuf2/trunk/multilib.diff)
Deleted:
lib32-gdk-pixbuf2/repos/multilib-x86_64/PKGBUILD
lib32-gdk-pixbuf2/repos/multilib-x86_64/gdk-pixbuf-query-loaders-32.hook
lib32-gdk-pixbuf2/repos/multilib-x86_64/lib32-gdk-pixbuf2.install
----------------------------------+
PKGBUILD | 136 +++++++++++++++++++------------------
gdk-pixbuf-query-loaders-32.hook | 22 ++---
lib32-gdk-pixbuf2.install | 6 -
multilib.diff | 17 ++++
4 files changed, 103 insertions(+), 78 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-09 21:12:52 UTC (rev 1264574)
+++ PKGBUILD 2022-08-09 21:13:18 UTC (rev 1264575)
@@ -1,64 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=lib32-gdk-pixbuf2
-pkgver=2.42.8
-pkgrel=1
-pkgdesc="An image loading library (32-bit)"
-url="https://wiki.gnome.org/Projects/GdkPixbuf"
-arch=(x86_64)
-license=(LGPL)
-depends=(lib32-glib2 lib32-libpng lib32-libtiff lib32-libjpeg gdk-pixbuf2)
-makedepends=(git meson)
-optdepends=(
- "lib32-librsvg: Load .svg, .svgz, and .svg.gz"
-)
-options=(debug)
-_commit=bca00032ad68d0b0aa2c1f7558db931e52bd9cd2 # tags/2.42.8^0
-source=(
- "git+https://gitlab.gnome.org/GNOME/gdk-pixbuf.git#commit=$_commit"
- gdk-pixbuf-query-loaders-32.hook
-)
-sha256sums=('SKIP'
- '60f0f8c2c022f9adef0902bdb4b89881e81f3388cd2e2e4830456eea10f49bae')
-
-pkgver() {
- cd gdk-pixbuf
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd gdk-pixbuf
-}
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
-
- arch-meson gdk-pixbuf build \
- --libdir /usr/lib32 \
- -D builtin_loaders=all \
- -D introspection=disabled \
- -D installed_tests=false
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-package() {
- provides=(libgdk_pixbuf-2.0.so)
- install=lib32-gdk-pixbuf2.install
-
- meson install -C build --destdir "$pkgdir"
-
- rm -rf "$pkgdir"/usr/{include,lib,share}
- find "$pkgdir/usr/bin" -type f -not -name gdk-pixbuf-query-loaders -delete
- mv "$pkgdir"/usr/bin/gdk-pixbuf-query-loaders{,-32}
-
- install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
-}
-
-# vim:set sw=2 et:
Copied: lib32-gdk-pixbuf2/repos/multilib-x86_64/PKGBUILD (from rev 1264574, lib32-gdk-pixbuf2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-09 21:13:18 UTC (rev 1264575)
@@ -0,0 +1,72 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=lib32-gdk-pixbuf2
+pkgver=2.42.9
+pkgrel=1
+pkgdesc="An image loading library (32-bit)"
+url="https://wiki.gnome.org/Projects/GdkPixbuf"
+arch=(x86_64)
+license=(LGPL)
+depends=(lib32-glib2 lib32-libpng lib32-libtiff lib32-libjpeg gdk-pixbuf2)
+makedepends=(git meson)
+optdepends=(
+ "lib32-librsvg: Load .svg, .svgz, and .svg.gz"
+)
+options=(debug)
+_commit=9b74d8dced44955b778fa1eac4fd0d29d5809e9d # tags/2.42.9^0
+source=(
+ "git+https://gitlab.gnome.org/GNOME/gdk-pixbuf.git#commit=$_commit"
+ gdk-pixbuf-query-loaders-32.hook
+ multilib.diff
+)
+sha256sums=('SKIP'
+ '60f0f8c2c022f9adef0902bdb4b89881e81f3388cd2e2e4830456eea10f49bae'
+ 'a87babba459f952148c0e89a046bb5c776e3530d10dd14ee6b9586c92061d500')
+
+pkgver() {
+ cd gdk-pixbuf
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd gdk-pixbuf
+
+ # Work around tests on lib32
+ # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/215
+ git apply -3 ../multilib.diff
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
+
+ arch-meson gdk-pixbuf build \
+ --libdir /usr/lib32 \
+ -D builtin_loaders=all \
+ -D introspection=disabled \
+ -D man=false \
+ -D installed_tests=false
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+package() {
+ provides=(libgdk_pixbuf-2.0.so)
+ install=lib32-gdk-pixbuf2.install
+
+ meson install -C build --destdir "$pkgdir"
+
+ rm -rf "$pkgdir"/usr/{include,lib,share}
+ find "$pkgdir/usr/bin" -type f -not -name gdk-pixbuf-query-loaders -delete
+ mv "$pkgdir"/usr/bin/gdk-pixbuf-query-loaders{,-32}
+
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
+}
+
+# vim:set sw=2 et:
Deleted: gdk-pixbuf-query-loaders-32.hook
===================================================================
--- gdk-pixbuf-query-loaders-32.hook 2022-08-09 21:12:52 UTC (rev 1264574)
+++ gdk-pixbuf-query-loaders-32.hook 2022-08-09 21:13:18 UTC (rev 1264575)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/*.so
-
-[Action]
-Description = Probing 32-bit GDK-Pixbuf loader modules...
-When = PostTransaction
-Exec = /usr/bin/gdk-pixbuf-query-loaders-32 --update-cache
Copied: lib32-gdk-pixbuf2/repos/multilib-x86_64/gdk-pixbuf-query-loaders-32.hook (from rev 1264574, lib32-gdk-pixbuf2/trunk/gdk-pixbuf-query-loaders-32.hook)
===================================================================
--- gdk-pixbuf-query-loaders-32.hook (rev 0)
+++ gdk-pixbuf-query-loaders-32.hook 2022-08-09 21:13:18 UTC (rev 1264575)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/*.so
+
+[Action]
+Description = Probing 32-bit GDK-Pixbuf loader modules...
+When = PostTransaction
+Exec = /usr/bin/gdk-pixbuf-query-loaders-32 --update-cache
Deleted: lib32-gdk-pixbuf2.install
===================================================================
--- lib32-gdk-pixbuf2.install 2022-08-09 21:12:52 UTC (rev 1264574)
+++ lib32-gdk-pixbuf2.install 2022-08-09 21:13:18 UTC (rev 1264575)
@@ -1,3 +0,0 @@
-pre_remove() {
- rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
-}
Copied: lib32-gdk-pixbuf2/repos/multilib-x86_64/lib32-gdk-pixbuf2.install (from rev 1264574, lib32-gdk-pixbuf2/trunk/lib32-gdk-pixbuf2.install)
===================================================================
--- lib32-gdk-pixbuf2.install (rev 0)
+++ lib32-gdk-pixbuf2.install 2022-08-09 21:13:18 UTC (rev 1264575)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
+}
Copied: lib32-gdk-pixbuf2/repos/multilib-x86_64/multilib.diff (from rev 1264574, lib32-gdk-pixbuf2/trunk/multilib.diff)
===================================================================
--- multilib.diff (rev 0)
+++ multilib.diff 2022-08-09 21:13:18 UTC (rev 1264575)
@@ -0,0 +1,17 @@
+diff --git i/tests/pixbuf-jpeg.c w/tests/pixbuf-jpeg.c
+index be2c6b4fe..bdcf26657 100644
+--- i/tests/pixbuf-jpeg.c
++++ w/tests/pixbuf-jpeg.c
+@@ -196,10 +196,10 @@ test_jpeg_fbfbfbfb (void)
+ g_assert_no_error (error);
+
+ gdk_pixbuf_loader_close (loader, &error);
+- g_assert_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE);
++ g_assert_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY);
+
+ pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+- g_assert_nonnull (pixbuf);
++ g_assert_null (pixbuf);
+
+ g_object_unref (loader);
+ g_free (contents);
More information about the arch-commits
mailing list