[meta-oe/meta-xfce/meta-gnome 0/4] updates/bugfix-world

[meta-oe/meta-xfce/meta-gnome 0/4] updates/bugfix-world

[Andreas Müller]

The following changes since commit 230e2171d07815f51d5b6d044627afa0ff13c5d4:

  gpsd: fix udev rules file (2013-03-06 06:05:35 +0100)

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

Andreas Müller (4):
      midori: update to 0.4.8
      geany: fix build on perl-less machines
      xfce4-eyes-plugin: update to 4.4.2
      xfce4-vala: initial add 4.10.2

 .../midori/{midori_0.4.7.bb => midori_0.4.8.bb}    |    8 +-
 meta-oe/recipes-devtools/geany/geany_1.22.bb       |    4 +-
 .../vala/files/0001-align-vapi-dir.patch           |   39 +++++++++++
 .../recipes-bindings/vala/xfce4-vala_4.10.2.bb     |   17 +++++
 .../eyes/files/port-to-libxfce4ui.patch            |   68 --------------------
 .../eyes/xfce4-eyes-plugin_4.4.1.bb                |   13 ----
 .../eyes/xfce4-eyes-plugin_4.4.2.bb                |   11 +++
 7 files changed, 73 insertions(+), 87 deletions(-)
 rename meta-gnome/recipes-connectivity/midori/{midori_0.4.7.bb => midori_0.4.8.bb} (84%)
 create mode 100644 meta-xfce/recipes-bindings/vala/files/0001-align-vapi-dir.patch
 create mode 100644 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.2.bb
 delete mode 100644 meta-xfce/recipes-panel-plugins/eyes/files/port-to-libxfce4ui.patch
 delete mode 100644 meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.1.bb
 create mode 100644 meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.2.bb

-- 
1.7.6.5

[meta-oe/meta-xfce/meta-gnome 1/4] midori: update to 0.4.8

[Andreas Müller]

the following issues caused similarity index decreasing:

| waf: error: no such option: --disable-hildon

| Checking for Python			:  /usr/bin/python2

| Checking for zeitgeist-1.0 >= 0.3.14        : Package zeitgeist-1.0 was not found in the pkg-config search path.
| Perhaps you should add the directory containing `zeitgeist-1.0.pc'

Run tests showed artifacts with google maps. Theses showed up with previous
version of midori and current version of firefox too. So they seem
independent of this update.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../midori/{midori_0.4.7.bb => midori_0.4.8.bb}    |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
 rename meta-gnome/recipes-connectivity/midori/{midori_0.4.7.bb => midori_0.4.8.bb} (84%)

diff --git a/meta-gnome/recipes-connectivity/midori/midori_0.4.7.bb b/meta-gnome/recipes-connectivity/midori/midori_0.4.8.bb
similarity index 84%
rename from meta-gnome/recipes-connectivity/midori/midori_0.4.7.bb
rename to meta-gnome/recipes-connectivity/midori/midori_0.4.8.bb
index 8521e47..266df4f 100644
--- a/meta-gnome/recipes-connectivity/midori/midori_0.4.7.bb
+++ b/meta-gnome/recipes-connectivity/midori/midori_0.4.8.bb
@@ -6,10 +6,10 @@ DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native l
 
 SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
           "
-SRC_URI[midori.md5sum] = "06db7b88a41e9b2265728960d5e98f35"
-SRC_URI[midori.sha256sum] = "65bf9976733597c405492ce91aa664fd10547cb7df16e0a70f260c7a3e97ea5d"
+SRC_URI[midori.md5sum] = "ce1b01fa5aa33d2ee50196df0c71e96f"
+SRC_URI[midori.sha256sum] = "40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f"
 
-inherit gtk-icon-cache pkgconfig vala
+inherit gtk-icon-cache pkgconfig vala pythonnative
 
 do_configure() {
     sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript
@@ -26,8 +26,8 @@ do_configure() {
             --includedir=${includedir} \
             --infodir=${infodir} \
             --mandir=${mandir} \
-            --disable-hildon \
             --disable-gtk3 \
+            --disable-zeitgeist \
 }
 
 PARALLEL_MAKE = ""
-- 
1.7.6.5

[meta-oe/meta-xfce/meta-gnome 2/4] geany: fix build on perl-less machines

[Andreas Müller]

while testing this patch a hidden configure error was detected [1]

autoreconf: running: gnu-configize
Can't load '/home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.14.3/auto/Data/Dumper/Dumper.so' for module Data::Dumper: /home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.14.3/auto/Data/Dumper/Dumper.so: undefined symbol: PL_charclass at /home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.14.3/XSLoader.pm line 71.
 at /home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.14.3/Data/Dumper.pm line 36
Compilation failed in require at /home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/share/autoconf/Autom4te/C4che.pm line 33.
BEGIN failed--compilation aborted at /home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/share/autoconf/Autom4te/C4che.pm line 33.
Compilation failed in require at /home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin/autom4te line 37.
BEGIN failed--compilation aborted at /home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin/autom4te line 37.
autoreconf: Leaving directory `.'

but this seems unrelated to geany.

[1] http://lists.linuxtogo.org/pipermail/openembedded-core/2013-March/036745.html

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-devtools/geany/geany_1.22.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/geany/geany_1.22.bb b/meta-oe/recipes-devtools/geany/geany_1.22.bb
index e0b5df5..f56c8f3 100644
--- a/meta-oe/recipes-devtools/geany/geany_1.22.bb
+++ b/meta-oe/recipes-devtools/geany/geany_1.22.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "http://www.geany.org/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c107cf754550e65755c42985a5d4e9c9"
 DEPENDS = "gtk+"
-PR = "r1"
+PR = "r2"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig perlnative
 
 SRC_URI = " \
     http://download.geany.org/${PN}-${PV}.tar.bz2 \
-- 
1.7.6.5

[meta-oe/meta-xfce/meta-gnome 3/4] xfce4-eyes-plugin: update to 4.4.2

[Andreas Müller]

minor license changes see [1]

[1] http://git.xfce.org/panel-plugins/xfce4-eyes-plugin/commit/?id=7cfd829fe7cd5a9df8dc855d3779db6f1f90ab4e

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../eyes/files/port-to-libxfce4ui.patch            |   68 --------------------
 .../eyes/xfce4-eyes-plugin_4.4.1.bb                |   13 ----
 .../eyes/xfce4-eyes-plugin_4.4.2.bb                |   11 +++
 3 files changed, 11 insertions(+), 81 deletions(-)
 delete mode 100644 meta-xfce/recipes-panel-plugins/eyes/files/port-to-libxfce4ui.patch
 delete mode 100644 meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.1.bb
 create mode 100644 meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.2.bb

diff --git a/meta-xfce/recipes-panel-plugins/eyes/files/port-to-libxfce4ui.patch b/meta-xfce/recipes-panel-plugins/eyes/files/port-to-libxfce4ui.patch
deleted file mode 100644
index 2fa96f7..0000000
--- a/meta-xfce/recipes-panel-plugins/eyes/files/port-to-libxfce4ui.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From aef48031ed443be04bfd16ae755766ff75d624b6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de>
-Date: Wed, 26 Oct 2011 00:40:09 +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/eyes.c      |    2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5ff1397..67e2288 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,9 +56,9 @@ dnl *** Check for required packages ***
- dnl ***********************************
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
- XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
--XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
--XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.1])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [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 1ee4d28..249303c 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -13,12 +13,12 @@ xfce4_eyes_plugin_SOURCES =						\
- 	themes.c
- 
- xfce4_eyes_plugin_CFLAGS =						\
--	$(LIBXFCEGUI4_CFLAGS)						\
-+	$(LIBXFCE4UI_CFLAGS)						\
- 	$(LIBXFCE4PANEL_CFLAGS)
- 	
- xfce4_eyes_plugin_LDADD =						\
- 	$(LIBXFCE4PANEL_LIBS)						\
--	$(LIBXFCEGUI4_LIBS)
-+	$(LIBXFCE4UI_LIBS)
- 
- desktopdir = $(datadir)/xfce4/panel-plugins
- desktop_in_in_files = eyes.desktop.in.in
-diff --git a/panel-plugin/eyes.c b/panel-plugin/eyes.c
-index 6c71938..f3cd195 100644
---- a/panel-plugin/eyes.c
-+++ b/panel-plugin/eyes.c
-@@ -33,7 +33,7 @@
- #include <stdlib.h>
- 
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- #include "eyes.h"
- #include "themes.h"
--- 
-1.7.4.4
-
diff --git a/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.1.bb b/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.1.bb
deleted file mode 100644
index 6ca49c7..0000000
--- a/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Panel plugin with graphical representation of the cpu frequency"
-HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-inherit xfce-panel-plugin
-
-# SRC_URI must follow inherited one
-SRC_URI += "file://port-to-libxfce4ui.patch"
-SRC_URI[md5sum] = "dcbf6ea9035d379d168b479be0d09f14"
-SRC_URI[sha256sum] = "eaae5d230b5c2fe6a8b448b59cfe959bf126796911c166a7343a51dc440fbbb2"
-
-FILES_${PN} += "${datadir}/xfce4/eyes"
diff --git a/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.2.bb b/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.2.bb
new file mode 100644
index 0000000..4acc3d8
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.2.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Panel plugin with graphical representation of the cpu frequency"
+HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+inherit xfce-panel-plugin
+
+SRC_URI[md5sum] = "1ef352c68dd8929c9e8743200b758b3c"
+SRC_URI[sha256sum] = "dad102fedd0d9e6df45338a018387b2aacaf24b05eb798275be0dfc05ffa3021"
+
+FILES_${PN} += "${datadir}/xfce4/eyes"
-- 
1.7.6.5

[meta-oe/meta-xfce/meta-gnome 4/4] xfce4-vala: initial add 4.10.2

[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 +++++++++
 2 files changed, 56 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-bindings/vala/files/0001-align-vapi-dir.patch
 create mode 100644 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.2.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
new file mode 100644
index 0000000..33c6ed3
--- /dev/null
+++ b/meta-xfce/recipes-bindings/vala/files/0001-align-vapi-dir.patch
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 0000000..152335a
--- /dev/null
+++ b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.2.bb
@@ -0,0 +1,17 @@
+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"
-- 
1.7.6.5

Re: [meta-oe/meta-xfce/meta-gnome 0/4] updates/bugfix-world

[Martin Jansa]

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

On Thu, Mar 07, 2013 at 12:43:29PM +0100, Andreas Müller wrote:
> The following changes since commit 230e2171d07815f51d5b6d044627afa0ff13c5d4:
> 
>   gpsd: fix udev rules file (2013-03-06 06:05:35 +0100)

Merged, thanks!

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

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