summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-10-24 16:39:13 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-10-24 16:39:13 +0000
commitaec850c0fc1dce4481fca269f97a654206651395 (patch)
tree62164985ed06efc2370165b4edaefcca2a779af9 /xfce-base
parentppc stable #281427 (diff)
downloadgentoo-2-aec850c0fc1dce4481fca269f97a654206651395.tar.gz
gentoo-2-aec850c0fc1dce4481fca269f97a654206651395.tar.bz2
gentoo-2-aec850c0fc1dce4481fca269f97a654206651395.zip
Fix configure.in to detect >=exo-0.5.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/xfce4-panel/ChangeLog6
-rw-r--r--xfce-base/xfce4-panel/files/xfce4-panel-4.6.2-exo.patch13
-rw-r--r--xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild4
3 files changed, 21 insertions, 2 deletions
diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index 59421350305c..4edfd4d71559 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-base/xfce4-panel
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.147 2009/10/19 14:25:32 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.148 2009/10/24 16:39:13 ssuominen Exp $
+
+ 24 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-panel-4.6.2.ebuild, +files/xfce4-panel-4.6.2-exo.patch:
+ Fix configure.in to detect >=exo-0.5.
*xfce4-panel-4.6.2 (19 Oct 2009)
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.6.2-exo.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.6.2-exo.patch
new file mode 100644
index 000000000000..9eee36200986
--- /dev/null
+++ b/xfce-base/xfce4-panel/files/xfce4-panel-4.6.2-exo.patch
@@ -0,0 +1,13 @@
+diff -ur xfce4-panel-4.6.2.orig/configure.in xfce4-panel-4.6.2/configure.in
+--- xfce4-panel-4.6.2.orig/configure.in 2009-10-16 16:18:49.000000000 +0300
++++ xfce4-panel-4.6.2/configure.in 2009-10-24 19:36:32.000000000 +0300
+@@ -117,7 +117,8 @@
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
+ XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.12.0])
+ XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.6.0])
+-XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.100])
++XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.100], [],
++ [XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.5.0])])
+ XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.0.0])
+
+ dnl **********************
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild
index 432e841d862b..4b2de4e4cf96 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild,v 1.1 2009/10/19 14:25:32 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild,v 1.2 2009/10/24 16:39:13 ssuominen Exp $
EAPI=2
+EAUTORECONF=yes
inherit xfconf
DESCRIPTION="Panel for Xfce4"
@@ -34,4 +35,5 @@ pkg_setup() {
$(use_enable startup-notification)
$(use_enable debug)"
DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+ PATCHES=( "${FILESDIR}/${P}-exo.patch" )
}