summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2009-03-13 18:25:26 +0530
committerNirbheek Chauhan <nirbheek@gentoo.org>2009-03-13 18:25:26 +0530
commit96d09d3ad8b59241b31580c19241a79bf006df7a (patch)
tree4b75b7c8e39e1c48b445e9b3532ddadbea964258 /gnome-base/gnome-settings-daemon/files
parentgnome-base/gnome-session: Bump to 2.25.92 (diff)
downloadgnome-96d09d3ad8b59241b31580c19241a79bf006df7a.tar.gz
gnome-96d09d3ad8b59241b31580c19241a79bf006df7a.tar.bz2
gnome-96d09d3ad8b59241b31580c19241a79bf006df7a.zip
gnome-base/gnome-settings-daemon: Bump to 2.25.92
* libnotify automagic patch has been merged upstream
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files')
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.90-libnotify-automagic.patch36
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.92-background.patch (renamed from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.90-background.patch)0
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.92-readd-AcmeVolume-support.patch (renamed from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.90-readd-AcmeVolume-support.patch)0
3 files changed, 0 insertions, 36 deletions
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.90-libnotify-automagic.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.90-libnotify-automagic.patch
deleted file mode 100644
index 0c1f651c..00000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.90-libnotify-automagic.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 506c4e4..aa55fc1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -89,9 +89,19 @@ dnl ---------------------------------------------------------------------------
- dnl - Check for libnotify
- dnl ---------------------------------------------------------------------------
-
--PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION,
-- [AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available])
-- have_libnotify=yes], [have_libnotify=no])
-+have_libnotify=no
-+AC_ARG_WITH(libnotify,
-+ AC_HELP_STRING([--without-libnotify], [Disable notifications (default: auto)]),
-+ with_libnotify=$withval, with_libnotify=auto)
-+
-+if test "x$with_libnotify" != "xno"; then
-+ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION,
-+ [AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available])
-+ have_libnotify=yes], have_libnotify=no)
-+ if test "x$have_libnotify" = xno -a "x$with_libnotify" = xyes; then
-+ AC_MSG_ERROR([libnotify support requested but libraries not found])
-+ fi
-+fi
- AC_SUBST(LIBNOTIFY_CFLAGS)
- AC_SUBST(LIBNOTIFY_LIBS)
-
-@@ -386,7 +396,7 @@ echo "
-
- dbus-1 system.d dir: ${DBUS_SYS_DIR}
-
-+ Libnotify support: ${have_libnotify}
- PulseAudio support: ${have_pulse}
--
- Profiling support: ${enable_profiling}
- "
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.90-background.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.92-background.patch
index a18d73ca..a18d73ca 100644
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.90-background.patch
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.92-background.patch
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.90-readd-AcmeVolume-support.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.92-readd-AcmeVolume-support.patch
index 9e9d2872..9e9d2872 100644
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.90-readd-AcmeVolume-support.patch
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.25.92-readd-AcmeVolume-support.patch