rpms/eog/devel 0001-Fix-linking-with-LCMS-support-enabled.patch, NONE, 1.1 eog.spec, 1.160, 1.161 libxml.patch, 1.1, NONE

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6585

Modified Files:
	eog.spec 
Added Files:
	0001-Fix-linking-with-LCMS-support-enabled.patch 
Removed Files:
	libxml.patch 
Log Message:
Fix libX11 linking

0001-Fix-linking-with-LCMS-support-enabled.patch:
 configure.ac |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Fix-linking-with-LCMS-support-enabled.patch ---
>From 42e4973f8de4c5e2a02687797d4fc7262e7649ed Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 10 Feb 2010 16:28:46 +0000
Subject: [PATCH] Fix linking with LCMS support enabled

We use libX11 functions, so we need to link against them.

/usr/bin/ld: ./.libs/libeog.a(libeog_la-eog-window.o): undefined reference to symbol 'XFree'
/usr/bin/ld: note: 'XFree' is defined in DSO /usr/lib64/libX11.so.6 so try adding it to the linker command line
/usr/lib64/libX11.so.6: could not read symbols: Invalid operation

https://bugzilla.gnome.org/show_bug.cgi?id=609553
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index a120bc5..1e011ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,7 +147,7 @@ AM_CONDITIONAL([HAVE_EXIF], [test "x$have_exif" = "xyes"])
 AC_ARG_WITH([cms], AC_HELP_STRING([--without-cms], [disable colour management support]))
 have_lcms=no
 if test x$with_cms != xno; then
-    PKG_CHECK_MODULES(LCMS, lcms, have_lcms=yes, have_lcms=no)
+    PKG_CHECK_MODULES(LCMS, lcms x11, have_lcms=yes, have_lcms=no)
 fi
 if test "x$have_lcms" = "xyes"; then
   AC_DEFINE(HAVE_LCMS, 1, [Little CMS Support.])
-- 
1.6.6



Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- eog.spec	10 Feb 2010 16:32:38 -0000	1.160
+++ eog.spec	10 Feb 2010 16:36:04 -0000	1.161
@@ -15,7 +15,6 @@ Version: 2.29.90
 Release: 1%{?dist}
 URL: http://projects.gnome.org/eog/
 Source: http://download.gnome.org/sources/eog/2.29/%{name}-%{version}.tar.bz2
-Patch0: libxml.patch
 # The GFDL has an "or later version" clause embedded inside the license.
 # There is no need to add the + here.
 License: GPLv2+ and GFDL


--- libxml.patch DELETED ---