Compile time fixes for bugs #209341 and #208731.

Package-Manager: portage-2.1.4.4

4 files changed, 140 insertions, 2 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 517b8d15862b..0b485dc71643 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.213 2008/02/07 15:05:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.214 2008/02/14 13:08:05 drac Exp $
+
+*xscreensaver-5.04-r1 (14 Feb 2008)
+
+  14 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  +files/xscreensaver-5.04-build.patch, +xscreensaver-5.04-r1.ebuild:
+  Compile time fixes for bugs #209341 and #208731.
 
   07 Feb 2008; Raúl Porcel <armin76@gentoo.org> xscreensaver-5.04.ebuild:
   alpha/ia64/sparc stable wrt #208297
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 742526f8b036..00c7a6c1876e 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,12 +1,14 @@
 AUX desktop_entries/screensaver-properties.desktop 1000 RMD160 9e331cdba7b943c9e5dc076c3a60e32bf0340111 SHA1 f55ab9f6430ee339edc6aab428bc277d1b84e03d SHA256 b2a5d44a6a6463beab7cb1d3b9d9f5613c765b48ce319232517b6097afad1fbd
 AUX xscreensaver-5.02-gentoo.patch 5731 RMD160 01d82a320dfcddfa0b5870c395d2334dc49e8af4 SHA1 8f3a08256907d0fe45eb75140843c9db8db3de88 SHA256 a5055ebfd350d236daa6625700dfdf1e638aea90f5472a3d700020c3ea303d73
 AUX xscreensaver-5.03-nsfw.patch 6541 RMD160 7730170a441d7666233cdfe66dbebc738116f5d2 SHA1 bf0309dcbafed19cf178b6b38d46ebd45f80d865 SHA256 5d91ce4e3c654ea98c7d3c453a108f6eaf7057d23e5e52dc0567a80f9fb7879a
+AUX xscreensaver-5.04-build.patch 1199 RMD160 f6a4e16513168daa57241f0fe09459710b8b7cc7 SHA1 f58ccaff5f145f28f980a5380eea614d976d6d8d SHA256 323827a4fa1bfab553e41dafef3fb45ae35bdb6cd20fe8f824a1a3b3518d8994
 AUX xscreensaver-5.04-desktop-entry.patch 636 RMD160 b784667858307267ef146d353616897277f1ee84 SHA1 12073dea7320220e7971058a0022054c7dff37e1 SHA256 85e23a898aced1f7497f71fed00d7556be7378ff5e755655b5ead3c15d7d8743
 AUX xscreensaver-5.04-gentoo.patch 4806 RMD160 abc9b3e218d4a8a5618d1ab04d00a21d4633c847 SHA1 56ae0cd141d9ac0667974d4b6f9162e80f2f87e3 SHA256 fdf5396983d5905b1d6d3eefdd6eed981abc2567d6bae58141516a75ab708a08
 AUX xscreensaver-5.04-nsfw.patch 2068 RMD160 0a0a1081584b81c8beda6cd7d6bd89d0dc8da72c SHA1 a2768a4bef374c7d36bd285e65244877abef752a SHA256 bdd5a0363ec5f71886b3fc402749d9082ba4be4d1e7e05eeb81d5271b2cd1acd
 DIST xscreensaver-5.03.tar.gz 5412089 RMD160 f28aca829982c9b9b1989f03309e48fdbdc8e2de SHA1 e283a52faf6148273a82a9e5c9ed70c5722cdcb8 SHA256 82ad32523f5e6b8c8b6431aac4474f2bfde9d4cf70caec9446ed900f48887d26
 DIST xscreensaver-5.04.tar.gz 5438905 RMD160 cf8c59a1aff1139c8d205bb734a17bc706f75287 SHA1 1733ba7ee46b758453ef9ded0fc4ee084b7420a9 SHA256 d1200b497795e6e32853e434a81be0cba718a3a46457b378cad7ac9d0dfba6d7
 EBUILD xscreensaver-5.03.ebuild 4475 RMD160 72bfbe6fd349d3d35af9ce7d1501dff553a56187 SHA1 8b623c40d88d037f7aad8c9e36a5850f46b3200d SHA256 f7279fa3d14a512710a653bcdabc27258eeaff267b3cf2d1f8916e0e6b0c91dd
+EBUILD xscreensaver-5.04-r1.ebuild 2682 RMD160 687f32b8cd8594944ce66a9f2a3066225a162140 SHA1 371619a489b0d6ff59911e67726bd4f8f51a7422 SHA256 9f32bf17a05cc4f2dad085d23f2e80bebef332944f8aa89d87817589e1d5c28f
 EBUILD xscreensaver-5.04.ebuild 2728 RMD160 23cc6e74f9e7246bbec654a3ef0182d2843d3441 SHA1 15a2a8133531ef8a8a00e240d5b94e1ae4417254 SHA256 18192827d1d04ce16a74860bd69cb00b73611e9799bdd901ba11b9c4f55e2cde
-MISC ChangeLog 34797 RMD160 898891f830042d1d9342d22e4a8be15177045190 SHA1 0eeacadd96efed57a7414194b13540764c9c400d SHA256 894bc0f3a00a310d910ed5404977dbd3d91d8b948508bf938a05e2b1e2b1eb15
+MISC ChangeLog 35002 RMD160 10f7aef1ee981d221e05a00050aa73d118d34192 SHA1 4b26e34817362bf9fb3caff481c7d0cf4d81977e SHA256 ca09eeb20f02ee2f9b72243283184e2ea7dd9200c9008e2f01af79368360ea0c
 MISC metadata.xml 387 RMD160 c34d8cf1f88cf45e7d0b6503f403ab8b8db11b20 SHA1 debca11d5df5829ba86249140fdb4f4a42d3103c SHA256 5ae2b87a5da10d0ec7099d2f48602c4d9c09e0247c0ff85856cf4b944d761360
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.04-build.patch b/x11-misc/xscreensaver/files/xscreensaver-5.04-build.patch
new file mode 100644
index 000000000000..e264bbc1345b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.04-build.patch
@@ -0,0 +1,29 @@
+diff -ur xscreensaver-5.04.orig/driver/demo-Gtk.c xscreensaver-5.04/driver/demo-Gtk.c
+--- xscreensaver-5.04.orig/driver/demo-Gtk.c	2007-04-10 04:56:40.000000000 +0300
++++ xscreensaver-5.04/driver/demo-Gtk.c	2008-02-14 14:58:09.000000000 +0200
+@@ -1127,7 +1127,7 @@
+   if (!was) gtk_widget_set_sensitive (parent, True);
+ #ifdef HAVE_GTK2
+   model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));
+-  STFU g_assert (model);
++  g_assert (model);
+   if (gtk_tree_model_iter_nth_child (model, &iter, NULL, list_elt))
+     {
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list));
+diff -ur xscreensaver-5.04.orig/hacks/glx/lockward.c xscreensaver-5.04/hacks/glx/lockward.c
+--- xscreensaver-5.04.orig/hacks/glx/lockward.c	2007-11-11 22:52:42.000000000 +0200
++++ xscreensaver-5.04/hacks/glx/lockward.c	2008-02-14 14:57:01.000000000 +0200
+@@ -34,6 +34,13 @@
+ /***************************************************************************
+  * #defines
+  */
++#define int8_t   char
++#define int16_t  short
++#define int32_t  int
++#define uint8_t  unsigned char
++#define uint16_t unsigned short
++#define uint32_t unsigned int
++
+ #ifdef USE_GL /* whole file */
+ 
+ #define	DEFAULTS	"*delay:	20000	\n"\
diff --git a/x11-misc/xscreensaver/xscreensaver-5.04-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.04-r1.ebuild
new file mode 100644
index 000000000000..fb47df4930a9
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.04-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.04-r1.ebuild,v 1.1 2008/02/14 13:08:05 drac Exp $
+
+inherit autotools eutils fixheadtails flag-o-matic multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
+HOMEPAGE="http://www.jwz.org/xscreensaver"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="jpeg new-login opengl pam suid xinerama"
+
+RDEPEND="x11-libs/libXxf86misc
+	x11-apps/xwininfo
+	x11-apps/appres
+	media-libs/netpbm
+	>=dev-libs/libxml2-2.5
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-1.99
+	pam? ( virtual/pam )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl )
+	xinerama? ( x11-libs/libXinerama )
+	new-login? ( gnome-base/gdm )"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	x11-proto/scrnsaverproto
+	x11-proto/recordproto
+	x11-proto/xf86miscproto
+	sys-devel/bc
+	dev-util/pkgconfig
+	sys-devel/gettext
+	dev-util/intltool
+	xinerama? ( x11-proto/xineramaproto )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-nsfw.patch
+	epatch "${FILESDIR}"/${P}-desktop-entry.patch
+	epatch "${FILESDIR}"/${P}-build.patch
+	eautoreconf
+	ht_fix_all
+}
+
+src_compile() {
+	# Simple workaround for the ppc* arches flurry screensaver, needed for <=5.04
+	filter-flags -mabi=altivec
+	filter-flags -maltivec
+	append-flags -U__VEC__
+
+	unset BC_ENV_ARGS
+
+	econf \
+		--with-x-app-defaults=/usr/share/X11/app-defaults \
+		--with-hackdir=/usr/$(get_libdir)/misc/${PN} \
+		--with-configdir=/usr/share/${PN}/config \
+		--x-libraries=/usr/$(get_libdir) \
+		--x-includes=/usr/include \
+		--with-dpms-ext \
+		--with-xf86vmode-ext \
+		--with-xf86gamma-ext \
+		--with-proc-interrupts \
+		--with-xpm \
+		--with-xshm-ext \
+		--with-xdbe-ext \
+		--enable-locking \
+		--without-kerberos \
+		--without-gle \
+		--with-gtk \
+		$(use_with suid setuid-hacks) \
+		$(use_with new-login login-manager) \
+		$(use_with xinerama xinerama-ext) \
+		$(use_with pam) \
+		$(use_with opengl gl) \
+		$(use_with jpeg)
+
+	# Bug 155049.
+	emake -j1 || die "emake failed."
+}
+
+src_install() {
+	emake install_prefix="${D}" install || die "emake install failed."
+
+	dodoc README*
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	# Bug 135549.
+	rm -f "${D}"/usr/share/${PN}/config/electricsheep.xml
+	rm -f "${D}"/usr/share/${PN}/config/fireflies.xml
+	dodir /usr/share/man/man6x
+	mv "${D}"/usr/share/man/man6/worm.6 \
+		"${D}"/usr/share/man/man6x/worm.6x
+}