[arch-commits] Commit in colord/repos (8 files)

Jan Steffens heftig at archlinux.org
Thu Nov 24 13:32:17 UTC 2016


    Date: Thursday, November 24, 2016 @ 13:32:16
  Author: heftig
Revision: 281987

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  colord/repos/extra-i686/PKGBUILD
    (from rev 281986, colord/trunk/PKGBUILD)
  colord/repos/extra-i686/colord.install
    (from rev 281986, colord/trunk/colord.install)
  colord/repos/extra-x86_64/PKGBUILD
    (from rev 281986, colord/trunk/PKGBUILD)
  colord/repos/extra-x86_64/colord.install
    (from rev 281986, colord/trunk/colord.install)
Deleted:
  colord/repos/extra-i686/PKGBUILD
  colord/repos/extra-i686/colord.install
  colord/repos/extra-x86_64/PKGBUILD
  colord/repos/extra-x86_64/colord.install

-----------------------------+
 /PKGBUILD                   |  128 ++++++++++++++++++++++++++++++++++++++++++
 /colord.install             |   16 +++++
 extra-i686/PKGBUILD         |   46 ---------------
 extra-i686/colord.install   |    8 --
 extra-x86_64/PKGBUILD       |   46 ---------------
 extra-x86_64/colord.install |    8 --
 6 files changed, 144 insertions(+), 108 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-11-24 13:31:11 UTC (rev 281986)
+++ extra-i686/PKGBUILD	2016-11-24 13:32:16 UTC (rev 281987)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=colord
-pkgver=1.3.3
-pkgrel=1
-pkgdesc="System daemon for managing color devices"
-arch=(i686 x86_64)
-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)
-optdepends=('sane: scanner support'
-            'argyllcms: color profiling')
-replaces=('shared-color-profiles')
-install=colord.install
-source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc})
-sha1sums=('401f4b5c2f38895b14be4cfa36590ed3ce40cce4'
-          'SKIP')
-validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17')
-
-prepare() {
-  cd $pkgname-$pkgver
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib/$pkgname --disable-static \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --enable-vala --enable-sane --with-daemon-user=colord
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # the build system has no colord user, so the chown fails
-  chown -R 124:124 "$pkgdir/var/lib/colord"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: colord/repos/extra-i686/PKGBUILD (from rev 281986, colord/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-11-24 13:32:16 UTC (rev 281987)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=colord
+pkgver=1.3.4
+pkgrel=1
+pkgdesc="System daemon for managing color devices"
+arch=(i686 x86_64)
+url="https://www.freedesktop.org/software/colord"
+license=(GPL2)
+depends=(lcms2 libgusb polkit sqlite systemd dconf dbus libgudev)
+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)
+install=colord.install
+_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() {
+  # 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
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --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
+  PATH="$srcdir/path:$PATH" make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+
+  # the build system has no colord user, so the chown fails
+  chown -R 124:124 "$pkgdir/var/lib/colord"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-i686/colord.install
===================================================================
--- extra-i686/colord.install	2016-11-24 13:31:11 UTC (rev 281986)
+++ extra-i686/colord.install	2016-11-24 13:32:16 UTC (rev 281987)
@@ -1,8 +0,0 @@
-post_install() {
-  getent group colord >/dev/null || groupadd -g 124 colord
-  getent passwd colord >/dev/null || useradd -d /var/lib/colord -u 124 -g colord -s /bin/false colord
-}
-
-post_upgrade() {
-  post_install
-}

Copied: colord/repos/extra-i686/colord.install (from rev 281986, colord/trunk/colord.install)
===================================================================
--- extra-i686/colord.install	                        (rev 0)
+++ extra-i686/colord.install	2016-11-24 13:32:16 UTC (rev 281987)
@@ -0,0 +1,8 @@
+post_install() {
+  getent group colord >/dev/null || groupadd -g 124 colord
+  getent passwd colord >/dev/null || useradd -d /var/lib/colord -u 124 -g colord -s /bin/false colord
+}
+
+post_upgrade() {
+  post_install
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-11-24 13:31:11 UTC (rev 281986)
+++ extra-x86_64/PKGBUILD	2016-11-24 13:32:16 UTC (rev 281987)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=colord
-pkgver=1.3.3
-pkgrel=1
-pkgdesc="System daemon for managing color devices"
-arch=(i686 x86_64)
-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)
-optdepends=('sane: scanner support'
-            'argyllcms: color profiling')
-replaces=('shared-color-profiles')
-install=colord.install
-source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc})
-sha1sums=('401f4b5c2f38895b14be4cfa36590ed3ce40cce4'
-          'SKIP')
-validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17')
-
-prepare() {
-  cd $pkgname-$pkgver
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib/$pkgname --disable-static \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --enable-vala --enable-sane --with-daemon-user=colord
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # the build system has no colord user, so the chown fails
-  chown -R 124:124 "$pkgdir/var/lib/colord"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: colord/repos/extra-x86_64/PKGBUILD (from rev 281986, colord/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-11-24 13:32:16 UTC (rev 281987)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=colord
+pkgver=1.3.4
+pkgrel=1
+pkgdesc="System daemon for managing color devices"
+arch=(i686 x86_64)
+url="https://www.freedesktop.org/software/colord"
+license=(GPL2)
+depends=(lcms2 libgusb polkit sqlite systemd dconf dbus libgudev)
+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)
+install=colord.install
+_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() {
+  # 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
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --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
+  PATH="$srcdir/path:$PATH" make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+
+  # the build system has no colord user, so the chown fails
+  chown -R 124:124 "$pkgdir/var/lib/colord"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-x86_64/colord.install
===================================================================
--- extra-x86_64/colord.install	2016-11-24 13:31:11 UTC (rev 281986)
+++ extra-x86_64/colord.install	2016-11-24 13:32:16 UTC (rev 281987)
@@ -1,8 +0,0 @@
-post_install() {
-  getent group colord >/dev/null || groupadd -g 124 colord
-  getent passwd colord >/dev/null || useradd -d /var/lib/colord -u 124 -g colord -s /bin/false colord
-}
-
-post_upgrade() {
-  post_install
-}

Copied: colord/repos/extra-x86_64/colord.install (from rev 281986, colord/trunk/colord.install)
===================================================================
--- extra-x86_64/colord.install	                        (rev 0)
+++ extra-x86_64/colord.install	2016-11-24 13:32:16 UTC (rev 281987)
@@ -0,0 +1,8 @@
+post_install() {
+  getent group colord >/dev/null || groupadd -g 124 colord
+  getent passwd colord >/dev/null || useradd -d /var/lib/colord -u 124 -g colord -s /bin/false colord
+}
+
+post_upgrade() {
+  post_install
+}



More information about the arch-commits mailing list