[meta-xfce 0/4] further tweaks

[meta-xfce 0/4] further tweaks

[Andreas Müller]

The series consists of two parts:

  * exo-native: When building from xfce-git-repos exo-csource is required. I 
    needed that several times for debugging (e.g when implementing extensions
    to xfce4-settings).
  * xfce4-closebutton-plugin: This is a very simple panel plugin I have 
    written. It is intended to close windows in environments with maximized and
    undecorated windows e.g on low resolution screens.

The following changes since commit 74eee8a7960cf0a898d795cb024b10a58357dbcd:

  multipath-tools: add recipe for git version (2013-03-29 13:16:39 +0100)

are available in the git repository at:
  git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git xfce-patches

Andreas Müller (4):
      exo: add native build
      exo: split out exo-csource to exo-dev - it is not required on target
      xfce4-closebutton-plugin: initial add
      packagegroup-xfce-extended: add xfce4-closebutton-plugin

 .../closebutton/xfce4-closebutton-plugin_git.bb    |   22 +++++++
 .../exo/exo/reduce-build-to-exo-csource-only.patch |   64 ++++++++++++++++++++
 meta-xfce/recipes-xfce/exo/exo_0.10.2.bb           |   10 +++
 .../packagegroups/packagegroup-xfce-extended.bb    |    3 +-
 4 files changed, 98 insertions(+), 1 deletions(-)
 create mode 100644 meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb
 create mode 100644 meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch

-- 
1.7.4.4

[meta-xfce 1/4] exo: add native build

[Andreas Müller]

The native build only creates exo-csource. exo-csource converts glade-files
into c-header files. When building xfce projects from git repo, exo-csource is
required (tarballs have the glade-headers included).

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../exo/exo/reduce-build-to-exo-csource-only.patch |   64 ++++++++++++++++++++
 meta-xfce/recipes-xfce/exo/exo_0.10.2.bb           |    7 ++
 2 files changed, 71 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch

diff --git a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch
new file mode 100644
index 0000000..45dab0c
--- /dev/null
+++ b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch
@@ -0,0 +1,64 @@
+From 7249ba76c9e6d573a72b3a84a2b3a3b2e75d18c2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 28 Mar 2013 23:41:03 +0100
+Subject: [PATCH] reduce build to exo-csource only
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+exo-csource creates c-header files from glade resource output files. When
+building xfce-packages from git instead of tarball this exo-csource-native is
+required.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ Makefile.am  |   10 +---------
+ configure.ac |   11 -----------
+ 2 files changed, 1 insertions(+), 20 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c2e3fff..79b0931 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,13 +1,5 @@
+ SUBDIRS =								\
+-	exo								\
+-	exo-csource							\
+-	exo-desktop-item-edit						\
+-	exo-helper							\
+-	exo-open							\
+-	docs								\
+-	icons								\
+-	pixmaps								\
+-	po
++	exo-csource
+ 
+ AUTOMAKE_OPTIONS =							\
+ 	1.9								\
+diff --git a/configure.ac b/configure.ac
+index efcd62e..23938b9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -165,17 +165,6 @@ dnl ***********************************
+ dnl *** Check for required packages ***
+ dnl ***********************************
+ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0])
+-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0])
+-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
+-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
+-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
+-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
+-XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0], [gio-unix], [GIO-Unix features])
+-
+-dnl *********************
+-dnl *** Check for X11 ***
+-dnl *********************
+-XDT_CHECK_LIBX11_REQUIRE()
+ 
+ dnl *************************
+ dnl *** Check for gtk-doc ***
+-- 
+1.7.4.4
+
diff --git a/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
index 4fdfd48..e859cfa 100644
--- a/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
+++ b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
@@ -3,6 +3,8 @@ SECTION = "x11"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "gtk+ libxfce4util libxfce4ui virtual/libx11 perl-native cairo"
+DEPENDS_virtclass-native = "glib-2.0-native xfce4-dev-tools-native"
+PR = "r1"
 
 inherit xfce pythonnative
 
@@ -12,6 +14,9 @@ SRC_URI += " \
     file://configure.patch \
     file://gnome-mount \
 "
+SRC_URI_append_virtclass-native = " \
+    file://reduce-build-to-exo-csource-only.patch \
+"
 
 SRC_URI[md5sum] = "c70f2a217811bfba2e62f938d4b8f748"
 SRC_URI[sha256sum] = "b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce"
@@ -30,3 +35,5 @@ FILES_${PN} += "${datadir}/xfce4/ \
 
 FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \
                    "
+
+BBCLASSEXTEND = "native"
-- 
1.7.4.4

[meta-xfce 2/4] exo: split out exo-csource to exo-dev - it is not required on target

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-xfce/recipes-xfce/exo/exo_0.10.2.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
index e859cfa..e7247ff 100644
--- a/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
+++ b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "gtk+ libxfce4util libxfce4ui virtual/libx11 perl-native cairo"
 DEPENDS_virtclass-native = "glib-2.0-native xfce4-dev-tools-native"
-PR = "r1"
+PR = "r2"
 
 inherit xfce pythonnative
 
@@ -36,4 +36,7 @@ FILES_${PN} += "${datadir}/xfce4/ \
 FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \
                    "
 
+FILES_${PN}-dev += "${bindir}/gio/exo-csource \
+                   "
+
 BBCLASSEXTEND = "native"
-- 
1.7.4.4

[meta-xfce 3/4] xfce4-closebutton-plugin: initial add

[Andreas Müller]

I do not have the environment and the time to create a tarball, so take sources
from my git repo.

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

diff --git a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb
new file mode 100644
index 0000000..cbc7df5
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Plugin displaying close button for application currently active"
+SECTION = "x11"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f"
+
+inherit xfce-panel-plugin gtk-icon-cache perlnative
+
+DEPENDS += "perl-native exo-native libwnck xfconf"
+
+PV = "0.1.0+gitr${SRCPV}"
+
+SRC_URI = "git://gitorious.org/xfce/xfce4-closebutton-plugin.git;protocol=git;branch=master"
+SRCREV = "bd76154afe26ba8a5251a1887d88f9d855301850"
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF += "--enable-maintainer-mode"
+
+do_configure_prepend() {
+	NOCONFIGURE=yes ./autogen.sh
+}
+
+FILES_${PN} += "${datadir}/xfce4/closebutton/themes"
-- 
1.7.4.4

[meta-xfce 4/4] packagegroup-xfce-extended: add xfce4-closebutton-plugin

[Andreas Müller]

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

diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index a771bc4..7ee65f6 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -3,7 +3,7 @@ SECTION = "x11/wm"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r8"
+PR = "r9"
 
 inherit packagegroup
 
@@ -41,6 +41,7 @@ RRECOMMENDS_${PN} = " \
     xfce4-battery-plugin \
     xfce4-mount-plugin \
     xfce4-brightness-plugin \
+    xfce4-closebutton-plugin \
     \
     xfce4-appfinder \
     xfce4-screenshooter \
-- 
1.7.4.4

[meta-xfce 3/4] xfce4-closebutton-plugin: initial add

[Andreas Müller]

On Friday, March 29, 2013, Andreas Müller <schnitzeltony@googlemail.com>
wrote:
> I do not have the environment and the time to create a tarball, so take
sources
> from my git repo.
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  .../closebutton/xfce4-closebutton-plugin_git.bb    |   22
++++++++++++++++++++
>  1 files changed, 22 insertions(+), 0 deletions(-)
>  create mode 100644 meta-xfce/recipes-panel-plugins/closebutton/
xfce4-closebutton-plugin_git.bb
>
> diff --git a/meta-xfce/recipes-panel-plugins/closebutton/
xfce4-closebutton-plugin_git.bbb/meta-xfce/recipes-panel-plugins/closebutton/
xfce4-closebutton-plugin_git.bb
> new file mode 100644
> index 0000000..cbc7df5
> --- /dev/null
> +++ b/meta-xfce/recipes-panel-plugins/closebutton/
xfce4-closebutton-plugin_git.bb
> @@ -0,0 +1,22 @@
> +DESCRIPTION = "Plugin displaying close button for application currently
active"
> +SECTION = "x11"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f"
> +
> +inherit xfce-panel-plugin gtk-icon-cache perlnative
> +
> +DEPENDS += "perl-native exo-native libwnck xfconf"
Seems perl-native belongs to exo. Will send v2.

Andreas
> +
> +PV = "0.1.0+gitr${SRCPV}"
> +
> +SRC_URI = "git://
gitorious.org/xfce/xfce4-closebutton-plugin.git;protocol=git;branch=master"
> +SRCREV = "bd76154afe26ba8a5251a1887d88f9d855301850"
> +S = "${WORKDIR}/git"
> +
> +EXTRA_OECONF += "--enable-maintainer-mode"
> +
> +do_configure_prepend() {
> +       NOCONFIGURE=yes ./autogen.sh
> +}
> +
> +FILES_${PN} += "${datadir}/xfce4/closebutton/themes"
> --
> 1.7.4.4
>
>