Date: Tuesday, January 17, 2012 @ 08:36:48 Author: ibiru Revision: 146778
archrelease: copy trunk to extra-x86_64 Added: colord/repos/extra-x86_64/PKGBUILD (from rev 146777, colord/trunk/PKGBUILD) Deleted: colord/repos/extra-x86_64/PKGBUILD colord/repos/extra-x86_64/scan_only_color_profile_dir.patch -----------------------------------+ PKGBUILD | 62 ++++++++++++++++++------------------ scan_only_color_profile_dir.patch | 35 -------------------- 2 files changed, 31 insertions(+), 66 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2012-01-17 13:35:06 UTC (rev 146777) +++ PKGBUILD 2012-01-17 13:36:48 UTC (rev 146778) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> -# Contributor: Ionut Biru <ib...@archlinux.org> - -pkgname=colord -pkgver=0.1.16 -pkgrel=1 -pkgdesc="Color daemon" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/software/colord" -license=('GPL2') -depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') -makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') -source=($url/releases/$pkgname-$pkgver.tar.xz) -options=('!libtool') -sha1sums=('bd2fbad0043d2c1f55ab7ff8cb5e261b684e699c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc --libexecdir=/usr/lib/colord \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: Copied: colord/repos/extra-x86_64/PKGBUILD (from rev 146777, colord/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2012-01-17 13:36:48 UTC (rev 146778) @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> + +pkgname=colord +pkgver=0.1.16 +pkgrel=1 +pkgdesc="Color daemon" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/software/colord" +license=('GPL2') +depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') +makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') +source=($url/releases/$pkgname-$pkgver.tar.xz) +options=('!libtool') +sha1sums=('bd2fbad0043d2c1f55ab7ff8cb5e261b684e699c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc --libexecdir=/usr/lib/colord \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Deleted: scan_only_color_profile_dir.patch =================================================================== --- scan_only_color_profile_dir.patch 2012-01-17 13:35:06 UTC (rev 146777) +++ scan_only_color_profile_dir.patch 2012-01-17 13:36:48 UTC (rev 146778) @@ -1,35 +0,0 @@ -From 78b6dc7dbf865df6b0d30526293591fe5773029a Mon Sep 17 00:00:00 2001 -From: Richard Hughes <rich...@hughsie.com> -Date: Tue, 6 Dec 2011 09:49:49 +0000 -Subject: [PATCH] If /usr/share/color appears at runtime, don't rescan the - parent dir - -Resolves https://bugs.freedesktop.org/show_bug.cgi?id=43542 ---- - src/cd-profile-store.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/cd-profile-store.c b/src/cd-profile-store.c -index ecad474..c662351 100644 ---- a/src/cd-profile-store.c -+++ b/src/cd-profile-store.c -@@ -260,8 +260,14 @@ cd_profile_store_file_monitor_changed_cb (GFileMonitor *monitor, - /* just rescan the correct directory */ - parent = g_file_get_parent (file); - parent_path = g_file_get_path (parent); -- g_debug ("CdProfileStore: %s was added, rescanning %s", path, parent_path); -- cd_profile_store_search_path (profile_store, parent_path); -+ if (g_strcmp0 (parent_path, DATADIR) == 0) { -+ g_debug ("CdProfileStore: %s was added, rescanning", path); -+ cd_profile_store_search_path (profile_store, path); -+ } else { -+ g_debug ("CdProfileStore: %s was added, rescanning parent %s", -+ path, parent_path); -+ cd_profile_store_search_path (profile_store, parent_path); -+ } - out: - if (parent != NULL) - g_object_unref (parent); --- -1.7.6 -