diff options
Diffstat (limited to 'extra/colord')
| -rw-r--r-- | extra/colord/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/colord/scan_only_color_profile_dir.patch | 35 |
2 files changed, 43 insertions, 6 deletions
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index bdd3b1e7a..57e789067 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 144384 2011-12-05 13:01:04Z ibiru $ +# $Id: PKGBUILD 144475 2011-12-06 14:25:28Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord pkgver=0.1.15 -pkgrel=2 +pkgrel=3 pkgdesc="Color daemon" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/software/colord" license=('GPL2') -depends=('lcms2' 'libgusb' 'polkit' 'sane' 'sqlite3' 'udev') +depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') -optdepends=('shared-color-profiles: color profiles') -source=($url/releases/$pkgname-$pkgver.tar.xz) +source=($url/releases/$pkgname-$pkgver.tar.xz + scan_only_color_profile_dir.patch) options=('!libtool') -sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8') +sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8' + 'b4b8ea1008ecfdc1084ec69d647127587a2a87f7') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/scan_only_color_profile_dir.patch" ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/colord \ --localstatedir=/var --disable-static diff --git a/extra/colord/scan_only_color_profile_dir.patch b/extra/colord/scan_only_color_profile_dir.patch new file mode 100644 index 000000000..0591fc420 --- /dev/null +++ b/extra/colord/scan_only_color_profile_dir.patch @@ -0,0 +1,35 @@ +From 78b6dc7dbf865df6b0d30526293591fe5773029a Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@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 + |