Date: Tuesday, February 21, 2023 @ 22:05:55 Author: wild Revision: 1403332
upgpkg: appstream-generator 0.9.0-2: Rebuilt against new ldc Added: appstream-generator/trunk/undeaD-xml.patch Modified: appstream-generator/trunk/PKGBUILD ------------------+ PKGBUILD | 19 ++++++++++++++++--- undeaD-xml.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-21 22:05:06 UTC (rev 1403331) +++ PKGBUILD 2023-02-21 22:05:55 UTC (rev 1403332) @@ -2,7 +2,7 @@ pkgname=appstream-generator pkgver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc='A fast AppStream metadata generator' arch=(x86_64) url='https://github.com/ximion/appstream-generator' @@ -9,9 +9,22 @@ 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=('7964924feb09348444cb8159fd2c22415f5df61d451d9f769f18d5b606d2cf52') +source=( + https://github.com/ximion/appstream-generator/archive/v$pkgver/$pkgname-$pkgver.tar.gz + "undeaD-1.1.8.tar.gz::https://github.com/dlang/undeaD/archive/refs/tags/v1.1.8.tar.gz"; + "undeaD-xml.patch" +) +sha256sums=('7964924feb09348444cb8159fd2c22415f5df61d451d9f769f18d5b606d2cf52' + '36a59b4740b147f4345caa26908f40a97fc7cc67dac6983c226369c59f909e92' + '3075e264251624b8d491d61a07a95ac70a21af8eeabcf5da9493619b3d1eadd2') +prepare() { + # Patch in undead.xml as std.xml has been removed + patch --directory="$pkgname-$pkgver" --forward --strip=1 --input "$srcdir"/undeaD-xml.patch + cd "$srcdir"/$pkgname-$pkgver + ln -s "$srcdir"/undeaD-1.1.8 +} + build() { export LDFLAGS="$(echo -ne $LDFLAGS | sed -e 's/-flto=auto/-flto=full/')" arch-meson $pkgname-$pkgver build -D download-js=false Added: undeaD-xml.patch =================================================================== --- undeaD-xml.patch (rev 0) +++ undeaD-xml.patch 2023-02-21 22:05:55 UTC (rev 1403332) @@ -0,0 +1,45 @@ +diff --git a/src/asgen/backends/rpmmd/rpmpkgindex.d b/src/asgen/backends/rpmmd/rpmpkgindex.d +index f336919..733e8f1 100644 +--- a/src/asgen/backends/rpmmd/rpmpkgindex.d ++++ b/src/asgen/backends/rpmmd/rpmpkgindex.d +@@ -25,7 +25,7 @@ import std.array : appender, empty; + import std.string : format; + import std.algorithm : canFind, endsWith; + import std.conv : to; +-import std.xml; ++import undead.xml; + static import std.file; + + import asgen.logging; +diff --git a/src/asgen/meson.build b/src/asgen/meson.build +index be49dba..d8a5b46 100644 +--- a/src/asgen/meson.build ++++ b/src/asgen/meson.build +@@ -64,6 +64,7 @@ backend_sources = [ + 'backends/ubuntu/ubupkg.d', + 'backends/ubuntu/ubupkgindex.d', + ++ '../../undeaD-1.1.8/src/undead/xml.d', + 'backends/rpmmd/package.d', + 'backends/rpmmd/rpmpkg.d', + 'backends/rpmmd/rpmpkgindex.d', +@@ -76,7 +77,8 @@ asgen_exe = executable('appstream-generator', + [asgen_sources, + backend_sources], + include_directories: [src_dir, +- gir_bind_dir], ++ gir_bind_dir, ++ '../../undeaD-1.1.8/src'], + dependencies: [glibd_dep, + appstream_dep, + ascompose_dep, +@@ -92,7 +94,8 @@ asgen_test_exe = executable('asgen_test', + [asgen_sources, + backend_sources], + include_directories: [src_dir, +- gir_bind_dir], ++ gir_bind_dir, ++ '../../undeaD-1.1.8/src'], + dependencies: [glibd_dep, + appstream_dep, + ascompose_dep,
