[arch-commits] Commit in appstream-generator/repos/community-x86_64 (4 files)
Antonio Rojas
arojas at gemini.archlinux.org
Mon Aug 30 20:32:17 UTC 2021
Date: Monday, August 30, 2021 @ 20:32:17
Author: arojas
Revision: 1010073
archrelease: copy trunk to community-x86_64
Added:
appstream-generator/repos/community-x86_64/FixCompilation.patch
(from rev 1010072, appstream-generator/trunk/FixCompilation.patch)
appstream-generator/repos/community-x86_64/PKGBUILD
(from rev 1010072, appstream-generator/trunk/PKGBUILD)
Deleted:
appstream-generator/repos/community-x86_64/FixCompilation.patch
appstream-generator/repos/community-x86_64/PKGBUILD
----------------------+
FixCompilation.patch | 102 ++++++++++++++++++++++++-------------------------
PKGBUILD | 57 ++++++++++-----------------
2 files changed, 73 insertions(+), 86 deletions(-)
Deleted: FixCompilation.patch
===================================================================
--- FixCompilation.patch 2021-08-30 20:32:07 UTC (rev 1010072)
+++ FixCompilation.patch 2021-08-30 20:32:17 UTC (rev 1010073)
@@ -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 ();
Copied: appstream-generator/repos/community-x86_64/FixCompilation.patch (from rev 1010072, appstream-generator/trunk/FixCompilation.patch)
===================================================================
--- FixCompilation.patch (rev 0)
+++ FixCompilation.patch 2021-08-30 20:32:17 UTC (rev 1010073)
@@ -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 ();
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-08-30 20:32:07 UTC (rev 1010072)
+++ PKGBUILD 2021-08-30 20:32:17 UTC (rev 1010073)
@@ -1,35 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=appstream-generator
-pkgver=0.8.4
-pkgrel=3
-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=($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"
- "FixCompilation.patch")
-sha256sums=('49bebcc959f02d72c31f26dad84e3acb3d1a12f64f18fe0a58db23e4d66f97b5'
- '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() {
- 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 1010072, appstream-generator/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-08-30 20:32:17 UTC (rev 1010073)
@@ -0,0 +1,22 @@
+# 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
+}
More information about the arch-commits
mailing list