Add no-intltool patch to fix bug 240958 and demo-gtk patch for 5.05 to fix bug 225547.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.26-hh3 i686

6 files changed, 220 insertions, 2 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 240c87fd97cb..246594cf8503 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.236 2008/09/09 02:42:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.237 2008/11/05 20:30:52 yngwin Exp $
+
+  05 Nov 2008; Ben de Groot <yngwin@gentoo.org>
+  +files/5.05/08_all_no_intltool.patch, +files/5.05/09_all_demo-gtk.patch,
+  +files/5.06/03_all_no_intltool.patch,
+  +files/5.07/02_all_no_intltool.patch:
+  Add no-intltool patch to fix bug 240958 and demo-gtk patch for 5.05 to fix
+  bug 225547.
 
 *xscreensaver-5.07 (09 Sep 2008)
 
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index ed232e4485dc..025c3a54e0fa 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -5,9 +5,13 @@ AUX 5.05/04_all_posix_head.patch 583 RMD160 f96101fa4608321d3a87d74fc121eb4ed89d
 AUX 5.05/05_all_offensive.patch 2068 RMD160 90653b5f867214283de204ab63dafbaba8319b35 SHA1 e76e5150e59f3efd463478891fa8f5740935d6cd SHA256 f85c587e6bfef0d9a6fe88846de22730d420f578f201b95d2e2e69b643890893
 AUX 5.05/06_all_rpm.patch 1772 RMD160 e5b862ce1e4c91c866ec584bd0732740dba8e09d SHA1 091c942a18cf36ac7b77ac05c5a3f0abf6f937ec SHA256 499b1a422abb09618bfecf5b9c885b168b8bac0da58f00c7e4e9b1456f750613
 AUX 5.05/07_all_xinerama.patch 645 RMD160 2d9080fe392442e1a967c58c4a0f8c5a465277ee SHA1 4cc93c5fcfe5b7a708df3f62a8667b5592d28908 SHA256 faedfe926ad014ae21ddeefe21d138cab49f3f9319676b65d47fafe61f31e1b1
+AUX 5.05/08_all_no_intltool.patch 2277 RMD160 a24cef7922cd1cfa1a01aece5536d98ebdb28ccc SHA1 2c1e221a789d9cda9fc64346503d2d305637e1aa SHA256 e6aff6454346b5811fb9da5d626efaca8af2329e0ab92af8e547b7492c96b19d
+AUX 5.05/09_all_demo-gtk.patch 1400 RMD160 71b2d7bad7b942f09e5373bfabd1d4a3773f03e4 SHA1 93282bdb4d0c9cb43ba0e34602a68e7c6362ce8c SHA256 fba9f00d27cbf250a9286626896c8297f9fb02ec3fb7a132644ae86ca9ca2e66
 AUX 5.06/01_all_default_settings.patch 4478 RMD160 07abe8dddfb615b302db1d1e693e3fe08f93ed45 SHA1 380989245e9008c5ebe1ea02992dc82ceaf81f64 SHA256 5514cde38e59cdafd4be55213dc5cc7d22885ca417276b39ae2860ed9e8ef276
 AUX 5.06/02_all_xinerama_function.patch 455 RMD160 561a05512cd97921410f7dfa80b65f40347da2e9 SHA1 17b9664c6e8c8efa725b200f8fe7b3d572d00161 SHA256 60cd6227010490af64323cb3cfc2e7df0d546183ab0a772c54dc7f54b11e35fd
+AUX 5.06/03_all_no_intltool.patch 2277 RMD160 a24cef7922cd1cfa1a01aece5536d98ebdb28ccc SHA1 2c1e221a789d9cda9fc64346503d2d305637e1aa SHA256 e6aff6454346b5811fb9da5d626efaca8af2329e0ab92af8e547b7492c96b19d
 AUX 5.07/01_all_default_settings.patch 4478 RMD160 07abe8dddfb615b302db1d1e693e3fe08f93ed45 SHA1 380989245e9008c5ebe1ea02992dc82ceaf81f64 SHA256 5514cde38e59cdafd4be55213dc5cc7d22885ca417276b39ae2860ed9e8ef276
+AUX 5.07/02_all_no_intltool.patch 2277 RMD160 a24cef7922cd1cfa1a01aece5536d98ebdb28ccc SHA1 2c1e221a789d9cda9fc64346503d2d305637e1aa SHA256 e6aff6454346b5811fb9da5d626efaca8af2329e0ab92af8e547b7492c96b19d
 DIST xscreensaver-5.05.tar.gz 5468293 RMD160 8f174d544ae68f54454d946c854cf81749427afb SHA1 6f23422b17dd8a06cdaf419fd16d398eee50601b SHA256 3c64366f1990ebe173db422660dce5d9d80b1c758f3a9ad6e55fb72657dc821a
 DIST xscreensaver-5.06.tar.gz 5486779 RMD160 de164ee7f68094f77b28dcfaa3279953f98cba83 SHA1 3310789ecf1ed8ff790d94512fe536857e793e4c SHA256 e7fb2f228caca0fed3181b0c88970f7bf501c385f8cdb4e152b34a0f43df38f6
 DIST xscreensaver-5.07.tar.gz 5513131 RMD160 d2fee54c3138c717433f5a6ca9a098028082af95 SHA1 82c611ab271807ad871aa46a3a7f6b95706d31aa SHA256 8c50a74c07b1fffcbb20bd79e3ee92f1f52191e5a187433bb49964ccf94badb6
@@ -15,5 +19,5 @@ EBUILD xscreensaver-5.05-r1.ebuild 2660 RMD160 c5f251a4492edc5e279f05bb320c1851e
 EBUILD xscreensaver-5.05.ebuild 2583 RMD160 44751191628b6963d3814632ffab22da6ff1d546 SHA1 355414c5386d718067eac10ec50592c8fb14a231 SHA256 e53ec07db00db2e85272ca355096481ee2f843946a61fd07cda01e3408dd3d6e
 EBUILD xscreensaver-5.06.ebuild 2675 RMD160 c4c5efc3144dbdd97892dad2cbe88b756097d341 SHA1 e68b145bd809f90fd0d8abfbef9e1fc952b858be SHA256 538ee3db23f513c4d4350a1db769c63badd012749f40ceeff7800ab3c11df041
 EBUILD xscreensaver-5.07.ebuild 2678 RMD160 5c7bcf658deb57aba2bf22e16cd8611ee778d847 SHA1 087918517b1cfc355cc02dd75bbdacc3cf19aa40 SHA256 84e0f792b444354fe54819e011d7b025c0d79d4653b63a3b5e08e0e5a0b4675d
-MISC ChangeLog 38692 RMD160 097dc9f28bdee160b372d4b895c2cb6588ae62ba SHA1 f51e8110c3601a6b1f16059185cbc00823f08244 SHA256 b8b47b5e46ec7f332acb131ecde8b49f7b7b3307bd193e9a91722a49c2dfe1cf
+MISC ChangeLog 38986 RMD160 420eb97a2438ff12578dfc24c0c8de91163db602 SHA1 8fc7262a962047097591b450678b531e2b6ed452 SHA256 5d34d85b777f769a052b8c04ad129ccfeaacc71eb6aff34ac6b51b0a9c322cc9
 MISC metadata.xml 531 RMD160 ba61120af65ea1ae8142ce39060b8c15c351f0bf SHA1 032c7910d0f046bc6ba8e3289ed49892196051f5 SHA256 2cc45f986ce1e3f89d36dc21dbe22ec1f2b60a64a06bb5e47e4ebcd6233234ef
diff --git a/x11-misc/xscreensaver/files/5.05/08_all_no_intltool.patch b/x11-misc/xscreensaver/files/5.05/08_all_no_intltool.patch
new file mode 100644
index 000000000000..f5fb645c8c09
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.05/08_all_no_intltool.patch
@@ -0,0 +1,57 @@
+diff -ur xscreensaver-5.07_old/configure.in xscreensaver-5.07/configure.in
+--- xscreensaver-5.07_old/configure.in	2008-10-16 02:15:57.761938178 +0200
++++ xscreensaver-5.07/configure.in	2008-10-16 02:11:43.311971411 +0200
+@@ -1172,7 +1172,7 @@
+ #
+ ###############################################################################
+ 
+-AC_PROG_INTLTOOL
++# AC_PROG_INTLTOOL # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ GETTEXT_PACKAGE=xscreensaver
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+ 		   [This is the name of the gettext package to use.])
+diff -ur xscreensaver-5.07_old/driver/Makefile.in xscreensaver-5.07/driver/Makefile.in
+--- xscreensaver-5.07_old/driver/Makefile.in	2008-10-16 02:15:57.835271514 +0200
++++ xscreensaver-5.07/driver/Makefile.in	2008-10-16 03:16:51.678244563 +0200
+@@ -22,7 +22,7 @@
+ mansuffix	= 1
+ manNdir		= $(mandir)/man$(mansuffix)
+ 
+-INTLTOOL_MERGE	= @INTLTOOL_MERGE@
++#INTLTOOL_MERGE	= @INTLTOOL_MERGE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ 
+ GTK_DATADIR	= @GTK_DATADIR@
+ GTK_APPDIR	= $(GTK_DATADIR)/applications
+@@ -492,20 +492,19 @@
+ 
+ # screensaver-properties.desktop
+ # into /usr/share/applications/
+-install-gnome:: screensaver-properties.desktop
++install-gnome::
+ 	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
+ 	   if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then		      \
+ 	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+ 		  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+ 	   fi								     ;\
+ 	   name2=xscreensaver-properties.desktop			     ;\
+-	   echo $(INSTALL_DATA) screensaver-properties.desktop		      \
++	   echo $(INSTALL_DATA) screensaver-properties.desktop.in		      \
+ 		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
+-		$(INSTALL_DATA) screensaver-properties.desktop		      \
++		$(INSTALL_DATA) screensaver-properties.desktop.in		      \
+ 		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
+ 	 fi
+ 
+-
+ # xscreensaver.xpm
+ # into /usr/share/pixmaps/
+ install-gnome:: $(LOGO)
+@@ -764,7 +763,7 @@
+ XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
+ 	$(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h
+ 
+-@INTLTOOL_DESKTOP_RULE@
++# @INTLTOOL_DESKTOP_RULE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ 
+ # The executables linked in this directory.
+ #
diff --git a/x11-misc/xscreensaver/files/5.05/09_all_demo-gtk.patch b/x11-misc/xscreensaver/files/5.05/09_all_demo-gtk.patch
new file mode 100644
index 000000000000..7eaeab1816be
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.05/09_all_demo-gtk.patch
@@ -0,0 +1,36 @@
+--- xscreensaver-5.05-orig/driver/demo-Gtk.c	2008-11-05 21:02:13.000000000 +0100
++++ xscreensaver-5.05/driver/demo-Gtk.c	2008-11-05 21:05:46.000000000 +0100
+@@ -582,13 +582,13 @@
+   gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
+   gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
+   gtk_window_set_title (GTK_WINDOW (dialog), progclass);
+-  STFU GTK_WIDGET_SET_FLAGS (ok, GTK_CAN_DEFAULT);
++  GTK_WIDGET_SET_FLAGS (ok, GTK_CAN_DEFAULT);
+   gtk_widget_show (ok);
+   gtk_widget_grab_focus (ok);
+ 
+   if (cancel)
+     {
+-      STFU GTK_WIDGET_SET_FLAGS (cancel, GTK_CAN_DEFAULT); 
++      GTK_WIDGET_SET_FLAGS (cancel, GTK_CAN_DEFAULT); 
+       gtk_widget_show (cancel);
+     }
+   gtk_widget_show (label);
+@@ -1808,7 +1808,7 @@
+   char *str;
+   int list_elt;
+ 
+-  STFU g_return_if_fail (!gdk_pointer_is_grabbed ());
++  g_return_if_fail (!gdk_pointer_is_grabbed ());
+ 
+   str = gtk_tree_path_to_string (path);
+   list_elt = strtol (str, NULL, 10);
+@@ -5003,7 +5003,7 @@
+       gtk_widget_ref (outer_vbox);
+       gtk_container_remove (GTK_CONTAINER (s->toplevel_widget),
+                             outer_vbox);
+-      STFU GTK_OBJECT_SET_FLAGS (outer_vbox, GTK_FLOATING);
++      GTK_OBJECT_SET_FLAGS (outer_vbox, GTK_FLOATING);
+       gtk_container_add (GTK_CONTAINER (capplet), outer_vbox);
+ 
+       /* Find the window above us, and set the title and close handler. */
diff --git a/x11-misc/xscreensaver/files/5.06/03_all_no_intltool.patch b/x11-misc/xscreensaver/files/5.06/03_all_no_intltool.patch
new file mode 100644
index 000000000000..f5fb645c8c09
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.06/03_all_no_intltool.patch
@@ -0,0 +1,57 @@
+diff -ur xscreensaver-5.07_old/configure.in xscreensaver-5.07/configure.in
+--- xscreensaver-5.07_old/configure.in	2008-10-16 02:15:57.761938178 +0200
++++ xscreensaver-5.07/configure.in	2008-10-16 02:11:43.311971411 +0200
+@@ -1172,7 +1172,7 @@
+ #
+ ###############################################################################
+ 
+-AC_PROG_INTLTOOL
++# AC_PROG_INTLTOOL # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ GETTEXT_PACKAGE=xscreensaver
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+ 		   [This is the name of the gettext package to use.])
+diff -ur xscreensaver-5.07_old/driver/Makefile.in xscreensaver-5.07/driver/Makefile.in
+--- xscreensaver-5.07_old/driver/Makefile.in	2008-10-16 02:15:57.835271514 +0200
++++ xscreensaver-5.07/driver/Makefile.in	2008-10-16 03:16:51.678244563 +0200
+@@ -22,7 +22,7 @@
+ mansuffix	= 1
+ manNdir		= $(mandir)/man$(mansuffix)
+ 
+-INTLTOOL_MERGE	= @INTLTOOL_MERGE@
++#INTLTOOL_MERGE	= @INTLTOOL_MERGE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ 
+ GTK_DATADIR	= @GTK_DATADIR@
+ GTK_APPDIR	= $(GTK_DATADIR)/applications
+@@ -492,20 +492,19 @@
+ 
+ # screensaver-properties.desktop
+ # into /usr/share/applications/
+-install-gnome:: screensaver-properties.desktop
++install-gnome::
+ 	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
+ 	   if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then		      \
+ 	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+ 		  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+ 	   fi								     ;\
+ 	   name2=xscreensaver-properties.desktop			     ;\
+-	   echo $(INSTALL_DATA) screensaver-properties.desktop		      \
++	   echo $(INSTALL_DATA) screensaver-properties.desktop.in		      \
+ 		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
+-		$(INSTALL_DATA) screensaver-properties.desktop		      \
++		$(INSTALL_DATA) screensaver-properties.desktop.in		      \
+ 		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
+ 	 fi
+ 
+-
+ # xscreensaver.xpm
+ # into /usr/share/pixmaps/
+ install-gnome:: $(LOGO)
+@@ -764,7 +763,7 @@
+ XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
+ 	$(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h
+ 
+-@INTLTOOL_DESKTOP_RULE@
++# @INTLTOOL_DESKTOP_RULE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ 
+ # The executables linked in this directory.
+ #
diff --git a/x11-misc/xscreensaver/files/5.07/02_all_no_intltool.patch b/x11-misc/xscreensaver/files/5.07/02_all_no_intltool.patch
new file mode 100644
index 000000000000..f5fb645c8c09
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.07/02_all_no_intltool.patch
@@ -0,0 +1,57 @@
+diff -ur xscreensaver-5.07_old/configure.in xscreensaver-5.07/configure.in
+--- xscreensaver-5.07_old/configure.in	2008-10-16 02:15:57.761938178 +0200
++++ xscreensaver-5.07/configure.in	2008-10-16 02:11:43.311971411 +0200
+@@ -1172,7 +1172,7 @@
+ #
+ ###############################################################################
+ 
+-AC_PROG_INTLTOOL
++# AC_PROG_INTLTOOL # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ GETTEXT_PACKAGE=xscreensaver
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+ 		   [This is the name of the gettext package to use.])
+diff -ur xscreensaver-5.07_old/driver/Makefile.in xscreensaver-5.07/driver/Makefile.in
+--- xscreensaver-5.07_old/driver/Makefile.in	2008-10-16 02:15:57.835271514 +0200
++++ xscreensaver-5.07/driver/Makefile.in	2008-10-16 03:16:51.678244563 +0200
+@@ -22,7 +22,7 @@
+ mansuffix	= 1
+ manNdir		= $(mandir)/man$(mansuffix)
+ 
+-INTLTOOL_MERGE	= @INTLTOOL_MERGE@
++#INTLTOOL_MERGE	= @INTLTOOL_MERGE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ 
+ GTK_DATADIR	= @GTK_DATADIR@
+ GTK_APPDIR	= $(GTK_DATADIR)/applications
+@@ -492,20 +492,19 @@
+ 
+ # screensaver-properties.desktop
+ # into /usr/share/applications/
+-install-gnome:: screensaver-properties.desktop
++install-gnome::
+ 	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
+ 	   if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then		      \
+ 	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+ 		  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+ 	   fi								     ;\
+ 	   name2=xscreensaver-properties.desktop			     ;\
+-	   echo $(INSTALL_DATA) screensaver-properties.desktop		      \
++	   echo $(INSTALL_DATA) screensaver-properties.desktop.in		      \
+ 		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
+-		$(INSTALL_DATA) screensaver-properties.desktop		      \
++		$(INSTALL_DATA) screensaver-properties.desktop.in		      \
+ 		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
+ 	 fi
+ 
+-
+ # xscreensaver.xpm
+ # into /usr/share/pixmaps/
+ install-gnome:: $(LOGO)
+@@ -764,7 +763,7 @@
+ XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
+ 	$(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h
+ 
+-@INTLTOOL_DESKTOP_RULE@
++# @INTLTOOL_DESKTOP_RULE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ 
+ # The executables linked in this directory.
+ #