diff options
| author | George Sherwood | 2009-01-22 17:11:43 -0600 |
|---|---|---|
| committer | George Sherwood | 2009-01-22 17:11:43 -0600 |
| commit | e0d68e6c554e304cef9d5d8b51962d615fa266d0 (patch) | |
| tree | 67f50bcf1e4a43dce5f4e8595d22ec006af2fcc5 | |
| parent | 740072396fd91bd5cf0acab95483c0f95f68f77a (diff) | |
libnotify, notification-daemon{,-xfce}: Fix dependency ordering
(Bug #14976)
* libnotify builds fine without a NOTIFICATION_DAEMON installed.
* notification-daemon fails without libnotify installed
checking for NOTIFICATION_DAEMON... yes
checking for NOTIFICATION_CAPPLET... configure: error: Package
requirements
(glib-2.0 >= 2.10.0 gtk+-2.0 >= 2.10.0 libglade-2.0 gconf-2.0 libnotify
dbus-1
dbus-glib-1) were not met:
No package 'libnotify' found
* notification-daemon-xfce compiles fine without libnotify installed
checking for optional package libnotify >= 0.4.0... not found
(cherry-picked from commit 59feabdaaa339cb48c98a708c2a99f65f79aa201)
| -rwxr-xr-x | utils/libnotify/DEPENDS | 3 | ||||
| -rw-r--r-- | utils/libnotify/HISTORY | 3 | ||||
| -rwxr-xr-x | utils/notification-daemon/DEPENDS | 1 | ||||
| -rw-r--r-- | utils/notification-daemon/HISTORY | 3 | ||||
| -rwxr-xr-x | xfce/notification-daemon-xfce/DEPENDS | 13 | ||||
| -rw-r--r-- | xfce/notification-daemon-xfce/HISTORY | 3 |
6 files changed, 20 insertions, 6 deletions
diff --git a/utils/libnotify/DEPENDS b/utils/libnotify/DEPENDS index 94ab04d5af..bcb43244ae 100755 --- a/utils/libnotify/DEPENDS +++ b/utils/libnotify/DEPENDS @@ -1,3 +1,2 @@ depends dbus-glib && -depends gtk+2 && -depends NOTIFICATION_DAEMON +depends gtk+2 diff --git a/utils/libnotify/HISTORY b/utils/libnotify/HISTORY index 2ebeab6cb7..30ed6874cc 100644 --- a/utils/libnotify/HISTORY +++ b/utils/libnotify/HISTORY @@ -1,3 +1,6 @@ +2009-01-21 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Doesn't depend on NOTIFICATION_DAEMON (Bug #14976) + 2008-11-21 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.4.5 diff --git a/utils/notification-daemon/DEPENDS b/utils/notification-daemon/DEPENDS index 10eaf6db11..7ad9c3a68a 100755 --- a/utils/notification-daemon/DEPENDS +++ b/utils/notification-daemon/DEPENDS @@ -2,4 +2,5 @@ depends gtk+2 && depends dbus-glib && depends libsexy && depends gconf2 && +depends libnotify && depends libwnck diff --git a/utils/notification-daemon/HISTORY b/utils/notification-daemon/HISTORY index 1f14f4126c..52f862ee95 100644 --- a/utils/notification-daemon/HISTORY +++ b/utils/notification-daemon/HISTORY @@ -1,3 +1,6 @@ +2009-01-21 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Depends on libnotify (Bug #14976) + 2008-11-21 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.4.0 diff --git a/xfce/notification-daemon-xfce/DEPENDS b/xfce/notification-daemon-xfce/DEPENDS index c18d12aea4..3993d33e84 100755 --- a/xfce/notification-daemon-xfce/DEPENDS +++ b/xfce/notification-daemon-xfce/DEPENDS @@ -1,4 +1,9 @@ -depends gtk+2 && -depends dbus-glib && -depends libsexy && -depends libxfcegui4 +depends gtk+2 && +depends dbus-glib && +depends libsexy && +depends libxfcegui4 && + +optional_depends libnotify \ + '--enable-settings-preview' \ + '--disable-settings-preview' \ + 'for XFCE Settings Manager Wrapper' diff --git a/xfce/notification-daemon-xfce/HISTORY b/xfce/notification-daemon-xfce/HISTORY index 465e320f74..f3ac8fe4d6 100644 --- a/xfce/notification-daemon-xfce/HISTORY +++ b/xfce/notification-daemon-xfce/HISTORY @@ -1,3 +1,6 @@ +2009-01-21 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Optionally depends on libnotify (Bug #14976) + 2007-05-26 George Sherwood <george@beernabeer.com> * DETAILS: updated spell to 0.3.7 * PRE_BUILD: Removed |