[arch-commits] Commit in appstream-generator/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Tue Apr 25 20:40:48 UTC 2017
Date: Tuesday, April 25, 2017 @ 20:40:48
Author: arojas
Revision: 225341
archrelease: copy trunk to community-i686, community-x86_64
Added:
appstream-generator/repos/community-i686/PKGBUILD
(from rev 225340, appstream-generator/trunk/PKGBUILD)
appstream-generator/repos/community-i686/appstream-generator-buildpath.patch
(from rev 225340, appstream-generator/trunk/appstream-generator-buildpath.patch)
appstream-generator/repos/community-x86_64/PKGBUILD
(from rev 225340, appstream-generator/trunk/PKGBUILD)
appstream-generator/repos/community-x86_64/appstream-generator-buildpath.patch
(from rev 225340, appstream-generator/trunk/appstream-generator-buildpath.patch)
Deleted:
appstream-generator/repos/community-i686/PKGBUILD
appstream-generator/repos/community-x86_64/PKGBUILD
------------------------------------------------------+
/PKGBUILD | 76 +++++++++++++++++
community-i686/PKGBUILD | 29 ------
community-i686/appstream-generator-buildpath.patch | 14 +++
community-x86_64/PKGBUILD | 29 ------
community-x86_64/appstream-generator-buildpath.patch | 14 +++
5 files changed, 104 insertions(+), 58 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-04-25 20:40:14 UTC (rev 225340)
+++ community-i686/PKGBUILD 2017-04-25 20:40:48 UTC (rev 225341)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=appstream-generator
-pkgver=0.6.3
-pkgrel=1
-pkgdesc="A fast AppStream metadata generator"
-arch=(i686 x86_64)
-url="https://github.com/ximion/appstream-generator"
-license=(GPL3)
-depends=(appstream libarchive librsvg lmdb liblphobos)
-makedepends=(ldc meson ninja mustache-d curl)
-source=("https://github.com/ximion/appstream-generator/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz")
-sha256sums=('927ac57571b4e033801635ef9446de1125c9fda00daa39000b0c2392465e34bb')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- meson ../$pkgname-$pkgver -Ddownload_js=false --prefix=/usr
- ninja -j1
-}
-
-package() {
- cd build
- DESTDIR="$pkgdir" ninja install
-}
Copied: appstream-generator/repos/community-i686/PKGBUILD (from rev 225340, appstream-generator/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-04-25 20:40:48 UTC (rev 225341)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=appstream-generator
+pkgver=0.6.3
+pkgrel=2
+pkgdesc="A fast AppStream metadata generator"
+arch=(i686 x86_64)
+url="https://github.com/ximion/appstream-generator"
+license=(GPL3)
+depends=(appstream libarchive librsvg lmdb liblphobos)
+makedepends=(ldc meson ninja mustache-d curl)
+source=("https://github.com/ximion/appstream-generator/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz"
+ appstream-generator-ldc-1.2.patch::"https://github.com/ximion/appstream-generator/commit/07e46bae.patch"
+ appstream-generator-buildpath.patch)
+sha256sums=('927ac57571b4e033801635ef9446de1125c9fda00daa39000b0c2392465e34bb'
+ '296706113ad8055daa317709079ba39d5a27a832561b077c210e4263db62e133'
+ '28ecd93c873956493829b0afa3f81d47239428ef765359f1871d1acb3ab015f9')
+
+prepare() {
+ mkdir -p build
+
+# Fix build with LDC 1.2
+ cd $pkgname-$pkgver
+ patch -p1 -i ../appstream-generator-ldc-1.2.patch
+ patch -p1 -i ../appstream-generator-buildpath.patch
+}
+
+build() {
+ cd build
+ meson ../$pkgname-$pkgver -Ddownload_js=false --prefix=/usr
+ ninja -j1
+}
+
+package() {
+ cd build
+ DESTDIR="$pkgdir" ninja install
+}
Copied: appstream-generator/repos/community-i686/appstream-generator-buildpath.patch (from rev 225340, appstream-generator/trunk/appstream-generator-buildpath.patch)
===================================================================
--- community-i686/appstream-generator-buildpath.patch (rev 0)
+++ community-i686/appstream-generator-buildpath.patch 2017-04-25 20:40:48 UTC (rev 225341)
@@ -0,0 +1,14 @@
+diff --git a/src/asgen/zarchive.d b/src/asgen/zarchive.d
+index 17a40d6..c7a1181 100644
+--- a/src/asgen/zarchive.d
++++ b/src/asgen/zarchive.d
+@@ -572,7 +572,8 @@ unittest
+
+ writeln ("TEST: ", "Extracting a tarball");
+
+- import std.file : buildPath, tempDir;
++ import std.file : tempDir;
++ import std.path: buildPath;
+ import asgen.utils : getTestSamplesDir;
+
+ auto archive = buildPath (getTestSamplesDir (), "test.tar.xz");
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-04-25 20:40:14 UTC (rev 225340)
+++ community-x86_64/PKGBUILD 2017-04-25 20:40:48 UTC (rev 225341)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=appstream-generator
-pkgver=0.6.3
-pkgrel=1
-pkgdesc="A fast AppStream metadata generator"
-arch=(i686 x86_64)
-url="https://github.com/ximion/appstream-generator"
-license=(GPL3)
-depends=(appstream libarchive librsvg lmdb liblphobos)
-makedepends=(ldc meson ninja mustache-d curl)
-source=("https://github.com/ximion/appstream-generator/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz")
-sha256sums=('927ac57571b4e033801635ef9446de1125c9fda00daa39000b0c2392465e34bb')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- meson ../$pkgname-$pkgver -Ddownload_js=false --prefix=/usr
- ninja -j1
-}
-
-package() {
- cd build
- DESTDIR="$pkgdir" ninja install
-}
Copied: appstream-generator/repos/community-x86_64/PKGBUILD (from rev 225340, appstream-generator/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-04-25 20:40:48 UTC (rev 225341)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=appstream-generator
+pkgver=0.6.3
+pkgrel=2
+pkgdesc="A fast AppStream metadata generator"
+arch=(i686 x86_64)
+url="https://github.com/ximion/appstream-generator"
+license=(GPL3)
+depends=(appstream libarchive librsvg lmdb liblphobos)
+makedepends=(ldc meson ninja mustache-d curl)
+source=("https://github.com/ximion/appstream-generator/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz"
+ appstream-generator-ldc-1.2.patch::"https://github.com/ximion/appstream-generator/commit/07e46bae.patch"
+ appstream-generator-buildpath.patch)
+sha256sums=('927ac57571b4e033801635ef9446de1125c9fda00daa39000b0c2392465e34bb'
+ '296706113ad8055daa317709079ba39d5a27a832561b077c210e4263db62e133'
+ '28ecd93c873956493829b0afa3f81d47239428ef765359f1871d1acb3ab015f9')
+
+prepare() {
+ mkdir -p build
+
+# Fix build with LDC 1.2
+ cd $pkgname-$pkgver
+ patch -p1 -i ../appstream-generator-ldc-1.2.patch
+ patch -p1 -i ../appstream-generator-buildpath.patch
+}
+
+build() {
+ cd build
+ meson ../$pkgname-$pkgver -Ddownload_js=false --prefix=/usr
+ ninja -j1
+}
+
+package() {
+ cd build
+ DESTDIR="$pkgdir" ninja install
+}
Copied: appstream-generator/repos/community-x86_64/appstream-generator-buildpath.patch (from rev 225340, appstream-generator/trunk/appstream-generator-buildpath.patch)
===================================================================
--- community-x86_64/appstream-generator-buildpath.patch (rev 0)
+++ community-x86_64/appstream-generator-buildpath.patch 2017-04-25 20:40:48 UTC (rev 225341)
@@ -0,0 +1,14 @@
+diff --git a/src/asgen/zarchive.d b/src/asgen/zarchive.d
+index 17a40d6..c7a1181 100644
+--- a/src/asgen/zarchive.d
++++ b/src/asgen/zarchive.d
+@@ -572,7 +572,8 @@ unittest
+
+ writeln ("TEST: ", "Extracting a tarball");
+
+- import std.file : buildPath, tempDir;
++ import std.file : tempDir;
++ import std.path: buildPath;
+ import asgen.utils : getTestSamplesDir;
+
+ auto archive = buildPath (getTestSamplesDir (), "test.tar.xz");
More information about the arch-commits
mailing list