[Pkg-xfce-commits] r7763 - in goodies/trunk/xfce4-mailwatch-plugin/debian: . patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Sat Jun 8 06:02:48 UTC 2013
Author: mrpouit-guest
Date: 2013-06-08 18:02:47 +0000 (Sat, 08 Jun 2013)
New Revision: 7763
Added:
goodies/trunk/xfce4-mailwatch-plugin/debian/patches/05_port-to-libxfce4ui.patch
Modified:
goodies/trunk/xfce4-mailwatch-plugin/debian/changelog
goodies/trunk/xfce4-mailwatch-plugin/debian/control
goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series
goodies/trunk/xfce4-mailwatch-plugin/debian/rules
Log:
* Port from libxfcegui4 to libxfce4ui:
- debian/patches/05_port-to-libxfce4ui.patch: added.
- debian/control: replace libxfcegui4-dev build-dep with libxfce4ui-1-dev.
* debian/rules:
- override dh_auto_clean to properly clean up autogenerated files changed
by xdt-autogen.
- use autotools-dev addon to rebuild config.{guess,sub} since they are
from 2008...
* debian/control:
- add build-dep on autotools-dev.
Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/changelog 2013-06-03 21:45:38 UTC (rev 7762)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/changelog 2013-06-08 18:02:47 UTC (rev 7763)
@@ -1,3 +1,18 @@
+xfce4-mailwatch-plugin (1.1.0-7) UNRELEASED; urgency=low
+
+ * Port from libxfcegui4 to libxfce4ui:
+ - debian/patches/05_port-to-libxfce4ui.patch: added.
+ - debian/control: replace libxfcegui4-dev build-dep with libxfce4ui-1-dev.
+ * debian/rules:
+ - override dh_auto_clean to properly clean up autogenerated files changed
+ by xdt-autogen.
+ - use autotools-dev addon to rebuild config.{guess,sub} since they are
+ from 2008...
+ * debian/control:
+ - add build-dep on autotools-dev.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 08 Jun 2013 19:35:59 +0200
+
xfce4-mailwatch-plugin (1.1.0-6) unstable; urgency=low
* debian/rules:
Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/control 2013-06-03 21:45:38 UTC (rev 7762)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/control 2013-06-08 18:02:47 UTC (rev 7763)
@@ -6,8 +6,8 @@
Stefan Ott <stefan at ott.net>, Yves-Alexis Perez <corsac at debian.org>,
Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: debhelper (>= 9), libgtk2.0-dev, xfce4-panel-dev,
- libgnutls-dev, libxml-parser-perl, libxfce4util-dev, libxfcegui4-dev,
- xfce4-dev-tools, intltool, libtool, autoconf
+ libgnutls-dev, libxml-parser-perl, libxfce4util-dev, libxfce4ui-1-dev,
+ xfce4-dev-tools, intltool, libtool, autoconf, autotools-dev
Standards-Version: 3.9.4
Homepage: http://spuriousinterrupt.org/projects/mailwatch
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-mailwatch-plugin/
Added: goodies/trunk/xfce4-mailwatch-plugin/debian/patches/05_port-to-libxfce4ui.patch
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/05_port-to-libxfce4ui.patch (rev 0)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/patches/05_port-to-libxfce4ui.patch 2013-06-08 18:02:47 UTC (rev 7763)
@@ -0,0 +1,283 @@
+Description: Port to libxfce4ui
+Origin: other, https://bugzilla.xfce.org/attachment.cgi?id=4507
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=9032
+
+--- xfce4-mailwatch-plugin-1.1.0.orig/configure.ac
++++ xfce4-mailwatch-plugin-1.1.0/configure.ac
+@@ -57,7 +57,7 @@ XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.4.0])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.2.0])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20],
+ [have_44_panel=yes], [
+--- xfce4-mailwatch-plugin-1.1.0.orig/panel-plugin/Makefile.am
++++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am
+@@ -26,6 +26,7 @@ libmailwatch_la_CFLAGS = \
+ -I$(top_srcdir)/libmailwatch-core \
+ @GTHREAD_CFLAGS@ \
+ @XFCE4_PANEL_CFLAGS@ \
++ @LIBXFCE4UI_CFLAGS@ \
+ -DDATADIR=\"$(datadir)\" \
+ -DLOCALEDIR=\"$(localedir)\"
+
+@@ -36,6 +37,7 @@ libmailwatch_la_LIBADD = \
+ $(top_builddir)/libmailwatch-core/libmailwatch-core.la \
+ @GTHREAD_LIBS@ \
+ @XFCE4_PANEL_LIBS@ \
++ @LIBXFCE4UI_LIBS@ \
+ @GNUTLS_LIBS@ \
+ @LIBGCRYPT_LIBS@
+
+@@ -51,7 +53,7 @@ xfce4_mailwatch_plugin_CFLAGS = \
+ -I$(top_srcdir)/libmailwatch-core \
+ @GTHREAD_CFLAGS@ \
+ @LIBXFCE4PANEL_CFLAGS@ \
+- @LIBXFCEGUI4_CFLAGS@ \
++ @LIBXFCE4UI_CFLAGS@ \
+ -DDATADIR=\"$(datadir)\" \
+ -DLOCALEDIR=\"$(localedir)\"
+
+@@ -62,7 +64,7 @@ xfce4_mailwatch_plugin_LDADD = \
+ $(top_builddir)/libmailwatch-core/libmailwatch-core.la \
+ @GTHREAD_LIBS@ \
+ @LIBXFCE4PANEL_LIBS@ \
+- @LIBXFCEGUI4_LIBS@ \
++ @LIBXFCE4UI_LIBS@ \
+ @GNUTLS_LIBS@ \
+ @LIBGCRYPT_LIBS@
+
+--- xfce4-mailwatch-plugin-1.1.0.orig/panel-plugin/mailwatch-plugin-4.2.c
++++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/mailwatch-plugin-4.2.c
+@@ -23,7 +23,7 @@
+ #include <gtk/gtk.h>
+
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libxfcegui4/xfce_scaled_image.h>
+
+ #include <panel/plugins.h>
+--- xfce4-mailwatch-plugin-1.1.0.orig/panel-plugin/mailwatch-plugin.c
++++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/mailwatch-plugin.c
+@@ -30,9 +30,8 @@
+ #include <gtk/gtk.h>
+
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
+-#include <libxfce4panel/xfce-panel-convenience.h>
++#include <libxfce4ui/libxfce4ui.h>
++#include <libxfce4panel/libxfce4panel.h>
+
+ #include "mailwatch.h"
+ #include "mailwatch-mailbox.h"
+@@ -145,7 +144,7 @@ mailwatch_new_messages_changed_cb(XfceMa
+ g_string_free(ttip_str, TRUE);
+
+ if(mwp->new_messages_command)
+- xfce_exec(mwp->new_messages_command, FALSE, FALSE, NULL);
++ xfce_spawn_command_line_on_screen(gdk_screen_get_default(), mwp->new_messages_command, FALSE, FALSE, NULL);
+ }
+ }
+ }
+@@ -175,7 +174,7 @@ mailwatch_button_release_cb(GtkWidget *w
+ switch(evt->button) {
+ case 1: /* left */
+ if(mwp->click_command && *mwp->click_command)
+- xfce_exec(mwp->click_command, FALSE, FALSE, NULL);
++ xfce_spawn_command_line_on_screen(gdk_screen_get_default(), mwp->click_command, FALSE, FALSE, NULL);
+ break;
+
+ case 2: /* middle */
+@@ -809,7 +808,7 @@ mailwatch_help_clicked_cb(GtkWidget *w,
+ {
+ GError *err = NULL;
+
+- if(!xfce_exec("xfhelp4 xfce4-mailwatch-plugin.html", FALSE, FALSE, &err)) {
++ if(!xfce_spawn_command_line_on_screen(gdk_screen_get_default(), "xfhelp4 xfce4-mailwatch-plugin.html", FALSE, FALSE, &err)) {
+ gchar *secondary = g_strdup_printf(_("Help is unavailable because 'xfhelp4' could not be run: %s"),
+ err->message);
+ xfce_message_dialog(NULL, _("Help Unavailable"), GTK_STOCK_DIALOG_ERROR,
+@@ -1025,35 +1024,28 @@ mailwatch_show_about(XfcePanelPlugin *pl
+ gpointer user_data)
+ {
+ XfceMailwatchPlugin *mwp = user_data;
+- XfceAboutInfo *ainfo;
+ GdkPixbuf *icon;
+-
+- if(G_UNLIKELY(mwp->about_dialog)) {
+- gtk_window_present(GTK_WINDOW(mwp->about_dialog));
+- return;
+- }
+-
+- ainfo = xfce_about_info_new(_("Xfce4 Mailwatch Plugin"),
+- VERSION,
+- _("A featureful mail-checker applet for the Xfce Panel"),
+- _("Copyright (c) 2005-2008 Brian Tarricone\n"
+- "Copyright (c) 2005 Pasi Orovuo"),
+- XFCE_LICENSE_GPL);
+- xfce_about_info_set_homepage(ainfo, WEBSITE);
+- xfce_about_info_add_credit(ainfo, "Brian J. Tarricone",
+- "bjt23 at cornell.edu",
+- _("Maintainer, Original Author"));
+- xfce_about_info_add_credit(ainfo, "Pasi Orovuo", "pasi.ov at gmail.com",
+- _("Developer"));
+-
+- icon = xfce_themed_icon_load("xfce-mail", 32);
+-
+- mwp->about_dialog = xfce_about_dialog_new_with_values(NULL, ainfo, icon);
+- g_object_add_weak_pointer(G_OBJECT(mwp->about_dialog),
+- (gpointer)&mwp->about_dialog);
+- gtk_widget_show_all(mwp->about_dialog);
+- g_signal_connect(G_OBJECT(mwp->about_dialog), "response",
+- G_CALLBACK(gtk_widget_destroy), NULL);
++ const gchar *auth[] = { "Brian J. Tarricone bjt23 at cornell.edu Maintainer, Original Author",
++ "Pasi Orovuo pasi.ov at gmail.com Developer",
++ NULL };
++
++ icon = xfce_panel_pixbuf_from_source("xfce-mail", NULL, 32);
++
++#if !GTK_CHECK_VERSION (2, 18, 0)
++ gtk_about_dialog_set_email_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
++ gtk_about_dialog_set_url_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
++#endif
++ gtk_show_about_dialog(NULL,
++ "logo", icon,
++ "program-name", _("Xfce4 Mailwatch Plugin"),
++ "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL),
++ "version", VERSION,
++ "comments", _("A featureful mail-checker applet for the Xfce Panel"),
++ "website", WEBSITE,
++ "copyright", _("Copyright (c) 2005-2008 Brian Tarricone\n"
++ "Copyright (c) 2005 Pasi Orovuo"),
++ "authors", auth,
++ NULL);
+
+ if(icon)
+ g_object_unref(G_OBJECT(icon));
+--- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-mailbox-maildir.c
++++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-maildir.c
+@@ -48,7 +48,7 @@
+ #include <gtk/gtk.h>
+
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include "mailwatch.h"
+
+--- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-mailbox-imap.c
++++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-imap.c
+@@ -58,7 +58,7 @@
+ #include <gtk/gtk.h>
+
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include "mailwatch-net-conn.h"
+ #include "mailwatch-utils.h"
+--- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/Makefile.am
++++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/Makefile.am
+@@ -27,7 +27,7 @@ endif
+ libmailwatch_core_la_CFLAGS = \
+ @GTHREAD_CFLAGS@ \
+ @GTK_CFLAGS@ \
+- @LIBXFCEGUI4_CFLAGS@ \
++ @LIBXFCE4UI_CFLAGS@ \
+ @GNUTLS_CFLAGS@ \
+ -DDATADIR=\"$(datadir)\" \
+ -DLOCALEDIR=\"$(localedir)\"
+--- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-mailbox-mbox.c
++++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-mbox.c
+@@ -48,7 +48,7 @@
+ #include <gtk/gtk.h>
+
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include "mailwatch.h"
+
+--- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch.c
++++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include "mailwatch.h"
+ #include "mailwatch-utils.h"
+--- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-utils.c
++++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-utils.c
+@@ -52,7 +52,7 @@
+
+ #include <gtk/gtk.h>
+
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include "mailwatch-utils.h"
+ #include "mailwatch-common.h"
+@@ -78,7 +78,7 @@ xfce_mailwatch_custom_button_new(const g
+ img = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON);
+ if(!img || gtk_image_get_storage_type(GTK_IMAGE(img)) == GTK_IMAGE_EMPTY) {
+ gtk_icon_size_lookup(GTK_ICON_SIZE_BUTTON, &iw, &ih);
+- pix = xfce_themed_icon_load(icon, iw);
++ pix = gtk_icon_theme_load_icon ( gtk_icon_theme_get_default(), icon, iw, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
+ if(pix) {
+ if(img)
+ gtk_image_set_from_pixbuf(GTK_IMAGE(img), pix);
+@@ -106,13 +106,7 @@ xfce_mailwatch_custom_button_new(const g
+ GtkWidget *
+ xfce_mailwatch_create_framebox(const gchar *title, GtkWidget **frame_bin)
+ {
+-#if LIBXFCEGUI4_CHECK_VERSION(4, 3, 4)
+- return xfce_create_framebox(title, frame_bin);
+-#else
+- GtkWidget *frame = xfce_framebox_new(title, TRUE);
+- *frame_bin = XFCE_FRAMEBOX(frame)->hbox;
+- return frame;
+-#endif
++ return xfce_gtk_frame_box_new(title, frame_bin);
+ }
+
+ #ifdef HAVE_SSL_SUPPORT
+--- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-mailbox-gmail.c
++++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-gmail.c
+@@ -74,7 +74,7 @@
+ #include <gtk/gtk.h>
+
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include "mailwatch-utils.h"
+ #include "mailwatch.h"
+--- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-mailbox-mh.c
++++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-mh.c
+@@ -48,7 +48,7 @@
+ #include <gtk/gtk.h>
+
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include "mailwatch.h"
+
+--- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-mailbox-pop3.c
++++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-pop3.c
+@@ -42,7 +42,7 @@
+ #include <gtk/gtk.h>
+
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include "mailwatch-utils.h"
+ #include "mailwatch.h"
Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series 2013-06-03 21:45:38 UTC (rev 7762)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series 2013-06-08 18:02:47 UTC (rev 7763)
@@ -3,3 +3,4 @@
02_link-with-libxfcegui4.patch
03_fix-implicit-dso-linking.patch
04_fix-format-string-errors.patch
+05_port-to-libxfce4ui.patch
Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/rules 2013-06-03 21:45:38 UTC (rev 7762)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/rules 2013-06-08 18:02:47 UTC (rev 7763)
@@ -5,12 +5,18 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
- dh $@ --parallel
+ dh $@ --parallel --with autotools-dev
override_dh_auto_configure:
NOCONFIGURE=1 xdt-autogen
dh_auto_configure
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -f $$(find -name 'Makefile.in*') compile *.in
+ rm -f INSTALL aclocal.m4 config.guess config.sub configure
+ rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
+
override_dh_install:
-rm -rf debian/`dh_listpackages`/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*.a
-rm -rf debian/`dh_listpackages`/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*.la
More information about the Pkg-xfce-commits
mailing list