From 0ded23e9afc3d3424aef90e5cec3f2ca6d6b4c30 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 13 Dec 2023 11:40:30 +0000 Subject: gentoo auto-resync : 13:12:2023 - 11:40:30 --- x11-misc/xscreensaver/Manifest | 2 + x11-misc/xscreensaver/xscreensaver-6.08.ebuild | 279 +++++++++++++++++++++++++ 2 files changed, 281 insertions(+) create mode 100644 x11-misc/xscreensaver/xscreensaver-6.08.ebuild (limited to 'x11-misc/xscreensaver') diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 92a36ada470b..3200d2c9acdb 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -21,8 +21,10 @@ DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B 48c2766ff5879b77f521d DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1 SHA512 988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5 DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834 BLAKE2B 57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4 SHA512 6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3 DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221 SHA512 abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5 +DIST xscreensaver-6.08.tar.gz 19990058 BLAKE2B 1dd13a656471335663738e677dd1b367ab1114ba91e65868ad2a1d8ebe95b16ff0311c2b69a2a5409ebdea68451d5e6cb507a66a5fb641921a469b8e69ec6b2d SHA512 a333d4921ed3a8219f3b672dd68543aea31fcd64ea6766143f1c7f6e5ed3bc7122355635d5afba1632457ad71a11cabdc7b2756431e4f1dc7e0426ae0896e6db EBUILD xscreensaver-6.05-r1.ebuild 6649 BLAKE2B 891003977a93c676505dcba1f38f4ee8225752cadcebd7c33c92a12a2df12c8950c86e16c2a756eb4dd9ec4b065ff061b65f993e0e71ddc06cd2b3974b45e118 SHA512 16f0aaf70d59747e0666fb3e0e3f5c4b69d672050ed2fcdcc57e90fea5530be416257245a7c1c352929522800204b436e81f97630b264afb993b571535de9c3e EBUILD xscreensaver-6.05-r2.ebuild 6744 BLAKE2B a7409658c267346f93d40ce61a1d186e0797f911ebf8c7700f95ef95e8b08f2e4238b9b2ff7f5d5cb6b2819b26c8d0d8c1061812d11554b14a5a33fbc8792e77 SHA512 20ccf63d1b987d9a969d121dded4bc55f6daa4a597ad3f0cb162ee4a94fa24239c17b9493d2112f42e805a89d5872d03df154865ee7d09a45f9e7dfef86dba4a EBUILD xscreensaver-6.06-r2.ebuild 7381 BLAKE2B 305d9c0dd9a5bdb284cd4f92cbb7f40bc4ff257592e431d4ecb585c837aaf735cfc627fe198d5b17c4f9ab2af36b3bcded4e637ea8389b747a4efa2cf03cc3c0 SHA512 701e99c9d4d8814c71fda838cb5e897022cf38adcb75a9b6a2560a12cd11f88ac2f8b7d4cf45c158cbe0f4eb7d1a13bf895400b97a46b4d138866c9d7fe715c5 EBUILD xscreensaver-6.07-r2.ebuild 7829 BLAKE2B 32f905e153ff67b8b425fc48be9e91160229c99bdde5550dc78f418e10b2e7999154adc8a09904a2462a69969940843a64cea4c2197d7f949a343e46df7a1f1e SHA512 88f641e3830c15b06ddaf74a980072ca27fb83b270fc717120e6d658fddd9e7c91f597a15d50798afb58768ad0c513cb11b7ab1402896869d0408b245af86843 +EBUILD xscreensaver-6.08.ebuild 7836 BLAKE2B 3c0f6392a65984e80798e6b9f0041ef6025f36cc758dcc661c1990294e2546ef9f38f9defb7848a7d094a4f4b1d647e90c370d761fb8401bd6d376197a8bbbb7 SHA512 75c827b2f1d9c0a51f92ffff2089d3652e3daccc6130bd3b304d55ab60da7ab981cf2f10baa5e2e54b63a7a11f37a5cc9890c08e7e292b56e975d8c4215534e7 MISC metadata.xml 1451 BLAKE2B 052182f01632e8179ad1d6fe358a823384284776cc90eaa6413b809744783b31f7d8fc8ddefa03e66a691ad11aab967db3fb400290f813cb7eff2dab149f45cb SHA512 d4abaebc08315a90d2c68baf08b307989d4fc8efc4606b151ae3d94311c64ebe13253f572845cc5a8e1e30d1bbccf3d0b16c74376d5ff61de1f1ecb1030099a8 diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild new file mode 100644 index 000000000000..29fc6c4aacc4 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2023 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 systemd xdg-utils + +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}.tar.gz + logind-idle-hint? ( + https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch -> + ${PN}-6.06-logind-idle-hint.patch + ) + systemd? ( + https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch -> + ${PN}-6.07-xscreensaver.service-start-with-no-splash.patch + ) +" + +# 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 ) systemd? ( ISC )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" +REQUIRED_USE=" + gles? ( !glx ) + ?? ( elogind systemd ) + pam? ( locking ) + logind-idle-hint? ( || ( elogind systemd ) ) +" + +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 ) + x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 + >=x11-libs/gtk+-3.0.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 ) + 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}-5.31-pragma.patch + "${FILESDIR}"/${PN}-6.01-gentoo.patch + "${FILESDIR}"/${PN}-6.07-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 + "${FILESDIR}"/${PN}-6.07-allow-no-pam.patch + "${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch +) + +DOCS=( README{,.hacking} ) + +# see https://bugs.gentoo.org/898328 +QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow ) + +src_prepare() { + default + + # bug #896440 + mv po/ca.po po/ca.po.old || die + iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die + + sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die + + if use systemd; then + # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver." + # after "systemctl --user enable xscreensaver". + sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \ + driver/xscreensaver.service.in || die + + eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch" + fi + + 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 + + if use logind-idle-hint; then + eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.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) + --with-pixbuf + $(use_with gles) + $(use_with glx) + --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=yes + --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 || 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 -rfv "${ED}${FONTDIR}" || die #812473 + fi + + einstalldocs + + if use pam; then + fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + fi + + if use systemd; then + systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service" + fi + # Makefile installs xscreensaver.service regardless of + # --without-systemd, and if USE=systemd, we will have installed the + # unit file already. + rm "${ED}/usr/share/${PN}/xscreensaver.service" || die + + # 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 + + xdg_icon_cache_update +} + +pkg_postrm() { + use fonts && font_pkg_postrm + xdg_icon_cache_update +} -- cgit v1.2.3