diff options
5 files changed, 215 insertions, 1 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/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. + # |