x11-misc/xscreensaver: Drop old

Signed-off-by: Sebastian Pipping <sping@gentoo.org>
Package-Manager: Portage-3.0.17, Repoman-3.0.2
This commit is contained in:
Sebastian Pipping
2021-03-12 21:32:28 +01:00
parent 64c7a5408e
commit f5f7bd0d57
11 changed files with 0 additions and 581 deletions

View File

@@ -1,4 +1,2 @@
DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14

View File

@@ -1,12 +0,0 @@
http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.17-blurb-hndl-test-passwd.patch
--- a/driver/test-passwd.c
+++ b/driver/test-passwd.c
@@ -66,6 +66,7 @@
Bool update_screen_layout (saver_info *si) { return 0; }
const char *blurb(void) { return progname; }
+Bool in_signal_handler_p = 0;
Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
void

View File

@@ -1,13 +0,0 @@
http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-test-passwd-segv-tty.patch
--- a/driver/passwd.c
+++ b/driver/passwd.c
@@ -205,7 +205,7 @@
{
# ifdef HAVE_SYSLOG
struct passwd *pw = getpwuid (getuid ());
- char *d = DisplayString (si->dpy);
+ char *d = (si->dpy ? DisplayString (si->dpy) : 0);
char *u = (pw && pw->pw_name ? pw->pw_name : "???");
int opt = 0;
int fac = 0;

View File

@@ -1,23 +0,0 @@
http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-tests-miscfix.patch
--- a/driver/test-xdpms.c
+++ a/driver/test-xdpms.c
@@ -29,7 +29,6 @@
#include <X11/Xproto.h>
#include <X11/extensions/dpms.h>
-#include <X11/extensions/dpmsstr.h>
extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret);
extern Bool DPMSCapable (Display *dpy);
--- a/driver/Makefile.in
+++ a/driver/Makefile.in
@@ -850,7 +850,7 @@
test-mlstring: test-mlstring.o
$(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS)
-TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS)
+TEST_FADE_OBJS = test-fade.o $(UTILS_BIN)/fade.o $(DEMO_UTIL_OBJS)
test-fade: test-fade.o $(UTILS_BIN)/fade.o
$(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS)

View File

@@ -1,21 +0,0 @@
--- a/hacks/tessellimage.c
+++ b/hacks/tessellimage.c
@@ -507,15 +507,15 @@
out[i].p = (n > 0
? (XPoint *) calloc (out[i].npoints + 1, sizeof (*out[i].p))
: 0);
-//printf("%d: ", i);
+/*printf("%d: ", i);*/
for (j = 0; j < out[i].npoints; j++)
{
ITRIANGLE *tt = &v[t->tri[j]];
out[i].p[j].x = (p[tt->p1].x + p[tt->p2].x + p[tt->p3].x) / 3;
out[i].p[j].y = (p[tt->p1].y + p[tt->p2].y + p[tt->p3].y) / 3;
-//printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y);
+/*printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y);*/
}
-//printf("\n");
+/*printf("\n");*/
}
free (vert_to_tri);

View File

@@ -1,47 +0,0 @@
--- a/driver/XScreenSaver.ad.in
+++ b/driver/XScreenSaver.ad.in
@@ -31,21 +31,21 @@
*mode: random
*timeout: 0:10:00
*cycle: 0:10:00
-*lockTimeout: 0:00:00
+*lockTimeout: 0:30:00
*passwdTimeout: 0:00:30
-*dpmsEnabled: False
+*dpmsEnabled: True
*dpmsQuickoffEnabled: False
*dpmsStandby: 2:00:00
*dpmsSuspend: 2:00:00
*dpmsOff: 4:00:00
-*grabDesktopImages: True
+*grabDesktopImages: False
*grabVideoFrames: False
*chooseRandomImages: @DEFAULT_IMAGES_P@
! This can be a local directory name, or the URL of an RSS or Atom feed.
*imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
*nice: 10
*memoryLimit: 0
-*lock: False
+*lock: True
*verbose: False
*timestamp: True
*fade: True
@@ -63,7 +63,7 @@
*textLiteral: XScreenSaver
*textFile: @DEFAULT_TEXT_FILE@
*textProgram: fortune
-*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
+*textURL: https://planet.gentoo.org/rss20.xml
*overlayTextForeground: #FFFF00
*overlayTextBackground: #000000
@@ -123,7 +123,8 @@
! 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
+!*dateFormat: %d-%b-%y (%a); %I:%M %p
+*dateFormat: %x %X
! To show the time only:
! *dateFormat: %I:%M %p
! For 24 hour time:

View File

@@ -1,59 +0,0 @@
--- a/hacks/barcode.c
+++ a/hacks/barcode.c
@@ -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",
--- a/hacks/glx/glsnake.c
+++ a/hacks/glx/glsnake.c
@@ -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",

View File

@@ -1,47 +0,0 @@
--- a/driver/XScreenSaver.ad.in
+++ b/driver/XScreenSaver.ad.in
@@ -31,21 +31,21 @@
*mode: random
*timeout: 0:10:00
*cycle: 0:10:00
-*lockTimeout: 0:00:00
+*lockTimeout: 0:30:00
*passwdTimeout: 0:00:30
-*dpmsEnabled: False
+*dpmsEnabled: True
*dpmsQuickoffEnabled: False
*dpmsStandby: 2:00:00
*dpmsSuspend: 2:00:00
*dpmsOff: 4:00:00
-*grabDesktopImages: True
+*grabDesktopImages: False
*grabVideoFrames: False
*chooseRandomImages: @DEFAULT_IMAGES_P@
! This can be a local directory name, or the URL of an RSS or Atom feed.
*imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
*nice: 10
*memoryLimit: 0
-*lock: False
+*lock: True
*verbose: False
*timestamp: True
*fade: True
@@ -63,7 +63,7 @@
*textLiteral: XScreenSaver
*textFile: @DEFAULT_TEXT_FILE@
*textProgram: fortune
-*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
+*textURL: https://planet.gentoo.org/rss20.xml
*overlayTextForeground: #FFFF00
*overlayTextBackground: #000000
@@ -124,7 +124,8 @@
! 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
+!*dateFormat: %d-%b-%y (%a); %I:%M %p
+*dateFormat: %x %X
! For day month date:
! *dateFormat: %a %b %d, %I:%M %p
! To show the time only:

View File

@@ -1,68 +0,0 @@
--- a/hacks/barcode.c
+++ a/hacks/barcode.c
@@ -118,8 +118,6 @@
"belly",
"bliss",
"bogosity",
- "boobies",
- "boobs",
"booty",
"bread",
"bubba",
@@ -132,7 +130,6 @@
"children",
"chocolate",
"CLONE",
- "cock",
"constriction",
"contrition",
"cop",
@@ -266,7 +263,6 @@
"punishment",
"punk rock",
"punk",
- "pussy",
"quagmire",
"quarantine",
"quartz",
@@ -334,8 +330,6 @@
"vegetarian",
"venom",
"verifiability",
- "viagra",
- "vibrator",
"victim",
"vignette",
"villainy",
--- a/hacks/glx/glsnake.c
+++ a/hacks/glx/glsnake.c
@@ -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",

View File

@@ -1,143 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools eutils flag-o-matic multilib pam
DESCRIPTION="A modular screen saver and locker for the X Window System"
HOMEPAGE="https://www.jwz.org/xscreensaver/"
SRC_URI="
https://www.jwz.org/xscreensaver/${P}.tar.gz
"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
COMMON_DEPEND="
>=gnome-base/libglade-2
dev-libs/libxml2
media-libs/netpbm
x11-apps/appres
x11-apps/xwininfo
x11-libs/gdk-pixbuf-xlib
>=x11-libs/gdk-pixbuf-2.42.0:2
x11-libs/gtk+:2
x11-libs/libX11
x11-libs/libXext
x11-libs/libXft
x11-libs/libXi
x11-libs/libXmu
x11-libs/libXrandr
x11-libs/libXt
x11-libs/libXxf86vm
jpeg? ( virtual/jpeg:0 )
new-login? (
gdm? ( gnome-base/gdm )
!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
)
opengl? (
virtual/glu
virtual/opengl
)
pam? ( sys-libs/pam )
xinerama? ( x11-libs/libXinerama )
"
# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
RDEPEND="
${COMMON_DEPEND}
perl? (
dev-lang/perl
dev-perl/libwww-perl
virtual/perl-Digest-MD5
)
selinux? ( sec-policy/selinux-xscreensaver )
"
DEPEND="
${COMMON_DEPEND}
dev-util/intltool
sys-devel/bc
sys-devel/gettext
virtual/pkgconfig
x11-base/xorg-proto
"
src_prepare() {
sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
strip-linguas -i po/
export ALL_LINGUAS="${LINGUAS}"
if use new-login && ! use gdm; then #392967
sed -i \
-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
configure{,.in} || die
fi
eapply \
"${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch \
"${FILESDIR}"/${PN}-5.05-interix.patch \
"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
"${FILESDIR}"/${PN}-5.28-comment-style.patch \
"${FILESDIR}"/${PN}-5.31-pragma.patch \
"${FILESDIR}"/${PN}-5.35-gentoo.patch
use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
eapply_user
eautoconf
eautoheader
}
src_configure() {
if use ppc || use ppc64; then
filter-flags -maltivec -mabi=altivec
append-flags -U__VEC__
fi
unset BC_ENV_ARGS #24568
export RPM_PACKAGE_VERSION=no #368025
econf \
$(use_with jpeg) \
$(use_with new-login login-manager) \
$(use_with opengl gl) \
$(use_with pam) \
$(use_with suid setuid-hacks) \
$(use_with xinerama xinerama-ext) \
--enable-locking \
--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
--with-dpms-ext \
--with-gtk \
--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
--with-pixbuf \
--with-proc-interrupts \
--with-randr-ext \
--with-text-file="${EPREFIX}"/etc/gentoo-release \
--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
--with-xdbe-ext \
--with-xf86gamma-ext \
--with-xf86vmode-ext \
--with-xinput-ext \
--with-xshm-ext \
--without-gle \
--without-kerberos \
--x-includes="${EPREFIX}"/usr/include \
--x-libraries="${EPREFIX}"/usr/$(get_libdir)
}
src_install() {
emake install_prefix="${D}" install
dodoc README{,.hacking}
if use pam; then
fperms 755 /usr/bin/${PN}
pamd_mimic_system ${PN} auth
fi
rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
}

View File

@@ -1,146 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools desktop eutils flag-o-matic multilib pam
DESCRIPTION="A modular screen saver and locker for the X Window System"
HOMEPAGE="https://www.jwz.org/xscreensaver/"
SRC_URI="
https://www.jwz.org/xscreensaver/${P}.tar.gz -> ${P}-r1.tar.gz
"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
COMMON_DEPEND="
>=gnome-base/libglade-2
dev-libs/libxml2
media-libs/netpbm
x11-apps/appres
x11-apps/xwininfo
x11-libs/gdk-pixbuf-xlib
>=x11-libs/gdk-pixbuf-2.42.0:2
x11-libs/gtk+:2
x11-libs/libX11
x11-libs/libXext
x11-libs/libXft
x11-libs/libXi
x11-libs/libXmu
x11-libs/libXrandr
x11-libs/libXt
x11-libs/libXxf86vm
caps? ( sys-libs/libcap )
jpeg? ( virtual/jpeg:0 )
new-login? (
gdm? ( gnome-base/gdm )
!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
)
opengl? (
virtual/glu
virtual/opengl
)
pam? ( sys-libs/pam )
xinerama? ( x11-libs/libXinerama )
"
# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
RDEPEND="
${COMMON_DEPEND}
perl? (
dev-lang/perl
dev-perl/libwww-perl
virtual/perl-Digest-MD5
)
selinux? ( sec-policy/selinux-xscreensaver )
"
DEPEND="
${COMMON_DEPEND}
dev-util/intltool
sys-devel/bc
sys-devel/gettext
virtual/pkgconfig
x11-base/xorg-proto
"
PATCHES=(
"${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch
"${FILESDIR}"/${PN}-5.05-interix.patch
"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
"${FILESDIR}"/${PN}-5.31-pragma.patch
"${FILESDIR}"/${PN}-5.43-gentoo.patch
)
src_prepare() {
sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
strip-linguas -i po/
export ALL_LINGUAS="${LINGUAS}"
if use new-login && ! use gdm; then #392967
sed -i \
-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
configure{,.in} || die
fi
default
use offensive || eapply "${FILESDIR}"/${PN}-5.43-offensive.patch
eapply_user
eautoconf
eautoheader
}
src_configure() {
if use ppc || use ppc64; then
filter-flags -maltivec -mabi=altivec
append-flags -U__VEC__
fi
unset BC_ENV_ARGS #24568
export RPM_PACKAGE_VERSION=no #368025
econf \
$(use_with caps setcap-hacks) \
$(use_with jpeg) \
$(use_with new-login login-manager) \
$(use_with opengl gl) \
$(use_with pam) \
$(use_with suid setuid-hacks) \
$(use_with xinerama xinerama-ext) \
--enable-locking \
--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
--with-dpms-ext \
--with-gtk \
--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
--with-pixbuf \
--with-proc-interrupts \
--with-randr-ext \
--with-text-file="${EPREFIX}"/etc/gentoo-release \
--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
--with-xdbe-ext \
--with-xf86gamma-ext \
--with-xf86vmode-ext \
--with-xinput-ext \
--with-xshm-ext \
--without-gle \
--without-kerberos \
--x-includes="${EPREFIX}"/usr/include \
--x-libraries="${EPREFIX}"/usr/$(get_libdir)
}
src_install() {
emake install_prefix="${D}" install
dodoc README{,.hacking}
if use pam; then
fperms 755 /usr/bin/${PN}
pamd_mimic_system ${PN} auth
fi
rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
}