From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
Date: Fri, 23 Jul 2021 06:26:17 +0000 (UTC) [thread overview]
Message-ID: <1627021568.e8f5f6d4d8baffa3918706dc7ce520cb0b32a3c9.robbat2@gentoo> (raw)
commit: e8f5f6d4d8baffa3918706dc7ce520cb0b32a3c9
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 23 06:07:36 2021 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 06:26:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f5f6d4
x11-misc/xscreensaver: fix compile & automagic build issues
- The RPM configure.ac change was not effective because configure was
not being regenerated.
- Enable /proc OOM Killer detection which might not always build
otherwise.
- Fix automagic linking against: libpng, xft, jpeg because the upstream
configure script isn't pure autoconf:
- USE='-gdk-pixbuf -gtk -png -jpeg -opengl -xft' is now a valid
extremely minimal build!
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 220 ++++++++++++++++++++++
1 file changed, 220 insertions(+)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
new file mode 100644
index 00000000000..10eae1bbfe2
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -0,0 +1,220 @@
+# 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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
+REQUIRED_USE="
+ gdk-pixbuf? ( gtk )
+ gtk? ( png )
+ opengl? ( png )
+ elogind? ( !systemd )
+"
+
+COMMON_DEPEND="
+ dev-libs/libxml2
+ media-libs/netpbm
+ virtual/libcrypt:=
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ xft? ( 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 )
+ png? ( media-libs/libpng:= )
+ 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
+ "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+ "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+ "${FILESDIR}"/${PN}-6.01-gtk-detection.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
+
+ # Must be eauto*re*conf, to force the rebuild
+ eautoreconf
+ eautoheader
+}
+
+src_configure() {
+ if use ppc || use ppc64; then
+ filter-flags -maltivec -mabi=altivec
+ append-flags -U__VEC__
+ fi
+
+ unset BC_ENV_ARGS #24568
+
+ # 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 gtk)
+ $(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-jpeg=$(usex jpeg yes no)
+ --with-png=$(usex png yes no)
+ --with-xft=$(usex xft yes no)
+ --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() {
+ 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
+}
next reply other threads:[~2021-07-23 6:26 UTC|newest]
Thread overview: 175+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 6:26 Robin H. Johnson [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-06 9:44 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/ Florian Schmaus
2024-10-18 16:44 Arthur Zamarin
2024-10-18 15:40 Arthur Zamarin
2024-10-16 11:03 Sam James
2024-10-16 11:03 Sam James
2024-10-16 11:03 Sam James
2024-10-16 8:31 Jakov Smolić
2024-10-16 8:31 Jakov Smolić
2024-06-18 18:56 Florian Schmaus
2024-05-13 11:43 Petr Vaněk
2024-02-07 4:55 Ionen Wolkens
2024-02-07 4:55 Ionen Wolkens
2024-02-07 4:55 Ionen Wolkens
2024-01-23 15:08 Sam James
2024-01-23 6:14 Sam James
2024-01-23 4:17 Sam James
2024-01-23 4:17 Sam James
2024-01-08 9:48 Sam James
2023-12-13 9:31 Florian Schmaus
2023-12-08 8:32 Arthur Zamarin
2023-12-08 8:29 Arthur Zamarin
2023-12-08 8:29 Arthur Zamarin
2023-11-15 16:35 Arthur Zamarin
2023-11-15 16:35 Arthur Zamarin
2023-10-18 15:42 Arthur Zamarin
2023-10-17 7:20 Joonas Niilola
2023-10-16 12:42 Sam James
2023-10-16 7:12 Sam James
2023-10-16 7:12 Sam James
2023-09-14 16:35 Florian Schmaus
2023-09-14 16:22 Florian Schmaus
2023-09-14 16:07 Florian Schmaus
2023-09-09 7:21 Yixun Lan
2023-09-08 12:04 Florian Schmaus
2023-09-06 10:51 Florian Schmaus
2023-09-06 7:14 Joonas Niilola
2023-09-06 6:47 Sam James
2023-09-06 6:47 Sam James
2023-09-06 6:47 Sam James
2023-08-15 15:53 Florian Schmaus
2023-07-27 8:27 Florian Schmaus
2023-05-18 10:42 Joonas Niilola
2023-05-06 9:34 Arthur Zamarin
2023-05-06 9:31 Arthur Zamarin
2023-05-06 9:31 Arthur Zamarin
2023-05-06 9:31 Arthur Zamarin
2023-04-16 17:10 Arthur Zamarin
2023-04-14 19:33 Sam James
2022-12-16 21:06 Arthur Zamarin
2022-12-10 9:14 Arthur Zamarin
2022-12-10 9:14 Arthur Zamarin
2022-12-10 9:14 Arthur Zamarin
2022-12-10 9:14 Arthur Zamarin
2022-12-10 9:14 Arthur Zamarin
2022-12-10 9:00 Arthur Zamarin
2022-10-31 9:25 Ulrich Müller
2022-08-28 5:06 WANG Xuerui
2022-07-30 5:22 Yixun Lan
2022-05-31 3:29 Sam James
2022-03-02 2:19 Sam James
2022-01-24 4:19 Mike Gilbert
2022-01-24 4:19 Mike Gilbert
2022-01-08 12:49 Joonas Niilola
2022-01-08 12:49 Joonas Niilola
2021-09-10 20:53 Ionen Wolkens
2021-09-01 18:32 Sam James
2021-08-29 17:52 Sam James
2021-08-29 10:02 Agostino Sarubbo
2021-08-28 21:02 Jakov Smolić
2021-08-28 5:36 Agostino Sarubbo
2021-08-27 20:04 Sam James
2021-08-27 20:04 Sam James
2021-07-25 5:42 Robin H. Johnson
2021-06-30 10:15 Ulrich Müller
2021-06-22 22:38 Sam James
2021-06-19 15:29 Sergei Trofimovich
2021-06-13 6:30 Agostino Sarubbo
2021-06-13 6:29 Agostino Sarubbo
2021-06-12 17:14 Sam James
2021-06-12 17:14 Sam James
2021-06-12 16:32 Sam James
2021-06-12 16:32 Sam James
2021-06-12 14:48 Sebastian Pipping
2021-06-12 14:31 Sebastian Pipping
2021-06-12 7:56 Sam James
2021-06-12 7:56 Sam James
2021-06-12 3:29 Sam James
2021-06-11 22:27 Sebastian Pipping
2021-06-07 8:33 Joonas Niilola
2021-04-20 17:06 Sergei Trofimovich
2021-04-19 0:23 Sam James
2021-04-18 6:44 Sam James
2021-04-18 2:58 Sam James
2021-04-18 2:58 Sam James
2021-04-18 2:58 Sam James
2021-04-18 2:57 Sam James
2021-03-11 22:25 Jonas Stein
2021-03-04 0:23 Sam James
2021-02-28 23:21 Sam James
2021-02-27 12:30 Sam James
2021-02-27 10:43 Sam James
2021-02-26 21:58 Sam James
2021-01-22 15:32 Mikle Kolyada
2020-12-17 14:00 Mart Raudsepp
2020-11-20 0:32 Sam James
2020-07-23 8:29 Kent Fredric
2020-06-24 10:19 Jeroen Roovers
2020-05-17 9:25 Jeroen Roovers
2020-03-22 7:33 Jeroen Roovers
2020-03-21 6:39 Jeroen Roovers
2020-02-16 20:24 David Seifert
2020-02-08 21:40 Mart Raudsepp
2020-02-02 20:05 Jeroen Roovers
2020-01-13 10:07 David Seifert
2019-12-13 9:58 Jeroen Roovers
2019-11-07 16:20 Michał Górny
2019-10-12 17:42 Mikle Kolyada
2019-08-27 4:43 Jeroen Roovers
2019-08-22 10:34 Jeroen Roovers
2019-08-22 10:30 Jeroen Roovers
2019-08-22 10:30 Jeroen Roovers
2019-06-05 10:32 Jeroen Roovers
2018-12-29 10:49 Jeroen Roovers
2018-12-29 10:49 Jeroen Roovers
2018-10-10 20:12 Jeroen Roovers
2018-08-13 8:12 Jeroen Roovers
2018-06-25 8:23 Jeroen Roovers
2018-04-16 22:04 Mikle Kolyada
2018-04-14 8:34 Jeroen Roovers
2018-04-07 21:30 Sergei Trofimovich
2018-03-07 20:09 Sergei Trofimovich
2018-03-06 8:35 Jeroen Roovers
2018-03-05 21:31 Tobias Klausmann
2018-03-04 19:11 Sergei Trofimovich
2018-03-01 21:02 Jeroen Roovers
2017-12-21 0:22 Jeroen Roovers
2017-07-06 10:05 Jeroen Roovers
2017-03-02 20:54 Jeroen Roovers
2017-03-02 20:54 Jeroen Roovers
2017-03-01 20:45 David Seifert
2016-12-25 15:19 Jeroen Roovers
2016-12-25 15:19 Jeroen Roovers
2016-12-24 10:26 Agostino Sarubbo
2016-12-22 9:34 Agostino Sarubbo
2016-12-20 9:44 Agostino Sarubbo
2016-12-19 15:12 Agostino Sarubbo
2016-12-18 15:57 Agostino Sarubbo
2016-12-18 15:44 Agostino Sarubbo
2016-12-14 9:14 Tobias Klausmann
2016-12-10 11:53 Johannes Huber
2016-10-21 3:40 Jeroen Roovers
2016-10-20 7:15 Jeroen Roovers
2016-10-11 19:40 Jeroen Roovers
2016-10-07 15:47 Jeroen Roovers
2016-10-07 15:47 Jeroen Roovers
2016-10-05 18:53 Markus Meier
2016-09-21 17:48 Tobias Klausmann
2016-09-21 6:16 Jeroen Roovers
2016-07-14 7:27 Jeroen Roovers
2016-07-08 14:33 Markus Meier
2016-07-04 8:53 Jeroen Roovers
2016-06-30 15:57 Tobias Klausmann
2015-11-07 23:39 Mikle Kolyada
2015-11-05 10:58 Agostino Sarubbo
2015-11-04 14:26 Agostino Sarubbo
2015-11-03 19:19 Markus Meier
2015-11-01 16:18 Mikle Kolyada
2015-11-01 14:10 Tobias Klausmann
2015-10-26 9:15 Agostino Sarubbo
2015-10-25 7:37 Jeroen Roovers
2015-10-25 5:43 Jeroen Roovers
2015-10-24 21:36 Jeroen Roovers
2015-10-24 7:38 Jeroen Roovers
2015-10-23 9:05 Agostino Sarubbo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1627021568.e8f5f6d4d8baffa3918706dc7ce520cb0b32a3c9.robbat2@gentoo \
--to=robbat2@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox