From 787c0c5136b36ea76d7c8e3f5188e072cd6fb0f3 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 19 Nov 2012 18:28:48 +0100 Subject: [PATCH] fix /etc/gimprc syntax error introduced in previous patch --- ...cm-system-monitor-profile-by-default.patch | 33 ++++++++++++++----- gimp.spec | 5 ++- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/gimp-2.8.2-cm-system-monitor-profile-by-default.patch b/gimp-2.8.2-cm-system-monitor-profile-by-default.patch index 094a037..2d52fd8 100644 --- a/gimp-2.8.2-cm-system-monitor-profile-by-default.patch +++ b/gimp-2.8.2-cm-system-monitor-profile-by-default.patch @@ -1,28 +1,45 @@ -From 3720401cc1499ac5f6a15248214168fd2b5c02ec Mon Sep 17 00:00:00 2001 +From 9a3f047f90a79e96af54a73090313a670b2685d3 Mon Sep 17 00:00:00 2001 From: Nils Philippsen -Date: Thu, 15 Nov 2012 12:17:26 +0100 +Date: Mon, 19 Nov 2012 18:26:16 +0100 Subject: [PATCH] patch: cm-system-monitor-profile-by-default Squashed commit of the following: +commit 1430096d27ba12566739fadf96302c9a4ce8f98b +Author: Nils Philippsen +Date: Mon Nov 19 18:25:28 2012 +0100 + + color mgmt: fix syntax error + commit eb78c3a0cfd7ff796110fcd3cd161ca11005fca5 Author: Richard Hughes Date: Thu Nov 15 12:12:12 2012 +0100 color mgmt: try to use the system monitor profile by default --- - etc/gimprc | 1 + - 1 file changed, 1 insertion(+) + etc/gimprc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/gimprc b/etc/gimprc -index 8306571..712488f 100644 +index 8306571..1511cd6 100644 --- a/etc/gimprc +++ b/etc/gimprc -@@ -293,6 +293,7 @@ +@@ -285,14 +285,15 @@ + + # Defines the color management behavior. This is a parameter list. + # +-# (color-management ++(color-management + # (mode display) +-# (display-profile-from-gdk no) ++ (display-profile-from-gdk yes) + # (display-rendering-intent perceptual) + # (simulation-rendering-intent perceptual) # (simulation-gamut-check no) # (out-of-gamut-color (color-rgb 0.501961 0.501961 0.501961)) - # (display-module "CdisplayLcms")) -+(display-profile-from-gdk yes) +-# (display-module "CdisplayLcms")) ++# (display-module "CdisplayLcms") ++) # How to handle embedded color profiles when opening a file. Possible values # are ask, keep and convert. diff --git a/gimp.spec b/gimp.spec index eba9b49..2c0e8e0 100644 --- a/gimp.spec +++ b/gimp.spec @@ -80,7 +80,7 @@ Summary: GNU Image Manipulation Program Name: gimp Epoch: 2 Version: 2.8.2 -Release: %{?prerelprefix}5%{dotprerel}%{dotgitrev}%{?dist} +Release: %{?prerelprefix}6%{dotprerel}%{dotgitrev}%{?dist} # Compute some version related macros # Ugly hack, you need to get your quoting backslashes/percent signs straight @@ -605,6 +605,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Mon Nov 19 2012 Nils Philippsen - 2:2.8.2-6 +- fix /etc/gimprc syntax error introduced in previous patch + * Thu Nov 15 2012 Nils Philippsen - 2:2.8.2-5 - try using the system monitor profile for color management by default (patch by Richard Hughes)