[meta-xfce 00/15] bugfix, new panel plugins ans xfce4-mixer

[meta-xfce 00/15] bugfix, new panel plugins ans xfce4-mixer

[Andreas Müller]

All have been run tested on angstrom/overo

Andreas Müller (15):
  xfce4-session: add consolekit to RDEPENDS
  xfce4-xkb-plugin 0.5.4.3 inital add
  xfce4-wavelan-plugin: initial add 0.5.10
  xfce4-places-plugin: initial add 1.3.0
  xfce4-datetime-plugin: update to latest git and unbreak build with
    xfce4-dev-tools 4.10.0
  xfce4-diskperf-plugin: update to 2.5.3
  xfce4-cpugraph-plugin: update to 1.0.2
  xfce4-clipman-plugin: update to 1.2.3
  xfce4-genmon-plugin: update to 3.4.0
  xfce4-systemload-plugin: initial add 1.1.0
  xfce4-time-out-plugin: initial add 1.0.1
  xfce4-embed-plugin: initial add 1.0.0
  xfce4-weather-plugin: Make it work for a while by using different
    license info
  xfce4-mixer: initial add 4.8.0
  task-xfce-extended: add panel plugins / applications

 .../recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb  |   14 ++
 ...ugin_1.2.2.bb => xfce4-clipman-plugin_1.2.3.bb} |    4 +-
 .../cpugraph/files/port-to-libxfce4ui.patch        |  102 -------------
 ...gin_1.0.1.bb => xfce4-cpugraph-plugin_1.0.2.bb} |    6 +-
 ...xfce4ui.patch => 0001-port-to-libxfce4ui.patch} |    1 +
 ...re.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch |   32 ++++
 .../datetime/xfce4-datetime-plugin_git.bb          |    5 +-
 .../diskperf/files/port-to-libxfce4ui.patch        |  142 ------------------
 ...gin_2.3.0.bb => xfce4-diskperf-plugin_2.5.3.bb} |    6 +-
 .../embed/xfce4-embed-plugin_1.0.0.bb              |   12 ++
 .../genmon/files/port-to-libxfce4ui.patch          |  150 --------------------
 ...lugin_3.3.1.bb => xfce4-genmon-plugin_3.4.0.bb} |    6 +-
 .../places/xfce4-places-plugin_1.3.0.bb            |    9 ++
 .../systemload/xfce4-systemload-plugin_1.1.0.bb    |   11 ++
 .../time-out/xfce4-time-out-plugin_1.0.1.bb        |   10 ++
 .../wavelan/xfce4-wavelan-plugin_0.5.10.bb         |    9 ++
 .../weather/xfce4-weather-plugin_0.7.4.bb          |   11 ++
 .../xkb/xfce4-xkb-plugin_0.5.4.3.bb                |   14 ++
 meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb |   11 ++-
 .../xfce4-session/xfce4-session_4.8.3.bb           |    3 +-
 20 files changed, 147 insertions(+), 411 deletions(-)
 create mode 100644 meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb
 rename meta-xfce/recipes-panel-plugins/clipman/{xfce4-clipman-plugin_1.2.2.bb => xfce4-clipman-plugin_1.2.3.bb} (69%)
 delete mode 100644 meta-xfce/recipes-panel-plugins/cpugraph/files/port-to-libxfce4ui.patch
 rename meta-xfce/recipes-panel-plugins/cpugraph/{xfce4-cpugraph-plugin_1.0.1.bb => xfce4-cpugraph-plugin_1.0.2.bb} (55%)
 rename meta-xfce/recipes-panel-plugins/datetime/files/{port-to-libxfce4ui.patch => 0001-port-to-libxfce4ui.patch} (99%)
 create mode 100644 meta-xfce/recipes-panel-plugins/datetime/files/0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch
 delete mode 100644 meta-xfce/recipes-panel-plugins/diskperf/files/port-to-libxfce4ui.patch
 rename meta-xfce/recipes-panel-plugins/diskperf/{xfce4-diskperf-plugin_2.3.0.bb => xfce4-diskperf-plugin_2.5.3.bb} (55%)
 create mode 100644 meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb
 delete mode 100644 meta-xfce/recipes-panel-plugins/genmon/files/port-to-libxfce4ui.patch
 rename meta-xfce/recipes-panel-plugins/genmon/{xfce4-genmon-plugin_3.3.1.bb => xfce4-genmon-plugin_3.4.0.bb} (65%)
 create mode 100644 meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.3.0.bb
 create mode 100644 meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.0.bb
 create mode 100644 meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.1.bb
 create mode 100644 meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.10.bb
 create mode 100644 meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.5.4.3.bb

-- 
1.7.4.4

[meta-xfce 01/15] xfce4-session: add consolekit to RDEPENDS

[Andreas Müller]

This error was hidden for years by my test image containing consolekit.

One result of missing consolekit are greyed 'Restart' and 'Shut Down' in XFCE's
logout-dialog and the log message:

** (xfce4-session:4125): WARNING **: 'CanStop' method failed : The name org.freedesktop.ConsoleKit was not provided by any .service files

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../xfce4-session/xfce4-session_4.8.3.bb           |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.3.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.3.bb
index 2db465b..3c84a72 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.3.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.3.bb
@@ -3,7 +3,8 @@ SECTION = "x11"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
 DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf xfce4-panel gconf gnome-keyring"
-RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth"
+RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit"
+PR = "r1"
 
 inherit xfce
 
-- 
1.7.4.4

[meta-xfce 02/15] xfce4-xkb-plugin 0.5.4.3 inital add

[Andreas Müller]

run tested on angstrom/overo

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../xkb/xfce4-xkb-plugin_0.5.4.3.bb                |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.5.4.3.bb

diff --git a/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.5.4.3.bb b/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.5.4.3.bb
new file mode 100644
index 0000000..8ec7fd2
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.5.4.3.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "XKB layout switching panel plug-in for the Xfce desktop environment"
+HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
+SECTION = "x11/application"
+LICENSE = "Alexander_Iliev"
+LIC_FILES_CHKSUM = "file://COPYING;md5=496f09f084b0f7e6f02f769a84490c6b"
+
+inherit xfce-panel-plugin
+
+DEPENDS += "libxklavier libwnck librsvg"
+
+SRC_URI[md5sum] = "b31144bd50875ec73f0b3101456c97fd"
+SRC_URI[sha256sum] = "ca4801bb2edfe04eeceb71879b3cf79a0674e8311c39117efdb9d3521307396d"
+
+FILES_${PN} += "${datadir}/xfce4/xkb"
-- 
1.7.4.4

[meta-xfce 03/15] xfce4-wavelan-plugin: initial add 0.5.10

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../wavelan/xfce4-wavelan-plugin_0.5.10.bb         |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.10.bb

diff --git a/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.10.bb b/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.10.bb
new file mode 100644
index 0000000..95acd62
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.10.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Panel plugin displaying stats from a wireless lan interface"
+HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
+LICENSE = "BenediktMeurer FlorianRivoal"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920"
+
+inherit xfce-panel-plugin
+
+SRC_URI[md5sum] = "a4cd20ef471123936e762a139f1025e1"
+SRC_URI[sha256sum] = "c5b2535b9c90d3fbf6a5f94d096fbc9cb5ce85e2c5d67df933f6fe74ae6f761d"
-- 
1.7.4.4

[meta-xfce 04/15] xfce4-places-plugin: initial add 1.3.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../places/xfce4-places-plugin_1.3.0.bb            |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.3.0.bb

diff --git a/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.3.0.bb b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.3.0.bb
new file mode 100644
index 0000000..5310586
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.3.0.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Panel plugin displaying menu with quick access to folders, documents, and removable media"
+HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f"
+
+inherit xfce-panel-plugin
+
+SRC_URI[md5sum] = "d075fffccf44bcf09a1bfcd4e0cd38a2"
+SRC_URI[sha256sum] = "0266e6bb9905b6af25f80cbb364d2710b6b95100382d2d540edf9f8408e09936"
-- 
1.7.4.4

[meta-xfce 05/15] xfce4-datetime-plugin: update to latest git and unbreak build with xfce4-dev-tools 4.10.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...xfce4ui.patch => 0001-port-to-libxfce4ui.patch} |    1 +
 ...re.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch |   32 ++++++++++++++++++++
 .../datetime/xfce4-datetime-plugin_git.bb          |    5 ++-
 3 files changed, 36 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/datetime/files/{port-to-libxfce4ui.patch => 0001-port-to-libxfce4ui.patch} (99%)
 create mode 100644 meta-xfce/recipes-panel-plugins/datetime/files/0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch

diff --git a/meta-xfce/recipes-panel-plugins/datetime/files/port-to-libxfce4ui.patch b/meta-xfce/recipes-panel-plugins/datetime/files/0001-port-to-libxfce4ui.patch
similarity index 99%
rename from meta-xfce/recipes-panel-plugins/datetime/files/port-to-libxfce4ui.patch
rename to meta-xfce/recipes-panel-plugins/datetime/files/0001-port-to-libxfce4ui.patch
index aab20ca..08ea135 100644
--- a/meta-xfce/recipes-panel-plugins/datetime/files/port-to-libxfce4ui.patch
+++ b/meta-xfce/recipes-panel-plugins/datetime/files/0001-port-to-libxfce4ui.patch
@@ -5,6 +5,7 @@ Subject: [PATCH] port to libxfce4ui
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
+Upstream-status: pending
 
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
diff --git a/meta-xfce/recipes-panel-plugins/datetime/files/0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch b/meta-xfce/recipes-panel-plugins/datetime/files/0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch
new file mode 100644
index 0000000..05f7c72
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/datetime/files/0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch
@@ -0,0 +1,32 @@
+From f6e97314f425574289697ddfa0914f7580130a7c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sat, 19 May 2012 20:23:06 +0200
+Subject: [PATCH] configure.ac.in: remove breaking BM_DEBUG_SUPPORT
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Upstream-status: pending
+
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac.in |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index 5200268..a2550ca 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -37,9 +37,6 @@ XDT_CHECK_PACKAGE([LIBXFCE4PANEL],[libxfce4panel-1.0],[4.8.0])
+ 
+ #CFLAGS="$CFLAGS -Wall -Werror"
+ 
+-dnl Check for debugging support
+-BM_DEBUG_SUPPORT()
+-
+ AC_OUTPUT([
+ Makefile
+ po/Makefile.in
+-- 
+1.7.4.4
+
diff --git a/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_git.bb b/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_git.bb
index 18dec94..9421c1e 100644
--- a/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_git.bb
+++ b/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_git.bb
@@ -5,12 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 inherit xfce-panel-plugin
 
-SRCREV = "e268210db6a32b2a47c03c63e5908ee3ba9461cc"
+SRCREV = "97ebbac9ba52397ec34edb43935083f6263d1666"
 PV = "0.6.1+gitr${SRCPV}"
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://git.xfce.org/panel-plugins/xfce4-datetime-plugin;protocol=git;branch=master \
-           file://port-to-libxfce4ui.patch \
+           file://0001-port-to-libxfce4ui.patch \
+           file://0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch \
           "
 SRC_URI[md5sum] = "e82f51ff0e75a63e5cbd139e43e094f9"
 SRC_URI[sha256sum] = "fb340c1c2170d4f33c7f278772966f3c01caaedcd4a7f58f670bf8e28580bb1b"
-- 
1.7.4.4

[meta-xfce 06/15] xfce4-diskperf-plugin: update to 2.5.3

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../diskperf/files/port-to-libxfce4ui.patch        |  142 --------------------
 ...gin_2.3.0.bb => xfce4-diskperf-plugin_2.5.3.bb} |    6 +-
 2 files changed, 2 insertions(+), 146 deletions(-)
 delete mode 100644 meta-xfce/recipes-panel-plugins/diskperf/files/port-to-libxfce4ui.patch
 rename meta-xfce/recipes-panel-plugins/diskperf/{xfce4-diskperf-plugin_2.3.0.bb => xfce4-diskperf-plugin_2.5.3.bb} (55%)

diff --git a/meta-xfce/recipes-panel-plugins/diskperf/files/port-to-libxfce4ui.patch b/meta-xfce/recipes-panel-plugins/diskperf/files/port-to-libxfce4ui.patch
deleted file mode 100644
index 498bf11..0000000
--- a/meta-xfce/recipes-panel-plugins/diskperf/files/port-to-libxfce4ui.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From c154d023bca9b3022cc3b99094c0a3aedb2f3bfb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de>
-Date: Wed, 2 Nov 2011 18:11:39 +0100
-Subject: [PATCH] port to libxfce4ui
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
----
- configure.ac              |    4 ++--
- panel-plugin/Makefile.am  |    4 ++--
- panel-plugin/config_gui.c |    2 +-
- panel-plugin/config_gui.h |    2 +-
- panel-plugin/main.c       |   17 +++++++++++------
- 5 files changed, 17 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e083872..e0eb74b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -48,8 +48,8 @@ XDT_I18N([@LINGUAS@])
- dnl ***********************************
- dnl *** Check for required packages ***
- dnl ***********************************
--XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90])
-+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
- 
- dnl ***********************************
- dnl *** Check for debugging support ***
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index 8f86c9a..6a30116 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -21,11 +21,11 @@ xfce4_diskperf_plugin_SOURCES =					\
- 
- xfce4_diskperf_plugin_CFLAGS =					\
- 	$(LIBXFCE4PANEL_CFLAGS)					\
--	$(LIBXFCEGUI4_CFLAGS)
-+	$(LIBXFCE4UI_CFLAGS)
- 
- xfce4_diskperf_plugin_LDADD=					\
- 	$(LIBXFCE4PANEL_LIBS)					\
--	$(LIBXFCEGUI4_LIBS)
-+	$(LIBXFCE4UI_LIBS)
- 
- #
- # Desktop file
-diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c
-index 89f630a..34982bf 100644
---- a/panel-plugin/config_gui.c
-+++ b/panel-plugin/config_gui.c
-@@ -32,7 +32,7 @@
- #include <gtk/gtk.h>
- 
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/dialogs.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- 
- #define COPYVAL(var, field)	((var)->field = field)
-diff --git a/panel-plugin/config_gui.h b/panel-plugin/config_gui.h
-index aa49838..6b49a94 100644
---- a/panel-plugin/config_gui.h
-+++ b/panel-plugin/config_gui.h
-@@ -24,7 +24,7 @@
- #include <gtk/gtk.h>
- 
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/dialogs.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- 
- typedef struct gui_t {
-diff --git a/panel-plugin/main.c b/panel-plugin/main.c
-index 43b0390..45020c1 100644
---- a/panel-plugin/main.c
-+++ b/panel-plugin/main.c
-@@ -25,7 +25,7 @@
- #include <gtk/gtk.h>
- 
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <libxfce4panel/xfce-panel-plugin.h>
- 
- #include <stdlib.h>
-@@ -631,7 +631,8 @@ static void SetDevice (Widget_t p_wTF, void *p_pvPlugin)
- 
-     status = stat (pcDevice, &oStat);
-     if (status == -1) {
--	xfce_err ("%s\n"
-+	xfce_dialog_show_error (NULL, NULL,
-+                  "%s\n"
- 		  "%s: %s (%d)",
- 		  PLUGIN_NAME, pcDevice, strerror (errno), errno);
- 	return;
-@@ -853,7 +854,8 @@ static int CheckStatsAvailability ()
- 	return (0);
-     if (status < 0) {
- 	status *= -1;
--	xfce_err (_("%s\n"
-+	xfce_dialog_show_error (NULL, NULL, 
-+                  _("%s\n"
- 		  "%s: %s (%d)\n\n"
- 		  "This monitor will not work!\n"
- 		  "Please remove it."),
-@@ -863,14 +865,16 @@ static int CheckStatsAvailability ()
-     }
-     switch (status) {
- 	case NO_EXTENDED_STATS:
--	    xfce_err (_("%s: No disk extended statistics found!\n"
-+	    xfce_dialog_show_error (NULL, NULL, 
-+                      _("%s: No disk extended statistics found!\n"
- 		      "Either old kernel (< 2.4.20) or not\n"
- 		      "compiled with CONFIG_BLK_STATS turned on.\n\n"
- 		      "This monitor will not work!\n"
- 		      "Please remove it."), PLUGIN_NAME);
- 	    break;
- 	default:
--	    xfce_err (_("%s: Unknown error\n\n"
-+	    xfce_dialog_show_error (NULL, NULL, 
-+                      _("%s: Unknown error\n\n"
- 		      "This monitor will not work!\n"
- 		      "Please remove it."), PLUGIN_NAME);
-     }
-@@ -882,7 +886,8 @@ static int CheckStatsAvailability ()
- static void About (Widget_t w, void *unused)
- 	/* Called back when the About button in clicked */
- {
--    xfce_info (_("%s %s - Disk Performance Monitor\n"
-+    xfce_dialog_show_info (NULL, NULL, 
-+               _("%s %s - Disk Performance Monitor\n"
- 	       "Display instantaneous disk I/O transfer rates and busy times "
- 	       "on Linux and NetBSD systems\n\n"
- 	       "(c) 2003, 2004 Roger Seguin <roger_seguin@msn.com>\n"
--- 
-1.7.4.4
-
diff --git a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.3.0.bb b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.3.bb
similarity index 55%
rename from meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.3.0.bb
rename to meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.3.bb
index 39acd40..e80d0bd 100644
--- a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.3.0.bb
+++ b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.3.bb
@@ -5,7 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1"
 
 inherit xfce-panel-plugin
 
-# SRC_URI must follow inherited one
-SRC_URI += "file://port-to-libxfce4ui.patch"
-SRC_URI[md5sum] = "c6ece8123c762ee203cbc6fd5450b503"
-SRC_URI[sha256sum] = "d75e2cd846c784cba804c5cc7796964b3965c764003ca4c1751c68ff83e85793"
+SRC_URI[md5sum] = "ba880f763e273787d0c8365eebc4feab"
+SRC_URI[sha256sum] = "418a250fe8d48f1fd87658206a8e6762032d35dc1b2e98e27d309a35f873f9b6"
-- 
1.7.4.4

[meta-xfce 07/15] xfce4-cpugraph-plugin: update to 1.0.2

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../cpugraph/files/port-to-libxfce4ui.patch        |  102 --------------------
 ...gin_1.0.1.bb => xfce4-cpugraph-plugin_1.0.2.bb} |    6 +-
 2 files changed, 2 insertions(+), 106 deletions(-)
 delete mode 100644 meta-xfce/recipes-panel-plugins/cpugraph/files/port-to-libxfce4ui.patch
 rename meta-xfce/recipes-panel-plugins/cpugraph/{xfce4-cpugraph-plugin_1.0.1.bb => xfce4-cpugraph-plugin_1.0.2.bb} (55%)

diff --git a/meta-xfce/recipes-panel-plugins/cpugraph/files/port-to-libxfce4ui.patch b/meta-xfce/recipes-panel-plugins/cpugraph/files/port-to-libxfce4ui.patch
deleted file mode 100644
index cb8025a..0000000
--- a/meta-xfce/recipes-panel-plugins/cpugraph/files/port-to-libxfce4ui.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 2db9e1d1a91ea335bfede19ec513dee69569f60a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de>
-Date: Tue, 18 Oct 2011 01:43:30 +0200
-Subject: [PATCH] port to libxfce4ui
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
----
- configure.ac              |    4 ++--
- panel-plugin/Makefile.am  |    4 ++--
- panel-plugin/cpu.c        |    4 ++--
- panel-plugin/properties.c |    2 +-
- panel-plugin/settings.c   |    2 +-
- 5 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e20015e..3aa57bb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,8 +27,8 @@ dnl Check for standard header files
- AC_HEADER_STDC
- 
- dnl configure the panel plugin
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
--XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
- XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
- 
- dnl translations
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index 595c61f..6340196 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -3,11 +3,11 @@ plugin_PROGRAMS = xfce4-cpugraph-plugin
- 
- xfce4_cpugraph_plugin_CFLAGS =					\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
--	@LIBXFCEGUI4_CFLAGS@					\
-+	@LIBXFCE4UI_CFLAGS@					\
- 	@LIBXFCE4PANEL_CFLAGS@
- 
- xfce4_cpugraph_plugin_LDADD =					\
--	@LIBXFCEGUI4_LIBS@					\
-+	@LIBXFCE4UI_LIBS@					\
- 	@LIBXFCE4PANEL_LIBS@
- 
- xfce4_cpugraph_plugin_SOURCES =                                 \
-diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c
-index 63431f6..1f13b51 100644
---- a/panel-plugin/cpu.c
-+++ b/panel-plugin/cpu.c
-@@ -26,7 +26,7 @@
- #include "mode.h"
- #include "properties.h"
- 
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <libxfce4panel/xfce-hvbox.h>
- #ifndef _
- # include <libintl.h>
-@@ -344,7 +344,7 @@ static gboolean command_cb( GtkWidget *w,GdkEventButton *event, CPUGraph *base )
- {
- 	if( event->button == 1 && base->command )
- 	{
--		xfce_exec( base->command, base->in_terminal, base->startup_notification, NULL );
-+		xfce_spawn_command_line_on_screen( gdk_screen_get_default(), base->command, base->in_terminal, base->startup_notification, NULL );
- 	}
- 	return FALSE;
- }
-diff --git a/panel-plugin/properties.c b/panel-plugin/properties.c
-index 411fafd..ed191dd 100644
---- a/panel-plugin/properties.c
-+++ b/panel-plugin/properties.c
-@@ -26,7 +26,7 @@
- #include "settings.h"
- 
- #include <glib/gprintf.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- #ifndef _
- # include <libintl.h>
-diff --git a/panel-plugin/settings.c b/panel-plugin/settings.c
-index dcc474e..c0f1fed 100644
---- a/panel-plugin/settings.c
-+++ b/panel-plugin/settings.c
-@@ -22,7 +22,7 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- #include "settings.h"
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- static void default_command( const gchar ** command, gboolean * in_terminal, gboolean * startup_notification )
- {
--- 
-1.7.4.4
-
diff --git a/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.1.bb b/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.2.bb
similarity index 55%
rename from meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.1.bb
rename to meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.2.bb
index abbc7f1..e3bea63 100644
--- a/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.1.bb
+++ b/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.2.bb
@@ -5,7 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e"
 
 inherit xfce-panel-plugin
 
-# SRC_URI must follow inherited one
-SRC_URI += "file://port-to-libxfce4ui.patch"
-SRC_URI[md5sum] = "ff551087b1f61c47b8746e8687c572aa"
-SRC_URI[sha256sum] = "b5fada35a92083b67818da0ce3fe5ba6a2443fee26d6eec71755ff383df7c407"
+SRC_URI[md5sum] = "93d7658d989ebf110875bc2deb76d7b3"
+SRC_URI[sha256sum] = "b535a9c3d105c0d1597fa4071fe140912bb483c4401c84ad178531fc85de0577"
-- 
1.7.4.4

[meta-xfce 08/15] xfce4-clipman-plugin: update to 1.2.3

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...ugin_1.2.2.bb => xfce4-clipman-plugin_1.2.3.bb} |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/clipman/{xfce4-clipman-plugin_1.2.2.bb => xfce4-clipman-plugin_1.2.3.bb} (69%)

diff --git a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.2.bb b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.3.bb
similarity index 69%
rename from meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.2.bb
rename to meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.3.bb
index c830229..d3c7138 100644
--- a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.2.bb
+++ b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.3.bb
@@ -8,5 +8,5 @@ inherit xfce-panel-plugin
 
 DEPENDS += "xfconf xproto libxtst"
 
-SRC_URI[md5sum] = "60df7769a8271d7fcab177210f4291e8"
-SRC_URI[sha256sum] = "fcac10bc150eb2f73955f28184ac2b8324c9aabc3d773242eadcec137e1096a1"
+SRC_URI[md5sum] = "61f3be97efa379cb358980c94e14692a"
+SRC_URI[sha256sum] = "4424447067cb2c3972c375330d2e1d19f12e59c41bd03e111c2e6e9e174a5067"
-- 
1.7.4.4

[meta-xfce 09/15] xfce4-genmon-plugin: update to 3.4.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../genmon/files/port-to-libxfce4ui.patch          |  150 --------------------
 ...lugin_3.3.1.bb => xfce4-genmon-plugin_3.4.0.bb} |    6 +-
 2 files changed, 3 insertions(+), 153 deletions(-)
 delete mode 100644 meta-xfce/recipes-panel-plugins/genmon/files/port-to-libxfce4ui.patch
 rename meta-xfce/recipes-panel-plugins/genmon/{xfce4-genmon-plugin_3.3.1.bb => xfce4-genmon-plugin_3.4.0.bb} (65%)

diff --git a/meta-xfce/recipes-panel-plugins/genmon/files/port-to-libxfce4ui.patch b/meta-xfce/recipes-panel-plugins/genmon/files/port-to-libxfce4ui.patch
deleted file mode 100644
index b615fe5..0000000
--- a/meta-xfce/recipes-panel-plugins/genmon/files/port-to-libxfce4ui.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 57e2a3787261ccc33f47d4d4061148d720d88d7d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Thu, 26 Jan 2012 00:45:31 +0100
-Subject: [PATCH] port to libxfce4ui
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Upstream status: pending https://bugzilla.xfce.org/show_bug.cgi?id=8406
-
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.ac              |    4 ++--
- panel-plugin/Makefile.am  |    4 ++--
- panel-plugin/cmdspawn.c   |    2 +-
- panel-plugin/config_gui.c |    2 +-
- panel-plugin/config_gui.h |    1 -
- panel-plugin/main.c       |   17 ++++++-----------
- 6 files changed, 12 insertions(+), 18 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b9d5bd3..a04d0ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,8 +31,8 @@ dnl Check for standard header files
- AC_HEADER_STDC
- 
- dnl configure the panel plugin
--XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
- 
- dnl Translations
- XDT_I18N([@LINGUAS@])
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index 861a466..f819ff6 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -4,11 +4,11 @@ plugin_PROGRAMS = xfce4-genmon-plugin
- xfce4_genmon_plugin_CFLAGS =					\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
- 	@LIBXFCE4PANEL_CFLAGS@					\
--	@LIBXFCEGUI4_CFLAGS@
-+	@LIBXFCE4UI_CFLAGS@
- 
- xfce4_genmon_plugin_LDADD =					\
- 	@LIBXFCE4PANEL_LIBS@					\
--	@LIBXFCEGUI4_LIBS@
-+	@LIBXFCE4UI_LIBS@
- 
- xfce4_genmon_plugin_SOURCES =	\
- 	main.c			\
-diff --git a/panel-plugin/cmdspawn.c b/panel-plugin/cmdspawn.c
-index aef7689..ae9de82 100644
---- a/panel-plugin/cmdspawn.c
-+++ b/panel-plugin/cmdspawn.c
-@@ -49,7 +49,7 @@
- #include <stdarg.h>
- #include <errno.h>
- #include <sys/wait.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- 
- /**********************************************************************/
-diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c
-index 49ef267..3550c35 100644
---- a/panel-plugin/config_gui.c
-+++ b/panel-plugin/config_gui.c
-@@ -28,7 +28,7 @@
- #include <gtk/gtk.h>
- 
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/dialogs.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <libxfce4panel/xfce-panel-plugin.h>
- 
- 
-diff --git a/panel-plugin/config_gui.h b/panel-plugin/config_gui.h
-index 84024b2..c6bb672 100644
---- a/panel-plugin/config_gui.h
-+++ b/panel-plugin/config_gui.h
-@@ -29,7 +29,6 @@
- #include <gtk/gtk.h>
- 
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/dialogs.h>
- #include <libxfce4panel/xfce-panel-plugin.h>
- 
- 
-diff --git a/panel-plugin/main.c b/panel-plugin/main.c
-index 1f741ee..14cf778 100644
---- a/panel-plugin/main.c
-+++ b/panel-plugin/main.c
-@@ -31,8 +31,7 @@
- #include <gtk/gtk.h>
- 
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/dialogs.h>
--#include <libxfcegui4/xfce-exec.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <libxfce4panel/xfce-panel-plugin.h>
- #include <libxfce4panel/xfce-panel-convenience.h>
- 
-@@ -98,7 +97,7 @@ static void ExecOnClickCmd (Widget_t p_wSc, void *p_pvPlugin)
-     struct monitor_t *poMonitor = &(poPlugin->oMonitor);
-     GError *error = NULL;
- 
--	xfce_exec(poMonitor->onClickCmd, 0, 0, &error);
-+    xfce_spawn_command_line_on_screen( gdk_screen_get_default(), poMonitor->onClickCmd, 0, 0, &error );
-     if (error) {
-         char first[256];
-         g_snprintf (first, sizeof(first), _("Could not run \"%s\""), poMonitor->onClickCmd);
-@@ -592,7 +591,8 @@ static void UpdateConf (void *p_pvPlugin)
- static void About (Widget_t w, void *unused)
- /* Called back when the About button in clicked */
- {
--    xfce_info (_("%s %s - Generic Monitor\n"
-+    xfce_dialog_show_info (NULL, NULL, 
-+        _("%s %s - Generic Monitor\n"
-         "Cyclically spawns a script/program, captures its output "
-         "and displays the resulting string in the panel\n\n"
-         "(c) 2004 Roger Seguin <roger_seguin@msn.com>\n"
-@@ -646,7 +646,7 @@ static void genmon_create_options (XfcePanelPlugin *plugin,
- /* Plugin API */
- /* Create/pop up the configuration/options GUI */
- {
--    GtkWidget *dlg, *header, *vbox;
-+    GtkWidget *dlg, *vbox;
-     struct param_t *poConf = &(poPlugin->oConf.oParam);
-     struct gui_t   *poGUI = &(poPlugin->oConf.oGUI);
-     const char     *pcFont = poConf->acFont;
-@@ -667,12 +667,7 @@ static void genmon_create_options (XfcePanelPlugin *plugin,
- 
-     gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
- 
--    header = xfce_create_header (NULL, _("Generic Monitor"));
--    gtk_widget_set_size_request (GTK_BIN (header)->child, -1, 32);
--    gtk_container_set_border_width (GTK_CONTAINER (header), BORDER - 2);
--    gtk_widget_show (header);
--    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header,
--        FALSE, TRUE, 0);
-+    xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Generic Monitor"));
- 
-     vbox = gtk_vbox_new(FALSE, BORDER);
-     gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER - 2);
--- 
-1.7.4.4
-
diff --git a/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.3.1.bb b/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb
similarity index 65%
rename from meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.3.1.bb
rename to meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb
index d2ed4fe..e5ef85f 100644
--- a/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.3.1.bb
+++ b/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe"
 
 inherit xfce-panel-plugin
 
-SRC_URI += "file://port-to-libxfce4ui.patch"
+SRC_URI[md5sum] = "24108b339bb040ed360266f53a245224"
+SRC_URI[sha256sum] = "b0a5337b49c85623dc89f3c9e47c7374b1d466af2418033d2d6dfc57a9790387"
 
-SRC_URI[md5sum] = "e0022e15d4211a87c17d9f252b68e1d3"
-SRC_URI[sha256sum] = "fe439d569f9ba3c8bdbfa907022a7c4a697ae4ae7fc5001a5600dfa5e1793471"
+S = "${WORKDIR}/xfce4-genmon-plugin-3.4"
-- 
1.7.4.4

[meta-xfce 10/15] xfce4-systemload-plugin: initial add 1.1.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../systemload/xfce4-systemload-plugin_1.1.0.bb    |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.0.bb

diff --git a/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.0.bb b/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.0.bb
new file mode 100644
index 0000000..367599e
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Panel plugin displaying current CPU load, the memory in use, the swap space and the system uptime"
+HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9acb172a93ff6c43cce2aff790a8aef8"
+
+inherit xfce-panel-plugin
+
+DEPENDS += "upower"
+
+SRC_URI[md5sum] = "130ad7befddd8705ca09a98e9cee5c3e"
+SRC_URI[sha256sum] = "bc4ca8a7f66acb598d3f11bf0ee1fa650b869b3483176d708905d4ce9b1889f3"
-- 
1.7.4.4

[meta-xfce 11/15] xfce4-time-out-plugin: initial add 1.0.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../time-out/xfce4-time-out-plugin_1.0.1.bb        |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.1.bb

diff --git a/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.1.bb b/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.1.bb
new file mode 100644
index 0000000..9763dee
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.1.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "This plugin makes it possible to take periodical breaks."
+HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
+SECTION = "x11/application"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+inherit xfce-panel-plugin
+
+SRC_URI[md5sum] = "b6e4a3145d31c341e2506fb17b014587"
+SRC_URI[sha256sum] = "e342f73315fa8176ac4fc321680a3959aa2e06fafed1ac78031fae64713a3db8"
-- 
1.7.4.4

[meta-xfce 12/15] xfce4-embed-plugin: initial add 1.0.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../embed/xfce4-embed-plugin_1.0.0.bb              |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb

diff --git a/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb b/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb
new file mode 100644
index 0000000..32d6edf
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A panel plugin that embeds arbitrary windows (or GtkPlug widgets) into the panel."
+HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin"
+SECTION = "x11/application"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+inherit xfce-panel-plugin
+
+# DEPENDS += "xfconf xproto libxtst"
+
+SRC_URI[md5sum] = "c5b86cbc1c54ee7c1d2e95a4502fed8e"
+SRC_URI[sha256sum] = "35d4c6c56dd6468c0e5afe66f657c1526f2d830a577105a51da43657651832e3"
-- 
1.7.4.4

[meta-xfce 13/15] xfce4-weather-plugin: Make it work for a while by using different license info

[Andreas Müller]

Grabbed from [1]

This is a inztermediate solution until next version hopefully will use another weather
data supplier. There are proceedings ongoing [2].

[1] https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/xfce4-weather-plugin
[2] http://git.xfce.org/panel-plugins/xfce4-weather-plugin/log/

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../weather/xfce4-weather-plugin_0.7.4.bb          |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.7.4.bb b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.7.4.bb
index d75d51e..202078e 100644
--- a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.7.4.bb
+++ b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.7.4.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Panel plugin to display current temperature and weather condition
 HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+PR = "r1"
 
 inherit xfce-panel-plugin
 
@@ -9,4 +10,14 @@ SRC_URI += "file://port-to-libxfce4ui.patch"
 SRC_URI[md5sum] = "03c972d13eba5cd226432ff66e3ff282"
 SRC_URI[sha256sum] = "3f76207b8a845d15bfec6825bd5300aedd086c455259c4dd8670a89a3c8ab382"
 
+do_compile_prepend() {
+	# Switch to a working license key
+	# https://bugs.archlinux.org/task/26815
+	sed -i \
+		-e 's/^#define PARTNER_ID.*/#define PARTNER_ID "1003666583"/' \
+		-e 's/^#define LICENSE_KEY.*/#define LICENSE_KEY "4128909340a9b2fc"/' \
+		${S}/panel-plugin/weather.h
+
+}
+
 FILES_${PN} += "${datadir}/xfce4/weather"
-- 
1.7.4.4

[meta-xfce 14/15] xfce4-mixer: initial add 4.8.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb  |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb

diff --git a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb
new file mode 100644
index 0000000..23a8ba5
--- /dev/null
+++ b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "A volume control application based on GStreamer"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+inherit xfce-panel-plugin
+
+DEPENDS += "glib-2.0 gst-plugins-base gtk+ xfconf"
+
+SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "3fa3a9973e18c04da26709a654e242ff"
+SRC_URI[sha256sum] = "9f9f48fdd0d3f6b1e46694b93a44d15b800db72a96d831b5111d9ac976970fab"
+
+RDEPENDS_${PN} = "gst-meta-audio"
-- 
1.7.4.4

[meta-xfce 15/15] task-xfce-extended: add panel plugins / applications

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb b/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb
index 2dbd9f0..3c9fced 100644
--- a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb
@@ -3,7 +3,7 @@ SECTION = "x11/wm"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r1"
+PR = "r2"
 
 inherit task
 
@@ -33,8 +33,17 @@ RRECOMMENDS_${PN} = " \
     xfce4-diskperf-plugin \
     xfce4-netload-plugin \
     xfce4-genmon-plugin \
+    xfce4-xkb-plugin \
+    xfce4-wavelan-plugin \
+    xfce4-places-plugin \
+    xfce4-systemload-plugin \
+    xfce4-time-out-plugin \
+    xfce4-embed-plugin \
+    xfce4-weather-plugin \
     \
     xfce4-appfinder \
     xfce4-screenshooter \
+    xfce4-power-manager \
+    xfce4-mixer \
     ristretto \
 "
-- 
1.7.4.4

Re: [meta-xfce 00/15] bugfix, new panel plugins ans xfce4-mixer

[Andreas Müller]

On Sat, Jun 2, 2012 at 2:15 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> All have been run tested on angstrom/overo
>
> Andreas Müller (15):
>  xfce4-session: add consolekit to RDEPENDS
>  xfce4-xkb-plugin 0.5.4.3 inital add
>  xfce4-wavelan-plugin: initial add 0.5.10
>  xfce4-places-plugin: initial add 1.3.0
>  xfce4-datetime-plugin: update to latest git and unbreak build with
>    xfce4-dev-tools 4.10.0
>  xfce4-diskperf-plugin: update to 2.5.3
>  xfce4-cpugraph-plugin: update to 1.0.2
>  xfce4-clipman-plugin: update to 1.2.3
>  xfce4-genmon-plugin: update to 3.4.0
>  xfce4-systemload-plugin: initial add 1.1.0
>  xfce4-time-out-plugin: initial add 1.0.1
>  xfce4-embed-plugin: initial add 1.0.0
>  xfce4-weather-plugin: Make it work for a while by using different
>    license info
>  xfce4-mixer: initial add 4.8.0
>  task-xfce-extended: add panel plugins / applications
>
>  .../recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb  |   14 ++
>  ...ugin_1.2.2.bb => xfce4-clipman-plugin_1.2.3.bb} |    4 +-
>  .../cpugraph/files/port-to-libxfce4ui.patch        |  102 -------------
>  ...gin_1.0.1.bb => xfce4-cpugraph-plugin_1.0.2.bb} |    6 +-
>  ...xfce4ui.patch => 0001-port-to-libxfce4ui.patch} |    1 +
>  ...re.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch |   32 ++++
>  .../datetime/xfce4-datetime-plugin_git.bb          |    5 +-
>  .../diskperf/files/port-to-libxfce4ui.patch        |  142 ------------------
>  ...gin_2.3.0.bb => xfce4-diskperf-plugin_2.5.3.bb} |    6 +-
>  .../embed/xfce4-embed-plugin_1.0.0.bb              |   12 ++
>  .../genmon/files/port-to-libxfce4ui.patch          |  150 --------------------
>  ...lugin_3.3.1.bb => xfce4-genmon-plugin_3.4.0.bb} |    6 +-
>  .../places/xfce4-places-plugin_1.3.0.bb            |    9 ++
>  .../systemload/xfce4-systemload-plugin_1.1.0.bb    |   11 ++
>  .../time-out/xfce4-time-out-plugin_1.0.1.bb        |   10 ++
>  .../wavelan/xfce4-wavelan-plugin_0.5.10.bb         |    9 ++
>  .../weather/xfce4-weather-plugin_0.7.4.bb          |   11 ++
>  .../xkb/xfce4-xkb-plugin_0.5.4.3.bb                |   14 ++
>  meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb |   11 ++-
>  .../xfce4-session/xfce4-session_4.8.3.bb           |    3 +-
>  20 files changed, 147 insertions(+), 411 deletions(-)
>  create mode 100644 meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb
>  rename meta-xfce/recipes-panel-plugins/clipman/{xfce4-clipman-plugin_1.2.2.bb => xfce4-clipman-plugin_1.2.3.bb} (69%)
>  delete mode 100644 meta-xfce/recipes-panel-plugins/cpugraph/files/port-to-libxfce4ui.patch
>  rename meta-xfce/recipes-panel-plugins/cpugraph/{xfce4-cpugraph-plugin_1.0.1.bb => xfce4-cpugraph-plugin_1.0.2.bb} (55%)
>  rename meta-xfce/recipes-panel-plugins/datetime/files/{port-to-libxfce4ui.patch => 0001-port-to-libxfce4ui.patch} (99%)
>  create mode 100644 meta-xfce/recipes-panel-plugins/datetime/files/0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch
>  delete mode 100644 meta-xfce/recipes-panel-plugins/diskperf/files/port-to-libxfce4ui.patch
>  rename meta-xfce/recipes-panel-plugins/diskperf/{xfce4-diskperf-plugin_2.3.0.bb => xfce4-diskperf-plugin_2.5.3.bb} (55%)
>  create mode 100644 meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb
>  delete mode 100644 meta-xfce/recipes-panel-plugins/genmon/files/port-to-libxfce4ui.patch
>  rename meta-xfce/recipes-panel-plugins/genmon/{xfce4-genmon-plugin_3.3.1.bb => xfce4-genmon-plugin_3.4.0.bb} (65%)
>  create mode 100644 meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.3.0.bb
>  create mode 100644 meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.0.bb
>  create mode 100644 meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.1.bb
>  create mode 100644 meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.10.bb
>  create mode 100644 meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.5.4.3.bb
>
> --
> 1.7.4.4
>
This series can be pulled form

git://gitorious.org/schnitzeltony-oe-meta/meta-oe.git branch
xfce-panel-apps-update

Andreas

Re: [meta-xfce 00/15] bugfix, new panel plugins ans xfce4-mixer

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 07-06-12 11:51, Andreas Müller schreef:
> On Sat, Jun 2, 2012 at 2:15 PM, Andreas Müller 
> <schnitzeltony@googlemail.com> wrote:
>> All have been run tested on angstrom/overo
>> 
>> Andreas Müller (15): xfce4-session: add consolekit to RDEPENDS 
>> xfce4-xkb-plugin 0.5.4.3 inital add xfce4-wavelan-plugin: initial add
>> 0.5.10 xfce4-places-plugin: initial add 1.3.0 xfce4-datetime-plugin:
>> update to latest git and unbreak build with xfce4-dev-tools 4.10.0 
>> xfce4-diskperf-plugin: update to 2.5.3 xfce4-cpugraph-plugin: update to
>> 1.0.2 xfce4-clipman-plugin: update to 1.2.3 xfce4-genmon-plugin: update
>> to 3.4.0 xfce4-systemload-plugin: initial add 1.1.0 
>> xfce4-time-out-plugin: initial add 1.0.1 xfce4-embed-plugin: initial
>> add 1.0.0 xfce4-weather-plugin: Make it work for a while by using
>> different license info xfce4-mixer: initial add 4.8.0 
>> task-xfce-extended: add panel plugins / applications
>> 
>> .../recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb  |   14 ++ 
>> ...ugin_1.2.2.bb => xfce4-clipman-plugin_1.2.3.bb} |    4 +- 
>> .../cpugraph/files/port-to-libxfce4ui.patch        |  102
>> ------------- ...gin_1.0.1.bb => xfce4-cpugraph-plugin_1.0.2.bb} |    6
>> +- ...xfce4ui.patch => 0001-port-to-libxfce4ui.patch} |    1 + 
>> ...re.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch |   32 ++++ 
>> .../datetime/xfce4-datetime-plugin_git.bb          |    5 +- 
>> .../diskperf/files/port-to-libxfce4ui.patch        |  142
>> ------------------ ...gin_2.3.0.bb => xfce4-diskperf-plugin_2.5.3.bb} |
>> 6 +- .../embed/xfce4-embed-plugin_1.0.0.bb              |   12 ++ 
>> .../genmon/files/port-to-libxfce4ui.patch          |  150
>> -------------------- ...lugin_3.3.1.bb => xfce4-genmon-plugin_3.4.0.bb}
>> |    6 +- .../places/xfce4-places-plugin_1.3.0.bb            |    9 ++ 
>> .../systemload/xfce4-systemload-plugin_1.1.0.bb    |   11 ++ 
>> .../time-out/xfce4-time-out-plugin_1.0.1.bb        |   10 ++ 
>> .../wavelan/xfce4-wavelan-plugin_0.5.10.bb         |    9 ++ 
>> .../weather/xfce4-weather-plugin_0.7.4.bb          |   11 ++ 
>> .../xkb/xfce4-xkb-plugin_0.5.4.3.bb                |   14 ++ 
>> meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb |   11 ++- 
>> .../xfce4-session/xfce4-session_4.8.3.bb           |    3 +- 20 files
>> changed, 147 insertions(+), 411 deletions(-) create mode 100644
>> meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb rename
>> meta-xfce/recipes-panel-plugins/clipman/{xfce4-clipman-plugin_1.2.2.bb
>> => xfce4-clipman-plugin_1.2.3.bb} (69%) delete mode 100644
>> meta-xfce/recipes-panel-plugins/cpugraph/files/port-to-libxfce4ui.patch
>>
>> 
rename
meta-xfce/recipes-panel-plugins/cpugraph/{xfce4-cpugraph-plugin_1.0.1.bb =>
xfce4-cpugraph-plugin_1.0.2.bb} (55%)
>> rename
>> meta-xfce/recipes-panel-plugins/datetime/files/{port-to-libxfce4ui.patch
>> => 0001-port-to-libxfce4ui.patch} (99%) create mode 100644
>> meta-xfce/recipes-panel-plugins/datetime/files/0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch
>>
>> 
delete mode 100644
meta-xfce/recipes-panel-plugins/diskperf/files/port-to-libxfce4ui.patch
>> rename
>> meta-xfce/recipes-panel-plugins/diskperf/{xfce4-diskperf-plugin_2.3.0.bb
>> => xfce4-diskperf-plugin_2.5.3.bb} (55%) create mode 100644
>> meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb 
>> delete mode 100644
>> meta-xfce/recipes-panel-plugins/genmon/files/port-to-libxfce4ui.patch 
>> rename
>> meta-xfce/recipes-panel-plugins/genmon/{xfce4-genmon-plugin_3.3.1.bb =>
>> xfce4-genmon-plugin_3.4.0.bb} (65%) create mode 100644
>> meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.3.0.bb 
>> create mode 100644
>> meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.0.bb
>>
>> 
create mode 100644
meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.1.bb
>> create mode 100644
>> meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.10.bb 
>> create mode 100644
>> meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.5.4.3.bb
>> 
>> -- 1.7.4.4
>> 
> This series can be pulled form
> 
> git://gitorious.org/schnitzeltony-oe-meta/meta-oe.git branch 
> xfce-panel-apps-update

It gave me a merge conflict, can you try to rebase it onto the current HEAD
of meta-oe please?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iQIcBAEBAgAGBQJP0bYJAAoJEHZqAkdh1vT6p/oP/1JmUKMGnJgkfBdVSgclJSVO
bQJcqT4H1Xanbn+YbuFlW5n4wRalX+/3c8rj6qOIaGFJpqRCclJEtojC9lhZc1Wc
ubXACva7cW1WWNn2aDsKkS2uIoVjhT2dY+pTcnUvlJHvhkkACfXXSReixosfzLrh
ZkhXEpqLIkHhLJn66hSolIimLBeF+ylMJk85uHCl1/vLwuXjhD26Rdg/kqE1Q9dZ
pJBP4HMdQsrMIYClX474Rg5f+gVms2S4P9Ti7X45QotSpQ99VsNcrXmzItZa8cey
0krsrP8irDff3hjG8Psi4dEKWH7giK0ukfrtDUGQ1dkkawqJ/byL/N85lPs1bwCo
YVq8ewZAgo8MWK2byGN87eNpfpR7mOTW9rC/kZgoSLEDKO0sMeX6plDdQf4QtD9u
XMY0L52WR88iy1y7yEZnebFlIKo+HEJjVQ6DEBFAcUqFZCyKFKABMM8lM0h9eEjr
NorEMQRLOX7xfo4WffJZ+bBp9+0LMG0KhloOSGaf85ajgYmHL4NftNqmdKD4r/4r
5utD3RQATrZ7NOC7WRKeE9QW00/D03vAC6UeMfefIx+l4m+Kt8D0iD3qLzp4qB1V
T/d/Fk5rnmuaVXDXu/0yUj5vB7+i6bak7OEqLkOa7qIu6hBJrJBZejYGWOUQZG3h
NV4T4IWuBQsTndc1oDc8
=8D4v
-----END PGP SIGNATURE-----

Re: [meta-xfce 00/15] bugfix, new panel plugins ans xfce4-mixer

[Andreas Müller]

On Fri, Jun 8, 2012 at 10:21 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> It gave me a merge conflict, can you try to rebase it onto the current HEAD
> of meta-oe please?
Done - can you give it another try?

Andreas