Patchwork [meta-xfce] xfce4-netload-plugin: update to 1.1.0

login
register
mail settings
Submitter Andreas Müller
Date Jan. 15, 2012, 12:41 a.m.
Message ID <1326588098-5256-1-git-send-email-schnitzeltony@gmx.de>
Download mbox | patch
Permalink /patch/19371/
State Accepted
Headers show

Comments

Andreas Müller - Jan. 15, 2012, 12:41 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
---
 .../netload/files/port-to-libxfce4ui.patch         |   72 --------------------
 ...ugin_1.0.0.bb => xfce4-netload-plugin_1.1.0.bb} |    6 +-
 2 files changed, 2 insertions(+), 76 deletions(-)
 delete mode 100644 meta-xfce/recipes-panel-plugins/netload/files/port-to-libxfce4ui.patch
 rename meta-xfce/recipes-panel-plugins/netload/{xfce4-netload-plugin_1.0.0.bb => xfce4-netload-plugin_1.1.0.bb} (55%)

Patch

diff --git a/meta-xfce/recipes-panel-plugins/netload/files/port-to-libxfce4ui.patch b/meta-xfce/recipes-panel-plugins/netload/files/port-to-libxfce4ui.patch
deleted file mode 100644
index 55bdffc..0000000
--- a/meta-xfce/recipes-panel-plugins/netload/files/port-to-libxfce4ui.patch
+++ /dev/null
@@ -1,72 +0,0 @@ 
-From 95fcb98d0189c3f9a051b56416503b42ac29ff90 Mon Sep 17 00:00:00 2001
-From: Christoph J. Thompson <cjsthompson@gmail.com>
-Date: Tue, 11 Jan 2011 16:17:48 +0100
-Subject: [PATCH 1/2] Port to libxfce4ui.
-
-	modified:   configure.ac
-	modified:   panel-plugin/Makefile.am
-	modified:   panel-plugin/netload.c
----
- configure.ac             |    2 +-
- panel-plugin/Makefile.am |    4 ++--
- panel-plugin/netload.c   |    5 +++--
- 3 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0348bfa..3baaa14 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,7 +56,7 @@ dnl configure the panel plugin
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
- 
- dnl configure the libxfcegui4
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
- 
- dnl Check for i18n support
- XDT_I18N([@LINGUAS@])
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index 0635d67..2163277 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -17,12 +17,12 @@ xfce4_netload_plugin_SOURCES =						\
- xfce4_netload_plugin_CFLAGS =						\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
- 	@LIBXFCE4PANEL_CFLAGS@				\
--	@LIBXFCEGUI4_CFLAGS@
-+	@LIBXFCE4UI_CFLAGS@
- 
- xfce4_netload_plugin_LDADD =						\
- 	@SOLLIBS@                                   			\
- 	@LIBXFCE4PANEL_LIBS@                                   			\
--	@LIBXFCEGUI4_LIBS@
-+	@LIBXFCE4UI_LIBS@
- 
- # .desktop file
- #
-diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c
-index b4868c4..43035f2 100644
---- a/panel-plugin/netload.c
-+++ b/panel-plugin/netload.c
-@@ -30,7 +30,7 @@
- #include <gtk/gtk.h>
- 
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <libxfce4panel/xfce-panel-plugin.h>
- 
- 
-@@ -460,7 +460,8 @@ static void setup_monitor(t_global_monitor *global, gboolean supress_warnings)
-     if (!init_netload( &(global->monitor->data), global->monitor->options.network_device)
-             && !supress_warnings)
-     {
--        xfce_err (_("%s: Error in initalizing:\n%s"),
-+        xfce_dialog_show_error (NULL, NULL,
-+	    _("%s: Error in initalizing:\n%s"),
-             _(APP_NAME),
-             _(errormessages[
-                 global->monitor->data.errorcode == 0 
--- 
-1.7.1
-
diff --git a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.0.0.bb b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.1.0.bb
similarity index 55%
rename from meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.0.0.bb
rename to meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.1.0.bb
index a0013b4..5dba77a 100644
--- a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.0.0.bb
+++ b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.1.0.bb
@@ -5,7 +5,5 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f"
 
 inherit xfce-panel-plugin
 
-# SRC_URI must follow inherited one
-SRC_URI += "file://port-to-libxfce4ui.patch"
-SRC_URI[md5sum] = "cab53e8cc2b9bfdf7ffd2230916ca3df"
-SRC_URI[sha256sum] = "f312d19fc6bfae525886a1f6e84e7d839f19a9f672be4e01f3df1c813f6a6032"
+SRC_URI[md5sum] = "19bee8171e7d681cb79539417f0b5917"
+SRC_URI[sha256sum] = "8a33dfed24a7bbd8eaf333524f94eb24e7d3a14ffccb181e5cab1d1b05ae3bf7"