diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2012-02-09 11:49:15 -0500 |
---|---|---|
committer | Package Import Robot <package-import@ubuntu.com> | 2012-02-09 11:49:15 -0500 |
commit | c14c51a28751efd19e94acba88016846dd764f86 (patch) | |
tree | 7ed33e456e05d74a9aaaa506d3476fef71f54657 /debian/patches/dbusmenu_05_90.patch | |
parent | 8baa6b251b2dcd1591fbdee1de9fe1174d425dcd (diff) | |
parent | 46ce85550e1349998561f82146a3828cc94e311e (diff) | |
download | ayatana-indicator-sound-c14c51a28751efd19e94acba88016846dd764f86.tar.gz ayatana-indicator-sound-c14c51a28751efd19e94acba88016846dd764f86.tar.bz2 ayatana-indicator-sound-c14c51a28751efd19e94acba88016846dd764f86.zip |
* debian/patches/sound_nua.patch
- open the new sound-nua panel in gnome-control-center
* debian/patches/dbusmenu_05_90.patch
- fixed FTBFS with dbusmenu 0.5.90
* debian/control
- bump build depends for dbusmenu to >= 0.5.90
Diffstat (limited to 'debian/patches/dbusmenu_05_90.patch')
-rw-r--r-- | debian/patches/dbusmenu_05_90.patch | 109 |
1 files changed, 109 insertions, 0 deletions
diff --git a/debian/patches/dbusmenu_05_90.patch b/debian/patches/dbusmenu_05_90.patch new file mode 100644 index 0000000..c477c68 --- /dev/null +++ b/debian/patches/dbusmenu_05_90.patch @@ -0,0 +1,109 @@ +=== modified file 'configure.ac' +--- old/configure.ac 2012-01-13 13:43:00 +0000 ++++ new/configure.ac 2012-02-01 03:15:46 +0000 +@@ -42,7 +42,7 @@ + GTK_REQUIRED_VERSION=2.22 + GTK3_REQUIRED_VERSION=3.0 + INDICATOR_REQUIRED_VERSION=0.3.19 +-DBUSMENUGTK_REQUIRED_VERSION=0.3.101 ++DBUSMENUGTK_REQUIRED_VERSION=0.5.90 + POLKIT_REQUIRED_VERSION=0.92 + PULSE_AUDIO_REQUIRED_VERSION=0.9.19 + INDICATOR_DISPLAY_OBJECTS=0.1.11 + +=== modified file 'src/indicator-sound.c' +--- old/src/indicator-sound.c 2012-01-25 02:57:50 +0000 ++++ new/src/indicator-sound.c 2012-02-01 03:20:44 +0000 +@@ -23,11 +23,7 @@ + #include <glib/gi18n.h> + #include <gtk/gtk.h> + #include <gdk/gdkkeysyms.h> +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include <libdbusmenu-gtk3/menu.h> +-#else + #include <libdbusmenu-gtk/menu.h> +-#endif + #include <libido/idoscalemenuitem.h> + + #include <gio/gio.h> + +=== modified file 'src/metadata-widget.h' +--- old/src/metadata-widget.h 2011-06-22 19:19:49 +0000 ++++ new/src/metadata-widget.h 2012-02-01 03:20:44 +0000 +@@ -20,11 +20,7 @@ + #define __METADATA_WIDGET_H__ + + #include <gtk/gtk.h> +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include <libdbusmenu-gtk3/menuitem.h> +-#else + #include <libdbusmenu-gtk/menuitem.h> +-#endif + + G_BEGIN_DECLS + + +=== modified file 'src/mute-widget.h' +--- old/src/mute-widget.h 2011-07-17 02:40:00 +0000 ++++ new/src/mute-widget.h 2012-02-01 03:20:44 +0000 +@@ -22,11 +22,7 @@ + #include <glib.h> + #include <glib-object.h> + #include <gtk/gtk.h> +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include <libdbusmenu-gtk3/menuitem.h> +-#else + #include <libdbusmenu-gtk/menuitem.h> +-#endif + #include <libindicator/indicator-object.h> + + G_BEGIN_DECLS + +=== modified file 'src/transport-widget.h' +--- old/src/transport-widget.h 2011-06-22 19:19:49 +0000 ++++ new/src/transport-widget.h 2012-02-01 03:20:44 +0000 +@@ -20,11 +20,7 @@ + #define __TRANSPORT_WIDGET_H__ + + #include <gtk/gtk.h> +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include <libdbusmenu-gtk3/menuitem.h> +-#else + #include <libdbusmenu-gtk/menuitem.h> +-#endif + + #include "common-defs.h" + + +=== modified file 'src/voip-input-widget.h' +--- old/src/voip-input-widget.h 2011-06-22 19:19:49 +0000 ++++ new/src/voip-input-widget.h 2012-02-01 03:20:44 +0000 +@@ -22,11 +22,7 @@ + #include <glib.h> + #include <glib-object.h> + #include <gtk/gtk.h> +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include <libdbusmenu-gtk3/menuitem.h> +-#else + #include <libdbusmenu-gtk/menuitem.h> +-#endif + + G_BEGIN_DECLS + + +=== modified file 'src/volume-widget.h' +--- old/src/volume-widget.h 2011-06-22 19:19:49 +0000 ++++ new/src/volume-widget.h 2012-02-01 03:20:44 +0000 +@@ -22,11 +22,7 @@ + #include <glib.h> + #include <glib-object.h> + #include <gtk/gtk.h> +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include <libdbusmenu-gtk3/menuitem.h> +-#else + #include <libdbusmenu-gtk/menuitem.h> +-#endif + #include <libindicator/indicator-object.h> + + G_BEGIN_DECLS + |