rpms/gedit/devel 0001-Fix-libm-and-libX11-linking.patch,1.1,1.2

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	0001-Fix-libm-and-libX11-linking.patch 
Log Message:
update patch


0001-Fix-libm-and-libX11-linking.patch:
 configure.ac |    2 ++
 1 file changed, 2 insertions(+)

Index: 0001-Fix-libm-and-libX11-linking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/0001-Fix-libm-and-libX11-linking.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Fix-libm-and-libX11-linking.patch	10 Feb 2010 17:57:01 -0000	1.1
+++ 0001-Fix-libm-and-libX11-linking.patch	2 Mar 2010 23:55:34 -0000	1.2
@@ -1,27 +1,6 @@
-From d0b56b9154ad47a4391839b814587e76d70e5fb4 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess at hadess.net>
-Date: Wed, 10 Feb 2010 17:42:24 +0000
-Subject: [PATCH] Fix libm and libX11 linking
-
-Otherwise we fail to link:
-/usr/bin/ld: ./.libs/libgedit.a(gedit-print-preview.o): undefined reference to symbol 'floor@@GLIBC_2.2.5'
-/usr/bin/ld: note: 'floor@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line
-/lib64/libm.so.6: could not read symbols: Invalid operation
-
-And:
-/usr/bin/ld: ./.libs/libgedit.a(gedit-utils.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=609562
----
- configure.ac |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b9c2632..63238b9 100644
---- a/configure.ac
-+++ b/configure.ac
+diff -up gedit-2.29.8/configure.ac.libm gedit-2.29.8/configure.ac
+--- gedit-2.29.8/configure.ac.libm	2010-03-01 15:12:45.000000000 -0500
++++ gedit-2.29.8/configure.ac	2010-03-02 18:53:13.191648202 -0500
 @@ -45,6 +45,7 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
  GTK_DOC_CHECK([1.0],[--flavour=no-tmpl])
  AC_CHECK_FUNCS(fsync)
@@ -30,14 +9,11 @@ index b9c2632..63238b9 100644
  
  dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
  AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
-@@ -252,6 +253,7 @@ PKG_CHECK_MODULES(GEDIT, [
- 	gio-2.0 >= 2.23.1
+@@ -253,6 +254,7 @@ PKG_CHECK_MODULES(GEDIT, [
  	gtk+-2.0 >= 2.16.0
- 	gtksourceview-2.0 >= 2.9.4
-+	x11
+ 	gtksourceview-2.0 >= 2.9.7
  	gconf-2.0 >= 1.1.11
++        x11
  ])
  
--- 
-1.6.6
-
+ dnl FIXME: Remove this when removing gedit-message-area