diff options
Diffstat (limited to 'x11-misc/xscreensaver')
| -rw-r--r-- | x11-misc/xscreensaver/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch | 32 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild | 23 |
3 files changed, 49 insertions, 12 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 7820e3764b2c..3dfbac1d93be 100644 --- a/x11-misc/xscreensaver/ChangeLog +++ b/x11-misc/xscreensaver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xscreensaver # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.284 2011/01/21 14:54:21 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.285 2011/03/15 23:22:25 abcd Exp $ + + 15 Mar 2011; Jonathan Callen <abcd@gentoo.org> + +files/xscreensaver-5.05-interix.patch, xscreensaver-5.12-r1.ebuild: + Add prefix support, patch, and keywords 21 Jan 2011; Jeroen Roovers <jer@gentoo.org> xscreensaver-5.12.ebuild: Stable for HPPA (bug #349029). diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch new file mode 100644 index 000000000000..2a5eead4879f --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch @@ -0,0 +1,32 @@ +diff -ru xscreensaver-5.05.orig/driver/prefs.c xscreensaver-5.05/driver/prefs.c +--- xscreensaver-5.05.orig/driver/prefs.c 2006-05-24 00:03:47 +0200 ++++ xscreensaver-5.05/driver/prefs.c 2008-03-11 09:20:58 +0100 +@@ -951,9 +951,12 @@ + { + p->init_file_date = write_date; + ++/* Interix has no sync() or alike. */ ++#ifndef __INTERIX + /* Since the .xscreensaver file is used for IPC, let's try and make + sure that the bits actually land on the disk right away. */ + sync (); ++#endif + + status = 0; /* wrote and renamed successfully! */ + } +diff -ru xscreensaver-5.05.orig/driver/setuid.c xscreensaver-5.05/driver/setuid.c +--- xscreensaver-5.05.orig/driver/setuid.c 2006-02-09 03:33:29 +0100 ++++ xscreensaver-5.05/driver/setuid.c 2008-03-11 09:22:59 +0100 +@@ -136,9 +136,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/xscreensaver-5.12-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild index 57c0ca41b469..9b9ddcda9a3e 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild,v 1.1 2011/01/13 11:34:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild,v 1.2 2011/03/15 23:22:25 abcd Exp $ -EAPI=2 +EAPI=3 inherit autotools eutils flag-o-matic multilib pam DESCRIPTION="A modular screen saver and locker for the X Window System" @@ -11,7 +11,7 @@ HOMEPAGE="http://www.jwz.org/xscreensaver" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="jpeg new-login opengl pam suid xinerama" RDEPEND="x11-libs/libXmu @@ -49,7 +49,8 @@ MAKEOPTS="${MAKEOPTS} -j1" src_prepare() { epatch "${FILESDIR}"/${PN}-5.10-gentoo.patch \ - "${FILESDIR}"/${P}-*.patch + "${FILESDIR}"/${P}-*.patch \ + "${FILESDIR}"/${PN}-5.05-interix.patch eautoconf } @@ -64,12 +65,12 @@ src_configure() { unset BC_ENV_ARGS #24568 econf \ - --x-includes=/usr/include \ - --x-libraries=/usr/$(get_libdir) \ + --x-includes="${EPREFIX}"/usr/include \ + --x-libraries="${EPREFIX}"/usr/$(get_libdir) \ --enable-locking \ - --with-hackdir=/usr/$(get_libdir)/misc/${PN} \ - --with-configdir=/usr/share/${PN}/config \ - --with-x-app-defaults=/usr/share/X11/app-defaults \ + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ + --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ + --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ --with-dpms-ext \ $(use_with xinerama xinerama-ext) \ --with-xinput-ext \ @@ -87,7 +88,7 @@ src_configure() { $(use_with jpeg) \ --with-xshm-ext \ --with-xdbe-ext \ - --with-text-file=/etc/gentoo-release \ + --with-text-file="${EPREFIX}"/etc/gentoo-release \ $(use_with suid setuid-hacks) } @@ -98,5 +99,5 @@ src_install() { use pam && fperms 755 /usr/bin/${PN} pamd_mimic_system ${PN} auth - rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml + rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml } |