--- Begin Message ---
Source: gnubiff
Version: 2.2.15-4
Tags: patch
Dear maintainer,
I am attaching the patch that ports gnubiff to the new libpanel-applet
API, so that it is compatible with gnome-panel 3.14 and newer releases.
New gnome-panel is so far only available in experimental, but we are
going to upload it to unstable at some point (it will be a transition
coordinated with Release Team).
You do not need to apply this patch right now, but feel free to review
it and/or upload the patched version to experimental.
--
Dmitry Shachnev
diff -Nru gnubiff-2.2.15/debian/changelog gnubiff-2.2.15/debian/changelog
--- gnubiff-2.2.15/debian/changelog 2014-10-03 19:21:00.000000000 +0400
+++ gnubiff-2.2.15/debian/changelog 2015-06-17 11:57:37.000000000 +0300
@@ -1,3 +1,9 @@
+gnubiff (2.2.15-4.1) UNRELEASED; urgency=medium
+
+ * Port to GAction and libpanel-applet 3.14.
+
+ -- Dmitry Shachnev <mity...@debian.org> Wed, 17 Jun 2015 11:57:28 +0300
+
gnubiff (2.2.15-4) unstable; urgency=medium
* Add patch by Frederic Briere to fix mutex unlocking that should really be a
diff -Nru gnubiff-2.2.15/debian/control gnubiff-2.2.15/debian/control
--- gnubiff-2.2.15/debian/control 2014-10-03 19:20:00.000000000 +0400
+++ gnubiff-2.2.15/debian/control 2015-06-17 11:57:12.000000000 +0300
@@ -2,7 +2,7 @@
Section: mail
Priority: optional
Maintainer: Roland Stigge <sti...@antcom.de>
-Build-Depends: debhelper (>= 9), libaudiofile-dev, libgtk-3-dev, libssl-dev, libxml-parser-perl, libfam-dev, libpopt-dev, intltool, automake, autoconf, libpanel-applet-4-dev
+Build-Depends: debhelper (>= 9), libaudiofile-dev, libgconf2-dev, libgtk-3-dev, libssl-dev, libxml-parser-perl, libfam-dev, libpopt-dev, intltool, automake, autoconf, libpanel-applet-dev
Standards-Version: 3.9.5
Homepage: http://gnubiff.sourceforge.net/
diff -Nru gnubiff-2.2.15/debian/patches/06-libpanel-applet.patch gnubiff-2.2.15/debian/patches/06-libpanel-applet.patch
--- gnubiff-2.2.15/debian/patches/06-libpanel-applet.patch 1970-01-01 03:00:00.000000000 +0300
+++ gnubiff-2.2.15/debian/patches/06-libpanel-applet.patch 2015-06-17 11:57:02.000000000 +0300
@@ -0,0 +1,159 @@
+Description: port to GAction and libpanel-applet 3.14
+Author: Dmitry Shachnev <mity...@debian.org>
+Forwarded: no (upstream seems dead)
+Last-Update: 2014-11-20
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -178,7 +178,7 @@
+ ######################################################################
+ if test "$OPT_USEGNOME" = "yes"; then
+ PKG_CHECK_MODULES(GNOME_DEP, [
+- libpanelapplet-4.0
++ libpanel-applet
+ ], [
+ AC_SUBST(GNOME_DEP_CFLAGS)
+ AC_SUBST(GNOME_DEP_LIBS)
+--- a/src/ui-applet-gnome.h
++++ b/src/ui-applet-gnome.h
+@@ -31,7 +31,6 @@
+ #define __APPLET_GNOME_H__
+
+ #include <panel-applet.h>
+-#include <panel-applet-gconf.h>
+ #include "ui-applet-gui.h"
+
+
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -25,7 +25,7 @@
+ src/gtk_image_animation.cc
+ src/ui-popup.cc
+ src/support.cc
+-src/GNOME_gnubiffApplet.xml
++[type: gettext/glade]src/GNOME_gnubiffApplet.xml
+ ui/applet-gtk.ui
+ ui/preferences.ui
+ ui/properties.ui
+--- a/src/GNOME_gnubiffApplet.xml
++++ b/src/GNOME_gnubiffApplet.xml
+@@ -1,4 +1,18 @@
+-<menuitem name="Item 1" action="Props" />
+-<menuitem name="Item 2" action="MailApp" />
+-<menuitem name="Item 3" action="MailRead" />
+-<menuitem name="Item 4" action="Info" />
++<section>
++ <item>
++ <attribute name="label" translatable="yes">_Preferences...</attribute>
++ <attribute name="action">gnubiff.props</attribute>
++ </item>
++ <item>
++ <attribute name="label" translatable="yes">_Run command</attribute>
++ <attribute name="action">gnubiff.mail-app</attribute>
++ </item>
++ <item>
++ <attribute name="label" translatable="yes">_Mark mailboxes read</attribute>
++ <attribute name="action">gnubiff.mail-read</attribute>
++ </item>
++ <item>
++ <attribute name="label" translatable="yes">_Info</attribute>
++ <attribute name="action">gnubiff.info</attribute>
++ </item>
++</section>
+--- a/src/ui-applet-gnome.cc
++++ b/src/ui-applet-gnome.cc
+@@ -88,36 +88,44 @@
+ }
+
+
+- static void APPLET_GNOME_on_menu_properties (GtkAction *action,
+- AppletGnome *data)
++ static void APPLET_GNOME_on_menu_properties (GSimpleAction *action,
++ GVariant *parameter,
++ gpointer user_data)
+ {
++ AppletGnome *data = (AppletGnome *)user_data;
+ if (data)
+ data->show_dialog_preferences ();
+ else
+ unknown_internal_error ();
+ }
+
+- void APPLET_GNOME_on_menu_command (GtkAction *action,
+- AppletGnome *data)
++ void APPLET_GNOME_on_menu_command (GSimpleAction *action,
++ GVariant *parameter,
++ gpointer user_data)
+ {
++ AppletGnome *data = (AppletGnome *)user_data;
+ if (data)
+ data->execute_command ("double_command", "use_double_command");
+ else
+ unknown_internal_error ();
+ }
+
+- void APPLET_GNOME_on_menu_mail_read (GtkAction *action,
+- AppletGnome *data)
++ void APPLET_GNOME_on_menu_mail_read (GSimpleAction *action,
++ GVariant *parameter,
++ gpointer user_data)
+ {
++ AppletGnome *data = (AppletGnome *)user_data;
+ if (data)
+ data->mark_messages_as_read ();
+ else
+ unknown_internal_error ();
+ }
+
+- void APPLET_GNOME_on_menu_info (GtkAction *action,
+- AppletGnome *data)
++ void APPLET_GNOME_on_menu_info (GSimpleAction *action,
++ GVariant *parameter,
++ gpointer user_data)
+ {
++ AppletGnome *data = (AppletGnome *)user_data;
+ if (data)
+ data->show_dialog_about ();
+ else
+@@ -159,18 +167,21 @@
+ AppletGnome::dock (GtkWidget *applet)
+ {
+ // Create the applet's menu
+- static const GtkActionEntry gnubiff_menu_actions [] = {
+- { "Props", GTK_STOCK_PROPERTIES, N_("_Preferences..."), NULL, NULL, G_CALLBACK (APPLET_GNOME_on_menu_properties) },
+- { "MailApp", GTK_STOCK_PROPERTIES, N_("_Run command"), NULL, NULL, G_CALLBACK (APPLET_GNOME_on_menu_command) },
+- { "MailRead", GTK_STOCK_PROPERTIES, N_("_Mark mailboxes read"), NULL, NULL, G_CALLBACK (APPLET_GNOME_on_menu_mail_read) },
+- { "Info", GTK_STOCK_ABOUT, N_("_Info"), NULL, NULL, G_CALLBACK (APPLET_GNOME_on_menu_info) }
++ static const GActionEntry gnubiff_menu_actions [] = {
++ { "props", APPLET_GNOME_on_menu_properties },
++ { "mail-app", APPLET_GNOME_on_menu_command },
++ { "mail-read", APPLET_GNOME_on_menu_mail_read },
++ { "info", APPLET_GNOME_on_menu_info }
+ };
+- GtkActionGroup * action_group = gtk_action_group_new ("ShowDesktop Applet Actions");
+- gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
+- gtk_action_group_add_actions (action_group, gnubiff_menu_actions, G_N_ELEMENTS (gnubiff_menu_actions), this);
++ GSimpleActionGroup * action_group = g_simple_action_group_new ();
++ g_action_map_add_action_entries (G_ACTION_MAP (action_group),
++ gnubiff_menu_actions,
++ G_N_ELEMENTS (gnubiff_menu_actions),
++ this);
+ gchar *ui_path = g_build_filename (GNUBIFF_UIDIR, "GNOME_gnubiffApplet.xml", NULL);
+- panel_applet_setup_menu_from_file (PANEL_APPLET (applet), ui_path, action_group);
++ panel_applet_setup_menu_from_file (PANEL_APPLET (applet), ui_path, action_group, GETTEXT_PACKAGE);
+ g_free (ui_path);
++ gtk_widget_insert_action_group (applet, "gnubiff", G_ACTION_GROUP (action_group));
+ g_object_unref (action_group);
+
+ // We need the PANEL_APPLET_EXPAND_MINOR for getting the correct size of
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -79,7 +79,7 @@
+
+ gnubiff_SOURCES = $(common_sources)
+ gnubiff_LDADD = $(INTLLIBS) $(GNUBIFF_DEP_LIBS) $(FAM_LIBS)
+-panelappletdir = `pkg-config --variable=libpanel_applet_dir libpanelapplet-4.0`
++panelappletdir = `pkg-config --variable=libpanel_applet_dir libpanel-applet`
+ panelapplet_in_files =
+ panelapplet_DATA =
+ servicedir = /usr/share/dbus-1/services
diff -Nru gnubiff-2.2.15/debian/patches/series gnubiff-2.2.15/debian/patches/series
--- gnubiff-2.2.15/debian/patches/series 2014-10-03 19:10:16.000000000 +0400
+++ gnubiff-2.2.15/debian/patches/series 2015-06-17 11:57:02.000000000 +0300
@@ -2,3 +2,4 @@
02-fix-mutex.patch
04-fix-POTFILES-in.patch
05-ignore-pc-dir-for-intltool.patch
+06-libpanel-applet.patch
signature.asc
Description: OpenPGP digital signature
--- End Message ---
