* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
@ 2024-05-05 9:39 Florian Schmaus
0 siblings, 0 replies; 11+ messages in thread
From: Florian Schmaus @ 2024-05-05 9:39 UTC (permalink / raw
To: gentoo-commits
commit: dbb5b85606e7b84f798ff349b84b864101f8c1c4
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun May 5 09:32:01 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun May 5 09:39:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb5b856
x11-misc/xscreensaver: drop old, add 6.08-r1
Drop a few old xscreensaver release and add 6.08-r1 that re-enables a
bunch of patches that were previously commented out starting with 6.06,
likely by accident in a4ee1e6e498f ("x11-misc/xscreensaver: add 6.06").
Also drop xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch as
it is now fixed upstream.
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
x11-misc/xscreensaver/Manifest | 2 -
.../xscreensaver/files/xscreensaver-5.45-gcc.patch | 16 --
...er-6.05-get-dirs-from-gtk3.0-in-configure.patch | 27 ---
x11-misc/xscreensaver/metadata.xml | 1 -
x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild | 243 --------------------
x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild | 247 ---------------------
...-6.06-r2.ebuild => xscreensaver-6.08-r1.ebuild} | 46 ++--
7 files changed, 29 insertions(+), 553 deletions(-)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index da4b46865a29..141e72c223b5 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,6 +1,4 @@
-DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B 48c2766ff5879b77f521d17f08452c84a9c926fabba932a02d02615808f6f2503ed2be4bbfd71f21152ba833c7f4cc0d672cdc219b82729963d6d357c6198682 SHA512 fd9848843c43a5eb07007e5cca21ad1517cce1e3ebecd9d678bb6287b9b7f80eee0751b5789f2ed9fb5e0cefa2430ac9d9657aade724d70c6457cce3df1f6ea3
-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
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch
deleted file mode 100644
index b62fd1f309e3..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -468,11 +468,11 @@
-
- AC_DEFUN([AC_CHECK_GCC_ARG],
- [if test -n "$GCC"; then
-- AC_CACHE_CHECK([whether gcc accepts [$2]],
-+ AC_CACHE_CHECK([whether [$CC] accepts [$2]],
- ac_cv_gcc_accepts_[$1],
- [rm -rf conftest.$ac_ext
- touch conftest.$ac_ext
-- if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
-+ if ( ( $CC -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
- grep unrecognized >/dev/null ); then
- ac_cv_gcc_accepts_[$1]=no
- else
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
deleted file mode 100644
index 4147540e1189..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Even though xscreensaver now uses GTK+3 instead of GTK+2 since version 6.05
-it still gets its directories from GTK+2 which results in an empty prefix
-when GTK+2 is not installed.
-
-Bug: https://bugs.gentoo.org/878875
-
-Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -2822,7 +2822,7 @@ if test "$with_gtk" = yes; then
-
- GTK_DATADIR=""
- if test "$have_gtk" = yes; then
-- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
-+ GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
- GTK_DATADIR="$GTK_DATADIR/share"
- fi
-
-@@ -4282,6 +4282,6 @@ AC_MSG_CHECKING([for locale directory])
- if test -n "$GTK_DATADIR" ; then
- PO_DATADIR="$GTK_DATADIR"
- elif test "$have_gtk" = yes; then
-- PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
-+ PO_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
- PO_DATADIR="$PO_DATADIR/share"
- fi
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 9963b899eb86..68803a1d6b15 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -17,7 +17,6 @@
</upstream>
<use>
<flag name="fonts">Install the fonts shipped with XScreenSaver that have clear licensing</flag>
- <flag name="gdk-pixbuf">Include support for the <pkg>x11-libs/gdk-pixbuf</pkg> library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well</flag>
<flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
<flag name="gles" restrict=">=x11-misc/xscreensaver-6.0.2">Emulate OpenGL 1.3 in terms of OpenGL ES 1.x</flag>
<flag name="glx" restrict=">=x11-misc/xscreensaver-6.0.2">Use GLX to interface OpenGL and X11 instead of EGL</flag>
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
deleted file mode 100644
index a5ae58707410..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2024 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 png ) )
-"
-
-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
- app-alternatives/bc
- sys-devel/gettext
- virtual/pkgconfig
-"
-PATCHES=(
- "${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-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
-}
-
-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
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
deleted file mode 100644
index 8d3e14908a05..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2024 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
- app-alternatives/bc
- sys-devel/gettext
- virtual/pkgconfig
-"
-PATCHES=(
- "${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
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
similarity index 83%
rename from x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
index fc7dab387fcf..a044a8b3bf9b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
@@ -13,6 +13,10 @@ SRC_URI="
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:
@@ -21,9 +25,9 @@ SRC_URI="
# 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 )"
+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"
+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 )
@@ -84,17 +88,16 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-5.31-pragma.patch
"${FILESDIR}"/${PN}-6.01-gentoo.patch
- "${FILESDIR}"/${PN}-5.45-gcc.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-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.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.06-service-remove-Alias-org.jwz.xscreensav.patch
- "${FILESDIR}"/${PN}-6.06-service-start-xscreensaver-with-no-splash.patch
+ "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
+ "${FILESDIR}"/${PN}-6.07-allow-no-pam.patch
+ "${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch
)
DOCS=( README{,.hacking} )
@@ -105,7 +108,21 @@ 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}"
@@ -211,15 +228,14 @@ src_install() {
if use fonts; then
# Do not install fonts with unclear licensing
- rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+ 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 -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
- rmdir -v "${ED}${FONTDIR}" || die #812473
+ rm -rfv "${ED}${FONTDIR}" || die #812473
fi
einstalldocs
@@ -229,10 +245,6 @@ src_install() {
pamd_mimic_system ${PN} auth
fi
- # bugs #809599, #828869
- #if ! use gtk; then
- # rm "${ED}/usr/bin/xscreensaver-demo" || die
- #fi
if use systemd; then
systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service"
fi
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
@ 2023-08-09 8:30 Florian Schmaus
0 siblings, 0 replies; 11+ messages in thread
From: Florian Schmaus @ 2023-08-09 8:30 UTC (permalink / raw
To: gentoo-commits
commit: ca9cc379aca25f6026c1592ac1c311d5a85899a9
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 9 08:30:29 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Aug 9 08:30:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca9cc379
x11-misc/xscreensaver: xscreensaver.service fixes
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
...06-service-remove-Alias-org.jwz.xscreensav.patch | 18 ++++++++++++++++++
...-service-start-xscreensaver-with-no-splash.patch | 21 +++++++++++++++++++++
...r-6.06-r1.ebuild => xscreensaver-6.06-r2.ebuild} | 2 ++
3 files changed, 41 insertions(+)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
new file mode 100644
index 000000000000..454a9a7dd6bf
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
@@ -0,0 +1,18 @@
+From f275dd14752d9dc6a2159008490c68bf968be025 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sat, 29 Jul 2023 11:52:22 +0200
+Subject: xscreensaver.service: remove Alias=org.jwz.xscreensaver
+
+$ systemctl --user enable xscreensaver
+Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver.
+--- a/driver/xscreensaver.service.in
++++ b/driver/xscreensaver.service.in
+@@ -14,5 +14,4 @@ Restart=on-failure
+ OOMScoreAdjust=-1000
+
+ [Install]
+-Alias=org.jwz.xscreensaver
+ WantedBy=default.target
+--
+2.41.0
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
new file mode 100644
index 000000000000..ec4f85d373f9
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
@@ -0,0 +1,21 @@
+From d2ad34b94c01b4e41cac6c6181d2ee0cf332c583 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sat, 29 Jul 2023 11:51:45 +0200
+Subject: xscreensaver.service: start xscreensaver with --no-splash
+
+Prevents the splash screen being shown when the user logs in.
+
+--- a/driver/xscreensaver.service.in
++++ b/driver/xscreensaver.service.in
+@@ -9,7 +9,7 @@ ConditionUser=!@system
+ Conflicts=org.gnome.ScreenSaver org.cinnamon.ScreenSaver org.mate.ScreenSaver org.xfce.ScreenSaver light-locker
+
+ [Service]
+-ExecStart=/usr/bin/xscreensaver
++ExecStart=/usr/bin/xscreensaver --no-splash
+ Restart=on-failure
+ OOMScoreAdjust=-1000
+
+--
+2.41.0
+
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
similarity index 97%
rename from x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
index 48ddc842e1b5..a3b38814fc7b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
@@ -86,6 +86,8 @@ PATCHES=(
"${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.06-service-remove-Alias-org.jwz.xscreensav.patch
+ "${FILESDIR}"/${PN}-6.06-service-start-xscreensaver-with-no-splash.patch
)
DOCS=( README{,.hacking} )
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
@ 2022-10-31 17:32 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2022-10-31 17:32 UTC (permalink / raw
To: gentoo-commits
commit: 964a1629b70ecd13442bf87c7db23ac3b5752c17
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Mon Oct 31 16:31:22 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 17:32:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=964a1629
x11-misc/xscreensaver: revbump, get install dirs from GTK3 instead of GTK2
Closes: https://bugs.gentoo.org/878875
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
...er-6.05-get-dirs-from-gtk3.0-in-configure.patch | 27 ++++++++++++++++++++++
...ver-6.05.ebuild => xscreensaver-6.05-r1.ebuild} | 1 +
2 files changed, 28 insertions(+)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
new file mode 100644
index 000000000000..c624c8046026
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
@@ -0,0 +1,27 @@
+Even though xscreensaver now uses GTK+3 instead of GTK+2 since version 6.05
+it still gets its directories from GTK+2 which results in an empty prefix
+when GTK+2 is not installed.
+
+Bug: https://bugs.gentoo.org/878875
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/configure
++++ b/configure
+@@ -16035,7 +16035,7 @@ printf "%s\n" "$ac_cv_gtk_config_libs" >&6; }
+
+ GTK_DATADIR=""
+ if test "$have_gtk" = yes; then
+- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
++ GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
+ GTK_DATADIR="$GTK_DATADIR/share"
+ fi
+
+@@ -21440,6 +21440,6 @@ printf %s "checking for locale directory... " >&6; }
+ if test -n "$GTK_DATADIR" ; then
+ PO_DATADIR="$GTK_DATADIR"
+ elif test "$have_gtk" = yes; then
+- PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
++ PO_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
+ PO_DATADIR="$PO_DATADIR/share"
+ fi
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
similarity index 99%
rename from x11-misc/xscreensaver/xscreensaver-6.05.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index 9a1a99c055ec..b751510dba2d 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -88,6 +88,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
"${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
"${FILESDIR}"/${PN}-6.05-configure-exit-codes.patch
+ "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
)
DOCS=( README{,.hacking} )
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
@ 2021-06-14 10:18 Sebastian Pipping
0 siblings, 0 replies; 11+ messages in thread
From: Sebastian Pipping @ 2021-06-14 10:18 UTC (permalink / raw
To: gentoo-commits
commit: f98fd90d3276407a021879491e05d53b43827c3c
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 10:16:57 2021 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 10:18:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98fd90d
x11-misc/xscreensaver: Fix compilation for USE=-opengl
Closes: https://bugs.gentoo.org/795891
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3
.../xscreensaver-6.01-without-gl-makefile.patch | 28 ++++++++++++++++++++++
x11-misc/xscreensaver/xscreensaver-6.01.ebuild | 1 +
2 files changed, 29 insertions(+)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
new file mode 100644
index 00000000000..c98d5297e9b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
@@ -0,0 +1,28 @@
+From fa531a3ff2dd8aa4e0b6767e3390f88bfbaca791 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 14 Jun 2021 12:11:32 +0200
+Subject: [PATCH] hacks/glx/Makefile.in: Fix target install-program for
+ --without-gl
+
+Symptom was:
+/usr/bin/install: cannot stat 'sonar': No such file or directory
+---
+ hacks/glx/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
+index ed07a1f..6ae969c 100644
+--- a/hacks/glx/Makefile.in
++++ b/hacks/glx/Makefile.in
+@@ -320,7 +320,7 @@ install-program:: $(EXES)
+ $(INSTALL_PROGRAM) $$program $$idir/$$program ; \
+ done ; \
+ \
+- exes="$(SUID_EXES)" ; \
++ exes="@SUID_EXES@" ; \
+ if [ @SETUID_HACKS@ = yes ]; then \
+ sinst="$(INSTALL_SETUID)" ; \
+ else \
+--
+2.31.1
+
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
index 98a77ac0e73..a3c8734ec8e 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
"${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
)
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
@ 2021-06-14 0:53 Sebastian Pipping
0 siblings, 0 replies; 11+ messages in thread
From: Sebastian Pipping @ 2021-06-14 0:53 UTC (permalink / raw
To: gentoo-commits
commit: 57a31e4b1f4d63318c13dc98cb9dfa8d5e3e5594
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 00:42:55 2021 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 00:50:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a31e4b
x11-misc/xscreensaver: 6.01
Thanks to José María Fernández González for his help!
Closes: https://bugs.gentoo.org/788865
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3
x11-misc/xscreensaver/Manifest | 1 +
.../xscreensaver-6.01-configure.ac-sandbox.patch | 120 +++++++++++++
.../files/xscreensaver-6.01-gentoo.patch | 47 +++++
.../files/xscreensaver-6.01-interix.patch | 30 ++++
x11-misc/xscreensaver/metadata.xml | 1 +
x11-misc/xscreensaver/xscreensaver-6.01.ebuild | 198 +++++++++++++++++++++
6 files changed, 397 insertions(+)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 2a8cc3823af..237089b7aff 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1 +1,2 @@
DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
+DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch
new file mode 100644
index 00000000000..fe56f927e20
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch
@@ -0,0 +1,120 @@
+From 0f4d029102c651ccbc69860bf222126d2c58e36e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 13 Jun 2021 23:41:42 +0200
+Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on
+ Gentoo
+
+---
+ configure.ac | 96 ----------------------------------------------------
+ 1 file changed, 96 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9b8641e..2eaea28 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4833,102 +4833,6 @@ for bad_choice in xscreensaver xscreensaver-settings xscreensaver-command ; do
+ done
+
+
+-# Warn if there's a previous RPM package installed.
+-
+-rpm_vers=
+-if test -z "$RPM_PACKAGE_VERSION" ; then
+- # Don't bother with this test if we are currently *building* an RPM.
+- rpmnames="xscreensaver xscreensaver-base xscreensaver-extras
+- xscreensaver-data xscreensaver-data-extra"
+-
+- # M4 sucks!!
+- changequote(X,Y)
+- pkg_vers=`(rpm -qv $rpmnames) 2>&- | \
+- sed -n 's/^[-a-z]*-\([0-9][0-9]*[.].*\)/\1/p' | head -1`
+- rpm_vers="$pkg_vers"
+- changequote([,])
+-fi
+-
+-if test \! -z "$rpm_vers" ; then
+-
+- # M4 sucks!!
+- changequote(A,B)
+- pkg_bindir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p'`
+- pkg_bindir2=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
+- pkg_hackdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+- pkg_confdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+- pkg_fontdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1`
+- pkg_addir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'`
+-
+- if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi
+- changequote([,])
+-fi
+-
+-
+-# Warn if there's a previous Debian package installed.
+-#
+-deb_vers=
+-if test -z "$pkg_vers" ; then
+- debnames="xscreensaver xscreensaver-data xscreensaver-data-extra"
+- pkg_vers=''
+- for dpkg in $debnames ; do
+- if test -z "$pkg_vers"; then
+- pkg_vers=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'`
+- deb_vers="$pkg_vers"
+- fi
+- done
+-fi
+-
+-if test \! -z "$deb_vers" ; then
+-
+- # M4 sucks!!
+- changequote(A,B)
+- pkg_bindir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p'`
+- pkg_bindir2=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
+- pkg_hackdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+- pkg_confdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+- pkg_fontdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1`
+- pkg_addir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'`
+- changequote([,])
+-
+- if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi
+-fi
+-
+-bindir_err=
+-hackdir_err=
+-confdir_err=
+-fontdir_err=
+-addir_err=
+-if ! test -z "$pkg_vers" ; then
+-
+- err=" (DIFFERS)"
+-
+- if test -z "$pkg_bindir" ; then pkg_bindir='???'
+- elif test "$pkg_bindir" != "${bindir}/" ; then bindir_err="$err" ; fi
+-
+- if test -z "$pkg_hackdir" ; then pkg_hackdir='???'
+- elif test "$pkg_hackdir" != "${HACKDIR}/" ; then hackdir_err="$err"; fi
+-
+- if test -z "$pkg_confdir" ; then pkg_confdir='???'
+- elif test "$pkg_confdir" != "${HACK_CONF_DIR}/" ; then confdir_err="$err"; fi
+-
+- if test -z "$pkg_fontdir" ; then pkg_fontdir='none'
+- elif test "$pkg_fontdir/" != "${FONT_DIR}" ; then fontdir_err="$err"; fi
+-
+- if test -z "$pkg_addir" ; then pkg_addir='???'
+- elif test "$pkg_addir" != "${APPDEFAULTS}/" ; then addir_err="$err" ; fi
+-
+- warning=no
+- warnL "There is already an installed package of xscreensaver"
+- warn2 "version \"$pkg_vers\", in these directories:"
+- echo ""
+- warn2 "User programs: $pkg_bindir$bindir_err"
+- warn2 "Screen savers: $pkg_hackdir$hackdir_err"
+- warn2 "Configuration: $pkg_confdir$confdir_err"
+- warn2 "Extra fonts: $pkg_fontdir$fontdir_err"
+- warn2 "App Defaults: $pkg_addir$addir_err"
+-fi
+-
+ echo ""
+ echo "$warnsep"
+ echo ""
+--
+2.31.1
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch
new file mode 100644
index 00000000000..41f8d7b7d08
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch
@@ -0,0 +1,47 @@
+--- 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
+ *fade: True
+ *unfade: True
+@@ -62,7 +62,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
+
+ ! This is what the "Settings" button on the splash screen runs.
+ *demoCommand: xscreensaver-settings
+@@ -103,7 +103,8 @@
+
+
+ ! The strftime(3) format string for printing the time on the password dialog.
+-*dateFormat: %I:%M %p, %a %b %e
++!*dateFormat: %I:%M %p, %a %b %e
++*dateFormat: %x %X
+ ! DD MMM:
+ ! *dateFormat: %I:%M %p, %e %b (%a)
+ ! 12 hour time only:
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
new file mode 100644
index 00000000000..72aa6535f13
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
@@ -0,0 +1,30 @@
+diff -Nru a/driver/prefsw.c b/driver/prefsw.c
+--- a/driver/prefsw.c 2021-02-19 02:52:32.000000000 +0100
++++ b/driver/prefsw.c 2021-05-07 15:20:09.280321274 +0200
+@@ -798,7 +798,10 @@
+ sure that the bits actually land on the disk right away. */
+ /* Update 2020: Apparently here in the future, this sometimes takes
+ 3+ seconds, so let's not. */
++/* Interix has no sync() or alike. */
++#ifndef __INTERIX
+ /* sync(); */
++#endif
+
+ status = 0; /* wrote and renamed successfully! */
+ }
+diff -Nru a/driver/setuid.c b/driver/setuid.c
+--- a/driver/setuid.c 2021-02-05 16:16:23.000000000 +0100
++++ b/driver/setuid.c 2021-05-07 15:21:05.987949943 +0200
+@@ -104,9 +104,12 @@
+ if (uid == (uid_t) -1) uid = (uid_t) -2;
+
+ errno = 0;
++
++#ifndef __INTERIX
+ if (setgroups_needed_p (gid) &&
+ setgroups (1, &gid) < 0)
+ sgs_errno = errno ? errno : -1;
++#endif
+
+ errno = 0;
+ if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 8893ad3c39c..31e771cd6ac 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -9,6 +9,7 @@
</maintainer>
</upstream>
<use>
+ <flag name="fonts">Install the fonts shipped with XScreenSaver that have clear licensing</flag>
<flag name="gdk-pixbuf">Include support for the <pkg>x11-libs/gdk-pixbuf</pkg> library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well</flag>
<flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
<flag name="locking">Compile in support for locking the display</flag>
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
new file mode 100644
index 00000000000..98a77ac0e73
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic font multilib optfeature pam
+
+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"
+
+# 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+ gdk-pixbuf? ( gtk )
+ elogind? ( !systemd )
+"
+
+COMMON_DEPEND="
+ dev-libs/libxml2
+ media-libs/netpbm
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXi
+ x11-libs/libXmu
+ 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 )
+ 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 )
+ systemd? ( >=sys-apps/systemd-221 )
+ 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}
+ dev-util/intltool
+ sys-devel/bc
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+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
+)
+
+src_prepare() {
+ 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
+
+ default
+
+ # 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
+ fi
+
+ 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
+
+ econf \
+ $(use_enable locking) \
+ $(use_with elogind) \
+ $(use_with gdk-pixbuf pixbuf) \
+ $(use_with gtk) \
+ $(use_with jpeg) \
+ $(use_with new-login login-manager) \
+ $(use_with opengl gl) \
+ $(use_with pam) \
+ $(use_with suid setuid-hacks) \
+ $(use_with systemd) \
+ $(use_with xinerama xinerama-ext) \
+ --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-xshm-ext \
+ --without-gle \
+ --without-kerberos \
+ --without-motif \
+ --x-includes="${EPREFIX}"/usr/include \
+ --x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+ emake install_prefix="${D}" 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
+ fi
+
+ 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
+}
+
+pkg_postinst() {
+ use fonts && font_pkg_postinst
+
+ 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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
@ 2021-03-16 0:16 Sebastian Pipping
0 siblings, 0 replies; 11+ messages in thread
From: Sebastian Pipping @ 2021-03-16 0:16 UTC (permalink / raw
To: gentoo-commits
commit: a280a38195993da6ee358ff7aa0cf9ccf96bfd06
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 00:14:47 2021 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 00:16:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a280a381
x11-misc/xscreensaver: Fix sandbox issues for 5.45
Closes: https://bugs.gentoo.org/775683
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.17, Repoman-3.0.2
.../xscreensaver-5.45-configure.ac-sandbox.patch | 146 +++++++++++++++++++++
x11-misc/xscreensaver/xscreensaver-5.45.ebuild | 1 +
2 files changed, 147 insertions(+)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
new file mode 100644
index 00000000000..cee3a30897f
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
@@ -0,0 +1,146 @@
+From 6e4e7c657f6628109c9809561f2c5d7bf51c8c8e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 16 Mar 2021 00:55:54 +0100
+Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on
+ Gentoo
+
+---
+ configure.ac | 115 ---------------------------------------------------
+ 1 file changed, 115 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 603b993..6ef2631 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3917,25 +3917,6 @@ for d in /usr/share/fonts/X11 \
+ done
+ AC_MSG_RESULT($have_bitmap_fonts)
+
+-# In case we didn't guess the font directory properly, check RPMs and DEBs too.
+-if test $have_bitmap_fonts != yes ; then
+- for r in 100dpi 75dpi ; do
+- for f in xfonts-$r \
+- xorg-x11-fonts-$r \
+- xorg-x11-fonts-ISO8859-1-$r \
+- ; do
+- if test $have_bitmap_fonts != yes ; then
+- AC_MSG_CHECKING(for $f)
+- if ( rpm -q "$f" 2>&- >&- ) ||
+- ( dpkg -s "$f" 2>&- | grep -q '^Status:.*installed' ) ; then
+- have_bitmap_fonts=yes
+- fi
+- AC_MSG_RESULT($have_bitmap_fonts)
+- fi
+- done
+- done
+-fi
+-
+
+ ###############################################################################
+ #
+@@ -4876,102 +4857,6 @@ for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command ; do
+ fi
+ done
+
+-
+-# 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
+-
+- # M4 sucks!!
+- changequote(A,B)
+- rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
+- rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+- rpmcdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+- rpmadir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'`
+- changequote([,])
+-
+- err=" (DIFFERS)"
+- if test -z "$rpmbdir" ; then rpmbdir='???'
+- elif test "$rpmbdir" != "${bindir}/" ; then rpmbdir="$rpmbdir$err";fi
+-
+- if test -z "$rpmhdir" ; then rpmhdir='???'
+- elif test "$rpmhdir" != "${HACKDIR}/" ; then rpmhdir="$rpmhdir$err";fi
+-
+- if test -z "$rpmcdir" ; then rpmcdir='???'
+- elif test "$rpmcdir" != "${HACK_CONF_DIR}/"; then rpmcdir="$rpmcdir$err";fi
+-
+- if test -z "$rpmadir" ; then rpmadir='???'
+- elif test "$rpmadir" != "${APPDEFAULTS}/" ; then rpmadir="$rpmadir$err";fi
+-
+- warning=no
+- warnL "There is already an installed RPM of xscreensaver"
+- warn2 "version \"$rpmv\" on this system."
+- echo ""
+- warn2 "It is currently installed in these directories:"
+- echo ""
+- warn2 "User programs: $rpmbdir$berr"
+- warn2 "Screen savers: $rpmhdir$herr"
+- warn2 "Configuration: $rpmcdir$cerr"
+- warn2 "App Defaults: $rpmadir$aerr"
+- fi
+-fi
+-
+-# Also warn if there's a Debian package installed.
+-#
+-debnames="xscreensaver xscreensaver-data xscreensaver-data-extra"
+-debv=''
+-for dpkg in $debnames ; do
+- if test -z "$debv"; then
+- debv=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'`
+- fi
+-done
+-
+-if test \! -z "$debv" ; then
+-
+- # M4 sucks!!
+- changequote(A,B)
+- debbdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/bin/\)xscreensaver$@\1@p'`
+- debhdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+- debcdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+- debadir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'`
+- changequote([,])
+-
+- err=" (DIFFERS)"
+- if test -z "$debbdir" ; then debbdir='???'
+- elif test "$debbdir" != "${bindir}/" ; then debbdir="$debbdir$err"; fi
+-
+- if test -z "$debhdir" ; then debhdir='???'
+- elif test "$debhdir" != "${HACKDIR}/" ; then debhdir="$debhdir$err"; fi
+-
+- if test -z "$debcdir" ; then debcdir='???'
+- elif test "$debcdir" != "${HACK_CONF_DIR}/" ; then debcdir="$debcdir$err"; fi
+-
+- if test -z "$debadir" ; then debadir='???'
+- elif test "$debadir" != "${APPDEFAULTS}/" ; then debadir="$debadir$err"; fi
+-
+- warning=no
+- warnL "There is already an installed dpkg of xscreensaver"
+- warn2 "version \"$debv\" on this system."
+- echo ""
+- warn2 "It is currently installed in these directories:"
+- echo ""
+- warn2 "User programs: $debbdir$berr"
+- warn2 "Screen savers: $debhdir$herr"
+- warn2 "Configuration: $debcdir$cerr"
+- warn2 "App Defaults: $debadir$aerr"
+-fi
+-
+ echo ""
+ echo "$warnsep"
+ echo ""
+--
+2.30.2
+
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
index 0cb931ea7de..f54eda2fff6 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
@@ -76,6 +76,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
"${FILESDIR}"/${PN}-5.44-gentoo.patch
"${FILESDIR}"/${PN}-5.45-gcc.patch
+ "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
@ 2020-03-22 7:33 Jeroen Roovers
0 siblings, 0 replies; 11+ messages in thread
From: Jeroen Roovers @ 2020-03-22 7:33 UTC (permalink / raw
To: gentoo-commits
commit: efa9f2b010f21e54d07e9e6070ee94253038b41c
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 07:32:44 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 07:33:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa9f2b0
x11-misc/xscreensaver: Update patches
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Closes: https://bugs.gentoo.org/713788
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../xscreensaver-5.44-blurb-hndl-test-passwd.patch | 10 ++++
.../files/xscreensaver-5.44-gentoo.patch | 47 +++++++++++++++
.../files/xscreensaver-5.44-offensive.patch | 68 ++++++++++++++++++++++
x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild | 6 +-
4 files changed, 128 insertions(+), 3 deletions(-)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
new file mode 100644
index 00000000000..cf95cf105b0
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
@@ -0,0 +1,10 @@
+--- a/driver/test-passwd.c
++++ b/driver/test-passwd.c
+@@ -69,6 +69,7 @@
+ char *timestring (time_t when) { return ""; }
+
+ const char *blurb(void) { return progname; }
++Bool in_signal_handler_p = 0;
+ Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
+
+ void
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
new file mode 100644
index 00000000000..279a19cf638
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
@@ -0,0 +1,47 @@
+--- 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
+
+ ! When a saver writes an error message to stdout/stderr, it can be printed
+ ! on the screen.
+@@ -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:
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch
new file mode 100644
index 00000000000..4b2d6189b1e
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch
@@ -0,0 +1,68 @@
+--- a/hacks/barcode.c
++++ b/hacks/barcode.c
+@@ -121,8 +121,6 @@
+ "belly",
+ "bliss",
+ "bogosity",
+- "boobies",
+- "boobs",
+ "booty",
+ "bread",
+ "brogrammers",
+@@ -137,7 +135,6 @@
+ "chocolate",
+ "chupacabra",
+ "CLONE",
+- "cock",
+ "congress",
+ "constriction",
+ "contrition",
+@@ -280,7 +277,6 @@
+ "punishment",
+ "punk rock",
+ "punk",
+- "pussy",
+ "quagmire",
+ "quarantine",
+ "quartz",
+@@ -355,8 +351,6 @@
+ "venom",
+ "verifiability",
+ "very fine people",
+- "viagra",
+- "vibrator",
+ "victim",
+ "vignette",
+ "villainy",
+--- a/hacks/glx/glsnake.c
++++ b/hacks/glx/glsnake.c
+@@ -569,17 +569,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 }
+@@ -999,7 +999,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/xscreensaver-5.44-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
index 67ed4a11730..0bb17e073d4 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
@@ -65,9 +65,9 @@ DEPEND="
"
PATCHES=(
"${FILESDIR}"/${PN}-5.05-interix.patch
- "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
"${FILESDIR}"/${PN}-5.31-pragma.patch
- "${FILESDIR}"/${PN}-5.43-gentoo.patch
+ "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
+ "${FILESDIR}"/${PN}-5.44-gentoo.patch
)
src_prepare() {
@@ -83,7 +83,7 @@ src_prepare() {
default
- use offensive || eapply "${FILESDIR}"/${PN}-5.43-offensive.patch
+ use offensive || eapply "${FILESDIR}"/${PN}-5.44-offensive.patch
eapply_user
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
@ 2019-11-07 8:28 Jeroen Roovers
0 siblings, 0 replies; 11+ messages in thread
From: Jeroen Roovers @ 2019-11-07 8:28 UTC (permalink / raw
To: gentoo-commits
commit: ab16276ebe5163c4e343b343848b702a262c5b49
Author: Christopher Head <chead <AT> chead <DOT> ca>
AuthorDate: Thu Nov 7 08:26:54 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Nov 7 08:28:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab16276e
x11-misc/xscreensaver: Expand offensive words list
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
Closes: https://bugs.gentoo.org/699512
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../files/xscreensaver-5.43-offensive.patch | 68 ++++++++++
x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild | 141 +++++++++++++++++++++
2 files changed, 209 insertions(+)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch
new file mode 100644
index 00000000000..25ee7a96ec7
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch
@@ -0,0 +1,68 @@
+--- 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",
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
new file mode 100644
index 00000000000..0232343448d
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop 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="
+ ${HOMEPAGE}${P}.tar.gz -> ${P}-r1.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+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:2[X]
+ 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/libXxf86misc
+ 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
+"
+PATCHES=(
+ "${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 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}
+
+ use pam && fperms 755 /usr/bin/${PN}
+ pamd_mimic_system ${PN} auth
+
+ rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
@ 2019-07-03 6:40 Jeroen Roovers
0 siblings, 0 replies; 11+ messages in thread
From: Jeroen Roovers @ 2019-07-03 6:40 UTC (permalink / raw
To: gentoo-commits
commit: 93a0a7911e4641654626df5f7f3a03d8da2676e4
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 06:38:14 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 06:40:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a0a791
x11-misc/xscreensaver: Version 5.43
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-misc/xscreensaver/Manifest | 1 +
.../files/xscreensaver-5.43-gentoo.patch | 47 +++++++
x11-misc/xscreensaver/xscreensaver-5.43.ebuild | 141 +++++++++++++++++++++
3 files changed, 189 insertions(+)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index b0862f16cfa..52403b2de16 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,3 +1,4 @@
DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
DIST xscreensaver-5.40.tar.gz 12248135 BLAKE2B 78ca8effdfae1360d4fbf79c269884b6f7e1648e3be841f99d63cfc6e43f2c813f01cc5e87ec3b502c286e7d1d5562b3f00fe831e1e2f55dd47c4dd98cf84866 SHA512 e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d
DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
+DIST xscreensaver-5.43.tar.gz 26968319 BLAKE2B 799f37f7851dc717e1bf09d63c83a07aca3c51be138d854c0d904c1d6878ef015e1750c55f7b083b6aa020c6be86e9e5a08c1aa8f47f5d063407d8a151c30d6d SHA512 e745711c5760434652aa6bee99c1060717f15cad5946fba2fa3aadbcb300bec6620935c27d095b6e8a68c06e5bbe6fc1879474674b6d07f04b2af82d05cc383a
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch
new file mode 100644
index 00000000000..a6978a58e68
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch
@@ -0,0 +1,47 @@
+--- 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:
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43.ebuild
new file mode 100644
index 00000000000..57235e1532a
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.43.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop 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="
+ ${HOMEPAGE}${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+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:2[X]
+ 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/libXxf86misc
+ 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? ( virtual/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}-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.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}
+
+ use pam && fperms 755 /usr/bin/${PN}
+ pamd_mimic_system ${PN} auth
+
+ rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
@ 2018-12-29 0:04 Jeroen Roovers
0 siblings, 0 replies; 11+ messages in thread
From: Jeroen Roovers @ 2018-12-29 0:04 UTC (permalink / raw
To: gentoo-commits
commit: 855ec577710c09d97a80fad38c066b41e2eea9fa
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 00:03:14 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 00:03:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855ec577
x11-misc/xscreensaver: Version 5.41
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-misc/xscreensaver/Manifest | 1 +
| 14 ++
x11-misc/xscreensaver/xscreensaver-5.41.ebuild | 142 +++++++++++++++++++++
3 files changed, 157 insertions(+)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index ba253477cf4..98b087be036 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,3 +1,4 @@
DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
DIST xscreensaver-5.39.tar.gz 12157285 BLAKE2B b33bf64541d07b2f65788160af0bac308d4bea78a6d2e13332ac0e80a1811cc8270e0922467c76a77bd3481b367e4421b6919d017e7a81b656c4bcc85c404741 SHA512 3f7aca6b428339c5d271d52deed469ee43370134d581a83e8f727dbe00e04a6c0f542952144f79447cba3f1f0c92ed7b1591e58255a4f94c0fc77342df19e0f7
DIST xscreensaver-5.40.tar.gz 12248135 BLAKE2B 78ca8effdfae1360d4fbf79c269884b6f7e1648e3be841f99d63cfc6e43f2c813f01cc5e87ec3b502c286e7d1d5562b3f00fe831e1e2f55dd47c4dd98cf84866 SHA512 e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d
+DIST xscreensaver-5.41.tar.gz 26903096 BLAKE2B 0a574355cff23d5210c8506844ce3549130fc66e5d0482bdeb618015e92d286ee3b183dd04988e8b8b67b9338e5e1bcd156212b0b37b5176bca72bb8b38dc4f3 SHA512 4be399a70dc3938e1edf9c1d533e082268f43e08a0812a0c639bee63ae07e99cfaefefe4a61acfaa96bb5a57606f910e5793c2c52d8946ea36f00555f8721aa2
--git a/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch b/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch
new file mode 100644
index 00000000000..8cef848ac7b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch
@@ -0,0 +1,14 @@
+--- a/hacks/fontglide.c
++++ b/hacks/fontglide.c
+@@ -2421,8 +2421,9 @@
+
+ textclient_close (s->tc);
+
+-// if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
+-// if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
++/* if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
++/ if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
++*/
+ XFreeGC (dpy, s->bg_gc);
+ if (s->charset) free (s->charset);
+ if (s->font_override) free (s->font_override);
diff --git a/x11-misc/xscreensaver/xscreensaver-5.41.ebuild b/x11-misc/xscreensaver/xscreensaver-5.41.ebuild
new file mode 100644
index 00000000000..941a5d01d77
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.41.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop 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="
+ ${HOMEPAGE}${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+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:2[X]
+ 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/libXxf86misc
+ 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? ( virtual/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}-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.35-gentoo.patch
+ "${FILESDIR}"/${PN}-5.41-comments.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.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}
+
+ use pam && fperms 755 /usr/bin/${PN}
+ pamd_mimic_system ${PN} auth
+
+ rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
@ 2016-05-24 14:37 Jeroen Roovers
0 siblings, 0 replies; 11+ messages in thread
From: Jeroen Roovers @ 2016-05-24 14:37 UTC (permalink / raw
To: gentoo-commits
commit: 810c4d2bc5fb2d31c93c4f45b18f4235281be626
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 14:36:29 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue May 24 14:37:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=810c4d2b
x11-misc/xscreensaver: Version bump.
Package-Manager: portage-2.3.0_rc1
x11-misc/xscreensaver/Manifest | 1 +
| 16 +++
x11-misc/xscreensaver/xscreensaver-5.35.ebuild | 143 +++++++++++++++++++++
3 files changed, 160 insertions(+)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 18776af..6a85174 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1 +1,2 @@
DIST xscreensaver-5.34.tar.gz 10788657 SHA256 6fff7ec4be743e5c042647ea9687dd0cdf48d1dd5e8e15098e5018bbd02e5e27 SHA512 58d0beb6556ee77122feb04090ceed80f9ffa67070f28305a00cc42adeae678305d43594c38d00539d2f13f2474311cb82cda6fdafc2bdc918a28438d6b51e75 WHIRLPOOL c7969e5b762cbeabd0564328aefdb895acfcd1c37e2b84c628718b613ca309f4c1222103c0d6ab0fd046eb355f02ee36b11fb57b55eb72e65944ea72e4fa7419
+DIST xscreensaver-5.35.tar.gz 10502254 SHA256 477882be0d829050c0883e4d7e3d08603857b019b79ad358948e45158f876e66 SHA512 c2b9c766b240439b472e9d2d85d2bbdb883fcc1803b1302d8c273e3fa7b3319a245f6d1c8f79c383c2f04ab9d19fc0f7d1302dadbb254e12c46d7309f051cfad WHIRLPOOL b97e6ebc0e368e75a02fdb793a9ac9c81fb1b505cce3a1b73679143b82efc6561769743aff0b77ee40251d63a0a1b7eb73d8ff7870e663fe9e6c45a1e8fd9594
--git a/x11-misc/xscreensaver/files/xscreensaver-5.35-comments.patch b/x11-misc/xscreensaver/files/xscreensaver-5.35-comments.patch
new file mode 100644
index 0000000..0794f4e
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.35-comments.patch
@@ -0,0 +1,16 @@
+--- a/utils/grabclient.c
++++ b/utils/grabclient.c
+@@ -127,11 +127,11 @@
+ XtInputId pipe_id;
+ FILE *pipe;
+
+-# if !defined(USE_IPHONE) && !defined(HAVE_COCOA) // Real X11
++# if !defined(USE_IPHONE) && !defined(HAVE_COCOA) /* Real X11 */
+ pid_t pid;
+ # endif
+
+-# if !defined(USE_IPHONE) && defined(HAVE_COCOA) // Desktop OSX
++# if !defined(USE_IPHONE) && defined(HAVE_COCOA) /* Desktop OSX */
+ char *directory;
+ # endif
+
diff --git a/x11-misc/xscreensaver/xscreensaver-5.35.ebuild b/x11-misc/xscreensaver/xscreensaver-5.35.ebuild
new file mode 100644
index 0000000..43b10c5
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.35.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils flag-o-matic multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+SRC_URI="
+ http://www.jwz.org/xscreensaver/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="gdm jpeg new-login 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/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXrandr
+ x11-libs/libXt
+ x11-libs/libXxf86misc
+ x11-libs/libXxf86vm
+ jpeg? ( virtual/jpeg:0 )
+ new-login? (
+ gdm? ( gnome-base/gdm )
+ !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
+ )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ pam? ( virtual/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-proto/recordproto
+ x11-proto/scrnsaverproto
+ x11-proto/xextproto
+ x11-proto/xf86miscproto
+ x11-proto/xf86vidmodeproto
+ xinerama? ( x11-proto/xineramaproto )
+"
+
+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
+
+ epatch \
+ "${FILESDIR}"/${PN}-5.33-gentoo.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-comments.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}
+
+ use pam && fperms 755 /usr/bin/${PN}
+ pamd_mimic_system ${PN} auth
+
+ rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-05-05 9:39 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-05 9:39 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2023-08-09 8:30 Florian Schmaus
2022-10-31 17:32 Ulrich Müller
2021-06-14 10:18 Sebastian Pipping
2021-06-14 0:53 Sebastian Pipping
2021-03-16 0:16 Sebastian Pipping
2020-03-22 7:33 Jeroen Roovers
2019-11-07 8:28 Jeroen Roovers
2019-07-03 6:40 Jeroen Roovers
2018-12-29 0:04 Jeroen Roovers
2016-05-24 14:37 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox