summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2005-09-26 15:31:47 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2005-09-26 15:31:47 +0000
commitf86ddbb60e49cd604b8f473470d4f19a28a8f440 (patch)
treef88416eaaebd7ecd8333dd9038af29a1da1f510d /media-sound
parentx86 stable (diff)
downloadgentoo-2-f86ddbb60e49cd604b8f473470d4f19a28a8f440.tar.gz
gentoo-2-f86ddbb60e49cd604b8f473470d4f19a28a8f440.tar.bz2
gentoo-2-f86ddbb60e49cd604b8f473470d4f19a28a8f440.zip
Fix empty xlibs. Bug #91707
(Portage version: 2.0.52-r1)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/rhythmbox/ChangeLog6
-rw-r--r--media-sound/rhythmbox/Manifest17
-rw-r--r--media-sound/rhythmbox/files/rhythmbox-0.8.8-empty-xlib.patch18
-rw-r--r--media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild5
4 files changed, 31 insertions, 15 deletions
diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 2165be33ce6a..7777bf60cb10 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/rhythmbox
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.56 2005/07/27 20:16:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.57 2005/09/26 15:31:47 dang Exp $
+
+ 26 Sep 2005; <dang@gentoo.org> +files/rhythmbox-0.8.8-empty-xlib.patch,
+ rhythmbox-0.8.8-r1.ebuild:
+ Fix empty xlibs. Bug #91707
27 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
rhythmbox-0.8.8-r1.ebuild:
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 33b0be631ce4..7e582e2e4d17 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4d41e769208d5bac88295e4787ba90e1 rhythmbox-0.8.8-r1.ebuild 2531
-MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
+MD5 e47485c30445520118ae935ba46fe7ce rhythmbox-0.8.8-r1.ebuild 2640
MD5 1f204be2751d01e7530bfdf6ad7f215a ChangeLog 6427
-MD5 9f5bc9bf255b78cc67342f9fc9423ef6 files/rhythmbox-0.8.8-ipod.patch 809
+MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
+MD5 a3ff016aec5eec7277e2598ad013b80a files/rhythmbox-0.8.8-empty-xlib.patch 496
MD5 44a42f72ca8c0f3136fded12f1aa7172 files/digest-rhythmbox-0.8.8-r1 69
MD5 7c49ce1b3d4a78dc9adba805fd3b82fb files/rhythmbox-0.8.7-gst_shn_support.patch 665
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFC5+vPKRy60XGEcJIRAoAzAJ9qmd8vo8H4YDdXMMbqFlLmZoBOhACdE9HX
-LnAPEyK9qFKPkZKd9qKagMU=
-=oUge
------END PGP SIGNATURE-----
+MD5 9f5bc9bf255b78cc67342f9fc9423ef6 files/rhythmbox-0.8.8-ipod.patch 809
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.8.8-empty-xlib.patch b/media-sound/rhythmbox/files/rhythmbox-0.8.8-empty-xlib.patch
new file mode 100644
index 000000000000..f25abddb264a
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.8.8-empty-xlib.patch
@@ -0,0 +1,18 @@
+diff -u -ruN rhythmbox-0.8.8.orig/configure.ac rhythmbox-0.8.8/configure.ac
+--- rhythmbox-0.8.8.orig/configure.ac 2004-10-05 14:06:30.000000000 -0400
++++ rhythmbox-0.8.8/configure.ac 2005-06-29 19:10:54.000000000 -0400
+@@ -339,8 +339,12 @@
+
+ AC_PATH_X
+
+-CFLAGS="-I$x_includes $CFLAGS"
+-LIBS="-L$x_libraries $LIBS"
++if test x"$x_includes" != x; then
++ CFLAGS="-I$x_includes $CFLAGS"
++fi
++if test x"$x_libraries" != x; then
++ LIBS="-L$x_libraries $LIBS"
++fi
+
+ have_xidle=no
+ AC_COMPILE_IFELSE([
diff --git a/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
index 32f0defdc573..996a1b6a0af0 100644
--- a/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild,v 1.8 2005/07/27 20:16:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild,v 1.9 2005/09/26 15:31:47 dang Exp $
inherit gnome2 eutils
@@ -81,5 +81,8 @@ src_unpack()
epatch ${FILESDIR}/${PN}-0.8.7-gst_shn_support.patch
# fix ipod crasher
epatch ${FILESDIR}/${P}-ipod.patch
+ # Fix empty X libs. Bug #91707
+ epatch ${FILESDIR}/${P}-empty-xlib.patch
+ autoconf || die "Autoconf failed"
}