From 5c23d138bfa80811e6c1198804dca164b608e08b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 17:17:40 -0500 Subject: * rebuild for libindicator7 * debian/rules - build with no-error=deprecated-declarations --- debian/changelog | 8 ++++++++ debian/rules | 1 + 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2d8b22f..32c27b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-sound (0.8.0.0-0ubuntu2) UNRELEASED; urgency=low + + * rebuild for libindicator7 + * debian/rules + - build with no-error=deprecated-declarations + + -- Ken VanDine Tue, 24 Jan 2012 12:58:33 -0500 + indicator-sound (0.8.0.0-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index dfd669b..f6ead0e 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,7 @@ DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 DEB_CONFIGURE_EXTRA_FLAGS = --disable-static +CFLAGS += -Wno-error=deprecated-declarations LDFLAGS += -Wl,-z,defs -Wl,--as-needed debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) -- cgit v1.2.3 From 645376ce15e97a5caca6869236aa7df82af3b1ca Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 22:20:59 -0500 Subject: * -debian/patches/disable_Werror.patch - disabled in debian/rules instead * Add lazy_init.patch: Avoid spawning notification daemon right at startup, instead initialize it lazily when actually doing a notification. Improves boot speed. (LP: #912150) * Add disable_Werror.patch: Build without -Werror, to avoid build failure due to deprecated declarations. (LP: #912160) --- debian/changelog | 14 +++++++++++++- debian/patches/lazy_init.patch | 40 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 debian/patches/lazy_init.patch diff --git a/debian/changelog b/debian/changelog index 32c27b6..bb1808d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,23 @@ -indicator-sound (0.8.0.0-0ubuntu2) UNRELEASED; urgency=low +indicator-sound (0.8.0.0-0ubuntu3) UNRELEASED; urgency=low * rebuild for libindicator7 * debian/rules - build with no-error=deprecated-declarations + * -debian/patches/disable_Werror.patch + - disabled in debian/rules instead -- Ken VanDine Tue, 24 Jan 2012 12:58:33 -0500 +indicator-sound (0.8.0.0-0ubuntu2) precise; urgency=low + + * Add lazy_init.patch: Avoid spawning notification daemon right at startup, + instead initialize it lazily when actually doing a notification. Improves + boot speed. (LP: #912150) + * Add disable_Werror.patch: Build without -Werror, to avoid build failure + due to deprecated declarations. (LP: #912160) + + -- Martin Pitt Thu, 05 Jan 2012 09:29:36 +0100 + indicator-sound (0.8.0.0-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/debian/patches/lazy_init.patch b/debian/patches/lazy_init.patch new file mode 100644 index 0000000..cc0fe17 --- /dev/null +++ b/debian/patches/lazy_init.patch @@ -0,0 +1,40 @@ +Description: Avoid spawning notification daemon right at startup, instead initialize it lazily when actually doing a notification. Improves boot speed. +Bug: https://launchpad.net/bugs/912150 +Author: Martin Pitt +Forwarded: https://code.launchpad.net/~pitti/indicator-sound/lazy-notification-init/+merge/87576 + +--- a/src/sound-state-manager.c 2011-04-05 03:14:19 +0000 ++++ b/src/sound-state-manager.c 2012-01-05 08:46:07 +0000 +@@ -80,8 +80,6 @@ + + priv->settings_manager = g_settings_new("com.canonical.indicators.sound"); + +- sound_state_manager_notification_init (self); +- + sound_state_manager_prepare_state_image_names (self); + sound_state_manager_prepare_blocked_animation (self); + +@@ -134,6 +132,13 @@ + static void + sound_state_manager_notification_init (SoundStateManager* self) + { ++ static gboolean initialized = FALSE; ++ ++ /* one-time lazy initialization */ ++ if (initialized) ++ return; ++ initialized = TRUE; ++ + SoundStateManagerPrivate* priv = SOUND_STATE_MANAGER_GET_PRIVATE(self); + + if (!notify_init(PACKAGE_NAME)) +@@ -164,6 +169,8 @@ + { + SoundStateManagerPrivate* priv = SOUND_STATE_MANAGER_GET_PRIVATE(self); + ++ sound_state_manager_notification_init (self); ++ + if (priv->notification == NULL || + g_settings_get_boolean (priv->settings_manager, "show-notify-osd-on-scroll") == FALSE){ + return; + diff --git a/debian/patches/series b/debian/patches/series index e69de29..20dfb03 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +lazy_init.patch -- cgit v1.2.3 From 4beadce168bb0894a2bfe195a989f348007c1031 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 25 Jan 2012 10:00:26 -0500 Subject: releasing version 0.8.0.0-0ubuntu3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bb1808d..0cb0725 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.8.0.0-0ubuntu3) UNRELEASED; urgency=low +indicator-sound (0.8.0.0-0ubuntu3) precise; urgency=low * rebuild for libindicator7 * debian/rules @@ -6,7 +6,7 @@ indicator-sound (0.8.0.0-0ubuntu3) UNRELEASED; urgency=low * -debian/patches/disable_Werror.patch - disabled in debian/rules instead - -- Ken VanDine Tue, 24 Jan 2012 12:58:33 -0500 + -- Ken VanDine Wed, 25 Jan 2012 10:00:00 -0500 indicator-sound (0.8.0.0-0ubuntu2) precise; urgency=low -- cgit v1.2.3