[arch-commits] Commit in colord/repos (10 files)
Jan de Groot
jgc at archlinux.org
Fri Apr 3 12:01:13 UTC 2015
Date: Friday, April 3, 2015 @ 14:01:13
Author: jgc
Revision: 235377
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
colord/repos/extra-i686/0001-Fix-session-helper-failing-to-find-argyll-tool.patch
(from rev 235376, colord/trunk/0001-Fix-session-helper-failing-to-find-argyll-tool.patch)
colord/repos/extra-i686/PKGBUILD
(from rev 235376, colord/trunk/PKGBUILD)
colord/repos/extra-i686/colord.install
(from rev 235376, colord/trunk/colord.install)
colord/repos/extra-x86_64/0001-Fix-session-helper-failing-to-find-argyll-tool.patch
(from rev 235376, colord/trunk/0001-Fix-session-helper-failing-to-find-argyll-tool.patch)
colord/repos/extra-x86_64/PKGBUILD
(from rev 235376, colord/trunk/PKGBUILD)
colord/repos/extra-x86_64/colord.install
(from rev 235376, 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 | 96 ++++++++++
/colord.install | 30 +++
extra-i686/0001-Fix-session-helper-failing-to-find-argyll-tool.patch | 30 +++
extra-i686/PKGBUILD | 41 ----
extra-i686/colord.install | 15 -
extra-x86_64/0001-Fix-session-helper-failing-to-find-argyll-tool.patch | 30 +++
extra-x86_64/PKGBUILD | 41 ----
extra-x86_64/colord.install | 15 -
8 files changed, 186 insertions(+), 112 deletions(-)
Copied: colord/repos/extra-i686/0001-Fix-session-helper-failing-to-find-argyll-tool.patch (from rev 235376, colord/trunk/0001-Fix-session-helper-failing-to-find-argyll-tool.patch)
===================================================================
--- extra-i686/0001-Fix-session-helper-failing-to-find-argyll-tool.patch (rev 0)
+++ extra-i686/0001-Fix-session-helper-failing-to-find-argyll-tool.patch 2015-04-03 12:01:13 UTC (rev 235377)
@@ -0,0 +1,30 @@
+From 301f24d02158f1e12a2e7ccdf9970d02ecddd534 Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh at redhat.com>
+Date: Mon, 23 Feb 2015 09:56:12 +0000
+Subject: [PATCH] Fix session-helper failing to find argyll tool.
+
+We don't want to free the thing we're trying to return. This fixes the
+bug introduced in commit b6f7c4d117a06f059a6e852e2dce8c13a3bb1f2c.
+
+See:
+ https://bugzilla.redhat.com/show_bug.cgi?id=1190720
+---
+ contrib/session-helper/cd-main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/session-helper/cd-main.c b/contrib/session-helper/cd-main.c
+index 61e0c5b..0f93697 100644
+--- a/contrib/session-helper/cd-main.c
++++ b/contrib/session-helper/cd-main.c
+@@ -939,7 +939,7 @@ cd_main_find_argyll_tool (const gchar *command,
+ GError **error)
+ {
+ gboolean ret;
+- _cleanup_free_ gchar *filename = NULL;
++ gchar *filename;
+
+ /* try the original argyllcms filename installed in /usr/local/bin */
+ filename = g_strdup_printf ("/usr/local/bin/%s", command);
+--
+2.1.0
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-04-03 12:01:06 UTC (rev 235376)
+++ extra-i686/PKGBUILD 2015-04-03 12:01:13 UTC (rev 235377)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=colord
-pkgver=1.2.9
-pkgrel=1
-pkgdesc="System daemon for managing color devices"
-arch=(i686 x86_64)
-url="http://www.freedesktop.org/software/colord"
-license=(GPL2)
-depends=(lcms2 libgusb polkit sqlite systemd dconf dbus)
-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=('1b6319812b12ab7f906983959bbaaf2e5b78bdb7'
- 'SKIP')
-validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17')
-
-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
- 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 235376, colord/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-04-03 12:01:13 UTC (rev 235377)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=colord
+pkgver=1.2.9
+pkgrel=2
+pkgdesc="System daemon for managing color devices"
+arch=(i686 x86_64)
+url="http://www.freedesktop.org/software/colord"
+license=(GPL2)
+depends=(lcms2 libgusb polkit sqlite systemd dconf dbus)
+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}
+ 0001-Fix-session-helper-failing-to-find-argyll-tool.patch)
+sha1sums=('1b6319812b12ab7f906983959bbaaf2e5b78bdb7'
+ 'SKIP'
+ '6d92d75cda7736e734f7472bed52dbc90ca3ea93')
+validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../0001-Fix-session-helper-failing-to-find-argyll-tool.patch
+}
+
+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
+ 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:
Deleted: extra-i686/colord.install
===================================================================
--- extra-i686/colord.install 2015-04-03 12:01:06 UTC (rev 235376)
+++ extra-i686/colord.install 2015-04-03 12:01:13 UTC (rev 235377)
@@ -1,15 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- if ! getent passwd colord >/dev/null; then
- groupadd -g 124 colord
- useradd -d /var/lib/colord -u 124 -g colord -s /bin/false colord
- fi
-}
-
-post_upgrade() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
-}
Copied: colord/repos/extra-i686/colord.install (from rev 235376, colord/trunk/colord.install)
===================================================================
--- extra-i686/colord.install (rev 0)
+++ extra-i686/colord.install 2015-04-03 12:01:13 UTC (rev 235377)
@@ -0,0 +1,15 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ if ! getent passwd colord >/dev/null; then
+ groupadd -g 124 colord
+ useradd -d /var/lib/colord -u 124 -g colord -s /bin/false colord
+ fi
+}
+
+post_upgrade() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_remove() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+}
Copied: colord/repos/extra-x86_64/0001-Fix-session-helper-failing-to-find-argyll-tool.patch (from rev 235376, colord/trunk/0001-Fix-session-helper-failing-to-find-argyll-tool.patch)
===================================================================
--- extra-x86_64/0001-Fix-session-helper-failing-to-find-argyll-tool.patch (rev 0)
+++ extra-x86_64/0001-Fix-session-helper-failing-to-find-argyll-tool.patch 2015-04-03 12:01:13 UTC (rev 235377)
@@ -0,0 +1,30 @@
+From 301f24d02158f1e12a2e7ccdf9970d02ecddd534 Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh at redhat.com>
+Date: Mon, 23 Feb 2015 09:56:12 +0000
+Subject: [PATCH] Fix session-helper failing to find argyll tool.
+
+We don't want to free the thing we're trying to return. This fixes the
+bug introduced in commit b6f7c4d117a06f059a6e852e2dce8c13a3bb1f2c.
+
+See:
+ https://bugzilla.redhat.com/show_bug.cgi?id=1190720
+---
+ contrib/session-helper/cd-main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/session-helper/cd-main.c b/contrib/session-helper/cd-main.c
+index 61e0c5b..0f93697 100644
+--- a/contrib/session-helper/cd-main.c
++++ b/contrib/session-helper/cd-main.c
+@@ -939,7 +939,7 @@ cd_main_find_argyll_tool (const gchar *command,
+ GError **error)
+ {
+ gboolean ret;
+- _cleanup_free_ gchar *filename = NULL;
++ gchar *filename;
+
+ /* try the original argyllcms filename installed in /usr/local/bin */
+ filename = g_strdup_printf ("/usr/local/bin/%s", command);
+--
+2.1.0
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-04-03 12:01:06 UTC (rev 235376)
+++ extra-x86_64/PKGBUILD 2015-04-03 12:01:13 UTC (rev 235377)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=colord
-pkgver=1.2.9
-pkgrel=1
-pkgdesc="System daemon for managing color devices"
-arch=(i686 x86_64)
-url="http://www.freedesktop.org/software/colord"
-license=(GPL2)
-depends=(lcms2 libgusb polkit sqlite systemd dconf dbus)
-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=('1b6319812b12ab7f906983959bbaaf2e5b78bdb7'
- 'SKIP')
-validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17')
-
-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
- 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 235376, colord/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-04-03 12:01:13 UTC (rev 235377)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=colord
+pkgver=1.2.9
+pkgrel=2
+pkgdesc="System daemon for managing color devices"
+arch=(i686 x86_64)
+url="http://www.freedesktop.org/software/colord"
+license=(GPL2)
+depends=(lcms2 libgusb polkit sqlite systemd dconf dbus)
+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}
+ 0001-Fix-session-helper-failing-to-find-argyll-tool.patch)
+sha1sums=('1b6319812b12ab7f906983959bbaaf2e5b78bdb7'
+ 'SKIP'
+ '6d92d75cda7736e734f7472bed52dbc90ca3ea93')
+validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../0001-Fix-session-helper-failing-to-find-argyll-tool.patch
+}
+
+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
+ 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:
Deleted: extra-x86_64/colord.install
===================================================================
--- extra-x86_64/colord.install 2015-04-03 12:01:06 UTC (rev 235376)
+++ extra-x86_64/colord.install 2015-04-03 12:01:13 UTC (rev 235377)
@@ -1,15 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- if ! getent passwd colord >/dev/null; then
- groupadd -g 124 colord
- useradd -d /var/lib/colord -u 124 -g colord -s /bin/false colord
- fi
-}
-
-post_upgrade() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
-}
Copied: colord/repos/extra-x86_64/colord.install (from rev 235376, colord/trunk/colord.install)
===================================================================
--- extra-x86_64/colord.install (rev 0)
+++ extra-x86_64/colord.install 2015-04-03 12:01:13 UTC (rev 235377)
@@ -0,0 +1,15 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ if ! getent passwd colord >/dev/null; then
+ groupadd -g 124 colord
+ useradd -d /var/lib/colord -u 124 -g colord -s /bin/false colord
+ fi
+}
+
+post_upgrade() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_remove() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+}
More information about the arch-commits
mailing list