fix lcms2 patch
This commit is contained in:
parent
fb0c93a2a3
commit
3d2f3e1d73
@ -1,10 +1,18 @@
|
||||
From 157e3f68f6196e071be0e43aad0f9ba96f29a9ec Mon Sep 17 00:00:00 2001
|
||||
From 8cff4692740cb6abd1eb87ba7d88e86aaab32099 Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@redhat.com>
|
||||
Date: Wed, 18 Sep 2013 16:45:45 +0200
|
||||
Date: Thu, 19 Sep 2013 17:45:48 +0200
|
||||
Subject: [PATCH] patch: lcms2
|
||||
|
||||
Squashed commit of the following:
|
||||
|
||||
commit c8e5735272fc436174b9969a41f3b16722f381f7
|
||||
Author: Nils Philippsen <nils@redhat.com>
|
||||
Date: Thu Sep 19 17:38:46 2013 +0200
|
||||
|
||||
lcms: pretty code even better if syntactically correct
|
||||
|
||||
Thanks to Jehan for spotting this.
|
||||
|
||||
commit fb40ab72c3e54be46df64916cf6f80cbd6924fbd
|
||||
Author: Michael Natterer <mitch@gimp.org>
|
||||
Date: Tue Sep 25 20:56:54 2012 +0200
|
||||
@ -270,7 +278,7 @@ index 0d5d20f..c668c3e 100644
|
||||
|
||||
if (config->display_intent ==
|
||||
diff --git a/modules/display-filter-lcms.c b/modules/display-filter-lcms.c
|
||||
index 30c5857..9a2350c 100644
|
||||
index 30c5857..e3052d7 100644
|
||||
--- a/modules/display-filter-lcms.c
|
||||
+++ b/modules/display-filter-lcms.c
|
||||
@@ -19,13 +19,20 @@
|
||||
@ -359,8 +367,8 @@ index 30c5857..9a2350c 100644
|
||||
+ else
|
||||
+ g_free (descData);
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
+#endif
|
||||
|
||||
+#ifdef HAVE_LCMS1
|
||||
if (*name && ! g_utf8_validate (*name, -1, NULL))
|
||||
@ -473,7 +481,7 @@ index 30c5857..9a2350c 100644
|
||||
cmsCloseProfile (profile);
|
||||
}
|
||||
diff --git a/modules/display-filter-proof.c b/modules/display-filter-proof.c
|
||||
index 41967f5..c10463a 100644
|
||||
index 41967f5..5178395 100644
|
||||
--- a/modules/display-filter-proof.c
|
||||
+++ b/modules/display-filter-proof.c
|
||||
@@ -19,7 +19,12 @@
|
||||
@ -540,8 +548,8 @@ index 41967f5..c10463a 100644
|
||||
+
|
||||
+ g_free (descData);
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
+#endif
|
||||
|
||||
cmsCloseProfile (profile);
|
||||
}
|
||||
|
@ -82,7 +82,7 @@ Summary: GNU Image Manipulation Program
|
||||
Name: gimp
|
||||
Epoch: 2
|
||||
Version: 2.8.6
|
||||
Release: %{?prerelprefix}4%{dotprerel}%{dotgitrev}%{?dist}
|
||||
Release: %{?prerelprefix}5%{dotprerel}%{dotgitrev}%{?dist}
|
||||
|
||||
# Compute some version related macros
|
||||
# Ugly hack, you need to get your quoting backslashes/percent signs straight
|
||||
@ -622,6 +622,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Sep 19 2013 Nils Philippsen <nils@redhat.com> - 2:2.8.6-5
|
||||
- fix lcms2 patch
|
||||
|
||||
* Wed Sep 18 2013 Nils Philippsen <nils@redhat.com> - 2:2.8.6-4
|
||||
- build against lcms2
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user