Ubuntu
liferea package

Merge lp:~ubuntu-branches/ubuntu/natty/liferea/natty-201103250153 into lp:ubuntu/natty/liferea

  1. Natty (11.04)
  2. natty-201103250153
  3. Merge into natty
Proposed by James Westby
Status: Work in progress
Proposed branch: lp:~ubuntu-branches/ubuntu/natty/liferea/natty-201103250153
Merge into: lp:ubuntu/natty/liferea
Diff against target: 210 lines (+204/-0) (has conflicts)
1 file modified
debian/patches/libunity.patch (+204/-0)
Conflict adding file debian/patches/libunity.patch.  Moved existing file to debian/patches/libunity.patch.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/natty/liferea/natty-201103250153
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+55051@code.launchpad.net

Description of the change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/liferea now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/liferea/natty-201103250153. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

111. By Ken VanDine

releasing version 1.6.4-1ubuntu6

110. By Ken VanDine

* debian/patches/libunity.patch
  - Displays the number of unread items in the Unity Launcher
    entry (LP: #732848).
* debian/control
  - Added missing build dep to libunity-dev

109. By Marc Deslauriers

* Fix indicator support again (LP: #723349)
  - debian/patches/libindicate.patch: updated check for new version of
    libindicate.
  - debian/control: bump libindicate-dev and libindicate-gtk-dev
    version requirement.

108. By Benjamin Drung

Change build dependency from libwebkit-dev to libwebkitgtk-dev
(LP: #703248).

107. By Marc Deslauriers

debian/control: Add libindicate-gtk-dev to Build-Depends so indicator
support gets built properly. (LP: #689710)

106. By Luke Yelavich

releasing version 1.6.4-1ubuntu2

105. By Luke Yelavich

debian/patches/libindicate.patch: Fixed reversed order and missing
favicons in indicator applet, thanks to Pavol Klačanský for the patch.
(LP: #653995)

104. By Luke Yelavich

Integrate indicator_icons.patch into libindicate.patch

103. By Luke Yelavich

Merge branch lp:~pavolzetor/ubuntu/natty/liferea/liferea-test with changes:
  - Kept src/ui/ui_indicator.{c,h} so they still have a revision history

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'debian/patches/libunity.patch'
--- debian/patches/libunity.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/libunity.patch 2011-03-28 07:07:36 +0000
@@ -0,0 +1,204 @@
1=== modified file 'src/Makefile.am'
2Index: fix-for-bug-732848/src/Makefile.am
3===================================================================
4--- fix-for-bug-732848.orig/src/Makefile.am 2011-03-12 12:50:17.735382000 +0100
5+++ fix-for-bug-732848/src/Makefile.am 2011-03-12 12:50:30.401905830 +0100
6@@ -97,3 +97,9 @@
7 liferea_LDADD += $(LIBINDICATE_LIBS)
8
9 endif
10+
11+if WITH_LIBUNITY
12+
13+liferea_LDADD += $(LIBUNITY_LIBS)
14+
15+endif
16Index: fix-for-bug-732848/src/ui/Makefile.am
17===================================================================
18--- fix-for-bug-732848.orig/src/ui/Makefile.am 2011-03-12 12:50:17.735382000 +0100
19+++ fix-for-bug-732848/src/ui/Makefile.am 2011-03-12 12:50:30.401905830 +0100
20@@ -8,7 +8,7 @@
21
22 noinst_LIBRARIES = libliui.a
23
24-libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(DBUS_CFLAGS) $(LIBINDICATE_CFLAGS)
25+libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(DBUS_CFLAGS) $(LIBINDICATE_CFLAGS) $(LIBUNITY_CFLAGS)
26 libliui_a_SOURCES = \
27 auth_dialog.c auth_dialog.h \
28 browser_tabs.c browser_tabs.h \
29@@ -35,4 +35,5 @@
30 ui_session.c ui_session.h \
31 ui_subscription.c ui_subscription.h \
32 ui_tray.c ui_tray.h \
33+ ui_unity.c ui_unity.h \
34 ui_update.c ui_update.h
35Index: fix-for-bug-732848/src/ui/ui_tray.c
36===================================================================
37--- fix-for-bug-732848.orig/src/ui/ui_tray.c 2011-03-12 12:50:17.735382000 +0100
38+++ fix-for-bug-732848/src/ui/ui_tray.c 2011-03-12 12:50:30.405905830 +0100
39@@ -188,6 +188,7 @@
40 gchar *msg, *tmp;
41
42 ui_indicator_update ();
43+ ui_unity_update();
44
45 if (!trayIcon_priv)
46 return;
47Index: fix-for-bug-732848/src/ui/ui_unity.c
48===================================================================
49--- /dev/null 1970-01-01 00:00:00.000000000 +0000
50+++ fix-for-bug-732848/src/ui/ui_unity.c 2011-03-12 12:50:52.949905875 +0100
51@@ -0,0 +1,62 @@
52+/*
53+ * Copyright (C) 2011 Jean-Philippe Orsini <jeanfi@gmail.com>
54+ *
55+ * This program is free software; you can redistribute it and/or modify
56+ * it under the terms of the GNU General Public License as published by
57+ * the Free Software Foundation; either version 2 of the License, or
58+ * (at your option) any later version.
59+ *
60+ * This program is distributed in the hope that it will be useful,
61+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
62+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
63+ * GNU Library General Public License for more details.
64+ *
65+ * You should have received a copy of the GNU General Public License
66+ * along with this program; if not, write to the Free Software
67+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
68+ */
69+
70+#include "ui_unity.h"
71+
72+#ifdef HAVE_LIBUNITY
73+
74+#include <feedlist.h>
75+
76+#include <unity.h>
77+
78+static UnityLauncherEntry *entry;
79+
80+void ui_unity_update (void)
81+{
82+ int count;
83+
84+ if (!entry)
85+ entry = unity_launcher_entry_get_for_desktop_file
86+ ("liferea.desktop");
87+
88+ if (entry) {
89+ count = feedlist_get_unread_item_count ();
90+
91+ if (count) {
92+ unity_launcher_entry_set_count (entry, count);
93+ unity_launcher_entry_set_count_visible (entry, TRUE);
94+ } else {
95+ unity_launcher_entry_set_count_visible (entry, FALSE);
96+ }
97+ }
98+}
99+
100+void ui_unity_destroy (void)
101+{
102+ if (entry) {
103+ unity_launcher_entry_set_count_visible (entry, FALSE);
104+ g_main_context_iteration(NULL, FALSE);
105+ }
106+}
107+
108+#else
109+
110+void ui_unity_update (void) {}
111+void ui_unity_destroy (void) {}
112+
113+#endif /* HAVE_LIBUNITY */
114Index: fix-for-bug-732848/src/ui/ui_unity.h
115===================================================================
116--- /dev/null 1970-01-01 00:00:00.000000000 +0000
117+++ fix-for-bug-732848/src/ui/ui_unity.h 2011-03-12 12:50:30.405905830 +0100
118@@ -0,0 +1,29 @@
119+/*
120+ * Copyright (C) 2011 Jean-Philippe Orsini <jeanfi@gmail.com>
121+ *
122+ * This program is free software; you can redistribute it and/or modify
123+ * it under the terms of the GNU General Public License as published by
124+ * the Free Software Foundation; either version 2 of the License, or
125+ * (at your option) any later version.
126+ *
127+ * This program is distributed in the hope that it will be useful,
128+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
129+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
130+ * GNU Library General Public License for more details.
131+ *
132+ * You should have received a copy of the GNU General Public License
133+ * along with this program; if not, write to the Free Software
134+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
135+ */
136+
137+#ifndef _UI_UNITY_H
138+#define _UI_UNITY_H
139+
140+#ifdef HAVE_CONFIG_H
141+ #include <config.h>
142+#endif
143+
144+void ui_unity_update ();
145+void ui_unity_destroy ();
146+
147+#endif /* _UI_UNITY_H */
148Index: fix-for-bug-732848/configure.ac
149===================================================================
150--- fix-for-bug-732848.orig/configure.ac 2011-03-12 12:50:17.735382000 +0100
151+++ fix-for-bug-732848/configure.ac 2011-03-12 12:50:30.405905830 +0100
152@@ -29,6 +29,7 @@
153 AC_ARG_ENABLE(nm, AS_HELP_STRING([--disable-nm],[compile without NetworkManager support]),,enable_nm=yes)
154 AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes)
155 AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes)
156+AC_ARG_ENABLE(libunity, AS_HELP_STRING([--disable-libunity],[compile without libunity support]),,enable_libunity=yes)
157 AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes)
158 dnl AC_ARG_ENABLE(avahi, AS_HELP_STRING([--disable-avahi],[don't compile with AVAHI support]),,enable_avahi=yes)
159
160@@ -119,6 +120,24 @@
161
162 AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes")
163
164+dnl *********
165+dnl libunity
166+dnl *********
167+
168+if test "x$enable_libunity" = "xyes"; then
169+ PKG_CHECK_MODULES([LIBUNITY], unity >= 3.4.2,enable_libunity=yes,enable_libunity=no)
170+ AC_SUBST(LIBUNITY_CFLAGS)
171+ AC_SUBST(LIBUNITY_LIBS)
172+else
173+ enable_libunity=no
174+fi
175+
176+if test "x$enable_libunity" = "xyes"; then
177+ AC_DEFINE(HAVE_LIBUNITY, 1, [Define if libunity support is enabled])
178+fi
179+
180+AM_CONDITIONAL(WITH_LIBUNITY, test "x$enable_libunity" = "xyes")
181+
182 dnl *****
183 dnl AVAHI
184 dnl *****
185@@ -260,6 +279,7 @@
186 echo "Use DBUS........................ : $enable_dbus"
187 echo "Use NetworkManager.............. : $enable_nm"
188 echo "Use libindicate................. : $enable_libindicate"
189+echo "Use libunity.................... : $enable_libunity"
190 dnl echo "AVAHI Support................... : $enable_avahi"
191 echo
192 eval eval echo Liferea will be installed in $bindir.
193Index: fix-for-bug-732848/src/ui/liferea_shell.c
194===================================================================
195--- fix-for-bug-732848.orig/src/ui/liferea_shell.c 2011-03-12 12:50:17.735382000 +0100
196+++ fix-for-bug-732848/src/ui/liferea_shell.c 2011-03-12 12:50:30.409905830 +0100
197@@ -1333,6 +1333,7 @@
198 ui_feedlist_select (NULL);
199 liferea_shell_save_position ();
200 ui_indicator_destroy ();
201+ ui_unity_destroy ();
202 ui_tray_enable (FALSE);
203 notification_enable (FALSE);
204 g_object_unref (shell->priv->tabs);
0205
=== renamed file 'debian/patches/libunity.patch' => 'debian/patches/libunity.patch.moved'

Subscribers

People subscribed via source and target branches