[arch-commits] Commit in appstream-generator/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Saturday, September 11, 2021 @ 18:32:41
  Author: arojas
Revision: 1014362

archrelease: copy trunk to community-x86_64

Added:
  appstream-generator/repos/community-x86_64/PKGBUILD
    (from rev 1014361, appstream-generator/trunk/PKGBUILD)
Deleted:
  appstream-generator/repos/community-x86_64/FixCompilation.patch
  appstream-generator/repos/community-x86_64/PKGBUILD

----------------------+
 FixCompilation.patch |   51 -------------------------------------------------
 PKGBUILD             |   50 ++++++++++++++++++++++++++----------------------
 2 files changed, 28 insertions(+), 73 deletions(-)

Deleted: FixCompilation.patch
===================================================================
--- FixCompilation.patch	2021-09-11 18:32:29 UTC (rev 1014361)
+++ FixCompilation.patch	2021-09-11 18:32:41 UTC (rev 1014362)
@@ -1,51 +0,0 @@
-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 ();

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-11 18:32:29 UTC (rev 1014361)
+++ PKGBUILD	2021-09-11 18:32:41 UTC (rev 1014362)
@@ -1,22 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=appstream-generator
-pkgver=0.8.5
-pkgrel=1
-pkgdesc='A fast AppStream metadata generator'
-arch=(x86_64)
-url='https://github.com/ximion/appstream-generator'
-license=(GPL3)
-depends=(appstream libarchive librsvg optipng glibd)
-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=('857f78329b716481731f6b8a298fa65e3d35dbf3a36825b14bb9673254ea5cfd')
-
-build() {
-  meson build $pkgname-$pkgver -Ddownload-js=false --prefix=/usr
-  ninja -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" ninja install -C build
-}

Copied: appstream-generator/repos/community-x86_64/PKGBUILD (from rev 1014361, appstream-generator/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-09-11 18:32:41 UTC (rev 1014362)
@@ -0,0 +1,28 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=appstream-generator
+pkgver=0.8.5
+pkgrel=2
+pkgdesc='A fast AppStream metadata generator'
+arch=(x86_64)
+url='https://github.com/ximion/appstream-generator'
+license=(GPL3)
+depends=(appstream libarchive librsvg optipng glibd)
+makedepends=(dmd 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
+        https://github.com/ximion/appstream-generator/commit/4283ed5d.patch)
+sha256sums=('857f78329b716481731f6b8a298fa65e3d35dbf3a36825b14bb9673254ea5cfd'
+            'e0639970c889a8877be1ee73de9e33020f7e4cd99383d8e39d0f5341ebe18eca')
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < 4283ed5d.patch # Fix missing icons in exported data
+}
+
+build() {
+  meson build $pkgname-$pkgver -Ddownload-js=false --prefix=/usr
+  ninja -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja install -C build
+}