Date: Monday, August 3, 2015 @ 16:11:06 Author: heftig Revision: 242964
1.2.11 Modified: colord/trunk/PKGBUILD Deleted: colord/trunk/0001-Fix-session-helper-failing-to-find-argyll-tool.patch -----------------------------------------------------------+ 0001-Fix-session-helper-failing-to-find-argyll-tool.patch | 30 ------------ PKGBUILD | 13 ++--- 2 files changed, 5 insertions(+), 38 deletions(-) Deleted: 0001-Fix-session-helper-failing-to-find-argyll-tool.patch =================================================================== --- 0001-Fix-session-helper-failing-to-find-argyll-tool.patch 2015-08-03 14:05:34 UTC (rev 242963) +++ 0001-Fix-session-helper-failing-to-find-argyll-tool.patch 2015-08-03 14:11:06 UTC (rev 242964) @@ -1,30 +0,0 @@ -From 301f24d02158f1e12a2e7ccdf9970d02ecddd534 Mon Sep 17 00:00:00 2001 -From: Tim Waugh <[email protected]> -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 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-08-03 14:05:34 UTC (rev 242963) +++ PKGBUILD 2015-08-03 14:11:06 UTC (rev 242964) @@ -3,8 +3,8 @@ # Contributor: Ionut Biru <[email protected]> pkgname=colord -pkgver=1.2.9 -pkgrel=3 +pkgver=1.2.11 +pkgrel=1 pkgdesc="System daemon for managing color devices" arch=(i686 x86_64) url="http://www.freedesktop.org/software/colord"; @@ -16,16 +16,13 @@ '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') +source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc}) +sha1sums=('efd7b7b90ea17a46c12f4dc4138c45f3629a5d2c' + 'SKIP') validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17') prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../0001-Fix-session-helper-failing-to-find-argyll-tool.patch } build() {
