[meta-oe/meta-xfce 00/10] new recipes / updates / fixes

[meta-oe/meta-xfce 00/10] new recipes / updates / fixes

[Andreas Müller]

The following changes since commit a83a588b4d096e89909e537b765d8988b4ca64b0:

  libao: add version 1.1.0 (2013-09-19 13:56:58 +0200)

are available in the git repository at:

  git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git patches

for you to fetch changes up to 65ec21e2e59f2ffbb6c67d4da4d78cac7d73c7cf:

  packagegroup-xfce-extended: add xfce4-taskmanager and xfce4-notes-plugin (2013-09-21 12:27:18 +0200)

----------------------------------------------------------------
Andreas Müller (10):
      libxfce4ui: avoid dragging in gtk3
      xfce4-vala: update to 4.10.3
      xfce4-cpufreq-plugin: update to 1.1.0
      sound-theme-freedesktop: initial add 0.8.0
      libcanberra avoid gtk3 dragged in at gtk2 environments
      libcanberra: move libtool librarties for modules to dev package
      xfce4-settings: add PACKAGECONFIG for sound-settings
      xfce4-taskmanager: inital add git-version
      xfce4-notes-plugin: initial add 1.7.7
      packagegroup-xfce-extended: add xfce4-taskmanager and xfce4-notes-plugin

 meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb                                         |  13 ++++++
 meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch          |  92 +++++++++++++++++++++++++++++++++++++++++
 meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb                                                        |  15 ++++---
 meta-xfce/recipes-apps/xfce4-taskmanager/files/0001-do-not-build-documantation-Makefile-has-no-install-t.patch |  29 +++++++++++++
 meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb                                              |  22 ++++++++++
 meta-xfce/recipes-bindings/vala/files/0001-align-vapi-dir.patch                                                |  39 -----------------
 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.2.bb                                                           |  17 --------
 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb                                                           |  14 +++++++
 meta-xfce/recipes-panel-plugins/cpufreq/files/port-to-libxfce4ui.patch                                         | 138 -------------------------------------------------------------
 meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.0.0.bb                                          |  11 -----
 meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb                                          |  15 +++++++
 meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch                            | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch        |  32 ++++++++++++++
 meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb                                              |  20 +++++++++
 meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch                |  37 +++++++++++++++++
 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb                                                         |   1 +
 meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb                                             |   2 +
 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb                                                    |   8 +++-
 18 files changed, 421 insertions(+), 212 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
 create mode 100644 meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
 create mode 100644 meta-xfce/recipes-apps/xfce4-taskmanager/files/0001-do-not-build-documantation-Makefile-has-no-install-t.patch
 create mode 100644 meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb
 delete mode 100644 meta-xfce/recipes-bindings/vala/files/0001-align-vapi-dir.patch
 delete mode 100644 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.2.bb
 create mode 100644 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
 delete mode 100644 meta-xfce/recipes-panel-plugins/cpufreq/files/port-to-libxfce4ui.patch
 delete mode 100644 meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.0.0.bb
 create mode 100644 meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb
 create mode 100644 meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch
 create mode 100644 meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch
 create mode 100644 meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb
 create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch

-- 
1.8.3.1

[meta-oe/meta-xfce 01/10] libxfce4ui: avoid dragging in gtk3

[Andreas Müller]

gtk3 support was introduced in b3a2a01b40affbedc2b0951f7180c1212d24d532 when we
moved to latest git

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...figure.ac.in-remove-optional-gtk3-support.patch | 37 ++++++++++++++++++++++
 .../recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb   |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch

diff --git a/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch b/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch
new file mode 100644
index 0000000..a93fabf
--- /dev/null
+++ b/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch
@@ -0,0 +1,37 @@
+From d61dc6718a2abaf70d19f17d34128cb7e161e057 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 18 Sep 2013 20:50:11 +0200
+Subject: [PATCH] configure.ac.in: remove optional gtk3 support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+it drags in gtk3 if that was build before. This is not yet wanted
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac.in | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index e47df04..b6edab1 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -129,12 +129,6 @@ XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.28.0])
+ XDT_CHECK_PACKAGE([GTK2], [gtk+-2.0], [2.24.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
+ 
+-dnl ***********************************************************
+-dnl *** Optional support for a GTK+3 version of the library ***
+-dnl ***********************************************************
+-XDT_CHECK_OPTIONAL_PACKAGE([GTK3],
+-                           [gtk+-3.0], [3.2.0], [gtk3],
+-                           [GTK+ 3 support])
+ AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test "x$GTK3_FOUND" = "xyes"])
+ 
+ dnl *************************************************
+-- 
+1.8.3.1
+
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
index 594358d..1a2b58a 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
@@ -9,6 +9,7 @@ inherit xfce
 SRC_URI = " \
     git://git.xfce.org/xfce/libxfce4ui;protocol=git \
     file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \
+    file://0002-configure.ac.in-remove-optional-gtk3-support.patch \
 "
 SRCREV = "530b72f50fcbd8cb4b970fcc97be0321bf78183e"
 PV = "4.10.0+git${SRCPV}"
-- 
1.8.3.1

[meta-oe/meta-xfce 02/10] xfce4-vala: update to 4.10.3

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../vala/files/0001-align-vapi-dir.patch           | 39 ----------------------
 .../recipes-bindings/vala/xfce4-vala_4.10.2.bb     | 17 ----------
 .../recipes-bindings/vala/xfce4-vala_4.10.3.bb     | 14 ++++++++
 3 files changed, 14 insertions(+), 56 deletions(-)
 delete mode 100644 meta-xfce/recipes-bindings/vala/files/0001-align-vapi-dir.patch
 delete mode 100644 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.2.bb
 create mode 100644 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb

diff --git a/meta-xfce/recipes-bindings/vala/files/0001-align-vapi-dir.patch b/meta-xfce/recipes-bindings/vala/files/0001-align-vapi-dir.patch
deleted file mode 100644
index 33c6ed3..0000000
--- a/meta-xfce/recipes-bindings/vala/files/0001-align-vapi-dir.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9ac15a092c50bb95973d1d81200af031109ad377 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 3 Feb 2013 23:31:50 +0100
-Subject: [PATCH 1/2] align vapi dir
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-
-Upstream-Status: : Inappropriate [configuration]
----
- configure.ac |   10 ++--------
- 1 files changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1692ce9..f43f904 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -35,14 +35,8 @@ M8T_CHECK_PACKAGE([EXO], [exo-1], [0.8.0])
- 
- dnl Check for Vala
- M8T_CHECK_VALA([0.16.0])
--AC_ARG_WITH([default-vapidir],
--		AC_HELP_STRING([--with-default-vapidir],
--				[Use default VAPI prefix from Vala installation]),
--		[],
--		[with_default_vapidir=no])
--if test x"$with_default_vapidir" == xno ; then
--	AC_SUBST([vapidir], [${datarootdir}/vala-0.16/vapi])
--fi
-+
-+AC_SUBST([vapidir], [${datarootdir}/vala/vapi])
- 
- dnl Makefile outputs
- AC_OUTPUT([
--- 
-1.7.4.4
-
diff --git a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.2.bb b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.2.bb
deleted file mode 100644
index 152335a..0000000
--- a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.2.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Xfce4 Vala provides bindings for the Xfce framework"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
-DEPENDS = "libxfce4util garcon xfconf libxfce4ui xfce4-panel exo vala xfce4-dev-tools-native"
-
-inherit xfce
-
-SRC_URI = " \
-    http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2 \
-    file://0001-align-vapi-dir.patch \
-"
-SRC_URI[md5sum] = "afcca7cb5ae84b9a9a621a352eaf59c4"
-SRC_URI[sha256sum] = "7d9ee9f7f4ce88f3ebc1bd465bad1cd813fa5d268be62fc8d313cbec5345a978"
-
-FILES_${PN} += "${datadir}/vala"
-
-RDEPENDS_${PN} = "vala"
diff --git a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
new file mode 100644
index 0000000..aae3ff0
--- /dev/null
+++ b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Xfce4 Vala provides bindings for the Xfce framework"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
+DEPENDS = "libxfce4util garcon xfconf libxfce4ui xfce4-panel exo vala xfce4-dev-tools-native"
+
+inherit xfce
+
+SRC_URI = "http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71"
+SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b"
+
+FILES_${PN} += "${datadir}/vala-*/vapi"
+
+RDEPENDS_${PN} = "vala"
-- 
1.8.3.1

[meta-oe/meta-xfce 03/10] xfce4-cpufreq-plugin: update to 1.1.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../cpufreq/files/port-to-libxfce4ui.patch         | 138 ---------------------
 .../cpufreq/xfce4-cpufreq-plugin_1.0.0.bb          |  11 --
 .../cpufreq/xfce4-cpufreq-plugin_1.1.0.bb          |  15 +++
 3 files changed, 15 insertions(+), 149 deletions(-)
 delete mode 100644 meta-xfce/recipes-panel-plugins/cpufreq/files/port-to-libxfce4ui.patch
 delete mode 100644 meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.0.0.bb
 create mode 100644 meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb

diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/files/port-to-libxfce4ui.patch b/meta-xfce/recipes-panel-plugins/cpufreq/files/port-to-libxfce4ui.patch
deleted file mode 100644
index 7afec61..0000000
--- a/meta-xfce/recipes-panel-plugins/cpufreq/files/port-to-libxfce4ui.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 273bac3e85098f422036b5e5f7c803b8abaecb7c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de>
-Date: Mon, 17 Oct 2011 23:14:29 +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                           |    6 +++---
- panel-plugin/Makefile.am               |    4 ++--
- panel-plugin/xfce4-cpufreq-configure.c |    2 +-
- panel-plugin/xfce4-cpufreq-linux.c     |    4 ++--
- panel-plugin/xfce4-cpufreq-overview.c  |    2 +-
- panel-plugin/xfce4-cpufreq-plugin.c    |    6 +++---
- 6 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1856861..19672e0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,9 +30,9 @@ XDT_I18N([@LINGUAS@])
- dnl configure the panel plugin
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
- XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
--XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90])
--XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90])
-+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
- 
- dnl ***********************************
- dnl *** Check for debugging support ***
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index d890f85..688402a 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -5,13 +5,13 @@ xfce4_cpufreq_plugin_CFLAGS =					\
- 	-I$(top_srcdir)						\
- 	@LIBXFCE4PANEL_CFLAGS@					\
- 	@LIBXFCE4UTIL_CFLAGS@					\
--	@LIBXFCEGUI4_CFLAGS@					\
-+	@LIBXFCE4UI_CFLAGS@					\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
- 
- xfce4_cpufreq_plugin_LDADD =					\
- 	@LIBXFCE4PANEL_LIBS@					\
- 	@LIBXFCE4UTIL_LIBS@					\
--	@LIBXFCEGUI4_LIBS@
-+	@LIBXFCE4UI_LIBS@
- 
- xfce4_cpufreq_plugin_SOURCES =					\
- 	xfce4-cpufreq-plugin.h					\
-diff --git a/panel-plugin/xfce4-cpufreq-configure.c b/panel-plugin/xfce4-cpufreq-configure.c
-index 3de12c8..60af8a7 100644
---- a/panel-plugin/xfce4-cpufreq-configure.c
-+++ b/panel-plugin/xfce4-cpufreq-configure.c
-@@ -23,7 +23,7 @@
- #include <config.h>
- #endif
- 
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include "xfce4-cpufreq-plugin.h"
- #include "xfce4-cpufreq-configure.h"
- 
-diff --git a/panel-plugin/xfce4-cpufreq-linux.c b/panel-plugin/xfce4-cpufreq-linux.c
-index 9a27419..00c6dd4 100644
---- a/panel-plugin/xfce4-cpufreq-linux.c
-+++ b/panel-plugin/xfce4-cpufreq-linux.c
-@@ -27,7 +27,7 @@
- #include "xfce4-cpufreq-plugin.h"
- #include "xfce4-cpufreq-linux.h"
- 
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- #ifndef _
- # include <libintl.h>
-@@ -410,7 +410,7 @@ cpufreq_linux_init (void)
- 	{
- 		if (cpuFreq->options->show_warning)
- 		{
--			xfce_warn (_("Your system does not support cpufreq.\nThe applet only shows the current cpu frequency"));
-+			xfce_dialog_show_warning (NULL, NULL, _("Your system does not support cpufreq.\nThe applet only shows the current cpu frequency"));
- 			cpuFreq->options->show_warning = FALSE;
- 		}
- 
-diff --git a/panel-plugin/xfce4-cpufreq-overview.c b/panel-plugin/xfce4-cpufreq-overview.c
-index a186f30..c4937bf 100644
---- a/panel-plugin/xfce4-cpufreq-overview.c
-+++ b/panel-plugin/xfce4-cpufreq-overview.c
-@@ -23,7 +23,7 @@
- #include <config.h>
- #endif
- 
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #ifndef _
- # include <libintl.h>
- # define _(String) gettext (String)
-diff --git a/panel-plugin/xfce4-cpufreq-plugin.c b/panel-plugin/xfce4-cpufreq-plugin.c
-index fd9788d..8bbc7c4 100644
---- a/panel-plugin/xfce4-cpufreq-plugin.c
-+++ b/panel-plugin/xfce4-cpufreq-plugin.c
-@@ -26,7 +26,7 @@
- #endif
- 
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #ifndef _
- # include <libintl.h>
- # define _(String) gettext (String)
-@@ -329,7 +329,7 @@ cpufreq_construct (XfcePanelPlugin *plugin)
- 
- #ifdef __linux__
- 	if (cpufreq_linux_init () == FALSE)
--		xfce_err (_("Your system is not configured correctly to support cpu frequency scaling !"));
-+		xfce_dialog_show_error (NULL, NULL, _("Your system is not configured correctly to support cpu frequency scaling !"));
- 
- 	gtk_widget_set_size_request (GTK_WIDGET (plugin), -1, -1);
- 	cpufreq_widgets ();
-@@ -339,7 +339,7 @@ cpufreq_construct (XfcePanelPlugin *plugin)
- 			(GSourceFunc) cpufreq_update_cpus,
- 			NULL);
- #else
--	xfce_err (_("Your system is not supported yet !"));
-+	xfce_dialog_show_error (NULL, NULL, _("Your system is not supported yet !"));
- #endif /* __linux__ */
- 
- 	g_signal_connect (plugin, "free-data", G_CALLBACK (cpufreq_free),
--- 
-1.7.4.4
-
diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.0.0.bb b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.0.0.bb
deleted file mode 100644
index 2c9789d..0000000
--- a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.0.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Panel plugin to display frequency of all cpus"
-HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36"
-
-inherit xfce-panel-plugin
-
-# SRC_URI must follow inherited one
-SRC_URI += "file://port-to-libxfce4ui.patch"
-SRC_URI[md5sum] = "24cae9b8583cae82b715b4f72aa8e341"
-SRC_URI[sha256sum] = "e1b39a997487ef67d4f7863c81e2d9c1a700abded840ebdbe009c72214925460"
diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb
new file mode 100644
index 0000000..07b1a9a
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Panel plugin to display frequency of all cpus"
+HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36"
+
+inherit xfce-panel-plugin
+
+SRC_URI[md5sum] = "dcc56af0e19266956c297d124ba551f4"
+SRC_URI[sha256sum] = "eafa261bf984231ed8487c08decea6d916339d82b52f4bbe748e5c6a95c7f6b6"
+
+# defaults in xfce4-panel-plugin.bbclass don't match so override here
+FILES_${PN} = "${datadir}/icons ${datadir}/xfce4 ${libdir}/xfce4/panel/plugins/*.so*"
+
+# *.so are required for plugin detection
+INSANE_SKIP_${PN} = "dev-so"
-- 
1.8.3.1

[meta-oe/meta-xfce 04/10] sound-theme-freedesktop: initial add 0.8.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../sound-themes/sound-theme-freedesktop_0.8.bb             | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb

diff --git a/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
new file mode 100644
index 0000000..97a1dba
--- /dev/null
+++ b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Freedesktop sound theme"
+HOMEPAGE = "http://freedesktop.org/wiki/Specifications/sound-theme-spec"
+LICENSE = "GPLv2+ CC-BY-3.0 CC-BY-SA-3.0"
+LIC_FILES_CHKSUM = "file://CREDITS;md5=3213e601ce34bb42ddc3498903ac4e69"
+
+inherit autotools gettext
+
+# with allarch.bbclass configure fails fo no compiler found
+PACKAGE_ARCH = "all"
+
+SRC_URI = "http://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "d7387912cfd275282d1ec94483cb2f62"
+SRC_URI[sha256sum] = "cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14"
-- 
1.8.3.1

[meta-oe/meta-xfce 05/10] libcanberra avoid gtk3 dragged in at gtk2 environments

[Andreas Müller]

* build two versions of canberra-gtk-play for gtk2 and gtk3.
* move canberra-gtk-play to libcanberra-gtk2 and canberra-gtk3-play to
  libcanberra-gtk2.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...tk-and-gtk3-version-for-canberra_gtk_play.patch | 92 ++++++++++++++++++++++
 .../libcanberra/libcanberra_0.29.bb                | 13 ++-
 2 files changed, 101 insertions(+), 4 deletions(-)
 create mode 100644 meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch

diff --git a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
new file mode 100644
index 0000000..4e0984f
--- /dev/null
+++ b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
@@ -0,0 +1,92 @@
+From 4a89ddffbb14d747adbe3365ace4db87de52ba39 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 16 Sep 2013 16:08:28 +0200
+Subject: [PATCH] build gtk- and gtk3-version for canberra_gtk_play
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/Makefile.am |   25 +++++++++++++++----------
+ 1 files changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 56ed96d..fc72e1f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -319,9 +319,6 @@ endif
+ 
+ if HAVE_GTK_ANY
+ 
+-bin_PROGRAMS += \
+-	canberra-gtk-play
+-
+ include_HEADERS += \
+ 	canberra-gtk.h
+ 
+@@ -329,6 +326,9 @@ endif
+ 
+ if HAVE_GTK3
+ 
++bin_PROGRAMS += \
++	canberra-gtk3-play
++
+ lib_LTLIBRARIES += \
+ 	libcanberra-gtk3.la
+ 
+@@ -367,6 +367,9 @@ endif
+ 
+ if HAVE_GTK
+ 
++bin_PROGRAMS += \
++	canberra-gtk-play
++
+ lib_LTLIBRARIES += \
+ 	libcanberra-gtk.la
+ 
+@@ -399,14 +402,17 @@ endif
+ 
+ if HAVE_GTK3
+ 
+-canberra_gtk_play_LDADD = \
++canberra_gtk3_play_LDADD = \
+ 	$(GTK3_LIBS) \
+ 	libcanberra.la \
+ 	libcanberra-gtk3.la
+-canberra_gtk_play_CFLAGS = \
++canberra_gtk3_play_CFLAGS = \
+ 	$(GTK3_CFLAGS)
+ 
+-else
++canberra_gtk3_play_SOURCES = \
++	canberra-gtk-play.c
++
++endif
+ if HAVE_GTK
+ 
+ canberra_gtk_play_LDADD = \
+@@ -416,7 +422,9 @@ canberra_gtk_play_LDADD = \
+ canberra_gtk_play_CFLAGS = \
+ 	$(GTK_CFLAGS)
+ 
+-endif
++canberra_gtk_play_SOURCES = \
++	canberra-gtk-play.c
++
+ endif
+ 
+ if HAVE_GTK_ANY
+@@ -424,9 +432,6 @@ if HAVE_GTK_ANY
+ dist_gsdgtkmodules_DATA = \
+ 	canberra-gtk-module.desktop
+ 
+-canberra_gtk_play_SOURCES = \
+-	canberra-gtk-play.c
+-
+ EXTRA_DIST += \
+ 	libcanberra-login-sound.desktop.in \
+ 	libcanberra-ready-sound.desktop.in \
+-- 
+1.7.6.5
+
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
index da94c20..8b771bf 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
@@ -8,7 +8,10 @@ DEPENDS = "gstreamer gtk+ gtk+3 libtool libvorbis"
 
 inherit autotools
 
-SRC_URI = "http://0pointer.de/lennart/projects/${BPN}/${BPN}-${PV}.tar.xz"
+SRC_URI = " \
+    http://0pointer.de/lennart/projects/${BPN}/${BPN}-${PV}.tar.xz \
+    file://0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch \
+"
 SRC_URI[md5sum] = "2594093a5d61047bd9cc87e955f86df8"
 SRC_URI[sha256sum] = "127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72"
 
@@ -39,19 +42,21 @@ PACKAGES_DYNAMIC += "^libcanberra-.*"
 
 FILES_${PN} = "${bindir}/ ${libdir}/${BPN}.so.*"
 
-FILES_${PN}-dev += "${datadir}/vala/vapi"
+FILES_${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.la"
 
 FILES_${PN}-dbg += "${libdir}/${P}/.debug ${libdir}/gtk-*/modules/.debug"
 
 FILES_${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \
                     ${libdir}/gtk-2.0/modules/*.la \
-                    ${libdir}/gtk-2.0/modules/*.so"
+                    ${libdir}/gtk-2.0/modules/*.so \
+                    ${bindir}/canberra-gtk-play"
 
 # -gtk3 ships a symlink to a .so
 INSANE_SKIP_${PN}-gtk3 = "dev-so"
 FILES_${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \
                     ${libdir}/gtk-3.0/modules/*.la \
-                    ${libdir}/gtk-3.0/modules/*.so"
+                    ${libdir}/gtk-3.0/modules/*.so \
+                    ${bindir}/canberra-gtk3-play"
 
 FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \
                      ${datadir}/gdm/ ${datadir}/gnome/"
-- 
1.8.3.1

[meta-oe/meta-xfce 06/10] libcanberra: move libtool librarties for modules to dev package

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
index 8b771bf..332b62b 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
@@ -47,14 +47,12 @@ FILES_${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.
 FILES_${PN}-dbg += "${libdir}/${P}/.debug ${libdir}/gtk-*/modules/.debug"
 
 FILES_${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \
-                    ${libdir}/gtk-2.0/modules/*.la \
                     ${libdir}/gtk-2.0/modules/*.so \
                     ${bindir}/canberra-gtk-play"
 
 # -gtk3 ships a symlink to a .so
 INSANE_SKIP_${PN}-gtk3 = "dev-so"
 FILES_${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \
-                    ${libdir}/gtk-3.0/modules/*.la \
                     ${libdir}/gtk-3.0/modules/*.so \
                     ${bindir}/canberra-gtk3-play"
 
-- 
1.8.3.1

[meta-oe/meta-xfce 07/10] xfce4-settings: add PACKAGECONFIG for sound-settings

[Andreas Müller]

defaults based upon DISTRO_FEATURES for alsa and pulseaudio

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
index 4b75dd7..227858a 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
@@ -23,9 +23,13 @@ PV = "4.10.0+git${SRCPV}"
  
 EXTRA_OECONF += "--enable-maintainer-mode --disable-debug"
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)}"
+PACKAGECONFIG ??= " \
+    ${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \
+    ${@base_contains('DISTRO_FEATURES','alsa','sound-setter', base_contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \
+"
 PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata"
 PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify"
+PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop"
 
 do_configure_prepend() {
     NOCONFIGURE=yes ./autogen.sh
@@ -43,3 +47,5 @@ do_install_prepend() {
 }
 
 RRECOMMENDS_${PN} += "gnome-icon-theme"
+RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}"
+RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}"
-- 
1.8.3.1

[meta-oe/meta-xfce 08/10] xfce4-taskmanager: inital add git-version

[Andreas Müller]

we use git sources - the last release is 3 years ago

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...d-documantation-Makefile-has-no-install-t.patch | 29 ++++++++++++++++++++++
 .../xfce4-taskmanager/xfce4-taskmanager_git.bb     | 22 ++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 meta-xfce/recipes-apps/xfce4-taskmanager/files/0001-do-not-build-documantation-Makefile-has-no-install-t.patch
 create mode 100644 meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb

diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/files/0001-do-not-build-documantation-Makefile-has-no-install-t.patch b/meta-xfce/recipes-apps/xfce4-taskmanager/files/0001-do-not-build-documantation-Makefile-has-no-install-t.patch
new file mode 100644
index 0000000..eeee8f7
--- /dev/null
+++ b/meta-xfce/recipes-apps/xfce4-taskmanager/files/0001-do-not-build-documantation-Makefile-has-no-install-t.patch
@@ -0,0 +1,29 @@
+From 9902fb9d4fce474426c35b73617149014799a0c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 19 Sep 2013 16:43:59 +0200
+Subject: [PATCH] do not build documantation - Makefile has no install target
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [config]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 6ffa8d9..6aef17a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,5 @@
+ SUBDIRS =								\
+ 	po								\
+-	doc								\
+ 	src
+ 
+ desktopdir = $(datadir)/applications
+-- 
+1.8.3.1
+
diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb
new file mode 100644
index 0000000..502c203
--- /dev/null
+++ b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Easy to use task manager"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+inherit xfce-app
+
+DEPENDS = "gtk+ cairo libwnck xfce4-dev-tools-native exo-native"
+
+SRC_URI = " \
+    git://git.xfce.org/apps/xfce4-taskmanager;protocol=git \
+    file://0001-do-not-build-documantation-Makefile-has-no-install-t.patch \
+"
+
+SRCREV = "e5d958738b6d2828a4c8353df67d3c1656c46af5"
+S = "${WORKDIR}/git"
+PV = "1.0.0+git${SRCPV}"
+
+EXTRA_OECONF += "--enable-maintainer-mode"
+
+do_configure_prepend() {
+       NOCONFIGURE=yes ./autogen.sh
+}
-- 
1.8.3.1

[meta-oe/meta-xfce 09/10] xfce4-notes-plugin: initial add 1.7.7

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../files/0001-Bump-dependency-to-Xfce-4.10.patch  | 128 +++++++++++++++++++++
 ...atus-icon.c-remove-deprecated-g_type_init.patch |  32 ++++++
 .../notes/xfce4-notes-plugin_1.7.7.bb              |  20 ++++
 3 files changed, 180 insertions(+)
 create mode 100644 meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch
 create mode 100644 meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch
 create mode 100644 meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb

diff --git a/meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch b/meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch
new file mode 100644
index 0000000..4a3b1ce
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch
@@ -0,0 +1,128 @@
+From 26c4ad1765d0d59b3918363d38174c5f5bfe0dcd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 20 Sep 2013 22:49:47 +0200
+Subject: [PATCH] Bump dependency to Xfce 4.10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Drop support for Xfce <= 4.6.
+Replace libxfcegui4 dependency against libxfce4ui.
+Update to new libtool syntax (use LT_PREREQ.)
+
+Upstream-status: Backport [1]
+
+[1] http://git.xfce.org/panel-plugins/xfce4-notes-plugin/commit/?id=d11fe51fae95b5b4963847be76ae4a07409a6076
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac               | 23 ++++++++++-------------
+ src/Makefile.am            |  4 ++--
+ src/xfce4-notes-settings.c |  6 +++---
+ 3 files changed, 15 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 20d27e5..8d4113f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,21 +24,17 @@ AC_INIT([Notes], [xfce4_notes_plugin_version], [http://bugzilla.xfce.org/], [xfc
+ AC_REVISION([xfce4_notes_plugin_version_build])
+ AC_CANONICAL_TARGET()
+ 
++LT_PREREQ([2.2.6])
++LT_INIT([disable-static])
++
+ AM_INIT_AUTOMAKE([1.11 dist-bzip2])
+ AM_CONFIG_HEADER([config.h])
+ AM_MAINTAINER_MODE()
+ AM_SILENT_RULES([yes])
+ 
+-dnl Avoid g77 and g++ checks
+-m4_undefine([AC_PROG_CXX])
+-m4_defun([AC_PROG_CXX],[])
+-m4_undefine([AC_PROG_F77])
+-m4_defun([AC_PROG_F77],[])
+-
+ dnl Check for basic programs
+ AM_PROG_CC_C_O()
+ AC_PROG_LD()
+-AC_PROG_LIBTOOL()
+ AC_PROG_INSTALL()
+ AC_PROG_INTLTOOL()
+ 
+@@ -51,12 +47,13 @@ AC_SUBST([MATH_LIBS], [" -lm"])
+ 
+ dnl Check for required packages
+ XDT_CHECK_LIBX11_REQUIRE()
+-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0])
+-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
+-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
+-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
+-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
++XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
++XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
++XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
++XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
++XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0])
++XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
+ XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.0.0])
+ 
+ dnl Check for libxfce4panel >= 4.7
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f69ab0f..2d97b63 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -36,7 +36,7 @@ xfce4_notes_settings_SOURCES =						\
+ xfce4_notes_settings_CFLAGS =						\
+ 	@LIBX11_CFLAGS@							\
+ 	@GTK_CFLAGS@							\
+-	@LIBXFCEGUI4_CFLAGS@						\
++	@LIBXFCE4UI_CFLAGS@						\
+ 	@XFCONF_CFLAGS@							\
+ 	@UNIQUE_CFLAGS@
+ 
+@@ -44,7 +44,7 @@ xfce4_notes_settings_LDADD =						\
+ 	$(top_builddir)/lib/libnotes.la					\
+ 	@LIBX11_LIBS@							\
+ 	@GTK_LIBS@							\
+-	@LIBXFCEGUI4_LIBS@						\
++	@LIBXFCE4UI_LIBS@						\
+ 	@XFCONF_LIBS@							\
+ 	@UNIQUE_LIBS@
+ 
+diff --git a/src/xfce4-notes-settings.c b/src/xfce4-notes-settings.c
+index f66bb13..1d7cc70 100644
+--- a/src/xfce4-notes-settings.c
++++ b/src/xfce4-notes-settings.c
+@@ -25,7 +25,7 @@
+ #include <xfconf/xfconf.h>
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "defines.h"
+ #include "color.h"
+@@ -115,7 +115,7 @@ prop_dialog_new (void)
+ 
+   /* === Global settings === */
+   box = gtk_vbox_new (FALSE, BORDER);
+-  frame = xfce_create_framebox_with_content (_("Global settings"), box);
++  frame = xfce_gtk_frame_box_new_with_content (_("Global settings"), box);
+   gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER);
+   gtk_container_add (GTK_CONTAINER (vbox), frame);
+ 
+@@ -163,7 +163,7 @@ prop_dialog_new (void)
+ 
+   /* === New window settings === */
+   box = gtk_vbox_new (FALSE, BORDER);
+-  frame = xfce_create_framebox_with_content (_("New group settings"), box);
++  frame = xfce_gtk_frame_box_new_with_content (_("New group settings"), box);
+   gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER);
+   gtk_container_add (GTK_CONTAINER (vbox), frame);
+ 
+-- 
+1.8.3.1
+
diff --git a/meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch b/meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch
new file mode 100644
index 0000000..e1ede27
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch
@@ -0,0 +1,32 @@
+From 0218e5ebf38f94d58b908fca451ba3789efa8899 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 20 Sep 2013 23:09:25 +0200
+Subject: [PATCH] main-status-icon.c remove deprecated g_type_init
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+this file was auto created by valac and xfce-vala when creating tarball. So
+
+Upstream-Status: Inappropriate [other]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/main-status-icon.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/main-status-icon.c b/src/main-status-icon.c
+index c6d73f8..f7db773 100644
+--- a/src/main-status-icon.c
++++ b/src/main-status-icon.c
+@@ -290,7 +290,6 @@ gint _vala_main (char** args, int args_length1) {
+ 
+ 
+ int main (int argc, char ** argv) {
+-	g_type_init ();
+ 	return _vala_main (argv, argc);
+ }
+ 
+-- 
+1.8.3.1
+
diff --git a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb
new file mode 100644
index 0000000..b97bc24
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Notes plugin for the Xfce Panel"
+HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+inherit xfce-panel-plugin
+
+DEPENDS = "gtk+ libxfce4ui xfce4-panel xfconf libunique"
+
+SRC_URI += " \
+    file://0001-Bump-dependency-to-Xfce-4.10.patch \
+    file://0002-main-status-icon.c-remove-deprecated-g_type_init.patch \
+"
+SRC_URI[md5sum] = "42b924b23f2fec6a1099e9b7a87db4a3"
+SRC_URI[sha256sum] = "a7baa105b37ad05dea4d6b55d98fd3214c77ad5c7a0e91471d4906c81e5f5217"
+
+FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so.*"
+
+# *.so are required for plugin detection
+INSANE_SKIP_${PN} = "dev-so"
-- 
1.8.3.1

[meta-oe/meta-xfce 10/10] packagegroup-xfce-extended: add xfce4-taskmanager and xfce4-notes-plugin

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index 059d8c9..30fd138 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -43,6 +43,7 @@ RRECOMMENDS_${PN} = " \
     xfce4-brightness-plugin \
     xfce4-closebutton-plugin \
     xfce4-equake-plugin \
+    xfce4-notes-plugin \
     \
     thunar-media-tags-plugin \
     thunar-archive-plugin \
@@ -52,4 +53,5 @@ RRECOMMENDS_${PN} = " \
     xfce4-power-manager \
     xfce4-mixer \
     ristretto \
+    xfce4-taskmanager \
 "
-- 
1.8.3.1

Re: [meta-oe/meta-xfce 07/10] xfce4-settings: add PACKAGECONFIG for sound-settings

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2719 bytes --]

On Sat, Sep 21, 2013 at 12:41:38PM +0200, Andreas Müller wrote:
> defaults based upon DISTRO_FEATURES for alsa and pulseaudio
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
> index 4b75dd7..227858a 100644
> --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
> +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
> @@ -23,9 +23,13 @@ PV = "4.10.0+git${SRCPV}"
>   
>  EXTRA_OECONF += "--enable-maintainer-mode --disable-debug"

Last xfce4-settings change caused PV going backwards:
xfce4-settings-4.10.0+gitAUTOINC+b7a0e1fd77: Package version for package
xfce4-settings-locale-si went backwards which would break package feeds
from (0:4.11.0-r0.55 to 0:4.10.0+git0+b7a0e1fd77-r0.2)

commit 23f020f742aea622e5dd7aef81eb59c99f8ef000
Author: Andreas M<C3><BC>ller <schnitzeltony@googlemail.com>
Date:   Mon Sep 16 09:04:15 2013 +0000

    xfce4-settings: move to schnitzeltony's git repo to get new datetime
setter
    
Is this git version really older tna old release we had?

Sorry that I haven't reported it on the commit which caused it :).

>  
> -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)}"
> +PACKAGECONFIG ??= " \
> +    ${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \
> +    ${@base_contains('DISTRO_FEATURES','alsa','sound-setter', base_contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \
> +"
>  PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata"
>  PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify"
> +PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop"
>  
>  do_configure_prepend() {
>      NOCONFIGURE=yes ./autogen.sh
> @@ -43,3 +47,5 @@ do_install_prepend() {
>  }
>  
>  RRECOMMENDS_${PN} += "gnome-icon-theme"
> +RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}"
> +RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}"
> -- 
> 1.8.3.1
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-oe/meta-xfce 07/10] xfce4-settings: add PACKAGECONFIG for sound-settings

[Andreas Müller]

On Fri, Oct 4, 2013 at 4:18 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Sat, Sep 21, 2013 at 12:41:38PM +0200, Andreas Müller wrote:
>> defaults based upon DISTRO_FEATURES for alsa and pulseaudio
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> ---
>>  meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 8 +++++++-
>>  1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
>> index 4b75dd7..227858a 100644
>> --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
>> +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
>> @@ -23,9 +23,13 @@ PV = "4.10.0+git${SRCPV}"
Aargh - it is definitely a 4.11+git - I have seen this warning long
time ago but did not take enough attention...
>
> Sorry that I haven't reported it on the commit which caused it :).

I will send a patch ontop of this series next week.

Nadreas

Re: [meta-oe/meta-xfce 07/10] xfce4-settings: add PACKAGECONFIG for sound-settings

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1444 bytes --]

On Fri, Oct 04, 2013 at 10:02:25PM +0200, Andreas Müller wrote:
> On Fri, Oct 4, 2013 at 4:18 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Sat, Sep 21, 2013 at 12:41:38PM +0200, Andreas Müller wrote:
> >> defaults based upon DISTRO_FEATURES for alsa and pulseaudio
> >>
> >> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> >> ---
> >>  meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 8 +++++++-
> >>  1 file changed, 7 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
> >> index 4b75dd7..227858a 100644
> >> --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
> >> +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
> >> @@ -23,9 +23,13 @@ PV = "4.10.0+git${SRCPV}"
> Aargh - it is definitely a 4.11+git - I have seen this warning long
> time ago but did not take enough attention...
> >
> > Sorry that I haven't reported it on the commit which caused it :).
> 
> I will send a patch ontop of this series next week.
> 
> Nadreas

OK, I'll merge this series this week (2nd build already running).

Could you check xfce4 specific issues in
http://lists.openembedded.org/pipermail/openembedded-core/2013-October/084905.html
?

That would be very appreciated.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]