cleaned patches

debian/patches/000_gtk+-debian-xinerama-pic.patch

@@ -1,73 +0,0 @@
-diff -ruN gtk+-2.2.2.orig/configure gtk+-2.2.2/configure
---- gtk+-2.2.2.orig/configure	2003-06-10 05:30:17.000000000 +0900
-+++ gtk+-2.2.2/configure	2003-07-13 02:01:52.000000000 +0900
-@@ -28377,13 +28377,13 @@
-       *)
- 	  # Check for XFree
- 	  use_xfree_xinerama=yes
--	  echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5
--echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6
--if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then
-+	  echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama_pic" >&5
-+echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama_pic... $ECHO_C" >&6
-+if test "${ac_cv_lib_Xinerama_pic_XineramaQueryExtension+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lXinerama -lXext $x_libs_for_checks $LIBS"
-+LIBS="-lXinerama_pic -lXext $x_libs_for_checks $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -28428,20 +28428,20 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_Xinerama_XineramaQueryExtension=yes
-+  ac_cv_lib_Xinerama_pic_XineramaQueryExtension=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_Xinerama_XineramaQueryExtension=no
-+ac_cv_lib_Xinerama_pic_XineramaQueryExtension=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5
--echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6
--if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_pic_XineramaQueryExtension" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xinerama_pic_XineramaQueryExtension" >&6
-+if test $ac_cv_lib_Xinerama_pic_XineramaQueryExtension = yes; then
-   echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
- echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6
- if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
-@@ -28497,8 +28497,8 @@
-   esac
- 
- 	           case "$x_extra_libs " in
--    *-lXinerama[\ \	]*)               ;;
--    *)               x_extra_libs="-lXinerama $x_extra_libs" ;;
-+    *-lXinerama_pic[\ \	]*)               ;;
-+    *)               x_extra_libs="-lXinerama_pic $x_extra_libs" ;;
-   esac
- 
- 		  cat >>confdefs.h <<\_ACEOF
---- gtk+-2.2.2.orig/configure.in	2003-06-09 13:24:51.000000000 +0900
-+++ gtk+-2.2.2/configure.in	2003-07-13 01:58:11.000000000 +0900
-@@ -1113,10 +1113,10 @@
-       *)
- 	  # Check for XFree
- 	  use_xfree_xinerama=yes
--	  AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-+	  AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,
- 	      [AC_CHECK_HEADER(X11/extensions/Xinerama.h, 
- 	          [GTK_ADD_LIB(x_extra_libs,Xext)
--	          GTK_ADD_LIB(x_extra_libs,Xinerama)
-+	          GTK_ADD_LIB(x_extra_libs,Xinerama_pic)
- 		  AC_DEFINE(HAVE_XFREE_XINERAMA)
- 		  AC_DEFINE(HAVE_XINERAMA)], 
- 		  use_xfree_xinerama=no,

debian/patches/004_gtkmodules.patch

@@ -1,16 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkmodules.c,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- gtkmodules.c	2005/01/01 03:04:17	1.4
-+++ gtk+-2.6.1/gtk/gtkmodules.c	2005/01/20 13:33:44	1.5
-@@ -297,7 +297,7 @@
- 		      g_module_symbol (module, "gtk_module_display_init",
- 				       (gpointer *) &info->display_init_func);
- 		      
--		      gtk_modules = g_slist_prepend (gtk_modules, info);
-+		      gtk_modules = g_slist_append (gtk_modules, info);
- 		      
- 		      /* display_init == NULL indicates a non-multihead aware module.
- 		       * For these, we delay the call to init_func until first display is