diff --git a/debian/changelog b/debian/changelog index e226aa5..774aa92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +liferea (1.8.3-0.1ubuntu2) precise; urgency=low + + * debian/patches: + - port-to-libindicate-0.7.patch: Replace deprecated + indicate_indicator_set_property_icon() call with + indicate_gtk_indicator_set_property_icon() (LP: #976120) + - indicator_include_config.h.patch: Include config.h for HAVE_LIBINDICATE + macro + + -- Chow Loong Jin Sun, 08 Apr 2012 02:13:07 +0800 + liferea (1.8.3-0.1ubuntu1) precise; urgency=low * New upstream release (LP: #290666, #371754, #741543, #716688) diff --git a/debian/patches/indicator_include_config.h.patch b/debian/patches/indicator_include_config.h.patch new file mode 100644 index 0000000..04c46b3 --- /dev/null +++ b/debian/patches/indicator_include_config.h.patch @@ -0,0 +1,18 @@ +From: Chow Loong Jin +Description: Include config.h for HAVE_LIBINDICATE macro +Bug-Ubuntu: https://bugs.launchpad.net/bugs/976120 +Index: liferea/src/ui/ui_indicator.c +=================================================================== +--- liferea.orig/src/ui/ui_indicator.c 2012-04-08 02:09:42.697186372 +0800 ++++ liferea/src/ui/ui_indicator.c 2012-04-08 02:10:56.604578970 +0800 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA + */ + ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #include "ui_indicator.h" + + #ifdef HAVE_LIBINDICATE diff --git a/debian/patches/port-to-libindicate-0.7.patch b/debian/patches/port-to-libindicate-0.7.patch new file mode 100644 index 0000000..4656179 --- /dev/null +++ b/debian/patches/port-to-libindicate-0.7.patch @@ -0,0 +1,16 @@ +From: Chow Loong Jin +Description: Replace deprecated indicate_indicator_set_property_icon() call with + indicate_gtk_indicator_set_property_icon() +Index: liferea/src/ui/ui_indicator.c +=================================================================== +--- liferea.orig/src/ui/ui_indicator.c 2012-04-08 02:07:12.622427210 +0800 ++++ liferea/src/ui/ui_indicator.c 2012-04-08 02:08:07.709609322 +0800 +@@ -179,7 +179,7 @@ + pixbuf = gdk_pixbuf_new_from_file (node->iconFile, NULL); + + /* display favicon */ +- indicate_indicator_set_property_icon (indicator, "icon", pixbuf); ++ indicate_gtk_indicator_set_property_icon (indicator, "icon", pixbuf); + gdk_pixbuf_unref (pixbuf); + + sprintf (count, "%u", node->unreadCount); diff --git a/debian/patches/series b/debian/patches/series index b1f98b3..c3c1957 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,5 @@ add_X-Ubuntu-Gettext-Domain libunity.patch libindicate_increase_version.patch #libindicate.patch +port-to-libindicate-0.7.patch +indicator_include_config.h.patch