[arch-commits] Commit in appstream-generator/trunk (PKGBUILD stack-size.diff)

[Jan Steffens]

    Date: Sunday, March 27, 2022 @ 18:56:00
  Author: heftig
Revision: 1177230

0.8.7-2: Fix crash?

Added:
  appstream-generator/trunk/stack-size.diff
Modified:
  appstream-generator/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   24 +++++++++++++++++-------
 stack-size.diff |   12 ++++++++++++
 2 files changed, 29 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-27 18:31:23 UTC (rev 1177229)
+++ PKGBUILD	2022-03-27 18:56:00 UTC (rev 1177230)
@@ -2,7 +2,7 @@
 
 pkgname=appstream-generator
 pkgver=0.8.7
-pkgrel=1
+pkgrel=2
 pkgdesc='A fast AppStream metadata generator'
 arch=(x86_64)
 url='https://github.com/ximion/appstream-generator'
@@ -9,15 +9,25 @@
 license=(GPL3)
 depends=(appstream libarchive librsvg optipng glibd lmdb)
 makedepends=(ldc meson ninja mustache-d curl gir-to-d gobject-introspection docbook-xsl)
-source=(https://github.com/ximion/appstream-generator/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('0e8432549e55b653ebd971421aac208956ec8e197dc23c5533a6c1932f125793')
+options=(debug !lto)
+source=(https://github.com/ximion/appstream-generator/archive/v$pkgver/$pkgname-$pkgver.tar.gz
+        stack-size.diff)
+sha256sums=('0e8432549e55b653ebd971421aac208956ec8e197dc23c5533a6c1932f125793'
+            '73f68b4b85611ddabbcac7189266e49af4bc012d4fb610fb6fc87bae57970c2a')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix crash due to stack exhaustion trying to initialize iconv in a Generator fiber
+  # https://github.com/ximion/appstream-generator/issues/101
+  patch -Np1 -i ../stack-size.diff
+}
+
 build() {
-  export LDFLAGS="$(echo -ne $LDFLAGS | sed -e 's/-flto/--flto=full/')"
-  meson build $pkgname-$pkgver -Ddownload-js=false --prefix=/usr
-  ninja -C build
+  arch-meson $pkgname-$pkgver build -D download-js=false
+  meson compile -C build -v
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja install -C build
+  meson install -C build --destdir="$pkgdir"
 }

Added: stack-size.diff
===================================================================
--- stack-size.diff	                        (rev 0)
+++ stack-size.diff	2022-03-27 18:56:00 UTC (rev 1177230)
@@ -0,0 +1,12 @@
+diff -u -r a/src/asgen/zarchive.d a2/src/asgen/zarchive.d
+--- a/src/asgen/zarchive.d	2022-02-22 18:16:54.000000000 +0100
++++ a2/src/asgen/zarchive.d	2022-03-27 20:51:22.390736900 +0200
+@@ -436,7 +436,7 @@
+                 aentry.data = this.readEntry (ar);
+                 yield (aentry);
+             }
+-        });
++        }, 65536);
+ 
+         return gen;
+     }