From 2e3225d394f787e526cb50665d99c56b13578387 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Jan 20 2015 17:28:39 +0000
Subject: obsolete patch


---

diff --git a/geeqie-1.1-lcms2.patch b/geeqie-1.1-lcms2.patch
deleted file mode 100644
index 875a586..0000000
--- a/geeqie-1.1-lcms2.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -Nurb --strip-trailing-cr geeqie-1.1-orig/configure.in geeqie-1.1/configure.in
---- geeqie-1.1-orig/configure.in	2012-08-12 22:13:40.000000000 +0200
-+++ geeqie-1.1/configure.in	2014-06-17 11:17:19.991826252 +0200
-@@ -275,6 +275,13 @@
-     [liblcms=$enableval], [liblcms=auto])
- 
- if test "x${liblcms}" != "xno"; then
-+  PKG_CHECK_MODULES(LCMS, [lcms2 >= 2.0],
-+    [
-+      HAVE_LCMS=yes
-+      AC_DEFINE(HAVE_LCMS2, 1, [lcms2 is used])
-+      AC_DEFINE(HAVE_LCMS, 1, [enable LCMS])
-+    ],
-+    [
-   PKG_CHECK_MODULES(LCMS, [lcms >= 1.14],
-     [
-       HAVE_LCMS=yes
-@@ -284,6 +291,7 @@
-       HAVE_LCMS=no
-       AC_MSG_WARN([$LCMS_PKG_ERRORS])
-     ])
-+    ])
- else
-   HAVE_LCMS=disabled
- fi
-diff -Nurb --strip-trailing-cr geeqie-1.1-orig/src/color-man.c geeqie-1.1/src/color-man.c
---- geeqie-1.1-orig/src/color-man.c	2012-08-12 22:13:41.000000000 +0200
-+++ geeqie-1.1/src/color-man.c	2014-06-17 11:18:46.532202184 +0200
-@@ -21,7 +21,11 @@
- #ifdef HAVE_LCMS
- /*** color support enabled ***/
- 
-+#ifdef HAVE_LCMS2
-+#include <lcms2.h>
-+#else
- #include <lcms.h>
-+#endif
- 
- 
- typedef struct _ColorManCache ColorManCache;
-@@ -52,7 +56,9 @@
- 	if (init_done) return;
- 	init_done = TRUE;
- 
-+#ifndef HAVE_LCMS2
- 	cmsErrorAction(LCMS_ERROR_IGNORE);
-+#endif
- }
- 
- static cmsHPROFILE color_man_create_adobe_comp(void)
-@@ -425,7 +431,11 @@
- 		case COLOR_PROFILE_FILE:
- 			if (profile)
- 				{
--				return g_strdup(cmsTakeProductName(profile));
-+                    cmsUInt32Number r;
-+                    char buffer[20];
-+                    buffer[0] = '\0';
-+                    r = cmsGetProfileInfoASCII(profile, cmsInfoDescription, "en", "US", &buffer, 20);
-+                    return g_strdup(buffer);
- 				}
- 			return g_strdup(_("Custom profile"));
- 			break;
-diff -Nurb --strip-trailing-cr geeqie-1.1-orig/src/exif-common.c geeqie-1.1/src/exif-common.c
---- geeqie-1.1-orig/src/exif-common.c	2012-08-12 22:13:41.000000000 +0200
-+++ geeqie-1.1/src/exif-common.c	2014-06-17 11:17:19.993826145 +0200
-@@ -23,10 +23,10 @@
- #ifdef HAVE_LCMS
- /*** color support enabled ***/
- 
--#ifdef HAVE_LCMS_LCMS_H
--  #include <lcms/lcms.h>
-+#ifdef HAVE_LCMS2
-+#include <lcms2.h>
- #else
--  #include <lcms.h>
-+#include <lcms.h>
- #endif
- #endif
- 
-@@ -413,6 +413,9 @@
- 
- static gchar *exif_build_formatted_ColorProfile(ExifData *exif)
- {
-+#ifdef HAVE_LCMS2
-+	cmsUInt8Number profileID[17];
-+#endif
- 	const gchar *name = "";
- 	const gchar *source = "";
- 	guchar *profile_data;
-@@ -452,7 +455,13 @@
- 			profile = cmsOpenProfileFromMem(profile_data, profile_len);
- 			if (profile)
- 				{
-+#ifdef HAVE_LCMS2
-+				profileID[16] = '\0';
-+				cmsGetHeaderProfileID(profile, profileID);
-+				name = profileID;
-+#else
- 				name = cmsTakeProductName(profile);
-+#endif
- 				cmsCloseProfile(profile);
- 				}
- 			g_free(profile_data);