diff --git a/appstream-generator-0.9.0-undeaD-xml.patch b/appstream-generator-0.9.0-undeaD-xml.patch new file mode 100644 index 0000000..450b599 --- /dev/null +++ b/appstream-generator-0.9.0-undeaD-xml.patch @@ -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, diff --git a/appstream-generator.spec b/appstream-generator.spec index f996562..6f1afcb 100644 --- a/appstream-generator.spec +++ b/appstream-generator.spec @@ -1,6 +1,6 @@ Name: appstream-generator Version: 0.9.0 -Release: 1mamba +Release: 2mamba Summary: A fast AppStream metadata generator Group: System/Tools Vendor: openmamba @@ -8,6 +8,8 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/ximion/appstream-generator Source: https://github.com/ximion/appstream-generator.git/v%{version}/appstream-generator-%{version}.tar.bz2 +Source1: https://github.com/dlang/undeaD/archive/refs/tags/v1.1.8.tar.gz +Patch0: appstream-generator-0.9.0-undeaD-xml.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -22,7 +24,7 @@ BuildRequires: libldc-devel BuildRequires: liblmdb-devel ## AUTOBUILDREQ-END BuildRequires: meson -BuildRequires: libldc-devel >= 1.29.0 +BuildRequires: libldc-devel >= 1.31.0 %description A fast AppStream metadata generator. @@ -30,7 +32,8 @@ A fast AppStream metadata generator. %debug_package %prep -%setup -q +%setup -q -a1 +%patch0 -p1 -b .undeaD-xml %build %meson @@ -60,6 +63,9 @@ A fast AppStream metadata generator. %doc LICENSE %changelog +* Mon Mar 13 2023 Silvan Calarco 0.9.0-2mamba +- rebuilt with ldc 1.31.0 + * Sat Jan 28 2023 Automatic Build System 0.9.0-1mamba - automatic version update by autodist