diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-10-24 16:29:53 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-10-24 16:29:53 +0000 |
| commit | d6cf9b0405f40f1b2ec6903809fbb75c81fd2aee (patch) | |
| tree | 05b8c8e3f3eae2b227915a1076b3454a95ffab4c | |
| parent | Stable on alpha, bug #289312 (diff) | |
| download | gentoo-2-d6cf9b0405f40f1b2ec6903809fbb75c81fd2aee.tar.gz gentoo-2-d6cf9b0405f40f1b2ec6903809fbb75c81fd2aee.tar.bz2 gentoo-2-d6cf9b0405f40f1b2ec6903809fbb75c81fd2aee.zip | |
Fix configure.ac to detect >=exo-0.5.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
| -rw-r--r-- | xfce-base/xfce4-settings/ChangeLog | 6 | ||||
| -rw-r--r-- | xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-exo.patch | 13 | ||||
| -rw-r--r-- | xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog index a3445f5bdab8..2fbe1b2d7990 100644 --- a/xfce-base/xfce4-settings/ChangeLog +++ b/xfce-base/xfce4-settings/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-base/xfce4-settings # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.24 2009/10/16 22:10:08 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.25 2009/10/24 16:29:52 ssuominen Exp $ + + 24 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> + xfce4-settings-4.6.3.ebuild, +files/xfce4-settings-4.6.3-exo.patch: + Fix configure.ac to detect >=exo-0.5. 16 Oct 2009; Markus Meier <maekke@gentoo.org> xfce4-settings-4.6.3.ebuild: x86 stable, bug #281427 diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-exo.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-exo.patch new file mode 100644 index 000000000000..2536af7bff87 --- /dev/null +++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-exo.patch @@ -0,0 +1,13 @@ +diff -ur xfce4-settings-4.6.3.orig/configure.ac xfce4-settings-4.6.3/configure.ac +--- xfce4-settings-4.6.3.orig/configure.ac 2009-09-29 01:50:13.000000000 +0300 ++++ xfce4-settings-4.6.3/configure.ac 2009-10-24 19:25:21.000000000 +0300 +@@ -77,7 +77,8 @@ + dnl *********************************** + dnl *** Check for required packages *** + dnl *********************************** +-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100]) ++XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100], [], ++ [XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])]) + XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0]) + XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.12.0]) + XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0]) diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild index 7b7367418e76..c2d969fb3683 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.6.3.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-settings/xfce4-settings-4.6.3.ebuild,v 1.6 2009/10/16 22:10:08 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild,v 1.7 2009/10/24 16:29:52 ssuominen Exp $ EAPI=2 +EAUTORECONF=yes inherit xfconf DESCRIPTION="Settings daemon for Xfce4" @@ -45,4 +46,5 @@ pkg_setup() { $(use_enable sound sound-settings) $(use_enable debug)" DOCS="AUTHORS ChangeLog NEWS TODO" + PATCHES=( "${FILESDIR}/${P}-exo.patch" ) } |