summaryrefslogtreecommitdiff
path: root/x11-misc/xscreensaver
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-12-16 21:37:19 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-12-16 21:37:19 +0000
commitcdda1ab7293bc67061befd2b34a4ed761e887042 (patch)
treede8e76bfa9ffd50c53fb3ad32c722257c030136b /x11-misc/xscreensaver
parent39fcd539b9eeb7df75bccad136265b5f001d1a3c (diff)
gentoo auto-resync : 16:12:2022 - 21:37:19
Diffstat (limited to 'x11-misc/xscreensaver')
-rw-r--r--x11-misc/xscreensaver/Manifest2
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch43
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild248
3 files changed, 293 insertions, 0 deletions
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 699110aa7218..6c995c66b19e 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -10,10 +10,12 @@ AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e
AUX xscreensaver-6.03-without-gl-configure.patch 541 BLAKE2B 42818f7ad82513cde5317c1c41c6d54a60a4abe14c98bfa3350b9b5be38141ab7b6c569eb03527ebdab577c87cbe91e1c7197b4bf49613e2a0a94f31420a018c SHA512 bd1b57143eb0a923b41c0d513649735700edd884d39bcb3f00f886d62c2bf94c1349327797008f5698cb8b44952b7517f218d03a12a7e6128c2790005752fd88
AUX xscreensaver-6.05-configure-exit-codes.patch 1179 BLAKE2B 7ed0bd31730bdf35278e5dc26ce9c96db6b56a094b246ce2ac0a5172a390033f00de2b8e6b25fcb0ea75131151ed19d26a7c8e2da275f1a337f15eda4ee402b3 SHA512 2db1841f485a4933837fc66d275b3516218a7c0757aad4f28cf38016aca2d4fd88138d3f94f86fb6fa42a487d10e7458760562a02fe8d2e5c534e2171cb9ca85
AUX xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch 891 BLAKE2B cbf7d70ced4992ca0090ff99436f817a98e255374c33f8596b7a39862a1b95c6b0740f8e91cb3ee41e904562b309a7f5c625f8ba3fddb9015d7642ff82aeff9c SHA512 9dd0156d7a13136c1959b82cf58b95c3a13583c770e24b44bca7e62104fedd1a25a46507bf804940e90ee2082013331a74fc0158f6ae6a5e36b7b280fd5d089d
+AUX xscreensaver-6.05-r2-configure-exit-codes.patch 1649 BLAKE2B 3846edb722f7b59d349d89608ca446971ec59d4179c461a28e9bb9cffd8c956c560993502d83564db49ca234cad7ce0a8dd978beae8016f07128e60db2c03746 SHA512 12e122672fbe6ee7058fb031300978a48501f21e69ad9bcd8fe745ce29f870d94524900dbc82bf8ba30f2989e1c6b8d380649ac26744b92536f1697e81fd4d90
AUX xscreensaver-6.05-remove-update-icon-cache.patch 368 BLAKE2B a595875f69e339a52f415e664be0524929c1b64ddfa8c80bb797379c08df0ef9860e6a5f3047d069084542eb81aff40470dfcf1db3dcb7e3515a0b986495a926 SHA512 7b797ae8b0cb8ec437f968e575bb3d9fdeab6bdf1f289302c1dabffad7276d4e73c8f03f10a4d8f8a0bedd223269e03c661187ea7c018f42cd11594454350d1d
AUX xscreensaver-6.05-teach-handsy-some-manners.patch 1820 BLAKE2B c94dbe895479b301d4bc57cf4a830b604c6b51fdf512656536c04a234e7be8f77c78ff4f91bec603ce70036b294c18d736c3b0ad9d3a14b49a627e5d1ccd6dd5 SHA512 06cbe07674a6902ca1467a72bf06f677693da0a030ecca7b880949406cfbf946ee42f5bb9daeefe4869cdad850d28b749e798b66ea890daf8c6f35c90eab9688
DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
EBUILD xscreensaver-6.01-r4.ebuild 5884 BLAKE2B e6e2b8f44c38c9c22181262b227bccc4fe16339c283de394de919670010ed1b0690681da990792162760ff93ff5090f9ffb2a01547c9abe25686d5726586ace9 SHA512 ded2ad6cf75c380f343b33d64ac2f3540b55fb3a91f640dd49d6f2cabae4634b17c124637e38a6ebd6425f1aeaf54092eb75f3787fbdf7f690e211f4960f3900
EBUILD xscreensaver-6.05-r1.ebuild 6690 BLAKE2B 4d5c0fd29121017dfa87729f20b098051cdc48682d9d47ae350b25e2ce30ec550b3e88e63a1714ca758c89ac7da0f2e7a827091dc0874e03d99390deceee7d75 SHA512 6197d3e5235600e398d052ce540f011266ec3a9493d30b8d772b9a4f75e82e1b53b9b0ba279042719a22bfe2687fd7eed02af6e00db66ae3980578d92ae7de81
+EBUILD xscreensaver-6.05-r2.ebuild 6790 BLAKE2B ed364c43ae523df1f13c2050bdc18dcfcfe42abc5d886f4d143fdc302391d166d14d14a79b9994c5ec2bf04133254cc8c955d08bbc68d6e202d87bda569fdc25 SHA512 28dd09f6749bea6a11ca19ef0376ef1fafa6e335da127ce2561c718b75e07d97692ca575b53875845853e7d3a011eea928681e3d413c88434582199ce4dcc82c
MISC metadata.xml 1346 BLAKE2B 1f3f0467a85b78d87dd72ab29c606e466ea903cfeedb2ee94e091ab628ad223ca40c5bfd1ccfe2652a561ad95904214963932f368b190affbe3aeccb8ea4a501 SHA512 918888b3144ba3dcab6469985279dc017420d1d8ede1a9e8509d97fef38513b7a828b4c298016270870e940f649a181f25e036d80352e05521300a89dbd28c7d
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch
new file mode 100644
index 000000000000..d69e5965ca2f
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch
@@ -0,0 +1,43 @@
+The configure scripts exits on a non zero exit code even with a warning. Even
+though for upstream this is just a warning, for portage this means failure and
+it will exit.
+We therefore alter the exit codes where neccesary.
+
+Bug: https://bugs.gentoo.org/885441
+
+Pascal Jäger <pascal.jaeger@leimstift.de> (2022-12-15)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -4588,7 +4588,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then
+ else
+ warnL "The GTK libraries do not seem to be available; the"
+ warn2 "\`xscreensaver-settings' program requires them."
+- CONF_STATUS=1
+ # echo ''
+ # warn2 'You can use Motif or Lesstif instead of GTK (use the'
+ # warn2 "\`--with-motif' option) but that is NOT recommended."
+@@ -4615,7 +4614,6 @@ if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then
+ warn "GTK is being used, but the GDK-Pixbuf library and/or"
+ warn2 "headers were not found. That can't be good. Please"
+ warn2 "install the GDK-Pixbuf development kit and re-configure."
+- CONF_STATUS=1
+ fi
+
+ if test "$have_motif" = yes -a "$have_lesstif" = yes ; then
+@@ -4714,7 +4712,6 @@ if test "$have_jpeg" = no ; then
+ warn2 "This means that it won't be possible for the image-manipulating"
+ warn2 "display modes to load files from disk; and it also means that"
+ warn2 "the \`webcollage' program will be much slower."
+- CONF_STATUS=1
+ else
+ warn2 "This means the \`webcollage' program will be much slower."
+ fi
+@@ -4733,7 +4730,6 @@ if test "$have_png" = no ; then
+
+ if test "$png_halfassed" = yes ; then halfassery ; fi
+ warn2 "Many things aren't going to work right."
+- CONF_STATUS=1
+ fi
+
+
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
new file mode 100644
index 000000000000..a8c07d03c410
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic font optfeature pam strip-linguas
+
+DESCRIPTION="Modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+# clacon.ttf -- MIT
+# gallant12x22.ttf -- unclear, hence dropped
+# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
+# OCRAStd.otf -- unclear, hence dropped
+# SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive pam +perl +png selinux suid systemd xinerama"
+REQUIRED_USE="
+ gles? ( !glx )
+ ?? ( elogind systemd )
+ gtk? ( gdk-pixbuf )
+ pam? ( locking )
+"
+
+COMMON_DEPEND="
+ >=dev-libs/libxml2-2.4.6
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXt
+ x11-libs/libXxf86vm
+ elogind? ( sys-auth/elogind )
+ gdk-pixbuf? (
+ x11-libs/gdk-pixbuf-xlib
+ >=x11-libs/gdk-pixbuf-2.42.0:2
+ )
+ gtk? ( >=x11-libs/gtk+-2.22.0:3 )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ locking? ( virtual/libcrypt:= )
+ new-login? (
+ gdm? ( gnome-base/gdm )
+ !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+ )
+ virtual/glu
+ virtual/opengl
+ pam? ( sys-libs/pam )
+ png? ( media-libs/libpng:= )
+ systemd? ( >=sys-apps/systemd-221 )
+ >=x11-libs/libXft-2.1.0
+ xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+ ${COMMON_DEPEND}
+ media-gfx/fbida
+ perl? (
+ dev-lang/perl
+ dev-perl/libwww-perl
+ virtual/perl-Digest-MD5
+ )
+ selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bc
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.01-interix.patch
+ "${FILESDIR}"/${PN}-5.31-pragma.patch
+ "${FILESDIR}"/${PN}-6.01-gentoo.patch
+ "${FILESDIR}"/${PN}-5.45-gcc.patch
+ "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+ "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+ "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+ "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
+ "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
+ "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
+ "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
+ "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
+)
+
+DOCS=( README{,.hacking} )
+
+src_prepare() {
+ default
+
+ sed -i configure.ac -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{,.ac} || die
+ fi
+
+ # We are patching driver/XScreenSaver.ad.in, so let's delete the
+ # header generated from it so that it gets back in sync during build:
+ rm driver/XScreenSaver_ad.h || die
+
+ if ! use offensive; then
+ sed -i \
+ -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+ hacks/barcode.c || die
+ sed -i \
+ -e 's|erect penis|shuffle board|g' \
+ -e 's|flaccid penis|flaccid anchor|g' \
+ -e 's|vagina|engagement ring|g' \
+ -e 's|Penis|Shuttle|g' \
+ hacks/glx/glsnake.c || die
+ sed -i \
+ 's| Stay.*fucking mask\.$||' \
+ hacks/glx/covid19.man \
+ hacks/config/covid19.xml || die
+ eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch"
+ fi
+
+ config_rpath_update "${S}"/config.rpath
+
+ # Must be eauto*re*conf, to force the rebuild
+ eautoreconf
+}
+
+src_configure() {
+ if use ppc || use ppc64; then
+ filter-flags -maltivec -mabi=altivec
+ append-flags -U__VEC__
+ fi
+
+ unset BC_ENV_ARGS #24568
+
+ # /proc/interrupts won't always have the keyboard bits needed
+ # Not clear this does anything in 6.03+(?) but let's keep it for now in case.
+ # (See also: configure argument)
+ export ac_cv_have_proc_interrupts=yes
+
+ # WARNING: This is NOT a normal autoconf script
+ # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X"
+ ECONF_OPTS=(
+ $(use_enable locking)
+ $(use_with elogind)
+ $(use_with gdk-pixbuf pixbuf)
+ $(use_with gles)
+ $(use_with glx)
+ $(use_with gtk)
+ $(use_with new-login login-manager)
+ $(use_with pam)
+ $(use_with suid setuid-hacks)
+ $(use_with systemd)
+ $(use_with xinerama xinerama-ext)
+ --with-jpeg=$(usex jpeg yes no)
+ --with-png=$(usex png yes no)
+ --with-xft=yes
+ --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults
+ --with-configdir="${EPREFIX}"/usr/share/${PN}/config
+ --with-dpms-ext
+ --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN}
+ --with-proc-interrupts
+ --with-randr-ext
+ --with-text-file="${EPREFIX}"/etc/gentoo-release
+ --with-xdbe-ext
+ --with-xf86gamma-ext
+ --with-xf86vmode-ext
+ --with-xinput-ext
+ --with-xkb-ext
+ --with-xshm-ext
+ --without-gle
+ --without-kerberos
+ --without-motif
+ --with-proc-oom
+ --x-includes="${EPREFIX}"/usr/include
+ --x-libraries="${EPREFIX}"/usr/$(get_libdir)
+ )
+ # WARNING: This is NOT a normal autoconf script
+ econf "${ECONF_OPTS[@]}"
+}
+
+src_compile() {
+ # stock target is "default", which is broken in some releases.
+ emake all
+}
+
+src_install() {
+ use pam && dodir /etc/pam.d/
+ emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install
+
+ if use fonts; then
+ # Do not install fonts with unclear licensing
+ rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+
+ # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
+ rm -v "${ED}${FONTDIR}"/luximr.ttf || die
+
+ font_xfont_config
+ else
+ rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
+ rmdir -v "${ED}${FONTDIR}" || die #812473
+ fi
+
+ einstalldocs
+
+ if use pam; then
+ fperms 755 /usr/bin/${PN}
+ pamd_mimic_system ${PN} auth
+ fi
+
+ # bugs #809599, #828869
+ if ! use gtk; then
+ rm "${ED}/usr/bin/xscreensaver-demo" || die
+ fi
+ # Makefile installs xscreensaver.service regardless of --without-systemd
+ if ! use systemd; then
+ rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
+ fi
+
+ # bug #885989
+ fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth
+}
+
+pkg_postinst() {
+ use fonts && font_pkg_postinst
+
+ # bug #811885
+ if ! use glx; then
+ elog "Enable USE='glx' if OpenGL screensavers are crashing."
+ fi
+
+ optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+ optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+ optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
+}
+
+pkg_postrm() {
+ use fonts && font_pkg_postrm
+}