rpms/fillets-ng/devel fillets-ng-0.7.3-libX11.patch, NONE, 1.1 fillets-ng.spec, 1.8, 1.9

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/fillets-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31550

Modified Files:
	fillets-ng.spec 
Added Files:
	fillets-ng-0.7.3-libX11.patch 
Log Message:
Add libX11 patch, link against X11 even when SDL isn't (#204594, #204600).


fillets-ng-0.7.3-libX11.patch:

--- NEW FILE fillets-ng-0.7.3-libX11.patch ---
diff -Naupr fillets-ng-0.7.3.orig/configure.in fillets-ng-0.7.3/configure.in
--- fillets-ng-0.7.3.orig/configure.in	2005-10-04 20:11:00.000000000 +0200
+++ fillets-ng-0.7.3/configure.in	2006-08-30 13:50:45.000000000 +0200
@@ -13,9 +13,6 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 
-CPPFLAGS="-I/usr/local/include $CPPFLAGS"
-LIBS="-L/usr/local/lib $LIBS"
-
 ###################################################
 # Check for libm
 AC_CHECK_LIB(m, sin, LIBS="$LIBS -lm")
@@ -89,18 +86,15 @@ AC_CHECK_LIB([SDL_ttf], [TTF_OpenFont],
 
 ###################################################
 # Test X11
-OLD_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
-AC_TRY_COMPILE([
-    #include "SDL.h"
-    #include "SDL_syswm.h"
-    #include <X11/Xutil.h>
-    ], [
-    SDL_SysWMinfo info;
-    info.subsystem = SDL_SYSWM_X11;
-    ], [have_x11="yes"], [have_x11="no"])
-CPPFLAGS="$OLD_CPPFLAGS"
-if test "x$have_x11" = xyes; then
+AC_PATH_X
+AC_CHECK_LIB(X11, XFree,
+    have_x11='yes',
+    have_x11='no',
+    [-lX11 -L${x_libraries}])
+AC_CHECK_HEADERS(X11/Xutil.h)
+if test "$have_x11" != 'no'; then
+    CPPFLAGS="$X_CFLAGS $CPPFLAGS"
+    LIBS="$X_LIBS $LIBS -lX11"
     AC_DEFINE(HAVE_X11)
 fi
 


Index: fillets-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/fillets-ng.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fillets-ng.spec	28 Aug 2006 10:02:53 -0000	1.8
+++ fillets-ng.spec	30 Aug 2006 11:55:23 -0000	1.9
@@ -9,6 +9,7 @@
 Source1: fillets.desktop
 Source2: fillets.png
 Patch0: fillets-ng-0.7.3-lua-pkgconfig.patch
+Patch1: fillets-ng-0.7.3-libX11.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: fillets-ng-data >= 0.7.1
 BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel
@@ -28,6 +29,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .lua-pkgconfig
+%patch1 -p1 -b .libX11
 autoreconf --install --force
 
 
@@ -73,6 +75,7 @@
 %changelog
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.7.3-5
 - FC6 rebuild.
+- Add libX11 patch, link against X11 even when SDL isn't (#204594, #204600).
 
 * Wed May 31 2006 Matthias Saou <http://freshrpms.net/> 0.7.3-4
 - Add patch to change lua detection from lua-config to pkgconfig since the