things

4 files changed, 81 insertions, 110 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b377821f7037..174f547ab8c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,45 @@
-pkgbase = colord-git
+pkgbase = colord
 	pkgdesc = System daemon for managing color devices
-	pkgver = 1.2.1.r14.g5a9987b
-	pkgrel = 1
-	url = http://www.freedesktop.org/software/colord
-	install = colord.install
-	arch = i686
+	pkgver = 1.4.4
+	pkgrel = 2
+	url = https://www.freedesktop.org/software/colord
 	arch = x86_64
 	license = GPL2
-	makedepends = intltool
 	makedepends = gobject-introspection
 	makedepends = vala
-	makedepends = docbook2x
 	makedepends = sane
 	makedepends = bash-completion
-	makedepends = perl-xml-libxml
-	makedepends = perl-file-which
+	makedepends = argyllcms
+	makedepends = git
+	makedepends = meson
+	makedepends = gtk-doc
+	makedepends = systemd
+	makedepends = docbook-xsl
 	depends = lcms2
 	depends = libgusb
 	depends = polkit
 	depends = sqlite
-	depends = systemd
 	depends = dconf
 	depends = dbus
-	optdepends = sane: scanner support
+	depends = libgudev
+	depends = shared-mime-info
+	depends = systemd-libs
+	depends = udev
 	provides = colord
+	provides = colord-sane
 	conflicts = colord
-	replaces = shared-color-profiles
-	source = colord::git+git://github.com/hughsie/colord.git
-	source = colord.install
-	source = colord-git-docbook.patch
-	sha1sums = SKIP
-	sha1sums = e06950f0c75ffedd2977ff12945cfbf5a947899d
-	sha1sums = ce6b0953a669abe228a309028ee9168c0f11f51c
+	conflicts = colord-sane
+	options = !emptydirs
+	source = git+https://github.com/hughsie/colord
+	sha256sums = SKIP
 
 pkgname = colord-git
+	optdepends = argyllcms: color profiling
+	optdepends = colord-sane: SANE support
+	replaces = shared-color-profiles
+
+pkgname = colord-sane-git
+	pkgdesc = System daemon for managing color devices (SANE support)
+	depends = colord
+	depends = sane
 
diff --git a/PKGBUILD b/PKGBUILD
index 67011bfb1b9a..9382e6b516cf 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,68 @@
-# Maintainer: Moritz Lipp <mlq@pwmt.org>
+# Maintainer:  Vincent Grande <shoober420@gmail.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 
-pkgname=colord-git
-pkgver=1.2.1.r14.g5a9987b
-pkgrel=1
+pkgbase=colord
+pkgname=(colord-git colord-sane-git)
+pkgver=1.4.4
+pkgrel=2
 pkgdesc="System daemon for managing color devices"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/software/colord"
+url="https://www.freedesktop.org/software/colord"
+arch=(x86_64)
 license=(GPL2)
-depends=(lcms2 libgusb polkit sqlite systemd dconf dbus)
-makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion
-perl-xml-libxml perl-file-which)
-optdepends=('sane: scanner support')
-replaces=('shared-color-profiles')
-provides=(colord)
-conflicts=(colord)
-install=colord.install
-source=('colord::git+git://github.com/hughsie/colord.git'
-        'colord.install'
-        'colord-git-docbook.patch'
-        )
-sha1sums=('SKIP'
-          'e06950f0c75ffedd2977ff12945cfbf5a947899d'
-          'ce6b0953a669abe228a309028ee9168c0f11f51c')
-_gitname=colord
+provides=(colord colord-sane)
+conflicts=(colord colord-sane)
+depends=(lcms2 libgusb polkit sqlite dconf dbus libgudev shared-mime-info systemd-libs udev)
+makedepends=(gobject-introspection vala sane bash-completion argyllcms git meson gtk-doc systemd
+             docbook-xsl)
+options=(!emptydirs)
+source=("git+https://github.com/hughsie/colord")
+sha256sums=('SKIP')
+#validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17')  # Richard Hughes
+
+pkgver() {
+  cd colord
+  git describe --tags | sed 's/-/+/g'
+}
 
 prepare() {
-  cd "$srcdir/$_gitname"
-  patch -p1 < $srcdir/colord-git-docbook.patch
+  cd colord
 }
 
 build() {
-  cd "$srcdir/$_gitname"
-  ./autogen.sh
-  ./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
-  make
+  arch-meson colord build \
+    -D libcolordcompat=true \
+    -D sane=true \
+    -D vapi=true \
+    -D print_profiles=true \
+    -D daemon_user=colord
+  ninja -C build
 }
 
-package() {
-  cd "$srcdir/$_gitname"
-  make DESTDIR="$pkgdir" install
+check() {
+  meson test -C build
 }
 
-pkgver() {
-  cd "$srcdir/$_gitname"
-  git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/_/./g;s/COLORD.//g'
+package_colord-git() {
+  optdepends=('argyllcms: color profiling'
+              'colord-sane: SANE support')
+  replaces=(shared-color-profiles)
+
+  DESTDIR="$pkgdir" meson install -C build
+
+  echo 'u colord - "Color management daemon" /var/lib/colord' |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/colord.conf"
+
+### Split colord-sane
+  mkdir -p colord-sane/usr/lib/colord-plugins
+  mv {"$pkgdir",colord-sane}/usr/lib/colord-sane
+  mv {"$pkgdir",colord-sane}/usr/lib/colord-plugins/libcolord_sensor_sane.so
+}
+
+package_colord-sane-git() {
+  pkgdesc+=" (SANE support)"
+  depends=(colord sane)
+  mv colord-sane/* "$pkgdir"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set sw=2 et:
diff --git a/colord-git-docbook.patch b/colord-git-docbook.patch
deleted file mode 100644
index 6f67302a8b6c..000000000000
--- a/colord-git-docbook.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/man/cd-create-profile.sgml b/man/cd-create-profile.sgml
-index 4933c86..cf92fb3 100644
---- a/man/cd-create-profile.sgml
-+++ b/man/cd-create-profile.sgml
-@@ -1,4 +1,6 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<?xml version="1.0" encoding="utf-8"?>
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
-+   "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" [
-   <!-- Please adjust the date whenever revising the manpage. -->
-   <!ENTITY date        "<date>8 April,1011</date>">
-   <!ENTITY package     "cd-create-profile">
-diff --git a/man/cd-fix-profile.sgml b/man/cd-fix-profile.sgml
-index 23c21b0..308f551 100644
---- a/man/cd-fix-profile.sgml
-+++ b/man/cd-fix-profile.sgml
-@@ -1,4 +1,6 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<?xml version="1.0" encoding="utf-8"?>
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
-+   "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" [
-   <!-- Please adjust the date whenever revising the manpage. -->
-   <!ENTITY date        "<date>8 April,1011</date>">
-   <!ENTITY package     "cd-fix-profile">
-diff --git a/man/colormgr.sgml b/man/colormgr.sgml
-index fbb6511..de6ca16 100644
---- a/man/colormgr.sgml
-+++ b/man/colormgr.sgml
-@@ -1,4 +1,6 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<?xml version="1.0" encoding="utf-8"?>
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
-+   "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" [
-   <!-- Please adjust the date whenever revising the manpage. -->
-   <!ENTITY date        "<date>18 June,2013</date>">
-   <!ENTITY package     "colormgr">
diff --git a/colord.install b/colord.install
deleted file mode 100644
index 2b20f5edde58..000000000000
--- a/colord.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    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
-    chown colord:colord /var/lib/colord
-    chown colord:colord /var/lib/colord/*.db 2>/dev/null || return 0
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    getent passwd colord >/dev/null && userdel colord
-    getent group colord >/dev/null && groupdel colord
-}