diff options
author | Brent Baude <ranger@gentoo.org> | 2008-11-20 20:48:44 +0000 |
---|---|---|
committer | Brent Baude <ranger@gentoo.org> | 2008-11-20 20:48:44 +0000 |
commit | da82f782e2b4aa053a83182f1d7165f081e185d4 (patch) | |
tree | b59db0de8bb1fee7a1212e4b7dfe9196b8c4374f /x11-misc/xscreensaver | |
parent | Disable some parts of SSP per bug #246652 with GCC3 as they cause NDB failures. (diff) | |
download | gentoo-2-da82f782e2b4aa053a83182f1d7165f081e185d4.tar.gz gentoo-2-da82f782e2b4aa053a83182f1d7165f081e185d4.tar.bz2 gentoo-2-da82f782e2b4aa053a83182f1d7165f081e185d4.zip |
Removing old files
(Portage version: 2.2_rc14/cvs/Linux 2.6.24-gentoo-r3-g5-64 ppc64)
Diffstat (limited to 'x11-misc/xscreensaver')
9 files changed, 0 insertions, 335 deletions
diff --git a/x11-misc/xscreensaver/files/5.05/01_all_default_settings.patch b/x11-misc/xscreensaver/files/5.05/01_all_default_settings.patch deleted file mode 100644 index 6d9464fbe2f9..000000000000 --- a/x11-misc/xscreensaver/files/5.05/01_all_default_settings.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -ur xscreensaver-5.05.orig/driver/XScreenSaver.ad.in xscreensaver-5.05/driver/XScreenSaver.ad.in ---- xscreensaver-5.05.orig/driver/XScreenSaver.ad.in 2008-03-01 23:33:47.000000000 +0200 -+++ xscreensaver-5.05/driver/XScreenSaver.ad.in 2008-05-07 20:47:16.000000000 +0300 -@@ -31,36 +31,36 @@ - *mode: random - *timeout: 0:10:00 - *cycle: 0:10:00 --*lockTimeout: 0:00:00 -+*lockTimeout: 0:20:00 - *passwdTimeout: 0:00:30 --*dpmsEnabled: False --*dpmsStandby: 2:00:00 --*dpmsSuspend: 2:00:00 --*dpmsOff: 4:00:00 --*grabDesktopImages: True -+*dpmsEnabled: True -+*dpmsStandby: 1:00:00 -+*dpmsSuspend: 1:00:00 -+*dpmsOff: 2:00:00 -+*grabDesktopImages: False - *grabVideoFrames: False - *chooseRandomImages: @DEFAULT_IMAGES_P@ - *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ - *nice: 10 - *memoryLimit: 0 --*lock: False -+*lock: True - *verbose: False - *timestamp: True - *fade: True - *unfade: False - *fadeSeconds: 0:00:03 - *fadeTicks: 20 --*splash: True -+*splash: False - *splashDuration: 0:00:05 - *visualID: default - *captureStderr: True - *ignoreUninstalledPrograms: False - --*textMode: file --*textLiteral: XScreenSaver --*textFile: @DEFAULT_TEXT_FILE@ --*textProgram: fortune --*textURL: http://www.livejournal.com/stats/latest-rss.bml -+*textMode: literal -+*textLiteral: Gentoo Linux -+*textFile: /etc/gentoo-release -+*textProgram: /usr/bin/fortune -+*textURL: http://planet.gentoo.org/rss20.xml - - *overlayTextForeground: #FFFF00 - *overlayTextBackground: #000000 -@@ -117,7 +117,10 @@ - - ! The format used for printing the date and time in the password dialog box - ! (see the strftime(3) manual page for details.) --*dateFormat: %d-%b-%y (%a); %I:%M %p -+! Preferred time representation for the current locale -+*dateFormat: %x %X -+! Xscreensaver's default -+! *dateFormat: %d-%b-%y (%a); %I:%M %p - ! To show the time only: - ! *dateFormat: %I:%M %p - ! For 24 hour time: diff --git a/x11-misc/xscreensaver/files/5.05/02_all_cracklib_words.patch b/x11-misc/xscreensaver/files/5.05/02_all_cracklib_words.patch deleted file mode 100644 index 3d05c5ae3660..000000000000 --- a/x11-misc/xscreensaver/files/5.05/02_all_cracklib_words.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur xscreensaver-5.05.orig/hacks/webcollage xscreensaver-5.05/hacks/webcollage ---- xscreensaver-5.05.orig/hacks/webcollage 2007-11-08 05:05:23.000000000 +0200 -+++ xscreensaver-5.05/hacks/webcollage 2008-05-07 20:52:08.000000000 +0300 -@@ -860,7 +860,9 @@ - - - sub pick_dictionary() { -- my @dicts = ("/usr/dict/words", -+ my @dicts = ("/usr/share/dict/cracklib-small", -+ "/usr/share/dict/cracklib-words", -+ "/usr/dict/words", - "/usr/share/dict/words", - "/usr/share/lib/dict/words"); - foreach my $f (@dicts) { diff --git a/x11-misc/xscreensaver/files/5.05/03_all_desktop_entry.patch b/x11-misc/xscreensaver/files/5.05/03_all_desktop_entry.patch deleted file mode 100644 index aef8f3835e61..000000000000 --- a/x11-misc/xscreensaver/files/5.05/03_all_desktop_entry.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur xscreensaver-5.05.orig/driver/Makefile.in xscreensaver-5.05/driver/Makefile.in ---- xscreensaver-5.05.orig/driver/Makefile.in 2008-03-02 07:34:46.000000000 +0200 -+++ xscreensaver-5.05/driver/Makefile.in 2008-05-07 20:31:30.000000000 +0300 -@@ -498,7 +498,7 @@ - echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ - fi ;\ -- name2=gnome-screensaver-properties.desktop ;\ -+ name2=xscreensaver-properties.desktop ;\ - echo $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GTK_APPDIR)/$$name2 ;\ - $(INSTALL_DATA) screensaver-properties.desktop \ -@@ -571,7 +571,7 @@ - # into /usr/share/applications/ - uninstall-gnome:: - @if [ "$(GTK_DATADIR)" != "" ]; then \ -- f=gnome-screensaver-properties.desktop ;\ -+ f=xscreensaver-properties.desktop ;\ - echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ - rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ - fi -diff -ur xscreensaver-5.05.orig/driver/screensaver-properties.desktop.in xscreensaver-5.05/driver/screensaver-properties.desktop.in ---- xscreensaver-5.05.orig/driver/screensaver-properties.desktop.in 2008-01-27 01:16:59.000000000 +0200 -+++ xscreensaver-5.05/driver/screensaver-properties.desktop.in 2008-05-07 20:31:51.000000000 +0300 -@@ -1,6 +1,6 @@ - [Desktop Entry] - Exec=xscreensaver-demo --Icon=xscreensaver -+Icon=/usr/share/pixmaps/xscreensaver.xpm - Terminal=false - _Name=Screensaver - _Comment=Change screensaver properties diff --git a/x11-misc/xscreensaver/files/5.05/04_all_posix_head.patch b/x11-misc/xscreensaver/files/5.05/04_all_posix_head.patch deleted file mode 100644 index d282e78e2e44..000000000000 --- a/x11-misc/xscreensaver/files/5.05/04_all_posix_head.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xscreensaver-5.05.orig/Makefile.in xscreensaver-5.05/Makefile.in ---- xscreensaver-5.05.orig/Makefile.in 2008-03-01 06:32:52.000000000 +0200 -+++ xscreensaver-5.05/Makefile.in 2008-03-02 16:27:25.000000000 +0200 -@@ -326,7 +326,7 @@ - diff -U0 download.html $$TMP ; \ - echo '' ; \ - \ -- OLDEST=`ls xscreensaver*.tar.gz | head -1` ; \ -+ OLDEST=`ls xscreensaver*.tar.gz | head -n 1` ; \ - /bin/echo -n "Delete $$DEST/$$OLDEST? "; \ - read line; \ - if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then \ diff --git a/x11-misc/xscreensaver/files/5.05/05_all_offensive.patch b/x11-misc/xscreensaver/files/5.05/05_all_offensive.patch deleted file mode 100644 index 60ea997265ba..000000000000 --- a/x11-misc/xscreensaver/files/5.05/05_all_offensive.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -ur xscreensaver-5.05.orig/hacks/barcode.c xscreensaver-5.05/hacks/barcode.c ---- xscreensaver-5.05.orig/hacks/barcode.c 2006-04-06 09:40:32.000000000 +0300 -+++ xscreensaver-5.05/hacks/barcode.c 2008-05-07 20:49:16.000000000 +0300 -@@ -131,7 +131,6 @@ - "children", - "chocolate", - "CLONE", -- "cock", - "constriction", - "contrition", - "cop", -@@ -265,7 +264,6 @@ - "punishment", - "punk rock", - "punk", -- "pussy", - "quagmire", - "quarantine", - "quartz", -@@ -333,8 +331,6 @@ - "vegetarian", - "venom", - "verifiability", -- "viagra", -- "vibrator", - "victim", - "vignette", - "villainy", -diff -ur xscreensaver-5.05.orig/hacks/glx/glsnake.c xscreensaver-5.05/hacks/glx/glsnake.c ---- xscreensaver-5.05.orig/hacks/glx/glsnake.c 2006-05-03 22:39:21.000000000 +0300 -+++ xscreensaver-5.05/hacks/glx/glsnake.c 2008-05-07 20:49:16.000000000 +0300 -@@ -565,17 +565,17 @@ - ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, - ZERO, PIN, ZERO } - }, -- { "erect penis", /* thanks benno */ -+ { "shuffle board", /* thanks benno */ - { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, - PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, - ZERO, ZERO } - }, -- { "flaccid penis", -+ { "flaccid anchor", - { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, - PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, - ZERO, ZERO } - }, -- { "vagina", -+ { "engagement ring", - { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, - LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, - PIN, RIGHT, ZERO } -@@ -995,7 +995,7 @@ - { "Parrot", - { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } - }, -- { "Penis", -+ { "Shuttle", - { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } - }, - { "PictureComingSoon", diff --git a/x11-misc/xscreensaver/files/5.05/06_all_rpm.patch b/x11-misc/xscreensaver/files/5.05/06_all_rpm.patch deleted file mode 100644 index ffaf233d9d4c..000000000000 --- a/x11-misc/xscreensaver/files/5.05/06_all_rpm.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur xscreensaver-5.05.orig/configure.in xscreensaver-5.05/configure.in ---- xscreensaver-5.05.orig/configure.in 2008-03-02 00:14:30.000000000 +0200 -+++ xscreensaver-5.05/configure.in 2008-05-07 20:53:26.000000000 +0300 -@@ -4169,41 +4169,7 @@ - # Now let's warn if there's a previous RPM version already installed. - # But don't bother with this test if we are currently *building* an RPM. - --if test -z "$RPM_PACKAGE_VERSION" ; then -- -- rpmnames="xscreensaver xscreensaver-base xscreensaver-extras" -- -- # M4 sucks!! -- changequote(X,Y) -- rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \ -- sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \ -- head -1` -- changequote([,]) -- -- if test \! -z "$rpmv" ; then -- rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'` -- rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'` -- -- warning=no -- warnL "There is already an installed RPM of xscreensaver $rpmv" -- warn2 'on this system. You might want to remove it ("rpm -ve")' -- warn2 'before running "make install" in this directory.' -- echo "" -- warn2 "Alternately, you could build this version of xscreensaver" -- warn2 'as an RPM, and then install that. An "xscreensaver.spec"' -- warn2 'file is included. Try "rpmbuild -v -ba xscreensaver.spec".' -- warn2 "See the RPM documentation for more info." -- echo "" -- -- if test "$rpmbdir" = "$rpmhdir" ; then -- warn2 "The RPM version was installed in $rpmbdir/." -- do_dir_warning=yes -- else -- warn2 "The RPM version was installed in $rpmbdir/," -- warn2 "with demos in $rpmhdir/." -- fi -- fi --fi -+# Nope - breaks compilation with sandbox violation - - if test "${bindir}" = "${HACKDIR}" ; then - do_dir_warning=yes diff --git a/x11-misc/xscreensaver/files/5.05/07_all_xinerama.patch b/x11-misc/xscreensaver/files/5.05/07_all_xinerama.patch deleted file mode 100644 index b908b1d03c00..000000000000 --- a/x11-misc/xscreensaver/files/5.05/07_all_xinerama.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xscreensaver-5.05.orig/driver/xscreensaver.c xscreensaver-5.05/driver/xscreensaver.c ---- xscreensaver-5.05.orig/driver/xscreensaver.c 2008-03-01 06:05:12.000000000 +0200 -+++ xscreensaver-5.05/driver/xscreensaver.c 2008-05-07 21:03:52.000000000 +0300 -@@ -816,7 +816,7 @@ - if (i != j && - xsi[i].screen_number >= 0 && - xsi[j].screen_number >= 0 && -- X1 >= X2 && Y1 >= Y2 && (X1+W1) <= (X2+W2) && (X1+H1) <= (X2+H2)) -+ X1 >= X2 && Y1 >= Y2 && (X1+W1) <= (X2+W2) && (Y1+H1) <= (Y2+H2)) - { - sprintf (err, "%dx%d+%d+%d enclosed by %dx%d+%d+%d", - W1, H1, X1, Y1, 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 deleted file mode 100644 index f5fb645c8c09..000000000000 --- a/x11-misc/xscreensaver/files/5.05/08_all_no_intltool.patch +++ /dev/null @@ -1,57 +0,0 @@ -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 deleted file mode 100644 index 7eaeab1816be..000000000000 --- a/x11-misc/xscreensaver/files/5.05/09_all_demo-gtk.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- 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. */ |