[arch-commits] Commit in appstream/trunk (3 files)

[Antonio Rojas]

    Date: Monday, September 4, 2017 @ 18:37:48
  Author: arojas
Revision: 304659

Update to 0.11.5

Added:
  appstream/trunk/update-appstream-cache.hook
    (from rev 304658, appstream/trunk/update-appstream-index.hook)
Modified:
  appstream/trunk/PKGBUILD
Deleted:
  appstream/trunk/update-appstream-index.hook

-----------------------------+
 PKGBUILD                    |   21 ++++++++-------------
 update-appstream-cache.hook |   17 +++++++++++++++++
 update-appstream-index.hook |   17 -----------------
 3 files changed, 25 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-04 17:41:03 UTC (rev 304658)
+++ PKGBUILD	2017-09-04 18:37:48 UTC (rev 304659)
@@ -5,8 +5,8 @@
 
 pkgbase=appstream
 pkgname=(appstream appstream-qt)
-pkgver=0.11.4
-pkgrel=2
+pkgver=0.11.5
+pkgrel=1
 pkgdesc="Provides a standard for creating app stores across distributions"
 arch=(i686 x86_64)
 url="http://distributions.freedesktop.org/wiki/AppStream"
@@ -14,19 +14,14 @@
 depends=(libyaml libxml2 libstemmer glib2)
 makedepends=(meson xmlto gobject-introspection python2 gtk-doc qt5-base itstool vala)
 source=("https://www.freedesktop.org/software/appstream/releases/AppStream-$pkgver.tar.xz"{,.asc}
-        update-appstream-index.hook
-        https://github.com/ximion/appstream/commit/5db6df1a.patch)
-sha256sums=('d1458c3266e7a71ac9a80c2412bc3535fcb8e35aac2c7e493ba61c5609e17b09'
+        update-appstream-cache.hook)
+sha256sums=('d87775f21b49424c6a6e4dae9c2d594cc228827415bcdb0aae96eb9a0cbfd4ae'
             'SKIP'
-            'a08b972b31388efe7edfa6db8dbd6909914bb613dd39b608b1764ed040907f82'
-            '8204883e4902e99a8c336f9dd19375f8eaf5a522fda68d6c9e1fe133844ec992')
+            'a6c42e4607ffd7d7dc931d608f1856e2ba7689d4caac0783e7100d86de0f951b')
 validpgpkeys=(D33A3F0CA16B0ACC51A60738494C8A5FBF4DECEB) # Matthias Klumpp <matthias at tenstral.net>
 
 prepare() {
   mkdir -p build
-
-  cd AppStream-$pkgver
-  patch -p1 -i ../5db6df1a.patch # don't check bitness when finding appstream-qt
 }
 
 build() {
@@ -34,8 +29,8 @@
 
   meson ../AppStream-$pkgver \
     --prefix=/usr \
-    -Dqt=true \
-    -Dvapi=true
+    -Denable-qt=true \
+    -Denable-vapi=true
   ninja
 }
 
@@ -47,7 +42,7 @@
 # provided by -qt subpackage
   rm -r "$pkgdir"/usr/{include/AppStreamQt,lib/cmake,lib/libAppStreamQt.*}
 
-  install -Dm644 "$srcdir"/update-appstream-index.hook "$pkgdir"/usr/share/libalpm/hooks/update-appstream-index.hook
+  install -Dm644 "$srcdir"/update-appstream-cache.hook "$pkgdir"/usr/share/libalpm/hooks/update-appstream-cache.hook
 }
 
 package_appstream-qt() {

Copied: appstream/trunk/update-appstream-cache.hook (from rev 304658, appstream/trunk/update-appstream-index.hook)
===================================================================
--- update-appstream-cache.hook	                        (rev 0)
+++ update-appstream-cache.hook	2017-09-04 18:37:48 UTC (rev 304659)
@@ -0,0 +1,17 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/app-info/*
+
+[Trigger]
+Type = Package
+Operation = Install
+Operation = Upgrade
+Target = appstream
+
+[Action]
+Description = Updating the appstream cache...
+When = PostTransaction
+Exec = /usr/bin/appstreamcli refresh-cache --force

Deleted: update-appstream-index.hook
===================================================================
--- update-appstream-index.hook	2017-09-04 17:41:03 UTC (rev 304658)
+++ update-appstream-index.hook	2017-09-04 18:37:48 UTC (rev 304659)
@@ -1,17 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/app-info/*
-
-[Trigger]
-Type = Package
-Operation = Install
-Operation = Upgrade
-Target = appstream
-
-[Action]
-Description = Updating the appstream index...
-When = PostTransaction
-Exec = /usr/bin/appstreamcli refresh-cache --force