Based on current arch package

3 files changed, 92 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1eaed9379a1..3c2cdbf1591b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,35 @@
 pkgbase = colord-nopolkit
-	pkgdesc = Color daemon widthout polkit
-	pkgver = 1.0.1
+	pkgdesc = System daemon for managing color devices, without polkit, logind and bach-completion dependancy.
+	pkgver = 1.3.4
 	pkgrel = 1
-	url = http://www.freedesktop.org/software/colord
+	url = https://www.freedesktop.org/software/colord
+	install = colord.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = intltool
 	makedepends = gobject-introspection
-	makedepends = vala
-	makedepends = docbook2x
+	makedepends = argyllcms
+	makedepends = gnome-common
+	makedepends = git
+	makedepends = docbook-utils
+	makedepends = docbook-sgml
+	makedepends = perl-sgmls
 	depends = lcms2
-	depends = sqlite3
-	depends = udev
+	depends = libgusb
+	depends = sqlite
+	depends = systemd
+	depends = dconf
+	depends = dbus
+	depends = libgudev
+	optdepends = sane: scanner support
+	optdepends = argyllcms: color profiling
 	provides = colord
-	conflicts = colord
-	options = !libtool
-	source = http://www.freedesktop.org/software/colord/releases/colord-1.0.1.tar.xz
-	sha256sums = 053f028aba6071068064ca7fe949bb3f74fb5ad16af2d7ec5bba10dea00cb785
+	conflicts = polkit
+	replaces = shared-color-profiles
+	source = git+https://github.com/hughsie/colord#commit=b4329ab9e5dfe87ac46db9df82bc014d658ee26a
+	validpgpkeys = 163EB50119225DB3DF8F49EA17ACBA8DFA970E17
+	sha1sums = SKIP
 
 pkgname = colord-nopolkit
 
diff --git a/PKGBUILD b/PKGBUILD
index f56ce0e49b0d..c79dfad2aba0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,73 @@
-# Maintainer: nullmark
-# Old Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id$
+# Upstream Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: Stefan Mark (nullmark) <mark at unserver dot de>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
-pkgname=colord-nopolkit
-pkgver=1.0.1
+_base_pkgname=colord
+pkgname=${_base_pkgname}-nopolkit
+pkgver=1.3.4
 pkgrel=1
-pkgdesc="Color daemon widthout polkit"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/software/colord"
-license=('GPL2')
-depends=('lcms2' 'sqlite3' 'udev')
-makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
-source=($url/releases/colord-$pkgver.tar.xz)
-options=('!libtool')
-sha256sums=('053f028aba6071068064ca7fe949bb3f74fb5ad16af2d7ec5bba10dea00cb785')
-provides=('colord')
-conflicts=('colord')
+pkgdesc="System daemon for managing color devices, without polkit, logind and bach-completion dependancy."
+arch=(i686 x86_64)
+url="https://www.freedesktop.org/software/colord"
+license=(GPL2)
+depends=(lcms2 libgusb sqlite systemd dconf dbus libgudev)
+makedepends=(intltool gobject-introspection argyllcms gnome-common git
+             docbook-utils docbook-sgml perl-sgmls)
+             # vala sane bash-completion
+optdepends=('sane: scanner support'
+            'argyllcms: color profiling')
+replaces=(shared-color-profiles)
+conflicts=(polkit)
+provides=(colord)
+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 ${_base_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 ${_base_pkgname}
+  NOCONFIGURE=1 ./autogen.sh
+}
 
 build() {
-  cd "$srcdir/colord-$pkgver"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --libexecdir=/usr/lib/colord \
-    --localstatedir=/var --disable-static \
-    --disable-polkit
-  make
+  cd ${_base_pkgname}
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/${_base_pkgname} \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-daemon-user=colord \
+    --enable-print-profiles \
+    --enable-libcolordcompat \
+    --disable-static \
+    --disable-polkit \
+    --disable-bash-completion \
+    --disable-systemd-login
+    #--enable-vala \
+    #--enable-sane \
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  PATH="$srcdir/path:$PATH" make
 }
 
 package() {
-  cd "$srcdir/colord-$pkgver"
+  cd ${_base_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:
-
diff --git a/colord.install b/colord.install
new file mode 100644
index 000000000000..cce1cd9d5d7b
--- /dev/null
+++ b/colord.install
@@ -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
+}