[arch-commits] Commit in colord/trunk (PKGBUILD)

[Jan Steffens]

    Date: Thursday, November 24, 2016 @ 13:31:11
  Author: heftig
Revision: 281986

1.3.4-1

Modified:
  colord/trunk/PKGBUILD

----------+
 PKGBUILD |   46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-24 11:22:57 UTC (rev 281985)
+++ PKGBUILD	2016-11-24 13:31:11 UTC (rev 281986)
@@ -3,7 +3,7 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=colord
-pkgver=1.3.3
+pkgver=1.3.4
 pkgrel=1
 pkgdesc="System daemon for managing color devices"
 arch=(i686 x86_64)
@@ -10,33 +10,51 @@
 url="https://www.freedesktop.org/software/colord"
 license=(GPL2)
 depends=(lcms2 libgusb polkit sqlite systemd dconf dbus libgudev)
-makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion
-             argyllcms)
+makedepends=(intltool gobject-introspection vala sane bash-completion argyllcms gnome-common git
+             docbook-utils docbook-sgml perl-sgmls)
 optdepends=('sane: scanner support'
             'argyllcms: color profiling')
-replaces=('shared-color-profiles')
+replaces=(shared-color-profiles)
 install=colord.install
-source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc})
-sha1sums=('401f4b5c2f38895b14be4cfa36590ed3ce40cce4'
-          'SKIP')
+_commit=b4329ab9e5dfe87ac46db9df82bc014d658ee26a  # tags/1.3.4^0
+source=("git+https://github.com/hughsie/colord#commit=$_commit")
+sha1sums=('SKIP')
 validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd $pkgname-$pkgver
+  # Fixup docbook-utils/perl-sgmls, for now...
+  mkdir path
+  ln -s /usr/bin/vendor_perl/sgmlspl.pl path/sgmlspl
+
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib/$pkgname --disable-static \
+  cd $pkgname
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --enable-vala --enable-sane --with-daemon-user=colord
+    --with-daemon-user=colord \
+    --enable-print-profiles \
+    --enable-libcolordcompat \
+    --enable-vala \
+    --enable-sane \
+    --disable-static
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  PATH="$srcdir/path:$PATH" make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 
   # the build system has no colord user, so the chown fails