[arch-commits] Commit in appstream-generator/trunk (FixCompilation.patch PKGBUILD)

[Dan Printzell]

    Date: Tuesday, August 3, 2021 @ 20:39:42
  Author: wild
Revision: 993573

upgpkg: appstream-generator 0.8.4-3: Rebuilt against new ldc

Added:
  appstream-generator/trunk/FixCompilation.patch
Modified:
  appstream-generator/trunk/PKGBUILD

----------------------+
 FixCompilation.patch |   51 +++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD             |   11 +++++++---
 2 files changed, 59 insertions(+), 3 deletions(-)

Added: FixCompilation.patch
===================================================================
--- FixCompilation.patch	                        (rev 0)
+++ FixCompilation.patch	2021-08-03 20:39:42 UTC (rev 993573)
@@ -0,0 +1,51 @@
+diff --git a/src/asgen/config.d b/src/asgen/config.d
+index 7ed01d1..a5daaff 100644
+--- a/src/asgen/config.d
++++ b/src/asgen/config.d
+@@ -147,7 +147,7 @@ private:
+         import glib.Util : Util;
+ 
+         // our default export format version
+-        formatVersion = FormatVersion.V0_12;
++        formatVersion = FormatVersion._12;
+ 
+         // find all the external binaries we (may) need
+         // we search for them unconditionally, because the unittests may rely on their absolute
+@@ -370,19 +370,19 @@ public:
+ 
+             switch (versionStr) {
+             case "0.8":
+-                formatVersion = FormatVersion.V0_8;
++                formatVersion = FormatVersion._8;
+                 break;
+             case "0.9":
+-                formatVersion = FormatVersion.V0_9;
++                formatVersion = FormatVersion._9;
+                 break;
+             case "0.10":
+-                formatVersion = FormatVersion.V0_10;
++                formatVersion = FormatVersion._10;
+                 break;
+             case "0.11":
+-                formatVersion = FormatVersion.V0_11;
++                formatVersion = FormatVersion._11;
+                 break;
+             case "0.12":
+-                formatVersion = FormatVersion.V0_12;
++                formatVersion = FormatVersion._12;
+                 break;
+             default:
+                 logWarning ("Configuration tried to set unknown AppStream format version '%s'. Falling back to default version.", versionStr);
+diff --git a/src/asgen/handlers/iconhandler.d b/src/asgen/handlers/iconhandler.d
+index 7f0746c..a2465c2 100644
+--- a/src/asgen/handlers/iconhandler.d
++++ b/src/asgen/handlers/iconhandler.d
+@@ -407,7 +407,7 @@ public:
+         // quickly identify it here.
+         auto icon = componentGetRawIcon (cpt);
+         if (!icon.isNull) {
+-            if (icon.getKind == IconKind.LOCAL)
++            if (icon.get.getKind == IconKind.LOCAL)
+                 name = icon.get.getFilename ();
+             else
+                 name = icon.get.getName ();

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-03 20:37:30 UTC (rev 993572)
+++ PKGBUILD	2021-08-03 20:39:42 UTC (rev 993573)
@@ -2,7 +2,7 @@
 
 pkgname=appstream-generator
 pkgver=0.8.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A fast AppStream metadata generator"
 arch=(x86_64)
 url="https://github.com/ximion/appstream-generator"
@@ -10,14 +10,19 @@
 depends=(appstream libarchive librsvg optipng glibd)
 makedepends=(ldc meson ninja mustache-d curl gir-to-d gobject-introspection docbook-xsl)
 source=($pkgname-$pkgver.tar.gz::"https://github.com/ximion/appstream-generator/archive/v$pkgver.tar.gz"
-        "FixCompilationDueToBrokenGeneratedCode.patch::https://github.com/ximion/appstream-generator/commit/d5dad3b174eea7e9fbe0ed6e7b55a366b8eb203d.patch")
+        "FixCompilationDueToBrokenGeneratedCode.patch::https://github.com/ximion/appstream-generator/commit/d5dad3b174eea7e9fbe0ed6e7b55a366b8eb203d.patch"
+        "FixCompilation.patch")
 sha256sums=('49bebcc959f02d72c31f26dad84e3acb3d1a12f64f18fe0a58db23e4d66f97b5'
-            '26341b31ddb7478affaba1dbcf5581ba1ae3a3d11d9770efa8d57fcc0bcc26ea')
+            '0a272985dbffeabd1f8de765b3e33a01c82277d7f4da1efaf629497fcb9aea3b'
+            '5d98fafea28931368ce1a42489fa11fe58f7d7e441634d01273f3b822a9cddca')
 
 prepare() {
   # Fix compilation due to broken generated GdkPixbuf code
   # https://github.com/ximion/appstream-generator/pull/90
   patch -d $pkgname-$pkgver -p1 -i "$srcdir"/FixCompilationDueToBrokenGeneratedCode.patch
+
+  # Some more fixes needed to get it to compile
+  patch -d $pkgname-$pkgver -p1 -i "$srcdir"/FixCompilation.patch
 }
 
 build() {