Date: Tuesday, December 6, 2011 @ 09:25:28 Author: ibiru Revision: 144475
archrelease: copy trunk to extra-i686, extra-x86_64 Added: colord/repos/extra-i686/PKGBUILD (from rev 144474, colord/trunk/PKGBUILD) colord/repos/extra-i686/scan_only_color_profile_dir.patch (from rev 144474, colord/trunk/scan_only_color_profile_dir.patch) colord/repos/extra-x86_64/PKGBUILD (from rev 144474, colord/trunk/PKGBUILD) colord/repos/extra-x86_64/scan_only_color_profile_dir.patch (from rev 144474, colord/trunk/scan_only_color_profile_dir.patch) Deleted: colord/repos/extra-i686/PKGBUILD colord/repos/extra-x86_64/PKGBUILD ------------------------------------------------+ extra-i686/PKGBUILD | 66 +++++++++++------------ extra-i686/scan_only_color_profile_dir.patch | 35 ++++++++++++ extra-x86_64/PKGBUILD | 66 +++++++++++------------ extra-x86_64/scan_only_color_profile_dir.patch | 35 ++++++++++++ 4 files changed, 138 insertions(+), 64 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-12-06 14:24:12 UTC (rev 144474) +++ extra-i686/PKGBUILD 2011-12-06 14:25:28 UTC (rev 144475) @@ -1,32 +0,0 @@ -# $Id$ -# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> -# Contributor: Ionut Biru <ib...@archlinux.org> - -pkgname=colord -pkgver=0.1.15 -pkgrel=2 -pkgdesc="Color daemon" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/software/colord" -license=('GPL2') -depends=('lcms2' 'libgusb' 'polkit' 'sane' 'sqlite3' 'udev') -makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') -optdepends=('shared-color-profiles: color profiles') -source=($url/releases/$pkgname-$pkgver.tar.xz) -options=('!libtool') -sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8') - -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-i686/PKGBUILD (from rev 144474, colord/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-12-06 14:25:28 UTC (rev 144475) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> + +pkgname=colord +pkgver=0.1.15 +pkgrel=3 +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 + scan_only_color_profile_dir.patch) +options=('!libtool') +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 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Copied: colord/repos/extra-i686/scan_only_color_profile_dir.patch (from rev 144474, colord/trunk/scan_only_color_profile_dir.patch) =================================================================== --- extra-i686/scan_only_color_profile_dir.patch (rev 0) +++ extra-i686/scan_only_color_profile_dir.patch 2011-12-06 14:25:28 UTC (rev 144475) @@ -0,0 +1,35 @@ +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 + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-12-06 14:24:12 UTC (rev 144474) +++ extra-x86_64/PKGBUILD 2011-12-06 14:25:28 UTC (rev 144475) @@ -1,32 +0,0 @@ -# $Id$ -# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> -# Contributor: Ionut Biru <ib...@archlinux.org> - -pkgname=colord -pkgver=0.1.15 -pkgrel=2 -pkgdesc="Color daemon" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/software/colord" -license=('GPL2') -depends=('lcms2' 'libgusb' 'polkit' 'sane' 'sqlite3' 'udev') -makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') -optdepends=('shared-color-profiles: color profiles') -source=($url/releases/$pkgname-$pkgver.tar.xz) -options=('!libtool') -sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8') - -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 144474, colord/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-12-06 14:25:28 UTC (rev 144475) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> + +pkgname=colord +pkgver=0.1.15 +pkgrel=3 +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 + scan_only_color_profile_dir.patch) +options=('!libtool') +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 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Copied: colord/repos/extra-x86_64/scan_only_color_profile_dir.patch (from rev 144474, colord/trunk/scan_only_color_profile_dir.patch) =================================================================== --- extra-x86_64/scan_only_color_profile_dir.patch (rev 0) +++ extra-x86_64/scan_only_color_profile_dir.patch 2011-12-06 14:25:28 UTC (rev 144475) @@ -0,0 +1,35 @@ +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 +