summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2006-11-15 16:43:50 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2006-11-15 16:43:50 +0000
commitda787451fa3aa1fd4671094d51e72e63ff7ca302 (patch)
treee06baa6e2c5272d158bcfbeace03eebfd078c321 /gnome-extra/deskbar-applet
parentStable on alpha/amd64/ppc/x86 wrt bug #154380. (diff)
downloadgentoo-2-da787451fa3aa1fd4671094d51e72e63ff7ca302.tar.gz
gentoo-2-da787451fa3aa1fd4671094d51e72e63ff7ca302.tar.bz2
gentoo-2-da787451fa3aa1fd4671094d51e72e63ff7ca302.zip
Unset DISPLAY before running tests; bug #148056
(Portage version: 2.1.2_rc1-r5)
Diffstat (limited to 'gnome-extra/deskbar-applet')
-rw-r--r--gnome-extra/deskbar-applet/ChangeLog6
-rw-r--r--gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild4
-rw-r--r--gnome-extra/deskbar-applet/files/deskbar-applet-2.16.1-display.patch11
3 files changed, 19 insertions, 2 deletions
diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 239e97489c73..0963b1548eb2 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-extra/deskbar-applet
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.28 2006/11/06 10:35:04 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.29 2006/11/15 16:43:50 dang Exp $
+
+ 15 Nov 2006; Daniel Gryniewicz <dang@gentoo.org>
+ +files/deskbar-applet-2.16.1-display.patch, deskbar-applet-2.16.1.ebuild:
+ Unset DISPLAY before running tests; bug #148056
*deskbar-applet-2.16.1 (06 Nov 2006)
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild
index d10b6e4d9c78..04dcb4179600 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild,v 1.1 2006/11/06 10:35:04 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild,v 1.2 2006/11/15 16:43:50 dang Exp $
inherit gnome2 eutils autotools python
@@ -40,6 +40,8 @@ src_unpack() {
# Fix installing libs into pythondir
epatch ${FILESDIR}/${PN}-2.15.3-multilib.patch
epatch ${FILESDIR}/${PN}-2.16-fix_encoding.patch
+ # Unset DISPLAY before tests; bug #148056
+ epatch ${FILESDIR}/${P}-display.patch
AT_M4DIR="m4" eautoreconf
}
diff --git a/gnome-extra/deskbar-applet/files/deskbar-applet-2.16.1-display.patch b/gnome-extra/deskbar-applet/files/deskbar-applet-2.16.1-display.patch
new file mode 100644
index 000000000000..eb766cc38438
--- /dev/null
+++ b/gnome-extra/deskbar-applet/files/deskbar-applet-2.16.1-display.patch
@@ -0,0 +1,11 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN deskbar-applet-2.16.1.orig/configure.ac deskbar-applet-2.16.1/configure.ac
+--- deskbar-applet-2.16.1.orig/configure.ac 2006-10-22 09:15:29.000000000 -0400
++++ deskbar-applet-2.16.1/configure.ac 2006-11-15 11:26:45.000000000 -0500
+@@ -71,6 +71,7 @@ AC_SUBST(DESKBAR_CFLAGS)
+ AC_SUBST(DESKBAR_LIBS)
+
+ AC_MSG_CHECKING([for gnomeapplet module])
++unset DISPLAY
+ if AC_RUN_LOG([$PYTHON -c '
+ try:
+ import gnomeapplet