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

[Balló György]

    Date: Saturday, December 22, 2018 @ 22:27:17
  Author: bgyorgy
Revision: 417569

archrelease: copy trunk to community-x86_64

Added:
  appstream-generator/repos/community-x86_64/0001-Load-components-for-Arch-Linux.patch
    (from rev 417568, appstream-generator/trunk/0001-Load-components-for-Arch-Linux.patch)
  appstream-generator/repos/community-x86_64/PKGBUILD
    (from rev 417568, appstream-generator/trunk/PKGBUILD)
Deleted:
  appstream-generator/repos/community-x86_64/PKGBUILD

-------------------------------------------+
 0001-Load-components-for-Arch-Linux.patch |   31 +++++++++++++
 PKGBUILD                                  |   63 +++++++++++++++-------------
 2 files changed, 66 insertions(+), 28 deletions(-)

Copied: appstream-generator/repos/community-x86_64/0001-Load-components-for-Arch-Linux.patch (from rev 417568, appstream-generator/trunk/0001-Load-components-for-Arch-Linux.patch)
===================================================================
--- 0001-Load-components-for-Arch-Linux.patch	                        (rev 0)
+++ 0001-Load-components-for-Arch-Linux.patch	2018-12-22 22:27:17 UTC (rev 417569)
@@ -0,0 +1,31 @@
+From 346a5c2987ffca88ef00a1ade8a5067057f7653b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Sat, 22 Dec 2018 22:54:12 +0100
+Subject: [PATCH] Load components for Arch Linux
+
+Load the "core" and "extra" components, which contain most of the icon data on Arch Linux.
+---
+ src/asgen/engine.d | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/asgen/engine.d b/src/asgen/engine.d
+index b7da45d..3d97dc3 100644
+--- a/src/asgen/engine.d
++++ b/src/asgen/engine.d
+@@ -470,11 +470,11 @@ public:
+     private HashMap!(string, Package) getIconCandidatePackages (Suite suite, string section, string arch)
+     {
+         // always load the "main" and "universe" components, which contain most of the icon data
+-        // on Debian and Ubuntu.
++        // on Debian and Ubuntu. Load the "core" and "extra" components for Arch Linux.
+         // FIXME: This is a hack, find a sane way to get rid of this, or at least get rid of the
+         // distro-specific hardcoding.
+         auto pkgs = appender!(Package[]);
+-        foreach (ref newSection; ["main", "universe"]) {
++        foreach (ref newSection; ["main", "universe", "core", "extra"]) {
+             if ((section != newSection) && (suite.sections.canFind (newSection))) {
+                 pkgs ~= pkgIndex.packagesFor (suite.name, newSection, arch);
+                 if (!suite.baseSuite.empty)
+-- 
+2.20.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-22 22:27:13 UTC (rev 417568)
+++ PKGBUILD	2018-12-22 22:27:17 UTC (rev 417569)
@@ -1,28 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=appstream-generator
-pkgver=0.7.4
-pkgrel=7
-pkgdesc="A fast AppStream metadata generator"
-arch=(x86_64)
-url="https://github.com/ximion/appstream-generator"
-license=(GPL3)
-depends=(appstream libarchive librsvg lmdb optipng d-stdx-allocator glibd d-containers)
-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")
-sha256sums=('b214273b9b9525170c8c6fe4e8dca8334aab47ad7cc93fa049c16464a5d902e5')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  meson ../$pkgname-$pkgver -Ddownload-js=false --prefix=/usr
-  ninja
-}
-
-package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
-}

Copied: appstream-generator/repos/community-x86_64/PKGBUILD (from rev 417568, appstream-generator/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-12-22 22:27:17 UTC (rev 417569)
@@ -0,0 +1,35 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=appstream-generator
+pkgver=0.7.4
+pkgrel=8
+pkgdesc="A fast AppStream metadata generator"
+arch=(x86_64)
+url="https://github.com/ximion/appstream-generator"
+license=(GPL3)
+depends=(appstream libarchive librsvg lmdb optipng d-stdx-allocator glibd d-containers)
+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"
+        0001-Load-components-for-Arch-Linux.patch)
+sha256sums=('b214273b9b9525170c8c6fe4e8dca8334aab47ad7cc93fa049c16464a5d902e5'
+            '8619c8dce6a10538e607231b53f212b26048b09b0d3ea7a5fa618e5e01eecfed')
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  # Load components for Arch Linux
+  # https://github.com/ximion/appstream-generator/pull/69
+  patch -Np1 -i ../0001-Load-components-for-Arch-Linux.patch
+}
+
+build() {
+  cd build
+  meson ../$pkgname-$pkgver -Ddownload-js=false --prefix=/usr
+  ninja
+}
+
+package() {
+  cd build
+  DESTDIR="$pkgdir" ninja install
+}