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 + .../files/xscreensaver-5.41-comments.patch | 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 diff --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 +}
