summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2009-08-02 22:42:06 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2009-08-02 22:42:06 +0000
commit2983e06d4dbabc9f544b89dacef209b682c2df1e (patch)
treec0fec2813d34376a158a28849d58a9f45fb900e6 /app-misc/gnote/files
parentClean up metadata.xml from old USE flag description. (diff)
downloadgentoo-2-2983e06d4dbabc9f544b89dacef209b682c2df1e.tar.gz
gentoo-2-2983e06d4dbabc9f544b89dacef209b682c2df1e.tar.bz2
gentoo-2-2983e06d4dbabc9f544b89dacef209b682c2df1e.zip
Initial ebuild by Gilles Dartiguelongue <eva@gentoo.org>, copied and bumped from gnome overlay, closes bug #268015.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/gnote/files')
-rw-r--r--app-misc/gnote/files/gnote-0.6.1-dbus-switch.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/app-misc/gnote/files/gnote-0.6.1-dbus-switch.patch b/app-misc/gnote/files/gnote-0.6.1-dbus-switch.patch
new file mode 100644
index 000000000000..34a9f9390d8e
--- /dev/null
+++ b/app-misc/gnote/files/gnote-0.6.1-dbus-switch.patch
@@ -0,0 +1,46 @@
+From fa67c7f9f70b24edfec27e6d2023a4aeb15ee8dd Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 3 Aug 2009 00:06:15 +0200
+Subject: [PATCH] Fix configure failure with --disable-dbus
+
+AM_CONDITIONAL for HAVE_DBUS was badly placed resulting in configure
+getting confused.
+
+GNOME bug #590560
+---
+ configure.ac | 18 ++++++++++--------
+ 1 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d9cf17a..f06deab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -166,15 +166,17 @@ AC_LANG_POP
+ #
+ # Use DBus to export our remote control if available.
+ #
+-AC_ARG_ENABLE(dbus,
+- [ --enable-dbus[[=no/yes]] compile with dbus support [[default: yes]]],
+- ENABLE_DBUS="$enableval", ENABLE_DBUS="yes")
+-if test "x$ENABLE_DBUS" != "xno"; then
+- PKG_CHECK_MODULES(DBUS, dbus-c++-1 >= $DBUSCPP_VERSION, [
+- have_dbus="yes";AC_DEFINE([ENABLE_DBUS], [1], [Define to 1 if DBus is enabled])
+- ], have_dbus="no")
+- AM_CONDITIONAL(HAVE_DBUS, test "$have_dbus" = "yes")
++AC_ARG_ENABLE(dbus,
++ AS_HELP_STRING([--enable-dbus],[compile with dbus support @<:@default: yes@:>@]),
++ [],[enable_dbus=yes])
++
++if test "$enable_dbus" != "no"; then
++ PKG_CHECK_MODULES(DBUS, dbus-c++-1 >= $DBUSCPP_VERSION, [
++ have_dbus="yes"
++ AC_DEFINE([ENABLE_DBUS], [1], [Define to 1 if DBus is enabled])
++ ], have_dbus="no")
+ fi
++AM_CONDITIONAL(HAVE_DBUS, test "$have_dbus" = "yes")
+
+
+
+--
+1.6.3.3
+