[meta-oe][PATCH 0/5] Fixes for oe-core changes

[meta-oe][PATCH 0/5] Fixes for oe-core changes

[Martin Jansa]

The following changes since commit 9afc488a1b97bfc5378f139ba04a7a5297b15fdb:

  nano: add PACKAGECONFIG for 'tiny' build (2012-07-25 09:18:12 +0200)

are available in the git repository at:
  git://git.openembedded.org/meta-openembedded-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Martin Jansa (5):
  tcpdump: bump PR to rebuild against libpcap1 instead libpcap
  vala-dbus-binding-tool: bump SRCREV and add recipe for 0.4.0 tarball
  libwnck: use gobject-introspection-stub instead of -native which was
    removed in oe-core
  libgee: use gobject-introspection-stub instead of -native which was
    removed in oe-core
  upower: use gobject-introspection-stub instead of -native which was
    removed in oe-core

 meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb |   10 +++-------
 meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb |   10 ++--------
 meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb    |    7 +++----
 .../vala-dbus-binding-tool.inc                     |    2 +-
 .../vala-dbus-binding-tool_0.4.0.bb                |    4 ++++
 .../vala-dbus-binding-tool_git.bb                  |    7 +++++--
 meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb   |    2 +-
 meta-oe/recipes-support/upower/upower_0.9.14.bb    |    4 ++--
 8 files changed, 21 insertions(+), 25 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb

-- 
1.7.8.6

[meta-oe][PATCH 1/5] tcpdump: bump PR to rebuild against libpcap1 instead libpcap

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb b/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb
index 9fd0ac0..46b19a1 100644
--- a/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb
+++ b/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867"
 SECTION = "console/network"
 DEPENDS = "libpcap"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = " \
 	http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
-- 
1.7.8.6

[meta-oe][PATCH 2/5] vala-dbus-binding-tool: bump SRCREV and add recipe for 0.4.0 tarball

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../vala-dbus-binding-tool.inc                     |    2 +-
 .../vala-dbus-binding-tool_0.4.0.bb                |    4 ++++
 .../vala-dbus-binding-tool_git.bb                  |    7 +++++--
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb

diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc
index a59488d..a3db952 100644
--- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc
+++ b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc
@@ -9,7 +9,7 @@ INC_PR = "r3"
 
 export XDG_DATA_DIRS = "${STAGING_DATADIR}"
 
-SRC_URI = "http://downloads.freesmartphone.org/sources/vala-dbus-binding-tool-${PV}.tar.bz2;name=archive"
+SRC_URI = "http://downloads.freesmartphone.org/sources/${BPN}/${BP}.tar.bz2;name=archive"
 
 inherit autotools perlnative
 
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb
new file mode 100644
index 0000000..3473971
--- /dev/null
+++ b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb
@@ -0,0 +1,4 @@
+require vala-dbus-binding-tool.inc
+
+SRC_URI[archive.md5sum] = "b7537a087f9f468e25170e81df0ed93f"
+SRC_URI[archive.sha256sum] = "6b0d3796e92b031839e2e2f484e294153ad9eaf9d32915056199a49ce8328722"
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb
index 30a7edd..dd96187 100644
--- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb
+++ b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb
@@ -1,6 +1,9 @@
 require vala-dbus-binding-tool.inc
-SRCREV = "2c72ff9c981be947837c72d3aa38e1fbf074068f"
-PV = "0.3.2+gitr${SRCPV}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRCREV = "53d56816a4154e3467f07bd22f4e27d166e3e3f3"
+PV = "0.4.0+gitr${SRCPV}"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/vala-dbus-binding-tool.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
-- 
1.7.8.6

[meta-oe][PATCH 3/5] libwnck: use gobject-introspection-stub instead of -native which was removed in oe-core

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb |   10 +++-------
 meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb |   10 ++--------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
index e2a3e3d..e54b8d3 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
@@ -5,14 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 BPN = "libwnck"
 
 SECTION = "x11/libs"
-DEPENDS = "gobject-introspection-native gtk+3 gdk-pixbuf-native"
+DEPENDS = "gobject-introspection-stub gtk+3 gdk-pixbuf-native"
+
+PR = "r1"
 
 inherit gnome
 SRC_URI[archive.md5sum] = "e4ea87320dd0600a81c50186e3804aae"
 SRC_URI[archive.sha256sum] = "4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083"
-
-EXTRA_OECONF += "--enable-introspection=no"
-
-do_configure_prepend() {
-	sed -i '/GOBJECT_INTROSPECTION_CHECK([0.6.14])/d' configure.ac
-}
diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
index 6c8ca28..935d4a3 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
@@ -2,17 +2,11 @@ DESCRIPTION = "Window navigation construction toolkit"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
-PR = "r1"
+PR = "r2"
 
 SECTION = "x11/libs"
-DEPENDS = "gobject-introspection-native gtk+ gdk-pixbuf-native"
+DEPENDS = "gobject-introspection-stub gtk+ gdk-pixbuf-native"
 
 inherit gnome
 SRC_URI[archive.md5sum] = "4162d5b96151e6d24ec02ae3a822203c"
 SRC_URI[archive.sha256sum] = "56b6681e89cd45491bb640165d62276d81369a08974042b26645dc1e0e954cc1"
-
-EXTRA_OECONF += "--enable-introspection=no"
-
-do_configure_prepend() {
-	sed -i '/GOBJECT_INTROSPECTION_CHECK([0.6.14])/d' configure.ac
-}
-- 
1.7.8.6

[meta-oe][PATCH 4/5] libgee: use gobject-introspection-stub instead of -native which was removed in oe-core

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb b/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb
index 4e2c643..228f96c 100644
--- a/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb
+++ b/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb
@@ -1,9 +1,8 @@
 require libgee.inc
 PE = "1"
-PR = "${INC_PR}.0"
-#autoreconf needs introspection.m4 (staged by gobject-introspection-native) after http://git.gnome.org/browse/libgee/commit/?id=d026a29b38ca1a3388981c6e75a92602212373d8
-DEPENDS += "gobject-introspection-native"
-DEPENDS_virtclass-native += "gobject-introspection-native"
+PR = "${INC_PR}.1"
+DEPENDS += "gobject-introspection-stub"
+DEPENDS_virtclass-native += "gobject-introspection-stub-native"
 
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/${SHRT_VER}/${BP}.tar.xz"
-- 
1.7.8.6

[meta-oe][PATCH 5/5] upower: use gobject-introspection-stub instead of -native which was removed in oe-core

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/upower/upower_0.9.14.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/upower/upower_0.9.14.bb b/meta-oe/recipes-support/upower/upower_0.9.14.bb
index 312ed58..5a33ab9 100644
--- a/meta-oe/recipes-support/upower/upower_0.9.14.bb
+++ b/meta-oe/recipes-support/upower/upower_0.9.14.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08"
 
-PR = "r1"
+PR = "r2"
 
-DEPENDS = "libusb1 udev glib-2.0 dbus-glib polkit gobject-introspection-native"
+DEPENDS = "libusb1 udev glib-2.0 dbus-glib polkit gobject-introspection-stub"
 
 SRC_URI = "http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "18803f82102d56aac90949d1e4251645"
-- 
1.7.8.6

Re: [meta-oe][PATCH 3/5] libwnck: use gobject-introspection-stub instead of -native which was removed in oe-core

[Andreas Müller]

On Sat, Jul 28, 2012 at 2:33 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb |   10 +++-------
>  meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb |   10 ++--------
>  2 files changed, 5 insertions(+), 15 deletions(-)
>
> diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
> index e2a3e3d..e54b8d3 100644
> --- a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
> +++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
> @@ -5,14 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
>  BPN = "libwnck"
>
>  SECTION = "x11/libs"
> -DEPENDS = "gobject-introspection-native gtk+3 gdk-pixbuf-native"
> +DEPENDS = "gobject-introspection-stub gtk+3 gdk-pixbuf-native"
> +
> +PR = "r1"
>
>  inherit gnome
>  SRC_URI[archive.md5sum] = "e4ea87320dd0600a81c50186e3804aae"
>  SRC_URI[archive.sha256sum] = "4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083"
> -
> -EXTRA_OECONF += "--enable-introspection=no"
> -
> -do_configure_prepend() {
> -       sed -i '/GOBJECT_INTROSPECTION_CHECK([0.6.14])/d' configure.ac
> -}
> diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
> index 6c8ca28..935d4a3 100644
> --- a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
> +++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
> @@ -2,17 +2,11 @@ DESCRIPTION = "Window navigation construction toolkit"
>  LICENSE = "LGPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
>
> -PR = "r1"
> +PR = "r2"
>
>  SECTION = "x11/libs"
> -DEPENDS = "gobject-introspection-native gtk+ gdk-pixbuf-native"
> +DEPENDS = "gobject-introspection-stub gtk+ gdk-pixbuf-native"
>
>  inherit gnome
>  SRC_URI[archive.md5sum] = "4162d5b96151e6d24ec02ae3a822203c"
>  SRC_URI[archive.sha256sum] = "56b6681e89cd45491bb640165d62276d81369a08974042b26645dc1e0e954cc1"
> -
> -EXTRA_OECONF += "--enable-introspection=no"
> -
> -do_configure_prepend() {
> -       sed -i '/GOBJECT_INTROSPECTION_CHECK([0.6.14])/d' configure.ac
> -}
> --
> 1.7.8.6
>
Acked-by: Andreas Müller <schnitzeltony@googlemail.com>

Re: [meta-oe][PATCH 4/5] libgee: use gobject-introspection-stub instead of -native which was removed in oe-core

[Andreas Müller]

On Sat, Jul 28, 2012 at 2:33 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb b/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb
> index 4e2c643..228f96c 100644
> --- a/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb
> +++ b/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb
> @@ -1,9 +1,8 @@
>  require libgee.inc
>  PE = "1"
> -PR = "${INC_PR}.0"
> -#autoreconf needs introspection.m4 (staged by gobject-introspection-native) after http://git.gnome.org/browse/libgee/commit/?id=d026a29b38ca1a3388981c6e75a92602212373d8
> -DEPENDS += "gobject-introspection-native"
> -DEPENDS_virtclass-native += "gobject-introspection-native"
> +PR = "${INC_PR}.1"
> +DEPENDS += "gobject-introspection-stub"
> +DEPENDS_virtclass-native += "gobject-introspection-stub-native"
>
>  SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
>  SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/${SHRT_VER}/${BP}.tar.xz"
> --
> 1.7.8.6
>
Acked-by: Andreas Müller <schnitzeltony@googlemail.com>

Re: [meta-oe][PATCH 5/5] upower: use gobject-introspection-stub instead of -native which was removed in oe-core

[Andreas Müller]

On Sat, Jul 28, 2012 at 2:33 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-support/upower/upower_0.9.14.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-support/upower/upower_0.9.14.bb b/meta-oe/recipes-support/upower/upower_0.9.14.bb
> index 312ed58..5a33ab9 100644
> --- a/meta-oe/recipes-support/upower/upower_0.9.14.bb
> +++ b/meta-oe/recipes-support/upower/upower_0.9.14.bb
> @@ -2,9 +2,9 @@ DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08"
>
> -PR = "r1"
> +PR = "r2"
>
> -DEPENDS = "libusb1 udev glib-2.0 dbus-glib polkit gobject-introspection-native"
> +DEPENDS = "libusb1 udev glib-2.0 dbus-glib polkit gobject-introspection-stub"
>
>  SRC_URI = "http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
>  SRC_URI[md5sum] = "18803f82102d56aac90949d1e4251645"
> --
> 1.7.8.6
>
Acked-by: Andreas Müller <schnitzeltony@googlemail.com>

Re: [meta-oe][PATCH 1/5] tcpdump: bump PR to rebuild against libpcap1 instead libpcap

[Andreas Müller]

On Sat, Jul 28, 2012 at 2:33 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb b/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb
> index 9fd0ac0..46b19a1 100644
> --- a/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb
> +++ b/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb
> @@ -4,7 +4,7 @@ LICENSE = "BSD"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867"
>  SECTION = "console/network"
>  DEPENDS = "libpcap"
> -PR = "r1"
> +PR = "r2"
>
>  SRC_URI = " \
>         http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
> --
> 1.7.8.6
>
Acked-by: Andreas Müller <schnitzeltony@googlemail.com>

[meta-oe][PATCH 6/6] gpsd: drop older version 3.4

[Martin Jansa]

* GNUtoo tested 3.5 and it works fine, Thanks

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...t-fix-DSO-build-for-ntpshm-garmin_monitor.patch |   41 -------
 ...prefix-includepy-with-sysroot-and-drop-sy.patch |   72 ------------
 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb        |  123 --------------------
 meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb        |    1 -
 .../recipes-navigation/gpsd/gpsd_3.4.bbappend      |   18 ---
 5 files changed, 0 insertions(+), 255 deletions(-)
 delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch
 delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
 delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
 delete mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend

diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch
deleted file mode 100644
index 1aa4304..0000000
--- a/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e1f780fc2355c22c2c3f0a70c1a1ef2669779c53 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 24 Apr 2012 13:42:38 +0200
-Subject: [PATCH] SConstruct: fix DSO build for ntpshm, garmin_monitor
-
-| x86_64-oe-linux-gcc -m64
---sysroot=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64 -o gpsmon
---sysroot=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64
--Wl,-rpath=/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/gpsd/gpsd-3.4-r2/gpsd-3.4
--Wl,-rpath=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib gpsmon.o
-monitor_italk.o monitor_nmea.o monitor_oncore.o monitor_sirf.o
-monitor_superstar2.o monitor_tnt.o monitor_ubx.o monitor_garmin.o -L.
--L/OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib
--L/OE/shr-core/tmp-eglibc/sysroots/qemux86-64/lib -lrt -lbluetooth
--lgpsd -lusb-1.0 -lbluetooth -lgps -lncurses -ltinfo
-
-/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/4.6.4/ld:
-* ntpshm.o: undefined reference to symbol 'log@@GLIBC_2.2.5'
-* monitor_garmin.o: undefined reference to symbol 'hypot@@GLIBC_2.2.5'
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- SConstruct |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 7bd44a1..9ff00c1 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -806,7 +806,7 @@ if qt_env:
- # The libraries have dependencies on system libraries
- 
- gpslibs = ["-lgps"]
--gpsdlibs = ["-lgpsd"] + usblibs + bluezlibs + gpslibs
-+gpsdlibs = ["-lgpsd"] + ["-lm"] + usblibs + bluezlibs + gpslibs
- 
- # Source groups
- 
--- 
-1.7.8.5
-
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
deleted file mode 100644
index 27c6aad..0000000
--- a/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From bc224302f1665078c8d15138318709c1a1c2c0a0 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 24 Apr 2012 18:45:14 +0200
-Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot
- from python_lib_dir
-
-* without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix
-  and with PYTHONPATH from OE it's pointing to native python dir
-
-    $ export PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/
-    $ python
-    Python 2.7.2 (default, Apr 18 2012, 09:19:59)
-    [GCC 4.6.2] on linux2
-    Type "help", "copyright", "credits" or "license" for more information.
-    >>> from distutils import sysconfig
-    >>> sysconfig.get_config_vars('INCLUDEPY')
-    ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
-    >>>
-    $ unset PYTHONPATH
-    $ python
-    Python 2.7.2 (default, Apr 18 2012, 09:19:59)
-    [GCC 4.6.2] on linux2
-    Type "help", "copyright", "credits" or "license" for more information.
-    >>> from distutils import sysconfig
-    >>> sysconfig.get_config_vars('INCLUDEPY')
-    ['/python2.7']
-    >>> import sysconfig
-    >>> sysconfig.get_config_vars('INCLUDEPY')
-    ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
-* python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
-  returns path to target sysroot
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- SConstruct |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 9ff00c1..9c0f751 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -924,6 +924,12 @@ else:
-         if vars[i] is None:
-             vars[i] = ""
-     (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext, includepy) = vars
-+
-+    if env['sysroot']:
-+        print "Prefixing includepy '%s' with sysroot prefix" % includepy
-+        includepy = os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], includepy))
-+        print "'%s'" % includepy
-+
-     # in case CC/CXX was set to the scan-build wrapper,
-     # ensure that we build the python modules with scan-build, too
-     if env['CC'] is None or env['CC'].find('scan-build') < 0:
-@@ -1158,11 +1164,14 @@ if not env['python']:
-     python_install = []
- else:
-     python_lib_dir = sysconfig.get_python_lib(plat_specific=1)
-+    python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
-     python_module_dir = python_lib_dir + os.sep + 'gps'
-     python_extensions_install = python_env.Install( DESTDIR + python_module_dir,
-                                                     python_built_extensions)
-     if not env['debug'] or env['profiling']:
-         python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET')
-+    env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \
-+                     % (python_lib_dir, ))
- 
-     python_modules_install = python_env.Install( DESTDIR + python_module_dir,
-                                                 python_modules)
--- 
-1.7.8.5
-
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
deleted file mode 100644
index 16fa739..0000000
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
+++ /dev/null
@@ -1,123 +0,0 @@
-DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
-SECTION = "console/network"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
-DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native"
-PROVIDES = "virtual/gpsd"
-
-PR = "r4"
-
-SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
-  file://0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch \
-  file://0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch \
-  file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \
-  file://0004-SConstruct-remove-rpath.patch \
-  file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
-  file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \
-  file://gpsd-default \
-  file://gpsd \
-  file://60-gpsd.rules \
-"
-SRC_URI[md5sum] = "c01353459faa68834309109d4e868460"
-SRC_URI[sha256sum] = "79f7de9ead63c7f5d2c9a92e85b5f82e53323c4d451ef8e27ea265ac3ef9a70f"
-
-inherit scons update-rc.d python-dir pythonnative
-
-INITSCRIPT_NAME = "gpsd"
-INITSCRIPT_PARAMS = "defaults 35"
-
-SYSTEMD_OESCONS ??= "false"
-
-export STAGING_INCDIR
-export STAGING_LIBDIR
-
-EXTRA_OESCONS = " \
-  sysroot=${STAGING_DIR_TARGET} \
-  libQgpsmm='false' \
-  debug='true' \
-  strip='false' \
-  systemd='${SYSTEMD_OESCONS}' \
-"
-# this cannot be used, because then chrpath is not found and only static lib is built
-# target=${HOST_SYS}
-
-do_compile_prepend() {
-    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
-    export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config"
-    export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
-
-    export BUILD_SYS="${BUILD_SYS}"
-    export HOST_SYS="${HOST_SYS}"
-}
-
-do_install() {
-    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
-    export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config"
-    export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
-
-    export BUILD_SYS="${BUILD_SYS}"
-    export HOST_SYS="${HOST_SYS}"
-
-    export DESTDIR="${D}"
-    # prefix is used for RPATH and DESTDIR/prefix for instalation
-    ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \
-      bbfatal "scons install execution failed."
-}
-
-do_install_append() {
-    install -d ${D}/${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/
-    install -d ${D}/${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default
-
-    #support for udev
-    install -d ${D}/${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/60-gpsd.rules ${D}/${sysconfdir}/udev/rules.d
-    install -d ${D}${base_libdir}/udev/
-    install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/
-
-    #support for python
-    install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
-    install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
-}
-
-pkg_postinst_${PN}-conf() {
-	update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10
-}
-
-pkg_postrm_${PN}-conf() {
-	update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default
-}
-
-PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils"
-
-FILES_gpsd-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc"
-
-FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug"
-
-RDEPENDS_${PN} = "gpsd-gpsctl"
-RRECOMMENDS_${PN} = "gpsd-conf gpsd-udev"
-
-DESCRIPTION_gpsd-udev = "udev relevant files to use gpsd hotplugging"
-FILES_gpsd-udev = "${base_libdir}/udev ${sysconfdir}/udev/*"
-RDEPENDS_gpsd-udev += "udev gpsd-conf"
-
-DESCRIPTION_libgpsd = "C service library used for communicating with gpsd"
-FILES_libgpsd = "${libdir}/libgpsd.so.*"
-
-DESCRIPTION_libgps = "C service library used for communicating with gpsd"
-FILES_libgps = "${libdir}/libgps.so.*"
-
-DESCRIPTION_gpsd-conf = "gpsd configuration files and init scripts"
-FILES_gpsd-conf = "${sysconfdir}"
-
-DESCRIPTION_gpsd-gpsctl = "Tool for tweaking GPS modes"
-FILES_gpsd-gpsctl = "${bindir}/gpsctl"
-
-DESCRIPTION_gps-utils = "Utils used for simulating, monitoring,... a GPS"
-FILES_gps-utils = "${bindir}/*"
-RDEPENDS_gps-utils = "python-pygps"
-
-DESCRIPTION_python-pygps = "Python bindings to gpsd"
-FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*"
-RDEPENDS_python-pygps = "python-core python-curses gpsd python-json"
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
index 1b1809f..568d492 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
@@ -7,7 +7,6 @@ PROVIDES = "virtual/gpsd"
 
 PR = "r4"
 
-DEFAULT_PREFERENCE = "-1"
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch \
   file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \
diff --git a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend
deleted file mode 100644
index 9504761..0000000
--- a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-PRINC := "${@int(PRINC) + 1}"
-
-inherit systemd
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://gpsd.service"
-
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.socket"
-SYSTEMD_OESCONS = "true"
-
-do_install_append() {
-    #support for systemd
-    install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
-    install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
-}
-- 
1.7.8.6

[meta-oe][PATCH 00/24] Merge some recipes from meta-smartphone + few fixes

[Martin Jansa]

The following changes since commit 9afc488a1b97bfc5378f139ba04a7a5297b15fdb:

  nano: add PACKAGECONFIG for 'tiny' build (2012-07-25 09:18:12 +0200)

are available in the git repository at:
  git://git.openembedded.org/meta-openembedded-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Martin Jansa (24):
  tcpdump: bump PR to rebuild against libpcap1 instead libpcap
  vala-dbus-binding-tool: bump SRCREV and add recipe for 0.4.0 tarball
  libwnck: use gobject-introspection-stub instead of -native which was
    removed in oe-core
  libgee: use gobject-introspection-stub instead of -native which was
    removed in oe-core
  upower: use gobject-introspection-stub instead of -native which was
    removed in oe-core
  gpsd: drop older version 3.4
  webkit-efl: upgrade to 1.9.3
  eve: add patch to build against newer webkit-efl
  e-wm: use new update-alternatives syntax
  gpsd: add chrpath-native to DEPENDS otherwise it could autodetect
    host chrpath
  udev-extra-rules: drop in favor of udev-extraconf from oe-core
  meta-elf: e-module: add *.a to PN-staticdev
  gnuplot: import from meta-smartphone
  libetpan: import from meta-smartphone
  claws-mail, sylpheed: import from meta-smartphone
  python-epydoc, python-gdata, python-ldap, python-webdav: import from
    meta-smartphone
  mcnavi, monav, omgps, orrery: import from meta-smartphone
  emacs: import from meta-smartphone
  fbreader, fltk, gpm, iksemel, joe, links, ode, openldap, opensync,
    xchat: import from meta-smartphone
  liblockfile, libungif: import from oe-classic
  emacs: fix dso build
  emacs: upgrade to 23.4
  pixman: add patch to fix SEGFAULT when parsing auxv
  emacs: drop older version 23.1

 meta-efl/recipes-efl/e17/e-module.inc              |    1 +
 meta-efl/recipes-efl/e17/e-wm_svn.bb               |    9 +-
 .../eve/0001-eve-update-for-newer-webkit-efl.patch |   38 ++
 meta-efl/recipes-efl/e17/eve_svn.bb                |    2 +
 ...t-pass-P-to-the-preprocessor-when-running.patch |   76 ---
 ...ore-add-EINA_LIBRARIES-to-shell-build-for.patch |   28 -
 .../recipes-efl/webkit/webkit-efl/CMakeLists.txt   |   38 +-
 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb      |   11 +-
 meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb |   10 +-
 meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb |   10 +-
 meta-oe/recipes-core/udev/udev-extra-rules.bb      |   36 --
 .../udev/udev-extra-rules/automount.rules          |   19 -
 .../udev/udev-extra-rules/autonet.rules            |   19 -
 .../recipes-core/udev/udev-extra-rules/local.rules |   21 -
 .../udev/udev-extra-rules/mount.blacklist          |    3 -
 .../recipes-core/udev/udev-extra-rules/mount.sh    |   64 ---
 .../recipes-core/udev/udev-extra-rules/network.sh  |   58 --
 meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb    |    7 +-
 .../recipes-devtools/python/python-epydoc_3.0.1.bb |   18 +
 .../recipes-devtools/python/python-gdata_1.2.4.bb  |   18 +
 .../python/python-ldap/setup.cfg.patch             |   14 +
 .../recipes-devtools/python/python-ldap_2.3.9.bb   |   13 +
 .../recipes-devtools/python/python-webdav_0.1.2.bb |   19 +
 .../vala-dbus-binding-tool.inc                     |    2 +-
 .../vala-dbus-binding-tool_0.4.0.bb                |    4 +
 .../vala-dbus-binding-tool_git.bb                  |    7 +-
 .../gnuplot/gnuplot-4.4.4/automake-1.12.x.patch    |   44 ++
 .../gnuplot/gnuplot-4.4.4/subdirs.patch            |   11 +
 meta-oe/recipes-extended/gnuplot/gnuplot.inc       |   35 ++
 .../gnuplot/gnuplot/gnuplot.desktop                |    8 +
 .../recipes-extended/gnuplot/gnuplot/gnuplot.png   |  Bin 0 -> 9383 bytes
 .../recipes-extended/gnuplot/gnuplot/qtopia.trm    |  483 ++++++++++++++++
 meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb  |   16 +
 .../liblockfile/liblockfile-1.06/configure.patch   |   25 +
 .../liblockfile/liblockfile-1.06/glibc-2.4.patch   |   70 +++
 .../liblockfile/liblockfile-1.06/install.patch     |   48 ++
 .../liblockfile/liblockfile-1.06/ldflags.patch     |   21 +
 .../liblockfile/liblockfile_1.06.bb                |   21 +
 .../recipes-extended/libungif/libungif_4.1.3.bb    |   14 +
 ...lated-workarounds-in-cpu-features-detecti.patch |  121 ++++
 .../xorg-lib/pixman_0.26.2.bbappend                |    6 +-
 ...t-fix-DSO-build-for-ntpshm-garmin_monitor.patch |   41 --
 ...prefix-includepy-with-sysroot-and-drop-sy.patch |   72 ---
 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb        |  123 -----
 meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb        |    5 +-
 meta-oe/recipes-navigation/gpsd/gpsd_git.bb        |    4 +-
 meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb  |   18 +
 .../recipes-navigation/monav/monav/monav.desktop   |   10 +
 meta-oe/recipes-navigation/monav/monav/monav.png   |  Bin 0 -> 21543 bytes
 meta-oe/recipes-navigation/monav/monav_0.3.bb      |   37 ++
 .../omgps/omgps/fix.capability.patch               |   59 ++
 .../recipes-navigation/omgps/omgps/gcc-4.4.patch   |   68 +++
 .../omgps/omgps/sysfs.node.2.6.32.patch            |   11 +
 .../omgps/omgps/use.unused.variable.patch          |   12 +
 meta-oe/recipes-navigation/omgps/omgps_svn.bb      |   23 +
 .../recipes-navigation/orrery/orrery/orrery.png    |  Bin 0 -> 19475 bytes
 .../orrery/orrery/use.GdkPixbuf.patch              |   59 ++
 meta-oe/recipes-navigation/orrery/orrery_2.7.bb    |   30 +
 .../claws-mail-3.6.1/claws-mail-g_strcmp0.patch    |  575 ++++++++++++++++++++
 .../claws-mail/claws-mail-3.6.1/desktop.patch      |   19 +
 .../claws-mail-3.6.1/duplicate-header.patch        |   10 +
 .../claws-mail/claws-mail-3.6.1/glib-2.32.patch    |   11 +
 .../recipes-sato/claws-mail/claws-mail_3.6.1.bb    |   62 +++
 .../claws-plugin-gtkhtml2-viewer_0.31.bb           |   19 +
 .../claws-plugin-mailmbox-fixup.patch              |  218 ++++++++
 .../claws-mail/claws-plugin-mailmbox_1.14.bb       |   19 +
 .../claws-mail/claws-plugin-rssyl_0.18.bb          |   18 +
 .../claws-mail/sylpheed/glib-2.32.patch            |   11 +
 meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb  |   37 ++
 .../emacs/emacs-23.4/nostdlib-unwind.patch         |   16 +
 .../emacs/emacs-23.4/use-qemu.patch                |  104 ++++
 meta-oe/recipes-support/emacs/emacs.inc            |   68 +++
 meta-oe/recipes-support/emacs/emacs_23.4.bb        |    8 +
 .../fbreader/fbreader-0.12.10/Makefile.patch       |   22 +
 .../fbreader/fbreader-0.12.10/gcc45.patch          |   20 +
 .../recipes-support/fbreader/fbreader_0.12.10.bb   |   45 ++
 meta-oe/recipes-support/fbreader/fbreader_git.bb   |   45 ++
 ...ation-of-the-icons-when-RESOLUTION-is-set.patch |   40 ++
 .../fltk/fltk-1.1.10/disable_test.patch            |   13 +
 .../recipes-support/fltk/fltk-1.1.10/dso-fix.patch |   13 +
 meta-oe/recipes-support/fltk/fltk_1.1.10.bb        |   37 ++
 meta-oe/recipes-support/gpm/gpm-1.99.7/init        |   32 ++
 .../recipes-support/gpm/gpm-1.99.7/no-docs.patch   |   18 +
 .../gpm/gpm-1.99.7/processcreds.patch              |   12 +
 meta-oe/recipes-support/gpm/gpm_1.99.7.bb          |   43 ++
 .../recipes-support/iksemel/iksemel-1.4/r25.diff   |   32 ++
 meta-oe/recipes-support/iksemel/iksemel_1.4.bb     |   16 +
 meta-oe/recipes-support/joe/joe_3.1.bb             |   13 +
 .../libetpan-0.57/libetpan-autoreconf.patch        |   12 +
 .../libetpan/libetpan-0.57/libetpan-ldflags.patch  |   11 +
 meta-oe/recipes-support/libetpan/libetpan_0.57.bb  |   24 +
 .../recipes-support/links/files/ac-prog-cxx.patch  |   11 +
 .../links/files/cookies-save-0.96.patch            |  106 ++++
 ...-2.1pre17-fix-segfault-on-loading-cookies.patch |   20 +
 meta-oe/recipes-support/links/files/links2.desktop |   14 +
 .../links/links-x11_2.0+2.1pre30.bb                |   26 +
 meta-oe/recipes-support/links/links.inc            |   19 +
 .../recipes-support/links/links_2.0+2.1pre30.bb    |   13 +
 meta-oe/recipes-support/ode/ode/install.patch      |   23 +
 meta-oe/recipes-support/ode/ode_0.9.bb             |   24 +
 .../openldap/openldap-2.4.23/initscript            |   29 +
 .../openldap/openldap-2.4.23/install-strip.patch   |   14 +
 .../openldap-2.4.23/openldap-m4-pthread.patch      |   20 +
 .../recipes-support/openldap/openldap_2.4.23.bb    |  270 +++++++++
 .../recipes-support/opensync/libsyncml_0.5.4.bb    |   29 +
 meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb  |   29 +
 meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb   |    2 +-
 meta-oe/recipes-support/upower/upower_0.9.14.bb    |    4 +-
 .../xchat/xchat-2.8.8/glib-2.32.patch              |   44 ++
 meta-oe/recipes-support/xchat/xchat_2.8.8.bb       |   30 +
 .../recipes-navigation/gpsd/gpsd_3.4.bbappend      |   18 -
 111 files changed, 3791 insertions(+), 637 deletions(-)
 create mode 100644 meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch
 delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch
 delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules.bb
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/automount.rules
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/autonet.rules
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/local.rules
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/mount.blacklist
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/mount.sh
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/network.sh
 create mode 100644 meta-oe/recipes-devtools/python/python-epydoc_3.0.1.bb
 create mode 100644 meta-oe/recipes-devtools/python/python-gdata_1.2.4.bb
 create mode 100644 meta-oe/recipes-devtools/python/python-ldap/setup.cfg.patch
 create mode 100644 meta-oe/recipes-devtools/python/python-ldap_2.3.9.bb
 create mode 100644 meta-oe/recipes-devtools/python/python-webdav_0.1.2.bb
 create mode 100644 meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot.inc
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb
 create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.06/configure.patch
 create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.06/glibc-2.4.patch
 create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.06/install.patch
 create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.06/ldflags.patch
 create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile_1.06.bb
 create mode 100644 meta-oe/recipes-extended/libungif/libungif_4.1.3.bb
 create mode 100644 meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
 delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch
 delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
 delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
 create mode 100644 meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
 create mode 100644 meta-oe/recipes-navigation/monav/monav/monav.desktop
 create mode 100644 meta-oe/recipes-navigation/monav/monav/monav.png
 create mode 100644 meta-oe/recipes-navigation/monav/monav_0.3.bb
 create mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
 create mode 100644 meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
 create mode 100644 meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
 create mode 100644 meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
 create mode 100644 meta-oe/recipes-navigation/omgps/omgps_svn.bb
 create mode 100644 meta-oe/recipes-navigation/orrery/orrery/orrery.png
 create mode 100644 meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch
 create mode 100644 meta-oe/recipes-navigation/orrery/orrery_2.7.bb
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/claws-mail-g_strcmp0.patch
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/desktop.patch
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/duplicate-header.patch
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/glib-2.32.patch
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail_3.6.1.bb
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox-1.14/claws-plugin-mailmbox-fixup.patch
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.18.bb
 create mode 100644 meta-oe/recipes-sato/claws-mail/sylpheed/glib-2.32.patch
 create mode 100644 meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb
 create mode 100644 meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch
 create mode 100644 meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch
 create mode 100644 meta-oe/recipes-support/emacs/emacs.inc
 create mode 100644 meta-oe/recipes-support/emacs/emacs_23.4.bb
 create mode 100644 meta-oe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch
 create mode 100644 meta-oe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch
 create mode 100644 meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb
 create mode 100644 meta-oe/recipes-support/fbreader/fbreader_git.bb
 create mode 100644 meta-oe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch
 create mode 100644 meta-oe/recipes-support/fltk/fltk-1.1.10/disable_test.patch
 create mode 100644 meta-oe/recipes-support/fltk/fltk-1.1.10/dso-fix.patch
 create mode 100644 meta-oe/recipes-support/fltk/fltk_1.1.10.bb
 create mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/init
 create mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch
 create mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch
 create mode 100644 meta-oe/recipes-support/gpm/gpm_1.99.7.bb
 create mode 100644 meta-oe/recipes-support/iksemel/iksemel-1.4/r25.diff
 create mode 100644 meta-oe/recipes-support/iksemel/iksemel_1.4.bb
 create mode 100644 meta-oe/recipes-support/joe/joe_3.1.bb
 create mode 100644 meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-autoreconf.patch
 create mode 100644 meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-ldflags.patch
 create mode 100644 meta-oe/recipes-support/libetpan/libetpan_0.57.bb
 create mode 100644 meta-oe/recipes-support/links/files/ac-prog-cxx.patch
 create mode 100644 meta-oe/recipes-support/links/files/cookies-save-0.96.patch
 create mode 100644 meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch
 create mode 100644 meta-oe/recipes-support/links/files/links2.desktop
 create mode 100644 meta-oe/recipes-support/links/links-x11_2.0+2.1pre30.bb
 create mode 100644 meta-oe/recipes-support/links/links.inc
 create mode 100644 meta-oe/recipes-support/links/links_2.0+2.1pre30.bb
 create mode 100644 meta-oe/recipes-support/ode/ode/install.patch
 create mode 100644 meta-oe/recipes-support/ode/ode_0.9.bb
 create mode 100644 meta-oe/recipes-support/openldap/openldap-2.4.23/initscript
 create mode 100644 meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch
 create mode 100644 meta-oe/recipes-support/openldap/openldap-2.4.23/openldap-m4-pthread.patch
 create mode 100644 meta-oe/recipes-support/openldap/openldap_2.4.23.bb
 create mode 100644 meta-oe/recipes-support/opensync/libsyncml_0.5.4.bb
 create mode 100644 meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
 create mode 100644 meta-oe/recipes-support/xchat/xchat-2.8.8/glib-2.32.patch
 create mode 100644 meta-oe/recipes-support/xchat/xchat_2.8.8.bb
 delete mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend

-- 
1.7.8.6

[meta-oe][PATCH 07/24] webkit-efl: upgrade to 1.9.3

[Martin Jansa]

* some revisions are broken for armv4t, see my comment at
  https://bugs.webkit.org/show_bug.cgi?id=80354
* and newer then this need developement snapshot of
  glib/glib-networking/libsoup-2.4
  https://bugs.webkit.org/show_bug.cgi?id=91626
* current version fails to find newer cairo, see:
  https://bugs.webkit.org/show_bug.cgi?id=84895

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...t-pass-P-to-the-preprocessor-when-running.patch |   76 --------------------
 ...ore-add-EINA_LIBRARIES-to-shell-build-for.patch |   28 -------
 .../recipes-efl/webkit/webkit-efl/CMakeLists.txt   |   38 ++++++----
 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb      |   11 ++--
 4 files changed, 27 insertions(+), 126 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch
 delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch

diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch
deleted file mode 100644
index dcd3a46..0000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 3dfc99730b99472d642f19b825fb9794e32a05c4 Mon Sep 17 00:00:00 2001
-From: "rakuco@webkit.org"
- <rakuco@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Tue, 10 Apr 2012 22:59:04 +0000
-Subject: [PATCH] [CMake] Do not pass -P to the preprocessor when running
- make_names.pl.
- https://bugs.webkit.org/show_bug.cgi?id=83225
-
-Reviewed by Rob Buis.
-
-This is necessary to make CMake-based ports build with the
-recently-released GCC 4.7.0, whose preprocessor seems to ignore
-empty lines when -P is passed to it.  Such behavior breaks
-make_names.pl (in fact, InFilesParser.pm), which expects an empty
-line to separate common and specific sections in .in files.
-
-A fix for this same problem has been supposedly done in r84123,
-but as the CMake-based ports always pass --preprocessor to the
-Perl tools the fix never reached us.
-
-The idea is to define CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS
-for (!MSVC && !QNX) and use it in the macros which call
-make_names.pl.
-
-* Source/cmake/OptionsCommon.cmake:
-* Source/cmake/WebKitMacros.cmake:
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113786 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- ChangeLog                        |   24 ++++++++++++++++++++++++
- Source/cmake/OptionsCommon.cmake |    7 +++++++
- Source/cmake/WebKitMacros.cmake  |    2 +-
- 3 files changed, 32 insertions(+), 1 deletions(-)
-
-diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
-index 11581e6..37cb4a8 100644
---- a/Source/cmake/OptionsCommon.cmake
-+++ b/Source/cmake/OptionsCommon.cmake
-@@ -5,14 +5,21 @@ IF (WTF_OS_UNIX)
-     ADD_DEFINITIONS(-DXP_UNIX)
- ENDIF (WTF_OS_UNIX)
- 
-+# CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC >= 4.7.0.  Since this
-+# version, -P does not output empty lines, which currently breaks make_names.pl in
-+# WebCore. Investigating whether make_names.pl should be changed instead is left as an exercise to
-+# the reader.
- IF (MSVC)
-     # FIXME: Some codegenerators don't support paths with spaces. So use the executable name only.
-     GET_FILENAME_COMPONENT(CODE_GENERATOR_PREPROCESSOR_EXECUTABLE ${CMAKE_CXX_COMPILER} NAME)
-     SET(CODE_GENERATOR_PREPROCESSOR "${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE} /nologo /EP")
-+    SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
- ELSEIF (CMAKE_SYSTEM_NAME MATCHES QNX)
-     SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -Wp,-P -x c++")
-+    SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
- ELSE ()
-     SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
-+    SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CMAKE_CXX_COMPILER} -E -x c++")
- ENDIF ()
- 
- SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
-diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
-index 3abe342..4e7ca9f 100644
---- a/Source/cmake/WebKitMacros.cmake
-+++ b/Source/cmake/WebKitMacros.cmake
-@@ -89,7 +89,7 @@ MACRO (GENERATE_DOM_NAMES _namespace _attrs)
-     ADD_CUSTOM_COMMAND(
-         OUTPUT  ${_outputfiles}
-         DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
--        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
-+        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
-         VERBATIM)
- ENDMACRO ()
- 
--- 
-1.7.7
-
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch
deleted file mode 100644
index 6958b9e..0000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 079acc344dc12818d8b56bf80a42065d8429f7ef Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 14 Feb 2012 09:56:53 +0100
-Subject: [PATCH] JavaScriptCore: add EINA_LIBRARIES to shell build for Efl
-
-* needed for libwtf_efl
-* otherwise fails with ../wtf/libwtf_efl.so.0.1.0: error: undefined reference to 'eina_module_free'
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- Source/JavaScriptCore/shell/PlatformEfl.cmake |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Source/JavaScriptCore/shell/PlatformEfl.cmake b/Source/JavaScriptCore/shell/PlatformEfl.cmake
-index c35af2d..ef3f437 100644
---- a/Source/JavaScriptCore/shell/PlatformEfl.cmake
-+++ b/Source/JavaScriptCore/shell/PlatformEfl.cmake
-@@ -1,6 +1,7 @@
- LIST(APPEND JSC_LIBRARIES
-     ${Glib_LIBRARIES}
-     ${ECORE_LIBRARIES}
-+    ${EINA_LIBRARIES}
-     ${CMAKE_DL_LIBS}
- )
- 
--- 
-1.7.8.4
-
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt b/meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt
index c130867..8071d61 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt
@@ -11,19 +11,15 @@ ENDIF ()
 # -----------------------------------------------------------------------------
 # Default library type
 # -----------------------------------------------------------------------------
-SET(ENABLE_WEBCORE On)
+SET(ENABLE_WEBCORE ON)
 
 IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2)
-    SET(ENABLE_WEBKIT On)
+    SET(ENABLE_WEBKIT ON)
 ENDIF ()
 
-OPTION(ONLY_BUILD_JAVASCRIPTCORE "only build JavaScriptCore")
-IF (ONLY_BUILD_JAVASCRIPTCORE)
-    SET(ENABLE_WEBCORE Off)
-    SET(ENABLE_WEBKIT Off)
-    SET(ENABLE_WEBKIT2 Off)
-ENDIF ()
+SET(ENABLE_TOOLS ON)
 
+SET(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
 SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
@@ -35,10 +31,15 @@ SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
 SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
 SET(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
 SET(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
+SET(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
 SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
 
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 INCLUDE(WebKitMacros)
 INCLUDE(WebKitFS)
 INCLUDE(WebKitHelpers)
@@ -109,24 +110,24 @@ SET(JavaScriptCore_LIBRARY_NAME JavaScriptCore)
 SET(WebCore_LIBRARY_NAME WebCore)
 SET(WebKit_LIBRARY_NAME WebKit)
 SET(WebKit2_LIBRARY_NAME WebKit2)
+SET(WebCoreTestSupport_LIBRARY_NAME WebCoreTestSupport)
 
 # -----------------------------------------------------------------------------
 # Default library types
 # -----------------------------------------------------------------------------
-OPTION(SHARED_CORE "build WTF, JavaScriptCore and WebCore as shared libraries")
+OPTION(SHARED_CORE "build JavaScriptCore and WebCore as shared libraries")
 
 IF (SHARED_CORE)
-    SET(WTF_LIBRARY_TYPE SHARED)
     SET(JavaScriptCore_LIBRARY_TYPE SHARED)
     SET(WebCore_LIBRARY_TYPE SHARED)
 ELSE ()
-    SET(WTF_LIBRARY_TYPE STATIC)
     SET(JavaScriptCore_LIBRARY_TYPE STATIC)
     SET(WebCore_LIBRARY_TYPE STATIC)
 ENDIF ()
 
 SET(WebKit_LIBRARY_TYPE SHARED)
 SET(WebKit2_LIBRARY_TYPE SHARED)
+SET(WebCoreTestSupport_LIBRARY_TYPE STATIC)
 
 # -----------------------------------------------------------------------------
 # Port-specific options
@@ -135,6 +136,13 @@ INCLUDE(OptionsCommon)
 INCLUDE(Options${PORT})
 
 # -----------------------------------------------------------------------------
+# Enable API unit tests and create a target for the test runner
+# -----------------------------------------------------------------------------
+IF (ENABLE_API_TESTS)
+    ENABLE_TESTING()
+ENDIF ()
+
+# -----------------------------------------------------------------------------
 # Install JavaScript shell
 # -----------------------------------------------------------------------------
 OPTION(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built JavaScript shell")
@@ -152,9 +160,7 @@ ADD_SUBDIRECTORY(Source)
 # -----------------------------------------------------------------------------
 # Add tools
 # -----------------------------------------------------------------------------
-ADD_SUBDIRECTORY(Tools)
+IF (ENABLE_TOOLS)
+    ADD_SUBDIRECTORY(Tools)
+ENDIF ()
 
-# -----------------------------------------------------------------------------
-# Prints a summary of all enabled/disabled features
-# -----------------------------------------------------------------------------
-WEBKIT_PRINT_FEATURES()
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
index 7719212..7a7b9bd 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
@@ -9,9 +9,10 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
            libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \
            libxml2 pango eina ecore evas edje"
 
-SRCREV = "105069"
-PV = "1.7.3+svnr${SRCPV}"
-PR = "r3"
+# 120145 and 122103 introduces dependency on libsoup-2.39.3 and glib-networking-2.33.2
+SRCREV = "120144"
+PV = "1.9.3+svnr${SRCPV}"
+PR = "r1"
 
 SRCREV_FORMAT = "source"
 
@@ -19,8 +20,6 @@ SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;protocol=http;subdir=src \
   svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http;subdir=src \
   svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http;subdir=src \
-  file://0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch \
-  file://0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch \
   file://CMakeLists.txt \
 "
 
@@ -34,7 +33,7 @@ inherit cmake lib_package pkgconfig perlnative pythonnative
 
 ARM_INSTRUCTION_SET = "arm"
 
-EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=ON"
+EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=On -DENABLE_DRAG_SUPPORT=On"
 
 LEAD_SONAME = "libewebkit.so"
 PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
-- 
1.7.8.6

[meta-oe][PATCH 08/24] eve: add patch to build against newer webkit-efl

[Martin Jansa]

* otherwise fails at runtime:
CRI<627>: /OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/webkit-efl/webkit-efl-1.9.5+svnr120144-r0/src/Source/WebKit/efl/ewk/ewk_view.cpp:1264 ewk_view_base_smart_set() Ewk_View_Smart_Class 0x617f00 is version 4 while 5 was expected.
CRI<627>: /OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/webkit-efl/webkit-efl-1.9.5+svnr120144-r0/src/Source/WebKit/efl/ewk/ewk_view.cpp:1264 ewk_view_base_smart_set() Ewk_View_Smart_Class 0x6180c0 is version 4 while 5 was expected.
eve[627]: segfault at 0 ip           (null) sp 00007fff7ee1fb18 error 14 in eve[400000+18000]
Segmentation fault

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../eve/0001-eve-update-for-newer-webkit-efl.patch |   38 ++++++++++++++++++++
 meta-efl/recipes-efl/e17/eve_svn.bb                |    2 +
 2 files changed, 40 insertions(+), 0 deletions(-)
 create mode 100644 meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch

diff --git a/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch b/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch
new file mode 100644
index 0000000..a1f14df
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch
@@ -0,0 +1,38 @@
+From 7c25cbf1901e9be1c0bebca6c9bcaa79dbbdf849 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 18 Jul 2012 17:54:50 +0200
+Subject: [PATCH] eve: update for newer webkit-efl
+
+* ewk_settings_icon_database_icon_object_add was renamed to ewk_settings_icon_database_icon_object_get
+  in webkit r113173 (see https://bugs.webkit.org/show_bug.cgi?id=82438)
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/bin/chrome.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/bin/chrome.c b/src/bin/chrome.c
+index e402cad..ee8f0c4 100644
+--- a/src/bin/chrome.c
++++ b/src/bin/chrome.c
+@@ -985,7 +985,7 @@ _chrome_state_apply(Evas_Object *chrome, Evas_Object *view)
+    if (old_icon) evas_object_del(old_icon);
+    if (url)
+      {
+-        favicon = ewk_settings_icon_database_icon_object_add(url, canvas);
++        favicon = ewk_settings_icon_database_icon_object_get(url, canvas);
+         if (favicon)
+            elm_object_part_content_set(text_url, "icon", favicon);
+      }
+@@ -2456,7 +2456,7 @@ more_content_get(void *data, Evas_Object *obj, const char *part)
+           {
+              Evas_Object *chrome = evas_object_data_get(obj, "chrome");
+              Evas *canvas = evas_object_evas_get(chrome);
+-             icon = ewk_settings_icon_database_icon_object_add(mmi->next, canvas);
++             icon = ewk_settings_icon_database_icon_object_get(mmi->next, canvas);
+           }
+         return icon;
+      }
+-- 
+1.7.8.6
+
diff --git a/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_svn.bb
index d760c4a..9528ff3 100644
--- a/meta-efl/recipes-efl/e17/eve_svn.bb
+++ b/meta-efl/recipes-efl/e17/eve_svn.bb
@@ -3,6 +3,7 @@ LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 DEPENDS = "evas ecore edje elementary webkit-efl"
 PV = "0.3.0.0+svnr${SRCPV}"
+PR = "r1"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e gettext
@@ -14,6 +15,7 @@ do_configure_prepend() {
 }
 
 SRC_URI += "file://eve-theme-for-smaller-screens.patch \
+  file://0001-eve-update-for-newer-webkit-efl.patch \
 "
 
 EXTRA_OECONF = "\
-- 
1.7.8.6

[meta-oe][PATCH 09/24] e-wm: use new update-alternatives syntax

[Martin Jansa]

* fixes warning WARNING: e-wm: Use of ALTERNATIVE_NAME is deprecated, see update-alternatives.bbclass for more info.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/e-wm_svn.bb |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb
index 852bbcc..6f5fab1 100644
--- a/meta-efl/recipes-efl/e17/e-wm_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2667a0f4120372ea91f7467cdff4095f"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e update-alternatives gettext
@@ -182,7 +182,6 @@ FILES_${PN}-doc += "\
 CONFFILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu"
 CONFFILES_${PN}-sysactions = "/etc/enlightenment/sysactions.conf"
 
-ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "16"
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/enlightenment_start.oe"
+ALTERNATIVE_PRIORITY[x-window-manager] = "16"
-- 
1.7.8.6

[meta-oe][PATCH 10/24] gpsd: add chrpath-native to DEPENDS otherwise it could autodetect host chrpath

[Martin Jansa]

* which doesn't work sometimes:
  chrpath -d "/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.5-r7/image/usr/sbin/gpsd"
  `/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.5-r7/image/usr/sbin/gpsd'
  probably isn't a 64-bit LSB-first ELF file.
  elf_open: Exec format error

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb |    4 ++--
 meta-oe/recipes-navigation/gpsd/gpsd_git.bb |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
index 568d492..1e3ac0c 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
 SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
-DEPENDS = "dbus dbus-glib ncurses python libusb1"
+DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native"
 PROVIDES = "virtual/gpsd"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch \
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
index 8404ba1..380f3ba 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
 SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
-DEPENDS = "dbus dbus-glib ncurses python libusb1"
+DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native"
 PROVIDES = "virtual/gpsd"
 
-PR = "r3"
+PR = "r4"
 
 SRCREV = "f8744f4af8cef211de698df5d8e6caddfe33f29d"
 
-- 
1.7.8.6

[meta-oe][PATCH 11/24] udev-extra-rules: drop in favor of udev-extraconf from oe-core

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-core/udev/udev-extra-rules.bb      |   36 -----------
 .../udev/udev-extra-rules/automount.rules          |   19 ------
 .../udev/udev-extra-rules/autonet.rules            |   19 ------
 .../recipes-core/udev/udev-extra-rules/local.rules |   21 -------
 .../udev/udev-extra-rules/mount.blacklist          |    3 -
 .../recipes-core/udev/udev-extra-rules/mount.sh    |   64 --------------------
 .../recipes-core/udev/udev-extra-rules/network.sh  |   58 ------------------
 7 files changed, 0 insertions(+), 220 deletions(-)
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules.bb
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/automount.rules
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/autonet.rules
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/local.rules
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/mount.blacklist
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/mount.sh
 delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/network.sh

diff --git a/meta-oe/recipes-core/udev/udev-extra-rules.bb b/meta-oe/recipes-core/udev/udev-extra-rules.bb
deleted file mode 100644
index 7f9ca85..0000000
--- a/meta-oe/recipes-core/udev/udev-extra-rules.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Extra udev rules"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-
-inherit allarch
-
-PR = "r4"
-
-SRC_URI = " \
-       file://automount.rules \
-       file://mount.sh \
-       file://mount.blacklist \
-       file://autonet.rules \
-       file://network.sh \
-       file://local.rules \
-"
-
-
-do_install() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-
-    install -m 0644 ${WORKDIR}/automount.rules     ${D}${sysconfdir}/udev/rules.d/automount.rules
-    install -m 0644 ${WORKDIR}/autonet.rules       ${D}${sysconfdir}/udev/rules.d/autonet.rules
-    install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
-
-    install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
-
-    install -d ${D}${sysconfdir}/udev/scripts/
-
-    install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
-    install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
-}
-
-FILES_${PN} = "${sysconfdir}/udev"
-RDEPENDS_${PN} = "udev"
-CONFFILES_${PN} = "${sysconfdir}/udev/mount.blacklist"
diff --git a/meta-oe/recipes-core/udev/udev-extra-rules/automount.rules b/meta-oe/recipes-core/udev/udev-extra-rules/automount.rules
deleted file mode 100644
index 7e844c3..0000000
--- a/meta-oe/recipes-core/udev/udev-extra-rules/automount.rules
+++ /dev/null
@@ -1,19 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# Media automounting
-SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
-SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
-
diff --git a/meta-oe/recipes-core/udev/udev-extra-rules/autonet.rules b/meta-oe/recipes-core/udev/udev-extra-rules/autonet.rules
deleted file mode 100644
index 19676aa..0000000
--- a/meta-oe/recipes-core/udev/udev-extra-rules/autonet.rules
+++ /dev/null
@@ -1,19 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# Handle network interface setup
-SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
-SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
-
diff --git a/meta-oe/recipes-core/udev/udev-extra-rules/local.rules b/meta-oe/recipes-core/udev/udev-extra-rules/local.rules
deleted file mode 100644
index 4eaa8ca..0000000
--- a/meta-oe/recipes-core/udev/udev-extra-rules/local.rules
+++ /dev/null
@@ -1,21 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# The first rtc device is symlinked to /dev/rtc
-KERNEL=="rtc0", SYMLINK+="rtc"
-
-#The first framebuffer is symlinked to /dev/fb
-KERNEL=="fb0",  SYMLINK+="fb"
-
diff --git a/meta-oe/recipes-core/udev/udev-extra-rules/mount.blacklist b/meta-oe/recipes-core/udev/udev-extra-rules/mount.blacklist
deleted file mode 100644
index d3ebb17..0000000
--- a/meta-oe/recipes-core/udev/udev-extra-rules/mount.blacklist
+++ /dev/null
@@ -1,3 +0,0 @@
-/dev/loop
-/dev/ram
-/dev/mtdblock
diff --git a/meta-oe/recipes-core/udev/udev-extra-rules/mount.sh b/meta-oe/recipes-core/udev/udev-extra-rules/mount.sh
deleted file mode 100644
index 67c2b4b..0000000
--- a/meta-oe/recipes-core/udev/udev-extra-rules/mount.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-#
-# Called from udev
-# Attemp to mount any added block devices
-# and remove any removed devices
-#
-
-MOUNT="/bin/mount"
-PMOUNT="/usr/bin/pmount"
-UMOUNT="/bin/umount"
-name="`basename "$DEVNAME"`"
-
-for line in `grep -v ^# /etc/udev/mount.blacklist`
-do
-	if ( echo "$DEVNAME" | grep -q "$line" )
-	then
-		logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
-		exit 0
-	fi
-done
-
-automount() {
-	! test -d "/media/$name" && mkdir -p "/media/$name"
-
-	if ! $MOUNT -t auto -o async,relatime $DEVNAME "/media/$name"
-	then
-		#logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!"
-		rm_dir "/media/$name"
-	else
-		logger "mount.sh/automount" "Auto-mount of [/media/$name] successful"
-		touch "/tmp/.automount-$name"
-	fi
-}
-
-rm_dir() {
-	# We do not want to rm -r populated directories
-	if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1"
-	then
-		! test -z "$1" && rm -r "$1"
-	else
-		logger "mount.sh/automount" "Not removing non-empty directory [$1]"
-	fi
-}
-
-if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
-	if [ -x "$PMOUNT" ]; then
-		$PMOUNT $DEVNAME 2> /dev/null
-	elif [ -x $MOUNT ]; then
-			$MOUNT $DEVNAME 2> /dev/null
-	fi
-
-	# Avoid remounting devices (e.g: rootfs)
-	awk '{print $1}' /proc/mounts | grep -q "^$DEVNAME$" || automount
-fi
-
-if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
-	for mnt in `grep "$DEVNAME" /proc/mounts | cut -f 2 -d " " `
-	do
-		$UMOUNT -l $mnt
-	done
-
-	# Remove empty directories from auto-mounter
-	test -e "/tmp/.automount-$name" && rm_dir "/media/$name"
-fi
diff --git a/meta-oe/recipes-core/udev/udev-extra-rules/network.sh b/meta-oe/recipes-core/udev/udev-extra-rules/network.sh
deleted file mode 100644
index 182c26d..0000000
--- a/meta-oe/recipes-core/udev/udev-extra-rules/network.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# udevd does clearenv(). Export shell PATH to children.
-export PATH
-
-# Do not run when pcmcia-cs is installed
-test -x /sbin/cardctl && exit 0
-
-# We get two "add" events for hostap cards due to wifi0
-echo "$INTERFACE" | grep -q wifi && exit 0
-
-
-# Check if /etc/init.d/network has been run yet to see if we are 
-# called by starting /etc/rcS.d/S03udev and not by hotplugging a device
-#
-# At this stage, network interfaces should not be brought up
-# automatically because:
-# a)	/etc/init.d/network has not been run yet (security issue)
-# b) 	/var has not been populated yet so /etc/resolv,conf points to 
-#	oblivion, making the network unusable
-#
-
-spoofp="`grep ^spoofprotect /etc/network/options`"
-if test -z "$spoofp"
-then
-	# This is the default from /etc/init.d/network
-	spoofp_val=yes
-else
-	spoofp_val=${spoofp#spoofprotect=}
-fi
-
-test "$spoofp_val" = yes && spoofp_val=1 || spoofp_val=0
-
-# I think it is safe to assume that "lo" will always be there ;)
-if test "`cat /proc/sys/net/ipv4/conf/lo/rp_filter`" != "$spoofp_val" -a -n "$spoofp_val"
-then
-	echo "$INTERFACE" >> /dev/udev_network_queue	
-	exit 0
-fi
-
-#
-# Code taken from pcmcia-cs:/etc/pcmcia/network
-#
-
-# if this interface has an entry in /etc/network/interfaces, let ifupdown
-# handle it
-if grep -q "iface \+$INTERFACE" /etc/network/interfaces; then
-  case $ACTION in
-    add)
-    	ifconfig | grep -q "^$INTERFACE" || ifup $INTERFACE
-    	;;
-    remove)
-    	ifdown $INTERFACE
-    	;;
-  esac
-  
-  exit 0
-fi
-- 
1.7.8.6

[meta-oe][PATCH 12/24] meta-elf: e-module: add *.a to PN-staticdev

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/e-module.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta-efl/recipes-efl/e17/e-module.inc b/meta-efl/recipes-efl/e17/e-module.inc
index d3f6e1b..0923575 100644
--- a/meta-efl/recipes-efl/e17/e-module.inc
+++ b/meta-efl/recipes-efl/e17/e-module.inc
@@ -15,4 +15,5 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} += "${libdir}/enlightenment/modules/${PN}"
 FILES_${PN}-dbg += "${libdir}/enlightenment/modules/${PN}/*/.debug"
+FILES_${PN}-staticdev += "${libdir}/enlightenment/modules/${PN}/*/*.a"
 
-- 
1.7.8.6

[meta-oe][PATCH 13/24] gnuplot: import from meta-smartphone

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../gnuplot/gnuplot-4.4.4/automake-1.12.x.patch    |   44 ++
 .../gnuplot/gnuplot-4.4.4/subdirs.patch            |   11 +
 meta-oe/recipes-extended/gnuplot/gnuplot.inc       |   35 ++
 .../gnuplot/gnuplot/gnuplot.desktop                |    8 +
 .../recipes-extended/gnuplot/gnuplot/gnuplot.png   |  Bin 0 -> 9383 bytes
 .../recipes-extended/gnuplot/gnuplot/qtopia.trm    |  483 ++++++++++++++++++++
 meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb  |   16 +
 7 files changed, 597 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot.inc
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm
 create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb

diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch
new file mode 100644
index 0000000..51f703c
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch
@@ -0,0 +1,44 @@
+Upstream-Status: Backport
+
+It's fixed in 4.6 and 4.7(HEAD)
+
+http://sourceforge.net/tracker/?func=detail&aid=3523591&group_id=2055&atid=102055
+
+diff -uNr gnuplot-4.4.4.orig/Makefile.am gnuplot-4.4.4/Makefile.am
+--- gnuplot-4.4.4.orig/Makefile.am	2012-07-20 10:54:49.075828905 +0200
++++ gnuplot-4.4.4/Makefile.am	2012-07-20 10:55:22.380831313 +0200
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+-AUTOMAKE_OPTIONS = foreign 1.2h
++AUTOMAKE_OPTIONS = foreign
+ 
+ SUBDIRS = config m4 term src  $(LISPDIR) man share
+ 
+diff -uNr gnuplot-4.4.4.orig/configure.in gnuplot-4.4.4/configure.in
+--- gnuplot-4.4.4.orig/configure.in	2011-09-02 06:09:40.000000000 +0200
++++ gnuplot-4.4.4/configure.in	2012-07-20 10:55:53.289833224 +0200
+@@ -16,10 +16,11 @@
+ dnl configure.in body
+ 
+ dnl Compiler characteristics
+-dnl Check for ANSI C prototypes, the const and inline keywords,
+-dnl and ANSI style stringification
++dnl Check for the const and inline keywords and ANSI style stringification
++dnl automake 1.12 dropped support for AM_C_PROTOTYPES and ansi2knr
++dnl But our code still tests for #ifdef PROTOTYPES, so define it here
++AC_DEFINE(PROTOTYPES,1,[Automake 1.12 dropped support for building without prototypes])
+ AC_PROG_CC
+-AM_C_PROTOTYPES
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
+diff -uNr gnuplot-4.4.4.orig/src/Makefile.am gnuplot-4.4.4/src/Makefile.am
+--- gnuplot-4.4.4.orig/src/Makefile.am	2010-10-06 06:53:16.000000000 +0200
++++ gnuplot-4.4.4/src/Makefile.am	2012-07-20 10:56:02.376834548 +0200
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+-AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h
++AUTOMAKE_OPTIONS = foreign
+ 
+ # in the spirit of automake ...
+ pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch
new file mode 100644
index 0000000..8c7d1f0
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.am	2007-08-23 13:10:15.560659023 +0200
++++ gnuplot-4.2.0/Makefile.am	2007-08-23 13:10:34.961764629 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+ AUTOMAKE_OPTIONS = foreign 1.2h
+ 
+-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
++SUBDIRS = config m4 term src  $(LISPDIR) man share
+ 
+ EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \
+ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
new file mode 100644
index 0000000..b72bbd7
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
@@ -0,0 +1,35 @@
+DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \
+(text or binary) and function plotting utility."
+HOMEPAGE = "http://www.gnuplot.info/"
+SECTION = "console/scientific"
+LICENSE = "BSD-4"
+LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f"
+DEPENDS = "virtual/libx11 gd cairo readline"
+
+inherit autotools
+
+acpaths = ""
+
+EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \
+                --without-lisp-files \
+                --without-tutorial \
+                --disable-wxwidgets"
+
+do_compile_prepend() {
+    install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/
+}
+
+do_install_append() {
+    install -d ${D}${datadir}/applications/
+    install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/
+    install -d ${D}${datadir}/pixmaps/
+    install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/
+}
+
+PACKAGES =+ "${PN}-x11-dbg ${PN}-x11"
+DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot."
+SECTION_${PN}-x11 = "x11/scientific"
+FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 "
+
+FILES_${PN} += "${datadir}/texmf"
+FILES_${PN}-x11-dbg += "${libexecdir}/gnuplot/*/.debug"
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop
new file mode 100644
index 0000000..f67df9e
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Gnuplot
+Comment=Plot data and function graphs
+Exec=x-terminal-emulator -e gnuplot
+Terminal=false
+Type=Application
+Icon=gnuplot
+Categories=Science;
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png
new file mode 100644
index 0000000000000000000000000000000000000000..054cd9e7c73f2a78a9f2dd91ef8cce52ac520389
GIT binary patch
literal 9383
zcmdT~y-EZz5Y8SV{$OPzVqxI}*ou{MqK6<Ng4&6Nogmm)+laMRVxg6tZ{Rcd0OC_v
zS!w3T?M>#A*~HBxy2ss4GC%pgZ*t)l?q+vqb7pFON+~td+v@J=`!c*I#`Whx=j&SE
z#!t34yXqTWkFU?SdS>!`>*zwM=~;MJ>i%I)sYTW6uI*n|)$-EYd-bg^9a#3ND);&U
z&^qqSjI%!Q0D<!vh~){i)JmK{#i_{o2E-a-#0f-w#bD0|?E3*XxQi3Oi&-{R76ZpN
zB+*z@s2l+V!l^nXf#Z=~h5(}|!e*PEoH7J3G)`&GXKLgp;87BD^4gAEaRTfy8lbTA
z`+*pW6NoxS5iqYwx*$%#0zwwIeB6NPR9*rYBm)YEHQD6|G$G^ssFVMPfTv^m2q4v(
zP8Lr5+GpyC6JU?g8cm?#=z=(b<i{xCDo&uk9^O6#K&zpyn}+~K>DUI?9c$+&5Q~t;
z69ME2NNpcOtkZwmfkiwEai>VM&!`ujXTZAhDtHR5yF}Vk&$ltKFaq^uw-5&3Mg%5T
zmH=K@Kz%506Ud+#=9I$jB>7$9LXt@gy8|vDDdvQ>4?r6wkV&}|x(o?Wh1!y6n;*e$
zv;z^zL7`Nfprr7iApzlq!Xd>)4hhh_-)@87=F#;7$2Nh~T}WNeLCPlJ2>9z$Jb~El
z5F4LBolyd*+HUH&egY@JU6&XoP`iu~s;Vch%tL+KF0{?3A~NIV4nVR;-MVg*zYa`q
z_z6%IeITv*r?taRrN&m_zW^F6t&twTRnbqz3Nr%>xSpe9SB~&p^ZzDdKxS4Sv}x`@
yC@4={`6Cr*dcc9Je=+_tN9q6=zWYG>=5el|ee`j5y70Af2TSxecDgU?$5%hDrHYvV

literal 0
HcmV?d00001

diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm b/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm
new file mode 100644
index 0000000..b52f9bb
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm
@@ -0,0 +1,483 @@
+/*
+ * $Id: dumb.trm,v 1.16 2004/04/13 17:24:16 broeker Exp $
+ *
+ */
+
+/* GNUPLOT - qtopia.trm */
+
+/*[
+ * Copyright 1991 - 1993, 1998, 2004   Thomas Williams, Colin Kelley
+ *
+ * Permission to use, copy, and distribute this software and its
+ * documentation for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.
+ *
+ * Permission to modify the software is granted, but not the right to
+ * distribute the complete modified source code.  Modifications are to
+ * be distributed as patches to the released version.  Permission to
+ * distribute binaries produced by compiling modified sources is granted,
+ * provided you
+ *   1. distribute the corresponding source modifications from the
+ *    released version in the form of a patch file along with the binaries,
+ *   2. add special version identification to distinguish your version
+ *    in addition to the base release version number,
+ *   3. provide your name and address as the primary contact for the
+ *    support of your modified version, and
+ *   4. retain our contact information in regard to use of the base
+ *    software.
+ * Permission to distribute the released version of the source code along
+ * with corresponding source modifications in the form of a patch file is
+ * granted with same provisions 2 through 4 for binary distributions.
+ *
+ * This software is provided "as is" without express or implied warranty
+ * to the extent permitted by applicable law.
+]*/
+
+/*
+ * This file is included by ../term.c.
+ *
+ * This terminal driver supports:
+ *   qtopia terminals
+ *
+ * AUTHORS
+ *   Michael Neuroth, 2004-05-16
+ *           INTERNET: michael.neuroth@freenet.de
+ *
+ * send your comments or suggestions to (gnuplot-info@lists.sourceforge.net).
+ *
+ */
+#include "driver.h"
+
+#define NO_QTOPIA_ENHANCED_SUPPORT
+
+#ifdef TERM_REGISTER
+register_term(qtopia_driver)
+#endif
+
+#ifdef TERM_PROTO
+TERM_PUBLIC void QTOPIA_options __PROTO((void));
+TERM_PUBLIC void QTOPIA_init __PROTO((void));
+TERM_PUBLIC void QTOPIA_graphics __PROTO((void));
+TERM_PUBLIC void QTOPIA_text __PROTO((void));
+TERM_PUBLIC void QTOPIA_reset __PROTO((void));
+TERM_PUBLIC void QTOPIA_linetype __PROTO((int linetype));
+TERM_PUBLIC void QTOPIA_move __PROTO((unsigned int x, unsigned int y));
+TERM_PUBLIC void QTOPIA_point __PROTO((unsigned int x, unsigned int y,
+				     int point));
+TERM_PUBLIC void QTOPIA_vector __PROTO((unsigned int x, unsigned int y));
+TERM_PUBLIC void QTOPIA_put_text __PROTO((unsigned int x, unsigned int y,
+					const char *str));
+TERM_PUBLIC void QTOPIA_arrow __PROTO((unsigned int sx, unsigned int sy,
+				     unsigned int ex, unsigned int ey,
+				     int head));
+
+#define ENHqtopia_put_text NULL
+
+
+#define QTOPIA_XMAX 4096
+#define QTOPIA_YMAX 4096
+
+#ifdef ZAURUS
+#define QTOPIA_VCHAR (QTOPIA_YMAX/25)
+#define QTOPIA_HCHAR (QTOPIA_XMAX/40)
+#define QTOPIA_VTIC (QTOPIA_YMAX/50)
+#define QTOPIA_HTIC (QTOPIA_XMAX/40)
+#else
+#define QTOPIA_VCHAR (QTOPIA_YMAX/25)
+#define QTOPIA_HCHAR (QTOPIA_XMAX/50)
+#define QTOPIA_VTIC (QTOPIA_YMAX/100)
+#define QTOPIA_HTIC (QTOPIA_XMAX/150)
+#endif
+
+#endif /* TERM_PROTO */
+
+#ifdef TERM_BODY
+
+/*#include <winsock2.h>*/
+/* needs: ws2_32.lib */
+#ifndef _MSC_VER
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+
+#define QTOPIA_MAX_BUFFER		512
+#define QTOPIA_MAX_DELAY_COUNT	20	/* * 100 ms = 2 s */
+
+#ifdef _MSC_VER
+#define QTOPIA_BAD_SOCKET		INVALID_SOCKET		/* -1 */
+#define QTOPIA_BAD_CONNECT		SOCKET_ERROR
+#else
+#define QTOPIA_BAD_SOCKET		-1
+#define QTOPIA_BAD_CONNECT		-1
+#endif
+#define QTOPIA_PORT_NO			5050
+
+static int qtopia_client_socket = QTOPIA_BAD_SOCKET;
+static unsigned short qtopia_port_no = QTOPIA_PORT_NO;
+static char qtopia_host_name[QTOPIA_MAX_BUFFER+1] = { "localhost" };
+
+static int OpenClient __PROTO(( int test));
+static void CloseClient();
+
+static void MySleep( delay )
+int delay;
+{
+#ifdef _MSC_VER
+	Sleep( delay );
+#else
+	usleep( delay );
+#endif
+}
+
+static void InitSockets()
+{
+#ifdef _MSC_VER
+	WORD wVersionRequested;
+	WSADATA wsaData;
+	int err;
+
+	wVersionRequested = MAKEWORD( 2, 2 );
+
+	err = WSAStartup( wVersionRequested, &wsaData );
+#endif
+}
+
+static void ExitSockets()
+{
+#ifdef _MSC_VER
+	WSACleanup();
+#endif
+}
+
+static int CheckForQtplot( count )
+int count;
+{
+	/* test (via sockets) if qtplot is allready running */
+	if( !OpenClient( 1 ) )
+	{
+		/* give qtplot a litle bit time to start... */
+		if( count < QTOPIA_MAX_DELAY_COUNT )
+		{
+			if( count == 0 )
+			{
+#ifdef _MSC_VER
+				system( "start qtplot" );
+#else
+				system( "qtplot&" );
+#endif
+			}
+		
+			MySleep(100);
+
+			return CheckForQtplot( count+1 );
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	else
+	{
+		CloseClient();
+
+		return 1;
+	}
+}
+
+static int OpenClient( test )
+int test;
+{
+    int len;
+    struct sockaddr_in address;
+    int result;
+
+	/*  Create a socket for the client.  */
+
+    qtopia_client_socket = socket(AF_INET, SOCK_STREAM, 0);
+
+	if( qtopia_client_socket != QTOPIA_BAD_SOCKET )
+	{
+		/*  Name the socket, as agreed with the server.  */
+
+		address.sin_family = AF_INET;
+		address.sin_addr.s_addr = inet_addr(/*qtopia_host_name*/"127.0.0.1");	/* localhost */
+		address.sin_port = htons(qtopia_port_no);
+		len = sizeof(address);
+
+		/*  Now connect our socket to the server's socket.  */
+
+		result = connect(qtopia_client_socket, (struct sockaddr *)&address, len);
+		
+		if( result == QTOPIA_BAD_SOCKET )
+		{
+			/* mark this socket as bad */
+
+			close( qtopia_client_socket );
+
+			qtopia_client_socket = QTOPIA_BAD_SOCKET;
+
+			if( !test )
+			{
+				fprintf( gpoutfile, "error connecting to server !\n" );
+			}
+			return 0;	/* something went wrong */
+		}
+	}
+	else
+	{
+		if( !test )
+		{
+			fprintf( gpoutfile, "error creating socket !\n" );
+		}
+		return 0;	/* something went wrong */
+	}
+
+	return 1;	/* everything ist ok ! */
+}
+
+static void CloseClient()
+{
+    close( qtopia_client_socket );
+}
+
+static int IsClientOk()
+{
+	return qtopia_client_socket != QTOPIA_BAD_SOCKET;
+}
+
+static void SendDataToSocket( sLine )
+const char * sLine;
+{
+	if( IsClientOk() )
+	{
+		int send_count;
+
+		send_count = send( qtopia_client_socket, sLine, strlen( sLine ), 0 );
+
+		if( send_count <= 0 )
+		{
+			fprintf( gpoutfile, "error writing to socket str=%s!\n", sLine );
+		}
+		/*
+		else
+		{
+			fprintf( gpoutfile, "wrote %d bytes\n", send_count );
+		}
+		*/
+	}
+	else
+	{
+		/* for testing... */
+		/*fprintf( gpoutfile, sLine );*/
+	}
+}
+
+/* ************************************************** */
+
+enum QTOPIA_id { QTOPIA_PORT, QTOPIA_HOST, QTOPIA_OTHER };
+
+static struct gen_table QTOPIA_opts[] =
+{
+    { "po$rt", QTOPIA_PORT },
+    { "ho$st", QTOPIA_HOST },
+    { NULL, QTOPIA_OTHER }
+};
+
+TERM_PUBLIC void
+QTOPIA_options()
+{
+    /* this is not for the qtopia terminal ! */
+	/*SendDataToSocket( "qtd options\n" );*/
+
+    int x, y;
+    struct value a;
+
+    while (!END_OF_COMMAND) 
+	{
+		switch(lookup_table(&QTOPIA_opts[0],c_token)) 
+		{
+			case QTOPIA_PORT:
+				c_token++;
+				if (END_OF_COMMAND)
+					int_error(c_token, "expecting port number");
+				qtopia_port_no = (int) real(const_express(&a));
+				break;
+			case QTOPIA_HOST:
+				c_token++;
+				if (END_OF_COMMAND)
+					int_error(c_token, "expecting host name");
+				if (isstring(c_token))
+					quote_str( qtopia_host_name, c_token, sizeof(qtopia_host_name) );
+				else
+ 					copy_str( qtopia_host_name, c_token, sizeof(qtopia_host_name) );
+				c_token++;
+				break;
+			case QTOPIA_OTHER:
+			default:
+				break;
+		}
+    }
+
+    sprintf(term_options, "host=%s port=%d",qtopia_host_name,qtopia_port_no);
+}
+
+
+TERM_PUBLIC void
+QTOPIA_init()
+{
+	/* initialize lib (if necassary) */
+	InitSockets();
+	CheckForQtplot( 0 );
+	OpenClient( 0 ); 
+
+	SendDataToSocket( "qtd init\n" );
+}
+
+
+TERM_PUBLIC void
+QTOPIA_graphics()
+{
+	SendDataToSocket( "qtd graphics\n" );
+}
+
+TERM_PUBLIC void
+QTOPIA_text()
+{
+	SendDataToSocket( "qtd text\n" );
+}
+
+
+TERM_PUBLIC void
+QTOPIA_reset()
+{
+	SendDataToSocket( "qtd reset\n" );
+
+	/* give the qtplot a litle bit time to shutdown */
+	MySleep(100);
+
+	CloseClient();
+	ExitSockets();
+}
+
+
+TERM_PUBLIC void
+QTOPIA_linetype(linetype)
+int linetype;
+{
+	char sBuffer[QTOPIA_MAX_BUFFER];
+
+	sprintf( sBuffer, "qtd linetype type=%d\n",linetype );
+
+	SendDataToSocket( sBuffer );
+}
+
+
+TERM_PUBLIC void
+QTOPIA_move(x, y)
+unsigned int x, y;
+{
+	char sBuffer[QTOPIA_MAX_BUFFER];
+
+	sprintf( sBuffer, "qtd move x=%d y=%d\n",x,y );
+
+	SendDataToSocket( sBuffer );
+}
+
+
+TERM_PUBLIC void
+QTOPIA_point(x, y, point)
+unsigned int x, y;
+int point;
+{
+	char sBuffer[QTOPIA_MAX_BUFFER];
+
+	sprintf( sBuffer, "qtd point x=%d y=%d point=%d\n",x,y,point );
+
+	SendDataToSocket( sBuffer );
+}
+
+
+TERM_PUBLIC void
+QTOPIA_vector(_x, _y)
+unsigned int _x, _y;
+{
+	char sBuffer[QTOPIA_MAX_BUFFER];
+
+	sprintf( sBuffer, "qtd vector x=%d y=%d\n",_x,_y );
+
+	SendDataToSocket( sBuffer );
+}
+
+
+TERM_PUBLIC void
+QTOPIA_put_text(x, y, str)
+unsigned int x, y;
+const char *str;
+{
+	char sBuffer[QTOPIA_MAX_BUFFER];
+
+	sprintf( sBuffer, "qtd put_text x=%d y=%d str=%s\n",x,y,str );
+
+	SendDataToSocket( sBuffer );
+}
+
+/* not suported yet ! */
+TERM_PUBLIC void
+QTOPIA_arrow(sx, sy, ex, ey, head)
+    unsigned int sx, sy, ex, ey;
+    int head;		/* ignored */
+{
+	char sBuffer[QTOPIA_MAX_BUFFER];
+
+	sprintf( sBuffer, "qtd arrow sx=%d sy=%d ex=%d ey=%d head=%d\n",sx,sy,ex,ey,head );
+
+	SendDataToSocket( sBuffer );
+}
+
+
+#endif /* TERM_BODY */
+
+#ifdef TERM_TABLE
+TERM_TABLE_START(qtopia_driver)
+    "qtopia", "qtopia or Qt",
+    QTOPIA_XMAX, QTOPIA_YMAX, QTOPIA_VCHAR, QTOPIA_HCHAR,
+    QTOPIA_VTIC, QTOPIA_HTIC, QTOPIA_options, QTOPIA_init, QTOPIA_reset,
+    QTOPIA_text, null_scale, QTOPIA_graphics, QTOPIA_move, QTOPIA_vector,
+    QTOPIA_linetype, QTOPIA_put_text, null_text_angle,
+    null_justify_text, QTOPIA_point, /*QTOPIA_arrow*/0, set_font_null,
+    0,				/* pointsize */
+    TERM_CAN_MULTIPLOT,
+    NULL, NULL, NULL, NULL
+#ifdef USE_MOUSE
+    , NULL, NULL, NULL, NULL, NULL
+#endif
+#ifdef PM3D
+    , NULL, NULL, NULL, NULL
+#endif
+TERM_TABLE_END(qtopia_driver)
+
+#undef LAST_TERM
+#define LAST_TERM qtopia_driver
+
+#endif /* TERM_TABLE */
+
+#ifdef TERM_HELP
+START_HELP(qtopia)
+"1 qtopia",
+"?commands set terminal qtopia",
+"?set terminal qtopia",
+"?set term qtopia",
+"?terminal qtopia",
+"?term qtopia",
+"?qtopia",
+" The `qtopia` terminal driver has no additional options.",
+"",
+" Syntax:",
+"       set terminal qtopia",
+""
+END_HELP(qtopia)
+#endif /* TERM_HELP */
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb
new file mode 100644
index 0000000..d922afc
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb
@@ -0,0 +1,16 @@
+require gnuplot.inc
+
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz;name=archive \
+   http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \
+   file://subdirs.patch \
+   file://gnuplot.desktop \
+   file://gnuplot.png \
+   file://automake-1.12.x.patch \
+"
+
+SRC_URI[archive.md5sum] = "97a43328e81e57ebed7f135ca0c07e82"
+SRC_URI[archive.sha256sum] = "d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd"
+SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
+SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132"
-- 
1.7.8.6

[meta-oe][PATCH 14/24] libetpan: import from meta-smartphone

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../libetpan-0.57/libetpan-autoreconf.patch        |   12 ++++++++++
 .../libetpan/libetpan-0.57/libetpan-ldflags.patch  |   11 +++++++++
 meta-oe/recipes-support/libetpan/libetpan_0.57.bb  |   24 ++++++++++++++++++++
 3 files changed, 47 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-autoreconf.patch
 create mode 100644 meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-ldflags.patch
 create mode 100644 meta-oe/recipes-support/libetpan/libetpan_0.57.bb

diff --git a/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-autoreconf.patch b/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-autoreconf.patch
new file mode 100644
index 0000000..d05967d
--- /dev/null
+++ b/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-autoreconf.patch
@@ -0,0 +1,12 @@
+Index: libetpan-0.57/configure.ac
+===================================================================
+--- libetpan-0.57.orig/configure.ac	2008-10-08 19:54:20.000000000 +0000
++++ libetpan-0.57/configure.ac	2008-11-11 16:34:33.000000000 +0000
+@@ -106,6 +106,7 @@
+ 
+ # Check the C compiler.
+ AC_PROG_CC
++AC_PROG_CXX
+ 
+ # Compiler flags.
+ AC_ARG_ENABLE(debug,   [  --enable-debug          setup flags (gcc) for debugging (default=no)],
diff --git a/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-ldflags.patch b/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-ldflags.patch
new file mode 100644
index 0000000..438f44f
--- /dev/null
+++ b/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-ldflags.patch
@@ -0,0 +1,11 @@
+--- libetpan-0.57/configure.ac~	2009-09-21 23:31:42.000000000 +0200
++++ libetpan-0.57/configure.ac	2009-09-21 23:31:42.000000000 +0200
+@@ -457,7 +457,7 @@
+       LDFLAGS="-$flag $LDFLAGS"
+       AC_TRY_LINK([], [pthread_create();], 
+                       [pthflag=yes; checkpthread=no], 
+-                      [pthflag=no; LDFLAGS="$OLDCFLAGS"])
++                      [pthflag=no; LDFLAGS="$OLDFLAGS"])
+       AC_MSG_RESULT($pthflag)
+     fi
+   done
diff --git a/meta-oe/recipes-support/libetpan/libetpan_0.57.bb b/meta-oe/recipes-support/libetpan/libetpan_0.57.bb
new file mode 100644
index 0000000..7049938
--- /dev/null
+++ b/meta-oe/recipes-support/libetpan/libetpan_0.57.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \
+It supports the protocols SMTP, POP3, IMAP and NNTP."
+HOMEPAGE = "http://www.etpan.org"
+SECTION = "libs"
+DEPENDS = "gnutls"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f18ebe7e452708c26f83954f81062ba7"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
+           file://libetpan-autoreconf.patch \
+           file://libetpan-ldflags.patch"
+
+inherit autotools pkgconfig gettext binconfig
+
+EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db"
+
+PARALLEL_MAKE = ""
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
+
+
+SRC_URI[md5sum] = "8ce8c6c071e81884a475b12b7f9a9cc0"
+SRC_URI[sha256sum] = "1f3fda5c9e2961d1a6298dc8aadae321493d37727d8db45bc2e8d58f20547011"
-- 
1.7.8.6

[meta-oe][PATCH 15/24] claws-mail, sylpheed: import from meta-smartphone

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../claws-mail-3.6.1/claws-mail-g_strcmp0.patch    |  575 ++++++++++++++++++++
 .../claws-mail/claws-mail-3.6.1/desktop.patch      |   19 +
 .../claws-mail-3.6.1/duplicate-header.patch        |   10 +
 .../claws-mail/claws-mail-3.6.1/glib-2.32.patch    |   11 +
 .../recipes-sato/claws-mail/claws-mail_3.6.1.bb    |   62 +++
 .../claws-plugin-gtkhtml2-viewer_0.31.bb           |   19 +
 .../claws-plugin-mailmbox-fixup.patch              |  218 ++++++++
 .../claws-mail/claws-plugin-mailmbox_1.14.bb       |   19 +
 .../claws-mail/claws-plugin-rssyl_0.18.bb          |   18 +
 .../claws-mail/sylpheed/glib-2.32.patch            |   11 +
 meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb  |   37 ++
 11 files changed, 999 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/claws-mail-g_strcmp0.patch
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/desktop.patch
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/duplicate-header.patch
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/glib-2.32.patch
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail_3.6.1.bb
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox-1.14/claws-plugin-mailmbox-fixup.patch
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.18.bb
 create mode 100644 meta-oe/recipes-sato/claws-mail/sylpheed/glib-2.32.patch
 create mode 100644 meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb

diff --git a/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/claws-mail-g_strcmp0.patch b/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/claws-mail-g_strcmp0.patch
new file mode 100644
index 0000000..17c213d
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/claws-mail-g_strcmp0.patch
@@ -0,0 +1,575 @@
+http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1773
+
+However using if (g_utf8_collate(foo1, foo2)) works and gives good results (at
+least if glibc or locale data are not broken), this usage is bad.
+
+If you need to just compare strings to get equal/non-equal return value, than
+using of four-pass locale wise lexicographic collating is purely superfluous.
+
+Using simpler functions like strcmp() or g_strcmp0() will give the same result
+5-50 times faster.
+
+In attached patch, I replaces all occurrences of upper mentioned use case.
+
+Stanislav Brabec
+
+diff -ur claws-mail-3.6.1.orig/src/addrcustomattr.c claws-mail-3.6.1/src/addrcustomattr.c
+--- claws-mail-3.6.1.orig/src/addrcustomattr.c	2008-07-25 23:01:29.000000000 +0200
++++ claws-mail-3.6.1/src/addrcustomattr.c	2008-11-14 14:27:12.000000000 +0100
+@@ -353,7 +353,7 @@
+ 	gchar *attr;
+ 	gtk_tree_model_get(model, iter, CUSTOM_ATTR_NAME, &attr, -1);
+ 
+-	if (g_utf8_collate(data->attr, attr)==0) {
++	if (g_strcmp0(data->attr, attr)==0) {
+ 		data->path = path; /* signal we found it */
+ 		data->iter = *iter;
+ 		return TRUE;
+diff -ur claws-mail-3.6.1.orig/src/addressbook_foldersel.c claws-mail-3.6.1/src/addressbook_foldersel.c
+--- claws-mail-3.6.1.orig/src/addressbook_foldersel.c	2008-09-09 19:10:50.000000000 +0200
++++ claws-mail-3.6.1/src/addressbook_foldersel.c	2008-11-14 14:27:12.000000000 +0100
+@@ -392,12 +392,19 @@
+        corresponds to what we received */
+ 
+ 	if ( path != NULL ) {
+-		if ( g_utf8_collate(path, _("Any")) == 0 || strcasecmp(path, "Any") ==0 || *path == '\0' )
++		/* FIXME: Do we really need to recognize "anY" (and translated form)? */
++		/* It's a bit more complicated than g_utf8_collate, but still much faster */
++		char *tmp1, *tmp2;
++		tmp1 = g_utf8_casefold(path, -1);
++		tmp2 = g_utf8_casefold(_("Any"), -1); /* FIXME: This should be done only once. */
++		if ( g_strcmp0(tmp1, tmp2) == 0 || g_ascii_strcasecmp(path, "Any") ==0 || *path == '\0' )
+ 			/* consider "Any" (both translated or untranslated forms) and ""
+ 			   as valid addressbook roots */
+ 			folder_path_match.matched = TRUE;
+ 		else
+ 			folder_path_match.folder_path = g_strsplit( path, "/", 256 );
++		g_free(tmp1);
++		g_free(tmp2);
+ 	}
+ 
+ 	addressbook_foldersel_load_data( addrIndex, &folder_path_match );
+diff -ur claws-mail-3.6.1.orig/src/addrgather.c claws-mail-3.6.1/src/addrgather.c
+--- claws-mail-3.6.1.orig/src/addrgather.c	2008-09-09 19:10:50.000000000 +0200
++++ claws-mail-3.6.1/src/addrgather.c	2008-11-14 14:27:12.000000000 +0100
+@@ -507,7 +507,7 @@
+ 	for (i = 0; i < NUM_FIELDS; i++) {
+ 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
+ 					     FALSE);
+-		if (g_utf8_collate(_harv_headerNames_[i], HEADER_FROM) == 0)
++		if (g_strcmp0(_harv_headerNames_[i], HEADER_FROM) == 0)
+ 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
+ 						    TRUE);
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/common/mgutils.c claws-mail-3.6.1/src/common/mgutils.c
+--- claws-mail-3.6.1.orig/src/common/mgutils.c	2007-10-15 19:19:53.000000000 +0200
++++ claws-mail-3.6.1/src/common/mgutils.c	2008-11-14 14:27:12.000000000 +0100
+@@ -356,7 +356,7 @@
+ 		if( strlen( str ) > 0 ) {
+ 			node = list;
+ 			while( node ) {
+-				if( g_utf8_collate( str, node->data ) == 0 )
++				if( g_strcmp0( str, node->data ) == 0 )
+ 					return FALSE;
+ 				node = g_slist_next( node );
+ 			}
+@@ -380,7 +380,7 @@
+ 		if( strlen( str ) > 0 ) {
+ 			node = list;
+ 			while( node ) {
+-				if( g_utf8_collate( str, node->data ) == 0 )
++				if( g_strcmp0( str, node->data ) == 0 )
+ 					return FALSE;
+ 				node = g_list_next( node );
+ 			}
+diff -ur claws-mail-3.6.1.orig/src/compose.c claws-mail-3.6.1/src/compose.c
+--- claws-mail-3.6.1.orig/src/compose.c	2008-10-04 12:58:45.000000000 +0200
++++ claws-mail-3.6.1/src/compose.c	2008-11-14 14:27:12.000000000 +0100
+@@ -2399,7 +2399,7 @@
+ 	for (h_list = compose->header_list; h_list != NULL; h_list = h_list->next) {
+ 		entry = GTK_ENTRY(((ComposeHeaderEntry *)h_list->data)->entry);
+ 		if (gtk_entry_get_text(entry) && 
+-		    !g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
++		    !g_strcmp0(gtk_entry_get_text(entry), mailto)) {
+ 			if (yellow_initialised) {
+ 				gtk_widget_modify_base(
+ 					GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
+@@ -4858,7 +4858,7 @@
+ 		headerentry = ((ComposeHeaderEntry *)list->data);
+ 		headerentryname = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo)))));
+ 
+-		if (g_utf8_collate(headerentryname, to_hdr) == 0) {
++		if (g_strcmp0(headerentryname, to_hdr) == 0) {
+ 			const gchar *entstr = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ 			Xstrdup_a(str, entstr, return -1);
+ 			g_strstrip(str);
+@@ -4886,7 +4886,7 @@
+ 		headerentry = ((ComposeHeaderEntry *)list->data);
+ 		headerentryname = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo)))));
+ 
+-		if (g_utf8_collate(headerentryname, cc_hdr) == 0) {
++		if (g_strcmp0(headerentryname, cc_hdr) == 0) {
+ 			const gchar *strg = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ 			Xstrdup_a(str, strg, return -1);
+ 			g_strstrip(str);
+@@ -5760,7 +5760,7 @@
+     		headerentry = ((ComposeHeaderEntry *)list->data);
+ 		headerentryname = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo)))));
+ 
+-		if (!g_utf8_collate(trans_fieldname, headerentryname)) {
++		if (!g_strcmp0(trans_fieldname, headerentryname)) {
+ 			str = gtk_editable_get_chars(GTK_EDITABLE(headerentry->entry), 0, -1);
+ 			g_strstrip(str);
+ 			if (str[0] != '\0') {
+diff -ur claws-mail-3.6.1.orig/src/customheader.c claws-mail-3.6.1/src/customheader.c
+--- claws-mail-3.6.1.orig/src/customheader.c	2007-07-11 18:33:01.000000000 +0200
++++ claws-mail-3.6.1/src/customheader.c	2008-11-14 14:27:12.000000000 +0100
+@@ -83,7 +83,7 @@
+ 
+ 	for (cur = header_list; cur != NULL; cur = cur->next) {
+ 		chdr = (CustomHeader *)cur->data;
+-		if (!g_utf8_collate(chdr->name, header))
++		if (!g_strcmp0(chdr->name, header))
+ 			return chdr;
+ 	}
+ 
+diff -ur claws-mail-3.6.1.orig/src/exportldif.c claws-mail-3.6.1/src/exportldif.c
+--- claws-mail-3.6.1.orig/src/exportldif.c	2007-10-04 19:36:26.000000000 +0200
++++ claws-mail-3.6.1/src/exportldif.c	2008-11-14 14:27:12.000000000 +0100
+@@ -275,7 +275,7 @@
+ 		UserAttribute *attrib = node->data;
+ 
+ 		node = g_list_next( node );
+-		if( g_utf8_collate( attrib->name, LDIF_TAG_DN ) == 0 ) {
++		if( g_strcmp0( attrib->name, LDIF_TAG_DN ) == 0 ) {
+ 			retVal = g_strdup( attrib->value );
+ 			break;
+ 		}
+diff -ur claws-mail-3.6.1.orig/src/gtk/combobox.c claws-mail-3.6.1/src/gtk/combobox.c
+--- claws-mail-3.6.1.orig/src/gtk/combobox.c	2008-08-29 10:37:19.000000000 +0200
++++ claws-mail-3.6.1/src/gtk/combobox.c	2008-11-14 14:27:12.000000000 +0100
+@@ -101,7 +101,7 @@
+ 	const gchar *curdata;
+ 
+ 	gtk_tree_model_get (GTK_TREE_MODEL(model), iter, 0, &curdata, -1);
+-	if (!g_utf8_collate(data, curdata)) {
++	if (!g_strcmp0(data, curdata)) {
+ 		gtk_combo_box_set_active_iter(combobox, iter);
+ 		return TRUE;
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/jpilot.c claws-mail-3.6.1/src/jpilot.c
+--- claws-mail-3.6.1.orig/src/jpilot.c	2008-10-01 09:10:29.000000000 +0200
++++ claws-mail-3.6.1/src/jpilot.c	2008-11-14 14:27:12.000000000 +0100
+@@ -1322,7 +1322,7 @@
+ 					}
+ 				}
+ 
+-				if( g_utf8_collate( labelName, lbl ) == 0 ) {
++				if( g_strcmp0( labelName, lbl ) == 0 ) {
+ 					ind = i;
+ 					break;
+ 				}
+@@ -1640,7 +1640,7 @@
+ 	if( labelName ) {
+ 		node = pilotFile->customLabels;
+ 		while( node ) {
+-			if( g_utf8_collate( labelName, ( gchar * ) node->data ) == 0 ) {
++			if( g_strcmp0( labelName, ( gchar * ) node->data ) == 0 ) {
+ 				retVal = TRUE;
+ 				break;
+ 			}
+diff -ur claws-mail-3.6.1.orig/src/ldapserver.c claws-mail-3.6.1/src/ldapserver.c
+--- claws-mail-3.6.1.orig/src/ldapserver.c	2007-08-22 18:08:33.000000000 +0200
++++ claws-mail-3.6.1/src/ldapserver.c	2008-11-14 14:27:12.000000000 +0100
+@@ -437,7 +437,7 @@
+ 	/* Search backwards for query */
+ 	while( node ) {
+ 		LdapQuery *qry = node->data;
+-		if( g_utf8_collate( ADDRQUERY_SEARCHVALUE(qry), searchTerm ) == 0 ) {
++		if( g_strcmp0( ADDRQUERY_SEARCHVALUE(qry), searchTerm ) == 0 ) {
+ 			if( qry->agedFlag ) continue;
+ 			if( qry->completed ) {
+ 				/* Found */
+diff -ur claws-mail-3.6.1.orig/src/ldif.c claws-mail-3.6.1/src/ldif.c
+--- claws-mail-3.6.1.orig/src/ldif.c	2008-08-06 21:38:36.000000000 +0200
++++ claws-mail-3.6.1/src/ldif.c	2008-11-14 14:27:12.000000000 +0100
+@@ -536,19 +536,19 @@
+ 	}
+ 	g_strstrip( val );
+ 
+-	if( g_utf8_collate( nm, LDIF_TAG_COMMONNAME ) == 0 ) {
++	if( g_strcmp0( nm, LDIF_TAG_COMMONNAME ) == 0 ) {
+ 		rec->listCName = g_slist_append( rec->listCName, val );
+ 	}
+-	else if( g_utf8_collate( nm, LDIF_TAG_FIRSTNAME ) == 0 ) {
++	else if( g_strcmp0( nm, LDIF_TAG_FIRSTNAME ) == 0 ) {
+ 		rec->listFName = g_slist_append( rec->listFName, val );
+ 	}
+-	else if( g_utf8_collate( nm, LDIF_TAG_LASTNAME ) == 0 ) {
++	else if( g_strcmp0( nm, LDIF_TAG_LASTNAME ) == 0 ) {
+ 		rec->listLName = g_slist_append( rec->listLName, val );
+ 	}
+-	else if( g_utf8_collate( nm, LDIF_TAG_NICKNAME ) == 0 ) {
++	else if( g_strcmp0( nm, LDIF_TAG_NICKNAME ) == 0 ) {
+ 		rec->listNName = g_slist_append( rec->listNName, val );
+ 	}
+-	else if( g_utf8_collate( nm, LDIF_TAG_EMAIL ) == 0 ) {
++	else if( g_strcmp0( nm, LDIF_TAG_EMAIL ) == 0 ) {
+ 		rec->listAddress = g_slist_append( rec->listAddress, val );
+ 	}
+ 	else {
+@@ -759,27 +759,27 @@
+ 			gchar *key = g_strdup( tag );
+ 
+ 			rec = ldif_create_fieldrec( tag );
+-			if( g_utf8_collate( tag, LDIF_TAG_DN ) == 0 ) {
++			if( g_strcmp0( tag, LDIF_TAG_DN ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( "dn" );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_COMMONNAME ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_COMMONNAME ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "Display Name" ) );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_FIRSTNAME ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_FIRSTNAME ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "First Name" ) );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_LASTNAME ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_LASTNAME ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "Last Name" ) );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_NICKNAME ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_NICKNAME ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "Nick Name" ) );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_EMAIL ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_EMAIL ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "Email Address" ) );
+ 			}
+@@ -894,7 +894,7 @@
+ 					/* Add tag to list */
+ 					listTags = g_slist_append( listTags, tagName );
+ 
+-					if( g_utf8_collate(
++					if( g_strcmp0(
+ 						tagName, LDIF_TAG_EMAIL ) == 0 )
+ 					{
+ 						flagMail = TRUE;
+diff -ur claws-mail-3.6.1.orig/src/plugins/bogofilter/bogofilter_gtk.c claws-mail-3.6.1/src/plugins/bogofilter/bogofilter_gtk.c
+--- claws-mail-3.6.1.orig/src/plugins/bogofilter/bogofilter_gtk.c	2008-09-09 19:10:52.000000000 +0200
++++ claws-mail-3.6.1/src/plugins/bogofilter/bogofilter_gtk.c	2008-11-14 14:27:12.000000000 +0100
+@@ -296,7 +296,7 @@
+ 					config->whitelist_ab_folder);
+ 		else
+ 		/* backward compatibility (when translated "Any" was stored) */
+-		if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0)
++		if (g_strcmp0(config->whitelist_ab_folder, _("Any")) == 0)
+ 			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
+ 					config->whitelist_ab_folder);
+ 		else
+@@ -373,7 +373,7 @@
+ 	config->whitelist_ab_folder = gtk_editable_get_chars(
+ 				GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))), 0, -1);
+ 	/* store UNtranslated "Any" */
+-	if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0) {
++	if (g_strcmp0(config->whitelist_ab_folder, _("Any")) == 0) {
+ 		g_free(config->whitelist_ab_folder);
+ 		config->whitelist_ab_folder = g_strdup("Any");
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/plugins/dillo_viewer/dillo_prefs.c claws-mail-3.6.1/src/plugins/dillo_viewer/dillo_prefs.c
+--- claws-mail-3.6.1.orig/src/plugins/dillo_viewer/dillo_prefs.c	2008-08-07 18:38:59.000000000 +0200
++++ claws-mail-3.6.1/src/plugins/dillo_viewer/dillo_prefs.c	2008-11-14 14:27:12.000000000 +0100
+@@ -209,7 +209,7 @@
+ 					_("Any"));
+ 		else
+ 		/* backward compatibility (when translated "Any" was stored) */
+-		if (g_utf8_collate(dillo_prefs.whitelist_ab_folder, _("Any")) == 0)
++		if (g_strcmp0(dillo_prefs.whitelist_ab_folder, _("Any")) == 0)
+ 			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
+ 					dillo_prefs.whitelist_ab_folder);
+ 		else
+@@ -272,7 +272,7 @@
+ 	dillo_prefs.whitelist_ab_folder = gtk_editable_get_chars(
+ 				GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((prefs_page->whitelist_ab_folder_combo)))), 0, -1);
+ 	/* store UNtranslated "Any" */
+-	if (g_utf8_collate(dillo_prefs.whitelist_ab_folder, _("Any")) == 0) {
++	if (g_strcmp0(dillo_prefs.whitelist_ab_folder, _("Any")) == 0) {
+ 		g_free(dillo_prefs.whitelist_ab_folder);
+ 		dillo_prefs.whitelist_ab_folder = g_strdup("Any");
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/plugins/spamassassin/spamassassin_gtk.c claws-mail-3.6.1/src/plugins/spamassassin/spamassassin_gtk.c
+--- claws-mail-3.6.1.orig/src/plugins/spamassassin/spamassassin_gtk.c	2008-09-09 19:10:52.000000000 +0200
++++ claws-mail-3.6.1/src/plugins/spamassassin/spamassassin_gtk.c	2008-11-14 14:27:12.000000000 +0100
+@@ -480,7 +480,7 @@
+ 					config->whitelist_ab_folder);
+ 		else
+ 		/* backward compatibility (when translated "Any" was stored) */
+-		if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0)
++		if (g_strcmp0(config->whitelist_ab_folder, _("Any")) == 0)
+ 			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
+ 					config->whitelist_ab_folder);
+ 		else
+@@ -603,7 +603,7 @@
+ 	config->whitelist_ab_folder = gtk_editable_get_chars(
+ 				GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))), 0, -1);
+ 	/* store UNtranslated "Any" */
+-	if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0) {
++	if (g_strcmp0(config->whitelist_ab_folder, _("Any")) == 0) {
+ 		g_free(config->whitelist_ab_folder);
+ 		config->whitelist_ab_folder = g_strdup("Any");
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/prefs_matcher.c claws-mail-3.6.1/src/prefs_matcher.c
+--- claws-mail-3.6.1.orig/src/prefs_matcher.c	2008-10-08 20:23:51.000000000 +0200
++++ claws-mail-3.6.1/src/prefs_matcher.c	2008-11-14 14:27:12.000000000 +0100
+@@ -1484,10 +1484,10 @@
+ 		if (*expr == '\0') {
+ 			gchar *tmp;
+ 
+-			if (g_utf8_collate(header, Q_("Filtering Matcher Menu|All")) == 0)
++			if (g_strcmp0(header, Q_("Filtering Matcher Menu|All")) == 0)
+ 				tmp = g_strdup(_("all addresses in all headers"));
+ 			else
+-			if (g_utf8_collate(header, _("Any")) == 0)
++			if (g_strcmp0(header, _("Any")) == 0)
+ 				tmp = g_strdup(_("any address in any header"));
+ 			else
+ 				tmp = g_strdup_printf(_("the address(es) in header '%s'"), header);
+@@ -1499,12 +1499,12 @@
+ 		    return NULL;
+ 		}
+ 		/* store UNtranslated "Any"/"All" in matcher expressions */
+-		if (g_utf8_collate(header, Q_("Filtering Matcher Menu|All")) == 0)
++		if (g_strcmp0(header, Q_("Filtering Matcher Menu|All")) == 0)
+ 			header = "All";
+ 		else
+-			if (g_utf8_collate(header, _("Any")) == 0)
++			if (g_strcmp0(header, _("Any")) == 0)
+ 				header = "Any";
+-		if (g_utf8_collate(expr, _("Any")) == 0)
++		if (g_strcmp0(expr, _("Any")) == 0)
+ 			expr = "Any";
+ 		break;
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/prefs_toolbar.c claws-mail-3.6.1/src/prefs_toolbar.c
+--- claws-mail-3.6.1.orig/src/prefs_toolbar.c	2008-09-09 19:10:50.000000000 +0200
++++ claws-mail-3.6.1/src/prefs_toolbar.c	2008-11-14 14:27:12.000000000 +0100
+@@ -391,7 +391,7 @@
+ 		gtk_tree_model_get(model_set, &iter,
+ 				   SET_EVENT, &entry, 
+ 				   -1);
+-		if (g_utf8_collate(chosen_action, entry) == 0) 
++		if (g_strcmp0(chosen_action, entry) == 0) 
+ 			result = TRUE;
+ 		g_free(entry);			
+ 	} while (!result && gtk_tree_model_iter_next(model_set, &iter));
+@@ -551,7 +551,7 @@
+ 						prefs_toolbar->item_func_combo));
+ 						
+ 			if (is_duplicate(prefs_toolbar, icon_event)
+-			&& g_utf8_collate(icon_event, set_event) != 0){
++			&& g_strcmp0(icon_event, set_event) != 0){
+ 				alertpanel_error(ERROR_MSG);
+ 				g_free(icon_event);
+ 				g_free(set_event);
+@@ -1179,7 +1179,7 @@
+ 	gtk_button_set_image(GTK_BUTTON(prefs_toolbar->icon_button),
+ 			     gtk_image_new_from_pixbuf(pix));
+ 	
+-	if (g_utf8_collate(toolbar_ret_descr_from_val(A_SEPARATOR), descr) == 0) {
++	if (g_strcmp0(toolbar_ret_descr_from_val(A_SEPARATOR), descr) == 0) {
+ 		gtk_button_set_label(GTK_BUTTON(prefs_toolbar->icon_button),
+ 				    _("None"));
+ 		g_free(prefs_toolbar->item_icon_file);
+@@ -1196,7 +1196,7 @@
+ 	gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry), 
+ 			   icon_text);
+ 
+-	if (g_utf8_collate(toolbar_ret_descr_from_val(A_CLAWS_ACTIONS), descr) == 0) {
++	if (g_strcmp0(toolbar_ret_descr_from_val(A_CLAWS_ACTIONS), descr) == 0) {
+ 		gtk_combo_box_set_active(GTK_COMBO_BOX(
+ 			prefs_toolbar->item_type_combo), ITEM_USER_ACTION);
+ 
+@@ -1205,7 +1205,7 @@
+ 			gchar *item_string;
+ 			get_action_name((gchar *)cur2->data, &item_string);
+ 			
+-			if(g_utf8_collate(item_string, icon_text) == 0) {
++			if(g_strcmp0(item_string, icon_text) == 0) {
+ 				gtk_combo_box_set_active(
+ 					GTK_COMBO_BOX(prefs_toolbar->item_action_combo),
+ 					item_num);
+@@ -1231,7 +1231,7 @@
+ 	for (cur = prefs_toolbar->combo_action_list, item_num = 0; cur != NULL; 
+ 	     cur = cur->next) {
+ 		gchar *item_str = (gchar*)cur->data;
+-		if (g_utf8_collate(item_str, descr) == 0) {
++		if (g_strcmp0(item_str, descr) == 0) {
+ 			gtk_combo_box_set_active(
+ 				GTK_COMBO_BOX(prefs_toolbar->item_func_combo),
+ 				item_num);
+diff -ur claws-mail-3.6.1.orig/src/procmime.c claws-mail-3.6.1/src/procmime.c
+--- claws-mail-3.6.1.orig/src/procmime.c	2008-10-01 09:10:29.000000000 +0200
++++ claws-mail-3.6.1/src/procmime.c	2008-11-14 14:27:12.000000000 +0100
+@@ -1020,14 +1020,6 @@
+ 	return hash_result;
+ }
+ 
+-static gint procmime_str_equal(gconstpointer gptr1, gconstpointer gptr2)
+-{
+-	const char *str1 = gptr1;
+-	const char *str2 = gptr2;
+-
+-	return !g_utf8_collate(str1, str2);
+-}
+-
+ static GHashTable *procmime_get_mime_type_table(void)
+ {
+ 	GHashTable *table = NULL;
+@@ -1040,7 +1032,7 @@
+ 		if (!mime_type_list) return NULL;
+ 	}
+ 
+-	table = g_hash_table_new(procmime_str_hash, procmime_str_equal);
++	table = g_hash_table_new(procmime_str_hash, g_str_equal);
+ 
+ 	for (cur = mime_type_list; cur != NULL; cur = cur->next) {
+ 		gint i;
+diff -ur claws-mail-3.6.1.orig/src/summaryview.c claws-mail-3.6.1/src/summaryview.c
+--- claws-mail-3.6.1.orig/src/summaryview.c	2008-10-09 20:17:53.000000000 +0200
++++ claws-mail-3.6.1/src/summaryview.c	2008-11-14 14:27:12.000000000 +0100
+@@ -4240,7 +4240,7 @@
+ 					g_strdup_printf("%s",
+ 							account->address);
+ 			
+-			if (g_utf8_collate(from_name, msginfo->from) == 0) {
++			if (g_strcmp0(from_name, msginfo->from) == 0) {
+ 				g_free(from_name);
+ 				found = TRUE;
+ 				break;
+diff -ur claws-mail-3.6.1.orig/src/toolbar.c claws-mail-3.6.1/src/toolbar.c
+--- claws-mail-3.6.1.orig/src/toolbar.c	2008-09-13 12:07:43.000000000 +0200
++++ claws-mail-3.6.1/src/toolbar.c	2008-11-14 14:39:07.000000000 +0100
+@@ -236,7 +236,7 @@
+ 	gint i;
+ 
+ 	for (i = 0; i < N_ACTION_VAL; i++) {
+-		if (g_utf8_collate(gettext(toolbar_text[i].descr), descr) == 0)
++		if (g_strcmp0(gettext(toolbar_text[i].descr), descr) == 0)
+ 				return i;
+ 	}
+ 	
+@@ -255,7 +255,7 @@
+ 	gint i;
+ 	
+ 	for (i = 0; i < N_ACTION_VAL; i++) {
+-		if (g_utf8_collate(toolbar_text[i].index_str, text) == 0)
++		if (g_strcmp0(toolbar_text[i].index_str, text) == 0)
+ 				return i;
+ 	}
+ 
+@@ -346,11 +346,11 @@
+ 		name = ((XMLAttr *)attr->data)->name;
+ 		value = ((XMLAttr *)attr->data)->value;
+ 		
+-		if (g_utf8_collate(name, TOOLBAR_ICON_FILE) == 0) 
++		if (g_strcmp0(name, TOOLBAR_ICON_FILE) == 0) 
+ 			item->file = g_strdup (value);
+-		else if (g_utf8_collate(name, TOOLBAR_ICON_TEXT) == 0)
++		else if (g_strcmp0(name, TOOLBAR_ICON_TEXT) == 0)
+ 			item->text = g_strdup (gettext(value));
+-		else if (g_utf8_collate(name, TOOLBAR_ICON_ACTION) == 0)
++		else if (g_strcmp0(name, TOOLBAR_ICON_ACTION) == 0)
+ 			item->index = toolbar_ret_val_from_text(value);
+ 		if (item->index == -1 && !strcmp(value, "A_DELETE")) {
+ 			/* switch button */
+@@ -821,7 +821,7 @@
+ 
+ 				action_p = strstr(action, ": ");
+ 				action_p[0] = 0x00;
+-				if (g_utf8_collate(act->name, action) == 0) {
++				if (g_strcmp0(act->name, action) == 0) {
+ 					found = TRUE;
+ 					g_free(action);
+ 					break;
+diff -ur claws-mail-3.6.1.orig/src/vcard.c claws-mail-3.6.1/src/vcard.c
+--- claws-mail-3.6.1.orig/src/vcard.c	2008-08-06 21:38:43.000000000 +0200
++++ claws-mail-3.6.1/src/vcard.c	2008-11-14 14:27:12.000000000 +0100
+@@ -348,7 +348,7 @@
+ 				str = nodeRemarks->data;
+ 				if( nodeRemarks ) {
+ 					if( str ) {
+-						if( g_utf8_collate( str, "internet" ) != 0 ) {
++						if( g_strcmp0( str, "internet" ) != 0 ) {
+ 							if( *str != '\0' )
+ 								addritem_email_set_remarks( email, str );
+ 						}
+@@ -442,7 +442,7 @@
+ 		/* g_print( "\ttype:  %s\n", tagtype ); */
+ 		/* g_print( "\tvalue: %s\n", tagvalue ); */
+ 
+-		if( g_utf8_collate( tagtype, VCARD_TYPE_QP ) == 0 ) {
++		if( g_strcmp0( tagtype, VCARD_TYPE_QP ) == 0 ) {
+ 			gchar *tmp;
+ 			/* Quoted-Printable: could span multiple lines */
+ 			tagvalue = vcard_read_qp( cardFile, tagvalue );
+@@ -452,26 +452,26 @@
+ 			/* g_print( "QUOTED-PRINTABLE !!! final\n>%s<\n", tagvalue ); */
+ 		}
+ 
+-		if( g_utf8_collate( tagname, VCARD_TAG_START ) == 0 &&
++		if( g_strcmp0( tagname, VCARD_TAG_START ) == 0 &&
+ 			g_ascii_strcasecmp( tagvalue, VCARD_NAME ) == 0 ) {
+ 			/* g_print( "start card\n" ); */
+ 			vcard_free_lists( listName, listAddress, listRemarks, listID );
+ 			listName = listAddress = listRemarks = listID = NULL;
+ 		}
+-		if( g_utf8_collate( tagname, VCARD_TAG_FULLNAME ) == 0 ) {
++		if( g_strcmp0( tagname, VCARD_TAG_FULLNAME ) == 0 ) {
+ 			/* g_print( "- full name: %s\n", tagvalue ); */
+ 			listName = g_slist_append( listName, g_strdup( tagvalue ) );
+ 		}
+-		if( g_utf8_collate( tagname, VCARD_TAG_EMAIL ) == 0 ) {
++		if( g_strcmp0( tagname, VCARD_TAG_EMAIL ) == 0 ) {
+ 			/* g_print( "- address: %s\n", tagvalue ); */
+ 			listAddress = g_slist_append( listAddress, g_strdup( tagvalue ) );
+ 			listRemarks = g_slist_append( listRemarks, g_strdup( tagtype ) );
+ 		}
+-		if( g_utf8_collate( tagname, VCARD_TAG_UID ) == 0 ) {
++		if( g_strcmp0( tagname, VCARD_TAG_UID ) == 0 ) {
+ 			/* g_print( "- id: %s\n", tagvalue ); */
+ 			listID = g_slist_append( listID, g_strdup( tagvalue ) );
+ 		}
+-		if( g_utf8_collate( tagname, VCARD_TAG_END ) == 0 &&
++		if( g_strcmp0( tagname, VCARD_TAG_END ) == 0 &&
+ 			g_ascii_strcasecmp( tagvalue, VCARD_NAME ) == 0 ) {
+ 			/* vCard is complete */
+ 			/* g_print( "end card\n--\n" ); */
+@@ -659,7 +659,7 @@
+ 				tagtemp = NULL;
+ 			}
+ 
+-			if( g_utf8_collate( tagtype, VCARD_TYPE_QP ) == 0 ) {
++			if( g_strcmp0( tagtype, VCARD_TYPE_QP ) == 0 ) {
+ 				gchar *tmp;
+ 				/* Quoted-Printable: could span multiple lines */
+ 				tagvalue = vcard_read_qp( cardFile, tagvalue );
+@@ -667,11 +667,11 @@
+ 				g_free(tagvalue);
+ 				tagvalue=tmp;
+ 			}
+-			if( g_utf8_collate( tagname, VCARD_TAG_START ) == 0 &&
++			if( g_strcmp0( tagname, VCARD_TAG_START ) == 0 &&
+ 				g_ascii_strcasecmp( tagvalue, VCARD_NAME ) == 0 ) {
+ 				haveStart = TRUE;
+ 			}
+-			if( g_utf8_collate( tagname, VCARD_TAG_END ) == 0 &&
++			if( g_strcmp0( tagname, VCARD_TAG_END ) == 0 &&
+ 				g_ascii_strcasecmp( tagvalue, VCARD_NAME ) == 0 ) {
+ 				/* vCard is complete */
+ 				if( haveStart ) cardFile->retVal = MGU_SUCCESS;
diff --git a/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/desktop.patch b/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/desktop.patch
new file mode 100644
index 0000000..c5ed7a9
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/desktop.patch
@@ -0,0 +1,19 @@
+Index: claws-mail-2.9.1/claws-mail.desktop
+===================================================================
+--- claws-mail-2.9.1.orig/claws-mail.desktop	2007-04-24 17:40:20.000000000 +0100
++++ claws-mail-2.9.1/claws-mail.desktop	2007-04-25 07:08:36.000000000 +0100
+@@ -1,11 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=Claws Mail
++Name=Mail
+ Exec=claws-mail
+ Icon=claws-mail
+-Info="Claws Mail"
++Info=Email Application
+ Categories=GTK;Network;Email;
+-Comment="Gtk+ based Mail Client"
++Comment=Email Application
+ Terminal=false
+ Type=Application
+ StartupNotify=true
diff --git a/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/duplicate-header.patch b/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/duplicate-header.patch
new file mode 100644
index 0000000..3c25ca1
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/duplicate-header.patch
@@ -0,0 +1,10 @@
+--- claws-mail-3.6.1/src/gtk/Makefile.am-orig	2008-10-10 00:17:55.000000000 -0700
++++ claws-mail-3.6.1/src/gtk/Makefile.am	2010-03-28 16:08:40.000000000 -0700
+@@ -62,7 +62,6 @@ clawsgtkinclude_HEADERS = \
+ 	menu.h \
+ 	pluginwindow.h \
+ 	prefswindow.h \
+-	gtkvscrollbutton.h \
+ 	progressdialog.h \
+ 	quicksearch.h \
+ 	sslcertwindow.h \
diff --git a/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/glib-2.32.patch b/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/glib-2.32.patch
new file mode 100644
index 0000000..c0faedb
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/glib-2.32.patch
@@ -0,0 +1,11 @@
+--- claws-mail-3.6.1.orig/src/common/defs.h	2007-12-18 09:20:54.000000000 +0100
++++ claws-mail-3.6.1/src/common/defs.h	2012-05-06 08:17:56.049692494 +0200
+@@ -24,8 +24,6 @@
+ #  include "config.h"
+ #endif
+ 
+-#include <glibconfig.h>
+-
+ #ifdef G_OS_WIN32
+ #  include <glib/gwin32.h>
+ #endif
diff --git a/meta-oe/recipes-sato/claws-mail/claws-mail_3.6.1.bb b/meta-oe/recipes-sato/claws-mail/claws-mail_3.6.1.bb
new file mode 100644
index 0000000..3c858d0
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/claws-mail_3.6.1.bb
@@ -0,0 +1,62 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ libetpan openssl aspell"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e059bde2972c1790af786f3e86bac22e"
+
+PR = "r1"
+
+inherit autotools pkgconfig gettext
+
+# translation patch: http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1774
+SRC_URI = "\
+        ${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2;name=archive \
+        http://www.penguin.cz/~utx/ftp/claws-mail/claws-mail-${PV}-po-update.patch;name=patch \
+        file://desktop.patch \
+        file://claws-mail-g_strcmp0.patch \
+        file://duplicate-header.patch \
+        file://glib-2.32.patch \
+        "
+SRC_URI[archive.md5sum] = "761b8ae2d574588460a0fb1ea4931ccb"
+SRC_URI[archive.sha256sum] = "67337a4a1a5a5ce09f2a38422b7a6fc481e4747f74d4ddedd130d4fb06fc3907"
+SRC_URI[patch.md5sum] = "e8ff3fabf1ed47f3b11a9cdc36b026bd"
+SRC_URI[patch.sha256sum] = "767258dd7c966e14ed519affe4c0da93e8fff66ee5fe9158413c8d163af72db8"
+
+do_configure_append() {
+    cd po ; for PO in *.po ; do MO=`echo $PO | sed s/\\.po//`.gmo ; if ! test -f $MO ; then msgfmt $PO -o $MO ; fi ; done
+}
+
+# FIXME: maemo builds may want --enable-maemo
+# FIXME: some platforms may want --enable-generic-umpc
+EXTRA_OECONF = " \
+        --disable-aspell-test \
+        --enable-aspell \
+        --disable-manual \
+        --disable-crash-dialog \
+        --disable-jpilot \
+        --disable-trayicon-plugin \
+        --disable-spamassassin-plugin \
+        --disable-bogofilter-plugin \
+        --disable-pgpcore-plugin \
+        --disable-pgpmime-plugin \
+        --disable-pgpinline-plugin \
+        --disable-dillo-viewer-plugin \
+        --disable-clamav-plugin \
+        --disable-gnomeprint \
+        --disable-valgrind \
+        "
+
+# Remove enchant references:
+do_install_prepend() {
+    sed -i -e 's:${STAGING_INCDIR}:${includedir}:g;s:${STAGING_LIBDIR}:${libdir}:g' claws-mail.pc
+}
+
+# Work-around broken GPE icon lookup:
+do_install_append() {
+    rm -r ${D}${datadir}/icons
+    install -d ${D}${datadir}/pixmaps
+    install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
+    sed -i 's/Icon=[^.]*$/&.png/' ${D}${datadir}/applications/claws-mail.desktop
+}
+
+RSUGGESTS_${PN} = "claws-plugin-gtkhtml2-viewer claws-plugin-mailmbox claws-plugin-rssyl" 
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb b/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb
new file mode 100644
index 0000000..118543b
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb
@@ -0,0 +1,19 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent plugins"
+DEPENDS = "claws-mail gtkhtml2 curl"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=977f04a8048c04684e521c06e2844a94"
+
+SRC_URI = "http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-${PV}.tar.gz"
+SRC_URI[md5sum] = "a6c9dfa6f969ccd844796a5724b52167"
+SRC_URI[sha256sum] = "4d41f6d961efaac0f51705e5052bac732bc0bdafee2ef2082a9cf9d89f183ae5"
+
+inherit autotools pkgconfig gettext
+
+S = "${WORKDIR}/gtkhtml2_viewer-${PV}"
+
+FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
+FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug"
+FILES_${PN}-dev += "${libdir}/claws-mail/plugins/*.la"
+FILES_${PN}-staticdev = "${libdir}/claws-mail/plugins/*.a"
+
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox-1.14/claws-plugin-mailmbox-fixup.patch b/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox-1.14/claws-plugin-mailmbox-fixup.patch
new file mode 100644
index 0000000..f8cce25
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox-1.14/claws-plugin-mailmbox-fixup.patch
@@ -0,0 +1,218 @@
+Index: mailmbox-1.14/src/plugin_gtk.c
+===================================================================
+--- mailmbox-1.14.orig/src/plugin_gtk.c	2008-12-04 06:18:50.000000000 +0300
++++ mailmbox-1.14/src/plugin_gtk.c	2008-12-04 06:49:40.000000000 +0300
+@@ -35,39 +35,41 @@
+
+ #include "pluginconfig.h"
+
+-static void new_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
+-static void delete_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
+-static void rename_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
+-static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
+-static void update_tree_cb(FolderView *folderview, guint action, GtkWidget *widget);
+-static void remove_mailbox_cb(FolderView *folderview, guint action, GtkWidget *widget);
+-static void add_mailbox(gpointer callback_data, guint callback_action, GtkWidget *widget);
+-
+-static GtkItemFactoryEntry claws_mailmbox_popup_entries[] =
+-{
+-	{N_("/Create _new folder..."),	 NULL, new_folder_cb,     0, NULL},
+-	{N_("/---"),			 NULL, NULL,              0, "<Separator>"},
+-	{N_("/_Rename folder..."),	 NULL, rename_folder_cb,  0, NULL},
+-	{N_("/M_ove folder..."), 	 NULL, move_folder_cb,    0, NULL},
+-	{N_("/Cop_y folder..."),	 NULL, move_folder_cb,    1, NULL},
+-	{N_("/---"),			 NULL, NULL,              0, "<Separator>"},
+-	{N_("/_Delete folder"),		 NULL, delete_folder_cb,  0, NULL},
+-	{N_("/---"),			 NULL, NULL,              0, "<Separator>"},
+-	{N_("/_Check for new messages"), NULL, update_tree_cb,    0, NULL},
+-	{N_("/C_heck for new folders"),  NULL, update_tree_cb,    1, NULL},
+-	{N_("/R_ebuild folder tree"),	 NULL, update_tree_cb,    2, NULL},
+-	{N_("/---"),			 NULL, NULL, 		  0, "<Separator>"},
+-	{N_("/Remove _mailbox"),	 NULL, remove_mailbox_cb, 0, NULL},
+-	{N_("/---"),			 NULL, NULL, 		  0, "<Separator>"},
++static void new_folder_cb(GtkAction *action, gpointer data);
++static void delete_folder_cb(GtkAction *action, gpointer data);
++static void rename_folder_cb(GtkAction *action, gpointer data);
++static void move_folder_cb(GtkAction *action, gpointer data);
++static void update_tree_cb(GtkAction *action, gpointer data);
++static void remove_mailbox_cb(GtkAction *action, gpointer data);
++static void add_mailbox(gpointer callback_data, guint callback_action, gpointer data);
++
++static GtkActionEntry claws_mailmbox_popup_entries[] =
++{
++	{"FolderViewPopup/CreateNewFolder",	NULL, N_("/Create _new folder..."), NULL, NULL, G_CALLBACK(new_folder_cb) },
++	{"FolderViewPopup/---",			NULL, N_("/---") },
++	{"FolderViewPopup/RenameFolder",	NULL, N_("/_Rename folder..."), NULL, NULL, G_CALLBACK(rename_folder_cb) },
++	{"FolderViewPopup/MoveFolder",		NULL, N_("/M_ove folder..."), NULL, NULL, G_CALLBACK(move_folder_cb) },
++	{"FolderViewPopup/CopyFolder",		NULL, N_("/Cop_y folder..."), NULL, NULL, G_CALLBACK(move_folder_cb) },
++	{"FolderViewPopup/---",			NULL, N_("/---") },
++	{"FolderViewPopup/DeleteFolder",	NULL, N_("/_Delete folder"), NULL, NULL, G_CALLBACK(delete_folder_cb) },
++	{"FolderViewPopup/---",			NULL, N_("/---") },
++	{"FolderViewPopup/CheckNewMessages",	NULL, N_("/_Check for new messages"), NULL, NULL, G_CALLBACK(update_tree_cb) },
++	{"FolderViewPopup/CheckNewFolders",	NULL, N_("/C_heck for new folders"), NULL, NULL, G_CALLBACK(update_tree_cb) },
++	{"FolderViewPopup/RebuildfTree",	NULL, N_("/R_ebuild folder tree"), NULL, NULL, G_CALLBACK(update_tree_cb) },
++	{"FolderViewPopup/---",			NULL, N_("/---") },
++	{"FolderViewPopup/RemoveMailbox",	NULL, N_("/Remove _mailbox"), NULL, NULL, G_CALLBACK(remove_mailbox_cb) },
+ };
+
+-static void set_sensitivity(GtkItemFactory *factory, FolderItem *item);
++static void set_sensitivity(GtkUIManager *factory, FolderItem *item);
+
+ static FolderViewPopup claws_mailmbox_popup =
+ {
+	"mailmbox",
+	"<MailmboxFolder>",
+-	NULL,
++	claws_mailmbox_popup_entries,
++	G_N_ELEMENTS(claws_mailmbox_popup_entries),
++	NULL, 0,
++	NULL, 0, 0, NULL, NULL,
+	set_sensitivity
+ };
+
+@@ -85,11 +87,6 @@
+	GtkItemFactory *ifactory;
+	MainWindow *mainwin = mainwindow_get_mainwindow();
+
+-	n_entries = sizeof(claws_mailmbox_popup_entries) /
+-		sizeof(claws_mailmbox_popup_entries[0]);
+-	for (i = 0; i < n_entries; i++)
+-		claws_mailmbox_popup.entries = g_slist_append(claws_mailmbox_popup.entries, &claws_mailmbox_popup_entries[i]);
+-
+	folderview_register_popup(&claws_mailmbox_popup);
+
+	ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+@@ -115,7 +112,7 @@
+	gtk_item_factory_delete_item(ifactory, mainwindow_add_mailbox.path);
+ }
+
+-static void set_sensitivity(GtkItemFactory *factory, FolderItem *item)
++static void set_sensitivity(GtkUIManager *factory, FolderItem *item)
+ {
+ #define SET_SENS(name, sens) \
+	menu_set_sensitive(factory, name, sens)
+@@ -132,10 +129,13 @@
+ #undef SET_SENS
+ }
+
+-static void update_tree_cb(FolderView *folderview, guint action,
+-			   GtkWidget *widget)
++#define DO_ACTION(name, act)	{ if (!strcmp(a_name, name)) act; }
++
++static void update_tree_cb(GtkAction *action, gpointer data)
+ {
++	FolderView *folderview = (FolderView *)data;
+	FolderItem *item;
++	const gchar *a_name = gtk_action_get_name(action);
+
+	item = folderview_get_selected_item(folderview);
+	g_return_if_fail(item != NULL);
+@@ -144,16 +144,12 @@
+
+	g_return_if_fail(item->folder != NULL);
+
+-	if (action == 0)
+-		folderview_check_new(item->folder);
+-	else if (action == 1)
+-		folderview_rescan_tree(item->folder, FALSE);
+-	else if (action == 2)
+-		folderview_rescan_tree(item->folder, TRUE);
++	DO_ACTION("FolderViewPopup/CheckNewMessages", folderview_check_new(item->folder));
++	DO_ACTION("FolderViewPopup/CheckNewFolders", folderview_rescan_tree(item->folder, FALSE));
++	DO_ACTION("FolderViewPopup/RebuildTree", folderview_rescan_tree(item->folder, FALSE));
+ }
+
+-static void add_mailbox(gpointer callback_data, guint callback_action,
+-                        GtkWidget *widget)
++static void add_mailbox(gpointer callback_data, guint callback_action, gpointer data)
+ {
+	MainWindow *mainwin = (MainWindow *) callback_data;
+	gchar *path, *basename;
+@@ -193,10 +189,10 @@
+	return;
+ }
+
+-static void new_folder_cb(FolderView *folderview, guint action,
+-		          GtkWidget *widget)
++static void new_folder_cb(GtkAction *action, gpointer data)
+ {
+-	GtkCTree *ctree = GTK_CTREE(folderview->ctree);
++	FolderView *folderview = (FolderView *)data;
++	GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+	FolderItem *item;
+	FolderItem *new_item;
+	gchar *new_folder;
+@@ -245,9 +241,10 @@
+	folder_write_list();
+ }
+
+-static void remove_mailbox_cb(FolderView *folderview, guint action, GtkWidget *widget)
++static void remove_mailbox_cb(GtkAction *action, gpointer data)
+ {
+-	GtkCTree *ctree = GTK_CTREE(folderview->ctree);
++	FolderView *folderview = (FolderView *)data;
++	GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+	GtkCTreeNode *node;
+	FolderItem *item;
+	gchar *name;
+@@ -276,10 +273,10 @@
+	folder_destroy(item->folder);
+ }
+
+-static void delete_folder_cb(FolderView *folderview, guint action,
+-			     GtkWidget *widget)
++static void delete_folder_cb(GtkAction *action, gpointer data)
+ {
+-	GtkCTree *ctree = GTK_CTREE(folderview->ctree);
++	FolderView *folderview = (FolderView *)data;
++	GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+	FolderItem *item;
+	gchar *message, *name;
+	AlertValue avalue;
+@@ -329,24 +326,41 @@
+
+ }
+
+-static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widget)
++static void move_folder_cb(GtkAction *action, gpointer data)
++{
++	FolderView *folderview = (FolderView *)data;
++	FolderItem *from_folder = NULL, *to_folder = NULL;
++
++	from_folder = folderview_get_selected_item(folderview);
++	if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class())
++		return;
++
++	to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, TRUE);
++	if (!to_folder)
++		return;
++
++	folderview_move_folder(folderview, from_folder, to_folder, 0);
++}
++
++static void copy_folder_cb(GtkAction *action, gpointer data)
+ {
++	FolderView *folderview = (FolderView *)data;
+	FolderItem *from_folder = NULL, *to_folder = NULL;
+
+	from_folder = folderview_get_selected_item(folderview);
+	if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class())
+		return;
+
+-	to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL);
++	to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, TRUE);
+	if (!to_folder)
+		return;
+
+-	folderview_move_folder(folderview, from_folder, to_folder, action);
++	folderview_move_folder(folderview, from_folder, to_folder, 1);
+ }
+
+-static void rename_folder_cb(FolderView *folderview, guint action,
+-			     GtkWidget *widget)
++static void rename_folder_cb(GtkAction *action, gpointer data)
+ {
++	FolderView *folderview = (FolderView *)data;
+	FolderItem *item, *parent;
+	gchar *new_folder;
+	gchar *name;
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb b/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb
new file mode 100644
index 0000000..8cb7fd0
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb
@@ -0,0 +1,19 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent plugins"
+DEPENDS = "claws-mail"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz\
+           file://claws-plugin-mailmbox-fixup.patch"
+SRC_URI[md5sum] = "0a5907628c1112cf8e5fe251ed1db551"
+SRC_URI[sha256sum] = "d8d948807b4a09eb6da392161564c4bcee01070c9c86483889f93f1b14fd0870"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/mailmbox-${PV}"
+
+FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
+FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug"
+FILES_${PN}-dev += "${libdir}/claws-mail/plugins/*.la"
+FILES_${PN}-staticdev = "${libdir}/claws-mail/plugins/*.a"
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.18.bb b/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.18.bb
new file mode 100644
index 0000000..767c672
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.18.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent plugins"
+DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0c2348e0a084e573f0220f5e45d8097e"
+
+SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz"
+SRC_URI[md5sum] = "7dfd8ae53cf1ed88d5e4150f77b9df63"
+SRC_URI[sha256sum] = "b02eff373fd66daec2ffd75afd3ad97c32c45679883ee65b21aa50fec92fc752"
+
+inherit autotools pkgconfig gettext
+
+S = "${WORKDIR}/rssyl-${PV}"
+
+FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
+FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug"
+FILES_${PN}-dev += "${libdir}/claws-mail/plugins/*.la"
+FILES_${PN}-staticdev = "${libdir}/claws-mail/plugins/*.a"
diff --git a/meta-oe/recipes-sato/claws-mail/sylpheed/glib-2.32.patch b/meta-oe/recipes-sato/claws-mail/sylpheed/glib-2.32.patch
new file mode 100644
index 0000000..1520e57
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/sylpheed/glib-2.32.patch
@@ -0,0 +1,11 @@
+--- sylpheed-2.7.1.orig/libsylph/defs.h	2009-06-10 09:55:46.000000000 +0200
++++ sylpheed-2.7.1/libsylph/defs.h	2012-05-06 08:28:27.514746256 +0200
+@@ -24,8 +24,6 @@
+ #  include "config.h"
+ #endif
+ 
+-#include <glibconfig.h>
+-
+ #ifdef G_OS_WIN32
+ #  include <glib/gwin32.h>
+ #endif
diff --git a/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb b/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb
new file mode 100644
index 0000000..d0da532
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb
@@ -0,0 +1,37 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ gpgme gnutls"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \
+                    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+PR = "r1"
+
+SRC_URI = "http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-${PV}.tar.bz2 \
+  file://glib-2.32.patch \
+"
+SRC_URI[md5sum] = "1f470525c1fbe53253813a0978c18228"
+SRC_URI[sha256sum] = "8bb6457db4e2eea1877b487d9ac8513546372db9a6a2e4271d11229f4af84e23"
+
+FILES_${PN} += "${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN}-doc += "${datadir}"
+
+EXTRA_OECONF = "--disable-ssl --enable-gnutls"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+do_configure_prepend() {
+    mkdir -p m4
+    for i in $(find ${S} -name "Makefile.am") ; do
+        sed -i s:'-I$(includedir)'::g $i
+    done
+}
+
+inherit autotools
+
+do_install_append() {
+    install -d ${D}${datadir}/applications
+    install -m 0644 sylpheed.desktop ${D}${datadir}/applications/
+    install -d ${D}${datadir}/pixmaps
+    install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/
+}
-- 
1.7.8.6

[meta-oe][PATCH 16/24] python-epydoc, python-gdata, python-ldap, python-webdav: import from meta-smartphone

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-devtools/python/python-epydoc_3.0.1.bb |   18 ++++++++++++++++++
 .../recipes-devtools/python/python-gdata_1.2.4.bb  |   18 ++++++++++++++++++
 .../python/python-ldap/setup.cfg.patch             |   14 ++++++++++++++
 .../recipes-devtools/python/python-ldap_2.3.9.bb   |   13 +++++++++++++
 .../recipes-devtools/python/python-webdav_0.1.2.bb |   19 +++++++++++++++++++
 5 files changed, 82 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/python/python-epydoc_3.0.1.bb
 create mode 100644 meta-oe/recipes-devtools/python/python-gdata_1.2.4.bb
 create mode 100644 meta-oe/recipes-devtools/python/python-ldap/setup.cfg.patch
 create mode 100644 meta-oe/recipes-devtools/python/python-ldap_2.3.9.bb
 create mode 100644 meta-oe/recipes-devtools/python/python-webdav_0.1.2.bb

diff --git a/meta-oe/recipes-devtools/python/python-epydoc_3.0.1.bb b/meta-oe/recipes-devtools/python/python-epydoc_3.0.1.bb
new file mode 100644
index 0000000..4ec0668
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-epydoc_3.0.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Epydoc is a tool for generating API documentation for Python modules, based on their docstrings" 
+SECTION = "devel/python" 
+LICENSE = "MIT" 
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=011c0d78eb6054d731c879132d7313f0"
+HOMEPAGE = "http://epydoc.sourceforge.net/" 
+SRCNAME = "epydoc" 
+DEPENDS += "python"
+DEPENDS_virtclass-native += "python-native"
+
+SRC_URI = "http://downloads.sourceforge.net/project/${SRCNAME}/${SRCNAME}/${PV}/${SRCNAME}-${PV}.tar.gz" 
+SRC_URI[md5sum] = "cdd6f6c76dd8bab5e653a343a0544294"
+SRC_URI[sha256sum] = "d4e5c8d90937d01b05170f592c1fa9b29e9ed0498dfe7f0eb2a3af61725b6ad1"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}" 
+
+inherit distutils 
+
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/python/python-gdata_1.2.4.bb b/meta-oe/recipes-devtools/python/python-gdata_1.2.4.bb
new file mode 100644
index 0000000..7351759
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-gdata_1.2.4.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Google Data APIs Python Client Library"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://README.txt;md5=473bd4dff0ddca1f958244b2dc7a162c"
+HOMEPAGE = "http://code.google.com/p/gdata-python-client/"
+
+inherit distutils
+
+SRC_URI = "http://gdata-python-client.googlecode.com/files/gdata.py-${PV}.tar.gz"
+SRC_URI[md5sum] = "521f33a377d64f8a6505ba119415b787"
+SRC_URI[sha256sum] = "fc5ddb8f76b17abd728721a0e0177ea35f55a70106f44dc9010b22eceb06abde"
+
+S = "${WORKDIR}/gdata.py-${PV}"
+
+FILES_${PN} += "${datadir}"
+
+RDEPENDS_${PN} = "python-elementtree"
+
diff --git a/meta-oe/recipes-devtools/python/python-ldap/setup.cfg.patch b/meta-oe/recipes-devtools/python/python-ldap/setup.cfg.patch
new file mode 100644
index 0000000..a703d34
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-ldap/setup.cfg.patch
@@ -0,0 +1,14 @@
+--- python-ldap-2.3.9/setup.cfg.orig    2009-08-13 11:07:23.000000000 +0200
++++ python-ldap-2.3.9/setup.cfg 2009-08-13 11:07:37.000000000 +0200
+@@ -1,9 +1,9 @@
+ [_ldap]
+ extra_objects = 
+ extra_compile_args = 
+-libs = ldap_r lber sasl2 ssl crypto
++libs = ldap_r lber ssl crypto
+ library_dirs = /opt/openldap-RE24/lib
+-include_dirs = /opt/openldap-RE24/include /usr/include/sasl
++include_dirs = /opt/openldap-RE24/include
+
+ [egg_info]
+ tag_build =  
diff --git a/meta-oe/recipes-devtools/python/python-ldap_2.3.9.bb b/meta-oe/recipes-devtools/python/python-ldap_2.3.9.bb
new file mode 100644
index 0000000..dfe1522
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-ldap_2.3.9.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "LDAP client API for Python, C wrapper module around OpenLDAP 2.x with an object-oriented API" 
+SECTION = "devel/python" 
+LICENSE = "Python-style" 
+LIC_FILES_CHKSUM = "file://LICENCE;md5=a41c82edffa04912007cae1d20cac555"
+HOMEPAGE = "http://www.python-ldap.org/" 
+DEPENDS = "python openldap" 
+
+SRC_URI = "http://pypi.python.org/packages/source/p/${PN}/${PN}-${PV}.tar.gz \ 
+           file://setup.cfg.patch"
+SRC_URI[md5sum] = "a9f9f16338288d118a1ae6266c993247"
+SRC_URI[sha256sum] = "62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4"
+
+inherit setuptools  
diff --git a/meta-oe/recipes-devtools/python/python-webdav_0.1.2.bb b/meta-oe/recipes-devtools/python/python-webdav_0.1.2.bb
new file mode 100644
index 0000000..7a6437d
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-webdav_0.1.2.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "This project aims to provide an object-oriented Python WebDAV client-side library\
+               based on Python`s standard httplib and Greg Stein`s davlib.\
+               The client shall fully support RFCs 4918 (basic specification),\
+               3744 (access control), and 3253 (versioning)."
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://src/webdav/WebdavClient.py;endline=15;md5=a1520fad859feb7b0d7f05277bc6ce48"
+HOMEPAGE = "http://sourceforge.net/projects/pythonwebdavlib/"
+SRCNAME = "Python_WebDAV_Library"
+DEPENDS = "python"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pythonwebdavlib/Python%20WebDAV%20Library%20-%20${PV}/${SRCNAME}-${PV}.zip"
+SRC_URI[md5sum] = "8e49e0ecc5b4327c4f752a544ee10e1a"
+SRC_URI[sha256sum] = "72c029ad1e25de950f59c2f1812d009d2c1691b70e4b5b09f1af9006e8fd5f23"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
-- 
1.7.8.6

[meta-oe][PATCH 17/24] mcnavi, monav, omgps, orrery: import from meta-smartphone

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb  |   18 +++++
 .../recipes-navigation/monav/monav/monav.desktop   |   10 +++
 meta-oe/recipes-navigation/monav/monav/monav.png   |  Bin 0 -> 21543 bytes
 meta-oe/recipes-navigation/monav/monav_0.3.bb      |   37 +++++++++++
 .../omgps/omgps/fix.capability.patch               |   59 +++++++++++++++++
 .../recipes-navigation/omgps/omgps/gcc-4.4.patch   |   68 ++++++++++++++++++++
 .../omgps/omgps/sysfs.node.2.6.32.patch            |   11 +++
 .../omgps/omgps/use.unused.variable.patch          |   12 ++++
 meta-oe/recipes-navigation/omgps/omgps_svn.bb      |   23 +++++++
 .../recipes-navigation/orrery/orrery/orrery.png    |  Bin 0 -> 19475 bytes
 .../orrery/orrery/use.GdkPixbuf.patch              |   59 +++++++++++++++++
 meta-oe/recipes-navigation/orrery/orrery_2.7.bb    |   30 +++++++++
 12 files changed, 327 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
 create mode 100644 meta-oe/recipes-navigation/monav/monav/monav.desktop
 create mode 100644 meta-oe/recipes-navigation/monav/monav/monav.png
 create mode 100644 meta-oe/recipes-navigation/monav/monav_0.3.bb
 create mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
 create mode 100644 meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
 create mode 100644 meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
 create mode 100644 meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
 create mode 100644 meta-oe/recipes-navigation/omgps/omgps_svn.bb
 create mode 100644 meta-oe/recipes-navigation/orrery/orrery/orrery.png
 create mode 100644 meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch
 create mode 100644 meta-oe/recipes-navigation/orrery/orrery_2.7.bb

diff --git a/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb b/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
new file mode 100644
index 0000000..9c7f3f2
--- /dev/null
+++ b/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Free GPS navigation for car and outdoor with OpenStreetMap maps"
+HOMEPAGE = "http://www.gps-routes.info/index.php?name=Content&pa=showpage&pid=1"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
+DEPENDS = "ecore evas imlib2 gpsd edje-native mysql5"
+
+SRC_URI = "http://www.gps-routes.info/debian/pool/main/m/mcnavi/mcnavi_${PV}.tar.gz"
+SRC_URI[md5sum] = "acc07debcdb3ef448b95e6a6cfcf53d8"
+SRC_URI[sha256sum] = "d3ce1f5901f13985d877b2b6ad06b64094ba43a4e13cbfe06c7cb2f1abdda309"
+
+S = "${WORKDIR}/${PN}"
+
+do_configure_prepend() {
+  # for some reason our mysql_config returns just sysroot/include_dir while mysql.h is in include_dir/mysql
+  sed -i 's#`mysql_config --include`#`mysql_config --include`/mysql#g' ${S}/configure.ac
+}
+
+inherit autotools
diff --git a/meta-oe/recipes-navigation/monav/monav/monav.desktop b/meta-oe/recipes-navigation/monav/monav/monav.desktop
new file mode 100644
index 0000000..5e86113
--- /dev/null
+++ b/meta-oe/recipes-navigation/monav/monav/monav.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=MoNav
+Exec=monav
+Icon=monav
+Terminal=false
+Type=Application
+Categories=Utility;Geography;
+X-MB-SingleInstance=true
+StartupNotify=true
+Comment=Fast navigation system featuring exact routing.
diff --git a/meta-oe/recipes-navigation/monav/monav/monav.png b/meta-oe/recipes-navigation/monav/monav/monav.png
new file mode 100644
index 0000000000000000000000000000000000000000..75b5a79623bf040f1ddfcde3d005dc7fd6de1ed9
GIT binary patch
literal 21543
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
aGa<9dQ(UQfcR;8oaKrGHL9w1)=zjo{-+O}q

literal 0
HcmV?d00001

diff --git a/meta-oe/recipes-navigation/monav/monav_0.3.bb b/meta-oe/recipes-navigation/monav/monav_0.3.bb
new file mode 100644
index 0000000..982d682
--- /dev/null
+++ b/meta-oe/recipes-navigation/monav/monav_0.3.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "MoNav is a fast navigation system featuring exact routing with OpenStreetMap data."
+HOMEPAGE = "http://code.google.com/p/monav"
+SECTION = "x11/applications"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://misc/license_template_christian;md5=d99c9b3bafdde80adee296762376348d"
+
+DEPENDS = "qt-mobility-x11"
+PR = "r1"
+
+SRC_URI = "http://monav.googlecode.com/files/${BPN}-${PV}.tar.gz \
+           file://monav.png \
+           file://monav.desktop"
+
+SRC_URI[md5sum] = "d048ccef8c6a21e8656aa4af3fcb8329"
+SRC_URI[sha256sum] = "5a3bf9e9f7368b81ba8e2f755960082fc42a2e2c78f9de645f99ba293c77ee7f"
+
+inherit qmake2 qt4x11
+
+EXTRA_QMAKEVARS_PRE="CONFIG+="release""
+QMAKE_PROFILES="monavclient.pro"
+
+do_install_append() {
+    install -d ${D}${datadir}/monav
+    install -d ${D}${datadir}/monav/images
+    cp -a ${S}/images/* ${D}${datadir}/monav/images
+
+    install -d ${D}${datadir}/icons
+    install -m 0644 ${WORKDIR}/monav.png ${D}${datadir}/icons
+
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/bin/monav ${D}${bindir}/monav
+
+    install -d ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/monav.desktop ${D}/${datadir}/applications
+}
+
+FILES_${PN} += "${bindir}/monav ${datadir}/icons/monav.png"
diff --git a/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch b/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
new file mode 100644
index 0000000..56ec3a4
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
@@ -0,0 +1,59 @@
+we need to include config.h first to know if HAVE_SYS_CAPABILITY_H is enabled or no, otherwise
+sys/capability.h is not included and later used
+| src/network.c: In function 'can_ping':
+| src/network.c:198:2: error: 'cap_flag_value_t' undeclared (first use in this function)
+| src/network.c:198:2: note: each undeclared identifier is reported only once for each function it appears in
+| src/network.c:198:19: error: expected ';' before 'cap'
+| src/network.c:199:2: error: 'cap_t' undeclared (first use in this function)
+| src/network.c:199:8: error: expected ';' before 'caps'
+| src/network.c:200:6: error: 'caps' undeclared (first use in this function)
+| cc1: warnings being treated as errors
+| src/network.c:203:2: error: implicit declaration of function 'cap_get_flag'
+| src/network.c:203:21: error: 'CAP_SYS_NICE' undeclared (first use in this function)
+| src/network.c:203:35: error: 'CAP_EFFECTIVE' undeclared (first use in this function)
+| src/network.c:203:51: error: 'cap' undeclared (first use in this function)
+| src/network.c:204:17: error: 'CAP_CLEAR' undeclared (first use in this function)
+| src/network.c:210:1: error: control reaches end of non-void function
+| make[1]: *** [omgps-network.o] Error 1
+
+and -lcap is needed for 2 functions later (should be added only for HAVE_SYS_CAPABILITY_H enabled, but I don't care enough)
+| omgps-network.o: In function `can_ping':
+| /OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/omgps-0.1+svnr109-r1/omgps/src/network.c:199: undefined reference to `cap_get_proc'
+| /OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/omgps-0.1+svnr109-r1/omgps/src/network.c:203: undefined reference to `cap_get_flag'
+| collect2: ld returned 1 exit status
+
+--- omgps.orig/src/network.c	2009-10-28 18:51:16.000000000 +0100
++++ omgps/src/network.c	2011-05-09 09:59:11.637676772 +0200
+@@ -19,16 +19,16 @@
+ #include <assert.h>
+ #include <glib.h>
+ 
+-#if (HAVE_SYS_CAPABILITY_H)
+-#undef _POSIX_SOURCE
+-#include <sys/capability.h>
+-#endif
+-
+ #include "config.h"
+ #include "util.h"
+ #include "network.h"
+ #include "customized.h"
+ 
++#if (HAVE_SYS_CAPABILITY_H)
++#undef _POSIX_SOURCE
++#include <sys/capability.h>
++#endif
++
+ /**
+  * Ping: reference <Unix network programming>, volume 1, third edition.
+  */
+--- omgps.orig/Makefile.am	2009-10-28 18:51:17.000000000 +0100
++++ omgps/Makefile.am	2011-05-09 10:04:58.578676679 +0200
+@@ -33,7 +33,7 @@
+ 
+ omgps_CFLAGS = $(common_CFLAGS) -O2
+ omgps_LDFLAGS = 
+-omgps_LDADD = @DEPENDENCIES_LIBS@ -lpython$(PY_VERSION)
++omgps_LDADD = @DEPENDENCIES_LIBS@ -lcap -lpython$(PY_VERSION)
+ 
+ omgps_SOURCES =          \
+   src/ctx_agps_online.c  \
diff --git a/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch b/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
new file mode 100644
index 0000000..3eae960
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
@@ -0,0 +1,68 @@
+diff -uNr omgps.orig/src/include/map_repo.h omgps/src/include/map_repo.h
+--- omgps.orig/src/include/map_repo.h	2009-07-20 19:54:08.000000000 +0200
++++ omgps/src/include/map_repo.h	2010-01-17 14:55:24.000000000 +0100
+@@ -3,6 +3,9 @@
+ 
+ #include <glib.h>
+ #include <gdk/gdk.h>
++// workaround Python.h unconditionally (re)defines _XOPEN_SOURCE and _POSIX_C_SOURCE
++#undef _XOPEN_SOURCE
++#undef _POSIX_C_SOURCE
+ #include <Python.h>
+ 
+ #define MAP_MAX_BG_COLORS	5
+diff -uNr omgps.orig/src/include/py_ext.h omgps/src/include/py_ext.h
+--- omgps.orig/src/include/py_ext.h	2009-07-20 19:54:08.000000000 +0200
++++ omgps/src/include/py_ext.h	2010-01-17 14:55:57.000000000 +0100
+@@ -4,8 +4,8 @@
+ void py_ext_init();
+ void py_ext_cleanup();
+ 
+-void inline py_ext_trylock();
+-void inline py_ext_lock();
+-void inline py_ext_unlock();
++void py_ext_trylock();
++void py_ext_lock();
++void py_ext_unlock();
+ 
+ #endif /* PY_EXT_H_ */
+diff -uNr omgps.orig/src/include/uart.h omgps/src/include/uart.h
+--- omgps.orig/src/include/uart.h	2009-07-20 19:54:08.000000000 +0200
++++ omgps/src/include/uart.h	2010-01-17 14:33:00.000000000 +0100
+@@ -12,9 +12,9 @@
+ extern void uart_cleanup();
+ extern void uart_close();
+ 
+-extern inline int read_with_timeout(U1 *buf, int len);
+-extern inline int write_with_timeout(U1 *buf, int len);
+-extern inline gboolean read_fixed_len(U1 *buf, int expected_len);
++extern int read_with_timeout(U1 *buf, int len);
++extern int write_with_timeout(U1 *buf, int len);
++extern gboolean read_fixed_len(U1 *buf, int expected_len);
+ 
+ extern int sysfs_get_gps_device_power();
+ extern gboolean gps_device_power_on();
+diff -uNr omgps.orig/src/py_ext.c omgps/src/py_ext.c
+--- omgps.orig/src/py_ext.c	2009-07-20 19:54:08.000000000 +0200
++++ omgps/src/py_ext.c	2010-01-17 14:56:46.000000000 +0100
+@@ -26,17 +26,17 @@
+ 		Py_Finalize();
+ }
+ 
+-void inline py_ext_trylock()
++void py_ext_trylock()
+ {
+ 	TRYLOCK_MUTEX(&lock);
+ }
+ 
+-void inline py_ext_lock()
++void py_ext_lock()
+ {
+ 	LOCK_MUTEX(&lock);
+ }
+ 
+-void inline py_ext_unlock()
++void py_ext_unlock()
+ {
+ 	UNLOCK_MUTEX(&lock);
+ }
diff --git a/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch b/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
new file mode 100644
index 0000000..d18a2fd
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
@@ -0,0 +1,11 @@
+diff -uNr omgps.orig//src/uart.c omgps/src/uart.c
+--- omgps.orig//src/uart.c	2010-08-22 23:34:09.000000000 +0200
++++ omgps/src/uart.c	2010-08-22 23:33:54.000000000 +0200
+@@ -30,6 +30,7 @@
+  * NOTE: these file paths are subject to change according to kernel and distribution.
+  */
+ static const char *sysfs_gps_power[] = {
++	"/sys/bus/platform/devices/gta02-pm-gps.0/power_on",
+ 	"/sys/bus/platform/devices/neo1973-pm-gps.0/power_on",
+ 	"/sys/bus/platform/devices/neo1973-pm-gps.0/pwron"
+ };
diff --git a/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch b/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
new file mode 100644
index 0000000..73d6dba
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
@@ -0,0 +1,12 @@
+--- a/src/settings.c	2011-12-12 13:21:30.573400795 +0100
++++ b/src/settings.c	2011-12-12 14:11:05.269606119 +0100
+@@ -278,6 +278,9 @@
+ 	}
+ 
+ 	ret = check_settings(errbuf, ERRBUF_LEN);
++	if (ret == FALSE) {
++		snprintf(errbuf, ERRBUF_LEN, "Something wrong while loading settings file");
++	}
+ 
+ 	if (fd > 0)
+ 		close(fd);
diff --git a/meta-oe/recipes-navigation/omgps/omgps_svn.bb b/meta-oe/recipes-navigation/omgps/omgps_svn.bb
new file mode 100644
index 0000000..59fd9b0
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps_svn.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "GPS application for openmoko freerunner"
+HOMEPAGE = "http://omgps.googlecode.com"
+SECTION = "openmoko/applications"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+DEPENDS = "gtk+ python-pygobject dbus-glib"
+SRCREV = "109"
+PV = "0.1+svnr${SRCPV}"
+S = "${WORKDIR}/${PN}"
+
+do_configure_prepend() {
+   sed -i "s#PY_VERSION = 2.6#PY_VERSION = ${PYTHON_BASEVERSION}#g" ${S}/Makefile.am
+   sed -i "s#PY_INC_DIR = \$(OPIEDIR)#PY_INC_DIR = ${STAGING_DIR_HOST}#g" ${S}/Makefile.am
+}
+
+SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;protocol=http \
+           file://gcc-4.4.patch \
+           file://sysfs.node.2.6.32.patch \
+           file://fix.capability.patch \
+           file://use.unused.variable.patch \
+"
+
+inherit autotools
diff --git a/meta-oe/recipes-navigation/orrery/orrery/orrery.png b/meta-oe/recipes-navigation/orrery/orrery/orrery.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9865b70ce777d6e4b4c437f73095d2329e222ce
GIT binary patch
literal 19475
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
ScFe&`q`Fg0$0Ox~7W_XxaP++Z

literal 0
HcmV?d00001

diff --git a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch b/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch
new file mode 100644
index 0000000..92d194d
--- /dev/null
+++ b/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch
@@ -0,0 +1,59 @@
+From: Benjamin Deering
+Subject: orrery crashing X
+Date: Thursday, September 2, 2010 - 5:25 pm
+Link: http://kerneltrap.org/mailarchive/openmoko-community/2010/9/3/13218
+
+diff -uNr orrery.orig//orrery.c orrery/orrery.c
+--- orrery.orig//orrery.c	2009-11-30 06:59:44.000000000 +0100
++++ orrery/orrery.c	2010-11-15 22:33:17.000000000 +0100
+@@ -1238,12 +1238,44 @@
+     }
+     currentEntry = currentEntry->forwardPointer;
+   }
+-  if (nDarkGreyPoints > 0)
+-    gdk_draw_points(pixmap, darkGreyGC, darkGreyPoints, nDarkGreyPoints);
+-  if (nGreyPoints > 0)
+-    gdk_draw_points(pixmap, greyGC, greyPoints, nGreyPoints);
+-  if (nWhitePoints > 0)
+-    gdk_draw_points(pixmap, whiteGC, whitePoints, nWhitePoints);
++  GdkPixbuf* starDrawingBuf = gdk_pixbuf_get_from_drawable( NULL,
++                                                            pixmap,
++                                                            gdk_colormap_get_system()
++                                                            , 0, 0, 0, 0, displayWidth, displayHeight);
++  g_assert (gdk_pixbuf_get_bits_per_sample (starDrawingBuf) == 8);
++  guchar* p;
++  int rowstride = gdk_pixbuf_get_rowstride (starDrawingBuf);
++  guchar* pixels = gdk_pixbuf_get_pixels (starDrawingBuf);
++  int n_channels = gdk_pixbuf_get_n_channels (starDrawingBuf);
++  GdkGCValues starGCval;
++  GdkColor starColor;
++  int pointNum;
++  gdk_gc_get_values(darkGreyGC, &starGCval);
++  gdk_colormap_query_color( gdk_gc_get_colormap(darkGreyGC),starGCval.foreground.pixel, &starColor );
++  for( pointNum = 0; pointNum < nDarkGreyPoints; pointNum++) {
++    p = pixels + darkGreyPoints[pointNum].y * rowstride + darkGreyPoints[pointNum].x * n_channels;
++    p[0] = starColor.red & 0xff;
++    p[1] = starColor.green & 0xff;
++    p[2] = starColor.blue & 0xff;
++  }
++  gdk_gc_get_values(greyGC, &starGCval);
++  gdk_colormap_query_color( gdk_gc_get_colormap(greyGC), starGCval.foreground.pixel, &starColor );
++  for( pointNum = 0; pointNum < nGreyPoints; pointNum++) {
++    p = pixels + greyPoints[pointNum].y * rowstride + greyPoints[pointNum].x * n_channels;
++    p[0] = starColor.red & 0xff;
++    p[1] = starColor.green & 0xff;
++    p[2] = starColor.blue & 0xff;
++  }
++  gdk_gc_get_values(whiteGC, &starGCval);
++  gdk_colormap_query_color( gdk_gc_get_colormap(whiteGC), starGCval.foreground.pixel, &starColor );
++  for( pointNum = 0; pointNum < nWhitePoints; pointNum++) {
++    p = pixels + whitePoints[pointNum].y * rowstride + whitePoints[pointNum].x * n_channels;
++    p[0] = starColor.red & 0xff;
++    p[1] = starColor.green & 0xff;
++    p[2] = starColor.blue & 0xff;
++  }
++  gdk_draw_pixbuf ( pixmap , NULL , starDrawingBuf,
++            0, 0, 0, 0, displayWidth, displayHeight, GDK_RGB_DITHER_NORMAL, 0, 0 ) ;
+ }
+ 
+ void makeTimeString(char *string)
diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
new file mode 100644
index 0000000..1e41f5b
--- /dev/null
+++ b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Astronomical application which displays the night sky"
+HOMEPAGE    = "http://projects.openmoko.org/projects/orrery/"
+SECTION = "x11/scientific"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe"
+
+inherit autotools
+
+SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz \
+           file://orrery.png \
+           file://use.GdkPixbuf.patch \
+"
+
+SRC_URI[md5sum]    = "bd62a33e7554ee1030313dfcdefcda8b"
+SRC_URI[sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbdf7a5e6"
+
+S = "${WORKDIR}/${PN}"
+
+do_configure_prepend() {
+  # fix DSO issue with binutils-2.22
+  sed -i 's/ -lrt/ -lrt -lm/g' ${S}/Makefile.am
+}
+do_install_append() {
+    install -d ${D}${datadir}/orrery
+    cp -a ${S}/data/* ${D}${datadir}/orrery
+    install -d ${D}${datadir}/icons
+    install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons
+}
+
+FILES_${PN} += "${datadir}/icons/orrery.png"
-- 
1.7.8.6

[meta-oe][PATCH 18/24] emacs: import from meta-smartphone

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../emacs-23.1/configure.in.lost.backslashes.patch |   24 +++++
 .../emacs/emacs-23.1/nostdlib-unwind.patch         |   16 +++
 .../emacs/emacs-23.1/use-qemu.patch                |  107 ++++++++++++++++++++
 meta-oe/recipes-support/emacs/emacs.inc            |   68 +++++++++++++
 meta-oe/recipes-support/emacs/emacs_23.1.bb        |    8 ++
 5 files changed, 223 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch
 create mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch
 create mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch
 create mode 100644 meta-oe/recipes-support/emacs/emacs.inc
 create mode 100644 meta-oe/recipes-support/emacs/emacs_23.1.bb

diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch b/meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch
new file mode 100644
index 0000000..2d29f17
--- /dev/null
+++ b/meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch
@@ -0,0 +1,24 @@
+pending upstream, fixed in 23.2
+http://debbugs.gnu.org/cgi-bin/bugreport.cgi?bug=5047
+https://bugzilla.redhat.com/show_bug.cgi?id=540921
+diff -up emacs-23.1/configure.in.cpp emacs-23.1/configure.in
+--- emacs-23.1/configure.in.cpp	2009-11-30 13:24:53.000000000 +0100
++++ emacs-23.1/configure.in	2009-11-30 13:25:45.000000000 +0100
+@@ -2983,7 +2983,7 @@ echo creating lib-src/Makefile
+   sed -e '1,/start of cpp stuff/d'\
+       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
+       < Makefile.c > junk.c
+-  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
++  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
+       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	\f]*$/d' > junk2.c
+   cat junk1.c junk2.c > Makefile.new
+   rm -f junk.c junk1.c junk2.c
+@@ -2999,7 +2999,7 @@ echo creating src/Makefile
+   sed -e '1,/start of cpp stuff/d'\
+       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
+       < Makefile.c > junk.c
+-  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
++  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
+       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	\f]*$/d' > junk2.c
+   cat junk1.c junk2.c > Makefile.new
+   rm -f junk.c junk1.c junk2.c
diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch b/meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch
new file mode 100644
index 0000000..4200301
--- /dev/null
+++ b/meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch
@@ -0,0 +1,16 @@
+Fix linking problem:
+undefined reference to `__aeabi_unwind_cpp_pr0'
+undefined reference to `__aeabi_unwind_cpp_pr1'
+Index: emacs/src/Makefile.in
+===================================================================
+--- emacs.orig/src/Makefile.in	2008-08-16 14:20:18.000000000 +0000
++++ emacs/src/Makefile.in	2008-08-16 14:51:25.000000000 +0000
+@@ -443,7 +443,7 @@
+    ask GCC explicitly where to find libgcc.a.  */
+ 
+ #ifndef LINKER
+-#define LINKER $(CC) -nostdlib
++#define LINKER $(CC) -nostdlib -lgcc_s
+ #endif
+ 
+ #ifndef LIB_GCC
diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch b/meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch
new file mode 100644
index 0000000..255b07f
--- /dev/null
+++ b/meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch
@@ -0,0 +1,107 @@
+Index: emacs-23.1/leim/Makefile.in
+===================================================================
+--- emacs-23.1.orig/leim/Makefile.in
++++ emacs-23.1/leim/Makefile.in
+@@ -51,7 +51,7 @@ buildlisppath=${srcdir}/${dot}${dot}/lis
+ 
+ # How to run Emacs.
+ RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
+-	${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
++	${QEMU} ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
+ 
+ # Subdirectories to be made if ${srcdir} is different from the current
+ # directory.
+Index: emacs-23.1/lib-src/Makefile.in
+===================================================================
+--- emacs-23.1.orig/lib-src/Makefile.in
++++ emacs-23.1/lib-src/Makefile.in
+@@ -23,7 +23,7 @@
+ SHELL = /bin/sh
+ 
+ # Following ../lisp/Makefile.in.
+-EMACS = ../src/emacs
++EMACS = ${QEMU} ../src/emacs
+ EMACSOPT = -batch --no-site-file --multibyte
+ 
+ # ==================== Things `configure' will edit ====================
+@@ -371,7 +371,7 @@ TAGS: etags${EXEEXT}
+    clobbered too.  */
+ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
+ 	$(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
+-	./test-distrib ${srcdir}/testfile
++	${QEMU} ./test-distrib ${srcdir}/testfile
+ 
+ /* We need the following in order to create a <getopt.h> when the system
+    does not have one that works with the given compiler.  */
+Index: emacs-23.1/lisp/Makefile.in
+===================================================================
+--- emacs-23.1.orig/lisp/Makefile.in
++++ emacs-23.1/lisp/Makefile.in
+@@ -26,8 +26,7 @@ srcdir=@srcdir@/..
+ # You can specify a different executable on the make command line,
+ # e.g. "make EMACS=../src/emacs ...".
+ 
+-EMACS = ../src/emacs
+-
++EMACS = "${QEMU} ../src/emacs"
+ # Command line flags for Emacs.  This must include --multibyte,
+ # otherwise some files will not compile.
+ 
+Index: emacs-23.1/Makefile.in
+===================================================================
+--- emacs-23.1.orig/Makefile.in
++++ emacs-23.1/Makefile.in
+@@ -336,7 +336,7 @@ lib-src lisp: Makefile FRC
+ # all preloaded elisp files, and only then dump the actual src/emacs, which
+ # is not wrong, but is overkill in 99.99% of the cases.
+ src: Makefile FRC
+-	boot=bootstrap-emacs$(EXEEXT);                         \
++	boot=${QEMU} bootstrap-emacs$(EXEEXT);                         \
+ 	if [ ! -x "src/$$boot" ]; then                                     \
+ 	    cd $@; $(MAKE) all $(MFLAGS)                                   \
+ 	      CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}'         \
+Index: emacs-23.1/src/Makefile.in
+===================================================================
+--- emacs-23.1.orig/src/Makefile.in
++++ emacs-23.1/src/Makefile.in
+@@ -497,7 +497,7 @@
+    this with the shell''s ``for'' construct.
+    Note that some people do not have '.'  in their paths, so we must
+    use ./prefix-args.  */
+-#define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags`
++#define YMF_PASS_LDFLAGS(flags) `${QEMU} ./prefix-args -Xlinker flags`
+ #else
+ #define YMF_PASS_LDFLAGS(flags) flags
+ #endif
+@@ -895,9 +895,9 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(L
+ #endif
+ 
+ #ifdef HAVE_SHM
+-RUN_TEMACS = `/bin/pwd`/temacs -nl
++RUN_TEMACS = ${QEMU} temacs -nl
+ #else
+-RUN_TEMACS = `/bin/pwd`/temacs
++RUN_TEMACS = ${QEMU} temacs
+ #endif
+ 
+ all: emacs${EXEEXT} OTHER_FILES
+@@ -912,7 +912,7 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DO
+ 	@: bootstrap-emacs, so let us replace it.
+ 	-ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
+ #endif /* ! defined (CANNOT_DUMP) */
+-	-./emacs -q -batch -f list-load-path-shadows
++	-${QEMU} ./emacs -q -batch -f list-load-path-shadows
+ 
+ /* We run make-docfile twice because the command line may get too long
+    on some systems.  */
+@@ -929,8 +929,8 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DO
+    only in order to reduce the command line length.  --Stef  */
+ ${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${lisp} ${SOME_MACHINE_LISP}
+ 	-rm -f ${etc}DOC
+-	${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC
+-	${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}
++	${QEMU}${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC
++	${QEMU} ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}
+ 
+ ${libsrc}make-docfile${EXEEXT}:
+ 	cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT}
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc
new file mode 100644
index 0000000..5883719
--- /dev/null
+++ b/meta-oe/recipes-support/emacs/emacs.inc
@@ -0,0 +1,68 @@
+DESCRIPTION = "Emacs"
+HOMEPAGE = "http://www.gnu.org/software/emacs/"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+SECTION = "editor"
+# and it needs to run some generated binaries..
+DEPENDS += "qemu-native"
+
+DEPENDS +=" liblockfile"
+
+X11DEPENDS = "gtk+ libungif dbus"
+
+EXTRA_OECONF =  "--without-sound "
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x,${X11DEPENDS}"
+
+inherit autotools
+
+PACKAGES =+ "${PN}-el"
+
+FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \
+                  ${datadir}/emacs/*/*/*/*.el.gz"
+
+FILES_${PN} += "${datadir}/emacs"
+
+FILES_${PN}-dbg += "${libexecdir}/emacs/*/*/.debug ${datadir}/emacs/*/*/.debug"
+
+TREEDIR = "${WORKDIR}/qemu-treedir"
+
+QEMUARCH= "${TARGET_ARCH}"
+QEMUARCH_i486 = "i386"
+QEMUARCH_i586 = "i386"
+QEMUARCH_i686 = "i386"
+
+# Large stack is required at least on x86_64 host, otherwise random segfaults appear:
+QEMU = "qemu-${QEMUARCH} ${QEMU_OPTIONS} -s 1048576 -L ${TREEDIR} "
+
+export LOGNAME = "$(whoami)"
+
+do_compile_prepend() {
+	sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile`
+	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
+# Ugly hack, see files/use-qemu.patch for more:
+	ln -sf ../src/emacs lisp/emacs
+	ln -sf ../src/emacs lib-src/emacs
+	ln -sf ../src/emacs leim/emacs
+#copy STAGING_DIR_TARGET and libgcc_s.so* to WORKDIR/qemu-treedir #copied code from glibc-package.bbclass
+	treedir=${TREEDIR}
+	if [ -e $treedir ];then
+		rm -rf $treedir
+	fi
+	mkdir $treedir
+	cp -pPR ${STAGING_DIR_TARGET}/* $treedir
+	if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so ]; then
+                cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
+        fi
+        if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then
+                cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
+        fi
+	# stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails
+	# temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one
+	if [ ! -f $treedir/lib/libc.so ]; then
+		ln -s libc.so.6 $treedir/lib/libc.so
+	fi
+}
+
+EXTRA_OEMAKE += 'QEMU="${QEMU}"'
diff --git a/meta-oe/recipes-support/emacs/emacs_23.1.bb b/meta-oe/recipes-support/emacs/emacs_23.1.bb
new file mode 100644
index 0000000..fe134f8
--- /dev/null
+++ b/meta-oe/recipes-support/emacs/emacs_23.1.bb
@@ -0,0 +1,8 @@
+require emacs.inc
+
+SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
+           file://use-qemu.patch \
+           file://nostdlib-unwind.patch \
+           file://configure.in.lost.backslashes.patch"
+SRC_URI[tarball.md5sum] = "a620d4452769d04ad8864d662f34f8dd"
+SRC_URI[tarball.sha256sum] = "a94cd46301f000d2d1dcd3fd7ef08ad952846d01ca5d4168b4ec3e38e857da47"
-- 
1.7.8.6

[meta-oe][PATCH 19/24] fbreader, fltk, gpm, iksemel, joe, links, ode, openldap, opensync, xchat: import from meta-smartphone

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../fbreader/fbreader-0.12.10/Makefile.patch       |   22 ++
 .../fbreader/fbreader-0.12.10/gcc45.patch          |   20 ++
 .../recipes-support/fbreader/fbreader_0.12.10.bb   |   45 ++++
 meta-oe/recipes-support/fbreader/fbreader_git.bb   |   45 ++++
 ...ation-of-the-icons-when-RESOLUTION-is-set.patch |   40 +++
 .../fltk/fltk-1.1.10/disable_test.patch            |   13 +
 .../recipes-support/fltk/fltk-1.1.10/dso-fix.patch |   13 +
 meta-oe/recipes-support/fltk/fltk_1.1.10.bb        |   37 +++
 meta-oe/recipes-support/gpm/gpm-1.99.7/init        |   32 +++
 .../recipes-support/gpm/gpm-1.99.7/no-docs.patch   |   18 ++
 .../gpm/gpm-1.99.7/processcreds.patch              |   12 +
 meta-oe/recipes-support/gpm/gpm_1.99.7.bb          |   43 +++
 .../recipes-support/iksemel/iksemel-1.4/r25.diff   |   32 +++
 meta-oe/recipes-support/iksemel/iksemel_1.4.bb     |   16 ++
 meta-oe/recipes-support/joe/joe_3.1.bb             |   13 +
 .../recipes-support/links/files/ac-prog-cxx.patch  |   11 +
 .../links/files/cookies-save-0.96.patch            |  106 ++++++++
 ...-2.1pre17-fix-segfault-on-loading-cookies.patch |   20 ++
 meta-oe/recipes-support/links/files/links2.desktop |   14 +
 .../links/links-x11_2.0+2.1pre30.bb                |   26 ++
 meta-oe/recipes-support/links/links.inc            |   19 ++
 .../recipes-support/links/links_2.0+2.1pre30.bb    |   13 +
 meta-oe/recipes-support/ode/ode/install.patch      |   23 ++
 meta-oe/recipes-support/ode/ode_0.9.bb             |   24 ++
 .../openldap/openldap-2.4.23/initscript            |   29 ++
 .../openldap/openldap-2.4.23/install-strip.patch   |   14 +
 .../openldap-2.4.23/openldap-m4-pthread.patch      |   20 ++
 .../recipes-support/openldap/openldap_2.4.23.bb    |  270 ++++++++++++++++++++
 .../recipes-support/opensync/libsyncml_0.5.4.bb    |   29 ++
 meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb  |   29 ++
 .../xchat/xchat-2.8.8/glib-2.32.patch              |   44 ++++
 meta-oe/recipes-support/xchat/xchat_2.8.8.bb       |   30 +++
 32 files changed, 1122 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch
 create mode 100644 meta-oe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch
 create mode 100644 meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb
 create mode 100644 meta-oe/recipes-support/fbreader/fbreader_git.bb
 create mode 100644 meta-oe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch
 create mode 100644 meta-oe/recipes-support/fltk/fltk-1.1.10/disable_test.patch
 create mode 100644 meta-oe/recipes-support/fltk/fltk-1.1.10/dso-fix.patch
 create mode 100644 meta-oe/recipes-support/fltk/fltk_1.1.10.bb
 create mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/init
 create mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch
 create mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch
 create mode 100644 meta-oe/recipes-support/gpm/gpm_1.99.7.bb
 create mode 100644 meta-oe/recipes-support/iksemel/iksemel-1.4/r25.diff
 create mode 100644 meta-oe/recipes-support/iksemel/iksemel_1.4.bb
 create mode 100644 meta-oe/recipes-support/joe/joe_3.1.bb
 create mode 100644 meta-oe/recipes-support/links/files/ac-prog-cxx.patch
 create mode 100644 meta-oe/recipes-support/links/files/cookies-save-0.96.patch
 create mode 100644 meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch
 create mode 100644 meta-oe/recipes-support/links/files/links2.desktop
 create mode 100644 meta-oe/recipes-support/links/links-x11_2.0+2.1pre30.bb
 create mode 100644 meta-oe/recipes-support/links/links.inc
 create mode 100644 meta-oe/recipes-support/links/links_2.0+2.1pre30.bb
 create mode 100644 meta-oe/recipes-support/ode/ode/install.patch
 create mode 100644 meta-oe/recipes-support/ode/ode_0.9.bb
 create mode 100644 meta-oe/recipes-support/openldap/openldap-2.4.23/initscript
 create mode 100644 meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch
 create mode 100644 meta-oe/recipes-support/openldap/openldap-2.4.23/openldap-m4-pthread.patch
 create mode 100644 meta-oe/recipes-support/openldap/openldap_2.4.23.bb
 create mode 100644 meta-oe/recipes-support/opensync/libsyncml_0.5.4.bb
 create mode 100644 meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
 create mode 100644 meta-oe/recipes-support/xchat/xchat-2.8.8/glib-2.32.patch
 create mode 100644 meta-oe/recipes-support/xchat/xchat_2.8.8.bb

diff --git a/meta-oe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch b/meta-oe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch
new file mode 100644
index 0000000..0e498c7
--- /dev/null
+++ b/meta-oe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch
@@ -0,0 +1,22 @@
+diff -uri fbreader-0.12.1.orig/fbreader/Makefile fbreader-0.12.1/fbreader/Makefile
+--- fbreader-0.12.1.orig/fbreader/Makefile	2009-12-13 09:03:11.000000000 +0100
++++ fbreader-0.12.1/fbreader/Makefile	2009-12-14 17:18:47.548638783 +0100
+@@ -37,7 +37,6 @@
+ 	@install $(TARGET) $(DESTDIR)$(BINDIR)/FBReader
+ 	@install -d $(FBSHAREDIR)
+ 	@install -d $(FBSHAREDIR)/help
+-	@./scripts/install_help.sh $(VARIANT) $(FBSHAREDIR)/help
+ 	@install -d $(FBSHAREDIR)/network
+ 	@install -m 0644 $(wildcard data/network/*.xml) $(FBSHAREDIR)/network
+ 	@install -d $(FBSHAREDIR)/network/certificates
+@@ -58,8 +57,8 @@
+ 	@install -d $(FBSHAREDIR)/resources
+ 	@install -m 0644 $(wildcard data/resources/*.xml) $(FBSHAREDIR)/resources
+ 	@install -d $(DESTDIR)$(APPIMAGEDIR_REAL)
+-	@install -m 0644 $(wildcard data/icons/toolbar/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+-	@install -m 0644 $(wildcard data/icons/filetree/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
++	@install -m 0644 $(wildcard data/icons/toolbar/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
++	@install -m 0644 $(wildcard data/icons/filetree/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+ 	@install -m 0644 $(wildcard data/icons/booktree/new/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+ 	@make -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install
+ 
diff --git a/meta-oe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch b/meta-oe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch
new file mode 100644
index 0000000..00cba10
--- /dev/null
+++ b/meta-oe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch
@@ -0,0 +1,20 @@
+  Fix compilation with gcc 4.5
+
+  [FBreader Ticket #340] -- http://old.fbreader.org/mantis/view.php?id=340
+
+  Without that patch we have:
+    Compiling Library.o ...Library.cpp:42:1: error: 'Library::Library' names the constructor, not the type
+
+  Upstream-Status: Accepted [Fixed in Version 0.14.0]
+
+--- fbreader-0.12.10-orig/fbreader/src/library/Library.cpp	2010-04-01 15:14:24.000000000 +0200
++++ fbreader-0.12.10/fbreader/src/library/Library.cpp	2010-04-13 13:34:06.000000000 +0200
+@@ -39,7 +39,7 @@
+ shared_ptr<Library> Library::ourInstance;
+ const size_t Library::MaxRecentListSize = 10;
+ 
+-Library::Library &Library::Instance() {
++Library &Library::Instance() {
+ 	if (ourInstance.isNull()) {
+ 		ourInstance = new Library();
+ 	}
diff --git a/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb b/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb
new file mode 100644
index 0000000..40fc631
--- /dev/null
+++ b/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "FBreader is an ebook reader"
+HOMEPAGE = "http://www.fbreader.org"
+SECTION = "x11/utils"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://fbreader/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
+DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi curl"
+
+SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
+file://Makefile.patch \
+file://gcc45.patch"
+
+# Set the defaults
+READER_RESOLUTION ?= "1024x600"
+READER_ARCH       ?= "desktop"
+READER_UI         ?= "gtk"
+READER_STATUS     ?= "release"
+
+FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary"
+FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/"
+
+CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=${prefix}"
+EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' LDFLAGS='${LDFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
+
+inherit pkgconfig
+
+do_configure() {
+    cd ${WORKDIR}/${PN}-${PV}
+    mv makefiles/target.mk makefiles/target.mk.orig
+
+    echo "TARGET_ARCH = ${READER_ARCH}" > makefiles/target.mk
+    echo "UI_TYPE = ${READER_UI}" >> makefiles/target.mk
+    echo "TARGET_STATUS = ${READER_STATUS}" >> makefiles/target.mk
+}
+
+do_install() {
+    oe_runmake install DESTDIR=${D} RESOLUTION=${READER_RESOLUTION}
+}
+
+SRC_URI[md5sum] = "da9ec4721efdb0ec0aaa182bff16ad82"
+SRC_URI[sha256sum] = "328aec454db80e225aa0b5c31adef74bf62a14357482947e87e9731686b3c624"
diff --git a/meta-oe/recipes-support/fbreader/fbreader_git.bb b/meta-oe/recipes-support/fbreader/fbreader_git.bb
new file mode 100644
index 0000000..8baec79
--- /dev/null
+++ b/meta-oe/recipes-support/fbreader/fbreader_git.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "FBreader is an ebook reader"
+HOMEPAGE = "http://www.fbreader.org"
+SECTION = "x11/utils"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://fbreader/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
+DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi curl"
+SRCREV = "2cf1ec0e306e1122dbed850bfa005cd59a6168ee"
+PV = "0.99.5+gitr${SRCPV}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "git://github.com/geometer/FBReader.git;protocol=http;branch=master \
+           file://0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch"
+
+# Set the defaults
+READER_RESOLUTION ?= "1024x600"
+READER_ARCH       ?= "desktop"
+READER_UI         ?= "gtk"
+READER_STATUS     ?= "release"
+
+FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary"
+FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/"
+
+CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=${prefix}"
+EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
+inherit pkgconfig
+
+S = "${WORKDIR}/git"
+
+do_configure() {
+    cd "${S}"
+
+    echo "TARGET_ARCH = ${READER_ARCH}" > makefiles/target.mk
+    echo "UI_TYPE = ${READER_UI}" >> makefiles/target.mk
+    echo "TARGET_STATUS = ${READER_STATUS}" >> makefiles/target.mk
+}
+
+do_install() {
+    oe_runmake install DESTDIR=${D} RESOLUTION=${READER_RESOLUTION}
+}
diff --git a/meta-oe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch b/meta-oe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch
new file mode 100644
index 0000000..f6e1202
--- /dev/null
+++ b/meta-oe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch
@@ -0,0 +1,40 @@
+From da4170b61bb41eff0af170d1d77bfd90f9ebe5dd Mon Sep 17 00:00:00 2001
+From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
+Date: Fri, 20 Jan 2012 11:34:42 +0100
+Subject: [PATCH] Fix installation of the icons when RESOLUTION is set
+
+When resolution is set, the following code(in fbreader/Makefile) is executed:
+  VARIANT = $(TARGET_ARCH)
+  ifneq "$(RESOLUTION)" ""
+    VARIANT = $(TARGET_ARCH)_$(RESOLUTION)
+  endif
+
+This fix is based on a patch from the openembedded project,
+  which can be found here:
+    http://cgit.openembedded.org/openembedded/tree/recipes/fbreader/fbreader-0.12.1/Makefile.patch
+
+Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
+---
+ Submitted trough github to git://github.com/geometer/FBReader.git as a pull request
+
+ fbreader/Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fbreader/Makefile b/fbreader/Makefile
+index bfa9242..03e6cc3 100644
+--- a/fbreader/Makefile
++++ b/fbreader/Makefile
+@@ -60,8 +60,8 @@ do_install:
+ 	@install -d $(FBSHAREDIR)/resources
+ 	@install -m 0644 $(wildcard data/resources/*.xml) $(FBSHAREDIR)/resources
+ 	@install -d $(DESTDIR)$(APPIMAGEDIR_REAL)
+-	@install -m 0644 $(wildcard data/icons/toolbar/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+-	@install -m 0644 $(wildcard data/icons/filetree/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
++	@install -m 0644 $(wildcard data/icons/toolbar/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
++	@install -m 0644 $(wildcard data/icons/filetree/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+ 	@install -m 0644 $(wildcard data/icons/booktree/new/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+ 	@make -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install
+ 
+-- 
+1.7.4.1
+
diff --git a/meta-oe/recipes-support/fltk/fltk-1.1.10/disable_test.patch b/meta-oe/recipes-support/fltk/fltk-1.1.10/disable_test.patch
new file mode 100644
index 0000000..8c01a1f
--- /dev/null
+++ b/meta-oe/recipes-support/fltk/fltk-1.1.10/disable_test.patch
@@ -0,0 +1,13 @@
+Index: fltk-1.1.9/Makefile
+===================================================================
+--- fltk-1.1.9.orig/Makefile	2008-06-06 16:14:11.936736201 +0200
++++ fltk-1.1.9/Makefile	2008-06-06 16:14:22.526357637 +0200
+@@ -27,7 +27,7 @@
+ 
+ include makeinclude
+ 
+-DIRS	=	$(IMAGEDIRS) src fluid test documentation
++DIRS	=	$(IMAGEDIRS) src fluid documentation
+ 
+ all: makeinclude fltk-config
+ 	for dir in $(DIRS); do\
diff --git a/meta-oe/recipes-support/fltk/fltk-1.1.10/dso-fix.patch b/meta-oe/recipes-support/fltk/fltk-1.1.10/dso-fix.patch
new file mode 100644
index 0000000..867e9ef
--- /dev/null
+++ b/meta-oe/recipes-support/fltk/fltk-1.1.10/dso-fix.patch
@@ -0,0 +1,13 @@
+src/fl_set_fonts_xft.cxx is using fontconfig symbols
+
+--- a/makeinclude.in	2012-01-26 18:09:58.628799060 +0100
++++ b/makeinclude.in	2012-01-26 18:08:58.115801758 +0100
+@@ -81,7 +81,7 @@
+ AUDIOLIBS	= @AUDIOLIBS@
+ DSOFLAGS	= -L. @DSOFLAGS@
+ LDFLAGS		= $(OPTIM) @LDFLAGS@
+-LDLIBS		= @LIBS@
++LDLIBS		= @LIBS@ -lfontconfig
+ GLDLIBS		= @GLLIB@ @LIBS@
+ LINKFLTK	= @LINKFLTK@
+ LINKFLTKGL	= @LINKFLTKGL@
diff --git a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb
new file mode 100644
index 0000000..2611b20
--- /dev/null
+++ b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "FLTK is a cross-platform C++ GUI toolkit"
+HOMEPAGE = "http://www.fltk.org"
+SECTION = "libs"
+LICENSE = "LGPLv2 & FLTK"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1c0b73db66884b6a925e727400315130"
+
+DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
+
+SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \
+           file://disable_test.patch \
+           file://dso-fix.patch \
+          "
+
+S = "${WORKDIR}/fltk-${PV}"
+
+inherit lib_package autotools binconfig
+
+TARGET_CC_ARCH += "${LDFLAGS} -DXFT_MAJOR=2"
+
+EXTRA_OECONF = "--enable-shared \
+                --enable-threads \
+                --enable-xdbe --enable-xft --enable-gl \
+                --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
+
+do_configure() {
+    oe_runconf
+}
+
+python populate_packages_prepend () {
+    if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+        bb.data.setVar('PKG_${PN}', 'libfltk${PV}', d)
+}
+
+LEAD_SONAME = "libfltk.so"
+
+SRC_URI[md5sum] = "a1765594bc427ff892e36089fe1fa672"
+SRC_URI[sha256sum] = "37ada22bf2586b8dd30d84209b8b58bdcb864627e5d02ae3f2c323a29261b19a"
diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/init b/meta-oe/recipes-support/gpm/gpm-1.99.7/init
new file mode 100644
index 0000000..2dcf9ab
--- /dev/null
+++ b/meta-oe/recipes-support/gpm/gpm-1.99.7/init
@@ -0,0 +1,32 @@
+#! /bin/sh  
+
+# Grab the common functions
+#. /etc/init.d/functions
+
+# FIXME: 
+# Add a configuration file for GPM here
+
+test -x /usr/sbin/gpm || exit 0
+
+case "$1" in
+  start)
+    if [ ! -p /dev/gpmdata ]; then
+        mkfifo /dev/gpmdata
+    fi
+
+    echo "Starting GPM:" 
+    start-stop-daemon -S -x /usr/sbin/gpm -- -R -m /dev/psaux -t ps2
+    ;;
+  stop)
+    echo "Stopping GPM:" 
+    start-stop-daemon -K -x /usr/sbin/gpm
+    ;;
+  restart|force-reload) 
+    $0 stop
+    $0 start
+    ;;
+  *)
+    usage /etc/init.d/gpm
+esac
+
+exit 0
diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch
new file mode 100644
index 0000000..f10217a
--- /dev/null
+++ b/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch
@@ -0,0 +1,18 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+Index: gpm-1.99.7/Makefile.in
+===================================================================
+--- gpm-1.99.7.orig/Makefile.in	2008-07-24 03:36:35.000000000 -0700
++++ gpm-1.99.7/Makefile.in	2010-06-22 18:28:45.269507001 -0700
+@@ -19,7 +19,7 @@
+ # user-overridable flags, but it's also all the implicit rule looks at.
+ # missing ?
+ 
+-SUBDIRS = src doc contrib gpm2
++SUBDIRS = src
+ 
+ 
+ ### simple, but effective rules
diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch
new file mode 100644
index 0000000..d647eca
--- /dev/null
+++ b/meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch
@@ -0,0 +1,12 @@
+Index: gpm-1.99.7/src/daemon/processconn.c
+===================================================================
+--- gpm-1.99.7.orig/src/daemon/processconn.c	2010-09-29 17:36:18.571782951 +0400
++++ gpm-1.99.7/src/daemon/processconn.c	2010-09-29 17:42:44.659991758 +0400
+@@ -20,6 +20,7 @@
+  *
+  ********/
+ 
++#define _GNU_SOURCE
+ #include <sys/socket.h>         /* accept */
+ #include <stdlib.h>             /* malloc */
+ #include <unistd.h>             /* close */
diff --git a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
new file mode 100644
index 0000000..bd42de3
--- /dev/null
+++ b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \
+for the console and xterm, with sample clients included \
+(emacs, etc)."
+SECTION = "console/utils"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://gpm2/core/main.c;endline=19;md5=66d3c205c4e7ee5704b2ee351dfed72f"
+
+DEPENDS = "ncurses"
+
+SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
+           file://no-docs.patch \
+           file://processcreds.patch \
+           file://init"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "gpm"
+INITSCRIPT_PARAMS = "defaults"
+
+#export LIBS = "-lm"
+
+# all fields are /* FIXME: gpm 1.99.13 */
+# gpm-1.99.7/src/lib/libhigh.c:171:43: error: parameter 'clientdata' set but not used [-Werror=unused-but-set-parameter]
+# gpm-1.99.7/src/lib/report-lib.c:28:21: error: parameter 'line' set but not used [-Werror=unused-but-set-parameter]
+# gpm-1.99.7/src/lib/report-lib.c:28:33: error: parameter 'file' set but not used [-Werror=unused-but-set-parameter]
+# gpm-1.99.7/src/drivers/empty/i.c:26:23: error: parameter 'fd' set but not used [-Werror=unused-but-set-parameter]
+# gpm-1.99.7/src/drivers/empty/i.c:26:42: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter]
+# gpm-1.99.7/src/drivers/etouch/i.c:34:43: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter]
+# gpm-1.99.7/src/drivers/msc/r.c:32:12: error: variable 'dy' set but not used [-Werror=unused-but-set-variable]
+# gpm-1.99.7/src/drivers/msc/r.c:32:8: error: variable 'dx' set but not used [-Werror=unused-but-set-variable]
+# cc1: all warnings being treated as errors
+CFLAGS += "-Wno-extra -Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable"
+
+do_install () {
+    oe_runmake 'ROOT=${D}' install
+    install -m 0644 src/headers/gpm.h ${D}${includedir}
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm
+    cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1
+}
+SRC_URI[md5sum] = "9fdddf5f53cb11d40bb2bb671d3ac544"
+SRC_URI[sha256sum] = "6071378b24494e36ca3ef6377606e7e565040413c86704753a162d2180af32ee"
+
diff --git a/meta-oe/recipes-support/iksemel/iksemel-1.4/r25.diff b/meta-oe/recipes-support/iksemel/iksemel-1.4/r25.diff
new file mode 100644
index 0000000..e666ce0
--- /dev/null
+++ b/meta-oe/recipes-support/iksemel/iksemel-1.4/r25.diff
@@ -0,0 +1,32 @@
+Taken from upstream subversion repository:
+
+http://code.google.com/p/iksemel/source/detail?r=25
+
+===================================================================
+---
+ configure.ac |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- iksemel-1.4.orig/configure.ac
++++ iksemel-1.4/configure.ac
+@@ -43,11 +43,19 @@ AM_CONDITIONAL(DO_POSIX, test "x$defio"
+ dnl Checks for library functions
+ AC_SEARCH_LIBS(recv,socket)
+ AC_CHECK_FUNCS(getopt_long)
+ AC_CHECK_FUNCS(getaddrinfo)
+ 
+-AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
++dnl Check GNU TLS
++PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no)
++if test "x$have_gnutls" = "xyes"; then
++  LIBGNUTLS_CFLAGS="$GNUTLS_CFLAGS"
++  LIBGNUTLS_LIBS="$GNUTLS_LIBS"
++  AC_SUBST(LIBGNUTLS_CFLAGS)
++  AC_SUBST(LIBGNUTLS_LIBS)
++  AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
++fi
+ 
+ dnl Check -Wall flag of GCC
+ if test "x$GCC" = "xyes"; then
+   if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
+     CFLAGS="$CFLAGS -Wall"
diff --git a/meta-oe/recipes-support/iksemel/iksemel_1.4.bb b/meta-oe/recipes-support/iksemel/iksemel_1.4.bb
new file mode 100644
index 0000000..9869149
--- /dev/null
+++ b/meta-oe/recipes-support/iksemel/iksemel_1.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Fast and portable XML parser and Jabber protocol library"
+AUTHOR = "Gurer Ozen <meduketto at gmail.com>"
+HOMEPAGE = "http://iksemel.googlecode.com"
+SECTION = "libs"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
+DEPENDS = "gnutls"
+
+PR = "r1"
+
+SRC_URI = "http://iksemel.googlecode.com/files/${P}.tar.gz;name=archive \
+           file://r25.diff"
+SRC_URI[archive.md5sum] = "532e77181694f87ad5eb59435d11c1ca"
+SRC_URI[archive.sha256sum] = "458c1b8fb3349076a6cecf26c29db1d561315d84e16bfcfba419f327f502e244"
+
+inherit autotools pkgconfig
diff --git a/meta-oe/recipes-support/joe/joe_3.1.bb b/meta-oe/recipes-support/joe/joe_3.1.bb
new file mode 100644
index 0000000..6c9190f
--- /dev/null
+++ b/meta-oe/recipes-support/joe/joe_3.1.bb
@@ -0,0 +1,13 @@
+SECTION = "console/utils"
+DESCRIPTION = "Console text editor with good functionality, good choice for vi-haters."
+HOMEPAGE = "http://joe-editor.sourceforge.net/"
+LICENSE = "GPLv1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=da10ed7cf8038981c580e11c1d3e8fb6"
+RDEPENDS_${PN} = "ncurses-terminfo"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz"
+
+inherit autotools
+
+SRC_URI[md5sum] = "2a6ef018870fca9b7df85401994fb0e0"
+SRC_URI[sha256sum] = "252390e4bc687957f09f334095904c8cc53b39c7b663ed47861ae1d11aef5946"
diff --git a/meta-oe/recipes-support/links/files/ac-prog-cxx.patch b/meta-oe/recipes-support/links/files/ac-prog-cxx.patch
new file mode 100644
index 0000000..41c3826
--- /dev/null
+++ b/meta-oe/recipes-support/links/files/ac-prog-cxx.patch
@@ -0,0 +1,11 @@
+--- links-2.1pre20/configure.in.orig	2005-12-21 15:23:49.000000000 +0000
++++ links-2.1pre20/configure.in	2005-12-21 15:23:59.000000000 +0000
+@@ -18,7 +18,7 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ 
+-#AC_PROG_CXX
++AC_PROG_CXX
+ #AC_PROG_AWK
+ #AM_PROG_LEX
+ #AC_PROG_YACC
diff --git a/meta-oe/recipes-support/links/files/cookies-save-0.96.patch b/meta-oe/recipes-support/links/files/cookies-save-0.96.patch
new file mode 100644
index 0000000..a1e35c0
--- /dev/null
+++ b/meta-oe/recipes-support/links/files/cookies-save-0.96.patch
@@ -0,0 +1,106 @@
+diff -ru links-0.96/cookies.c links-0.96+cookies-save/cookies.c
+--- links-0.96/cookies.c	Mon Sep  3 07:19:37 2001
++++ links-0.96+cookies-save/cookies.c	Mon Sep  3 07:18:42 2001
+@@ -276,15 +276,99 @@
+ 
+ void init_cookies(void)
+ {
+-	/* !!! FIXME: read cookies */
++	unsigned char in_buffer[MAX_STR_LEN];
++	unsigned char *cookfile, *p, *q;
++	FILE *fp;
++
++	/* must be called after init_home */
++	if (! links_home) return;
++	
++	cookfile = stracpy(links_home);
++	if (! cookfile) return;
++	add_to_strn(&cookfile, "cookies");
++
++	fp = fopen(cookfile, "r");
++	mem_free(cookfile);
++	if (fp == NULL) return;
++	
++	while (fgets(in_buffer, MAX_STR_LEN, fp)) {
++		struct cookie *cookie;
++		
++		if (!(cookie = mem_alloc(sizeof(struct cookie)))) return;
++		memset(cookie, 0, sizeof(struct cookie));
++		
++		q = in_buffer; p = strchr(in_buffer, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->name = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->value = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->server = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->path = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->domain = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->expires = atoi(q);
++		
++		cookie->secure = atoi(p);
++		
++		cookie->id = cookie_id++;
++
++		accept_cookie(cookie);
++
++		continue;
++
++inv:
++		free_cookie(cookie);
++		free(cookie);
++	}
++	fclose(fp);
+ }
+ 
+ void cleanup_cookies(void)
+ {
+ 	struct cookie *c;
++	unsigned char *cookfile;
++	FILE *fp;
++	
+ 	free_list(c_domains);
+-	/* !!! FIXME: save cookies */
+-	foreach (c, cookies) free_cookie(c);
++
++	cookfile = stracpy(links_home);
++	if (! cookfile) return;
++	add_to_strn(&cookfile, "cookies");
++
++	fp = fopen(cookfile, "w");
++	mem_free(cookfile);
++	if (fp == NULL) return;
++	
++	foreach (c, cookies) {
++		if (c->expires && ! cookie_expired(c))
++			fprintf(fp, "%s %s %s %s %s %d %d\n", c->name, c->value,
++			    c->server?c->server:(unsigned char *)"", c->path?c->path:(unsigned char *)"",
++			    c->domain?c->domain:(unsigned char *)"", c->expires, c->secure);
++
++		free_cookie(c);
++	}
++
++	fclose(fp);
++	
+ 	free_list(cookies);
+ }
+ 
diff --git a/meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch b/meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch
new file mode 100644
index 0000000..0d3b407
--- /dev/null
+++ b/meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch
@@ -0,0 +1,20 @@
+--- links-2.1pre17/cookies.c.pix	2005-05-15 23:05:10.000000000 +0800
++++ links-2.1pre17/cookies.c	2005-05-15 23:17:21.000000000 +0800
+@@ -41,7 +41,7 @@
+ 
+ void free_cookie(struct cookie *c)
+ {
+-	mem_free(c->name);
++	if (c->value) mem_free(c->name);
+ 	if (c->value) mem_free(c->value);
+ 	if (c->server) mem_free(c->server);
+ 	if (c->path) mem_free(c->path);
+@@ -355,7 +355,7 @@
+ 
+ inv:
+ 		free_cookie(cookie);
+-		free(cookie);
++		mem_free(cookie);
+ 	}
+ 	fclose(fp);
+ }
diff --git a/meta-oe/recipes-support/links/files/links2.desktop b/meta-oe/recipes-support/links/files/links2.desktop
new file mode 100644
index 0000000..a05bce1
--- /dev/null
+++ b/meta-oe/recipes-support/links/files/links2.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Links
+Comment=Links is a browser very similar to lynx
+Comment[es]=El links es un browser para modo texto, similar a lynx
+Comment[pl]=Links jest przeglądarką podobną do lynksa
+Comment[pt]=O links é um browser para modo texto, similar ao lynx
+Comment[pt_BR]=O links é um browser para modo texto, similar ao lynx
+Exec=links -g
+Terminal=true
+Icon=links2
+Type=Application
+Categories=Application;ConsoleOnly;Network;WebBrowser;
+# vi: encoding=utf-8
diff --git a/meta-oe/recipes-support/links/links-x11_2.0+2.1pre30.bb b/meta-oe/recipes-support/links/links-x11_2.0+2.1pre30.bb
new file mode 100644
index 0000000..b71da9f
--- /dev/null
+++ b/meta-oe/recipes-support/links/links-x11_2.0+2.1pre30.bb
@@ -0,0 +1,26 @@
+require links.inc
+
+DEPENDS += "virtual/libx11"
+RCONFLICTS_${PN} = "links"
+
+SRC_URI += " file://links2.desktop \
+             http://www.xora.org.uk/oe/links2.png;name=icon"
+
+EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
+                --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
+                --without-libtiff --without-svgalib --without-fb \
+                --without-directfb --without-pmshell --without-atheos \
+                --with-x --without-gpm --without-sdl"
+
+do_install_append() {
+    install -d ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications
+    install -d ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps
+}
+
+
+SRC_URI[md5sum] = "f0f107cc824b71e43f0c6ab620209daf"
+SRC_URI[sha256sum] = "f32314d851e86ec463967ddce78d051e3953b529878cbaeecf882c625ad29c75"
+SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33"
+SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47"
diff --git a/meta-oe/recipes-support/links/links.inc b/meta-oe/recipes-support/links/links.inc
new file mode 100644
index 0000000..9001d2a
--- /dev/null
+++ b/meta-oe/recipes-support/links/links.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "Links is graphics and text mode WWW \
+browser, similar to Lynx."
+HOMEPAGE = "http://links.twibright.com/"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b0c80473f97008e42e29a9f80fcc55ff"
+DEPENDS = "jpeg libpng flex openssl zlib"
+
+LPV = "${@bb.data.getVar("PV",d,1).split("+")[1]}"
+
+SRC_URI = "http://links.twibright.com/download/links-${LPV}.tar.bz2 \
+           file://ac-prog-cxx.patch \
+           file://cookies-save-0.96.patch \
+           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch"
+
+inherit autotools
+
+S = "${WORKDIR}/links-${LPV}"
+
diff --git a/meta-oe/recipes-support/links/links_2.0+2.1pre30.bb b/meta-oe/recipes-support/links/links_2.0+2.1pre30.bb
new file mode 100644
index 0000000..2496173
--- /dev/null
+++ b/meta-oe/recipes-support/links/links_2.0+2.1pre30.bb
@@ -0,0 +1,13 @@
+require links.inc
+
+DEPENDS += "gpm"
+RCONFLICTS_${PN} = "links-x11"
+
+EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
+                --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
+                --without-libtiff --without-svgalib --with-fb \
+                --without-directfb --without-pmshell --without-atheos \
+                --without-x --without-sdl"
+
+SRC_URI[md5sum] = "f0f107cc824b71e43f0c6ab620209daf"
+SRC_URI[sha256sum] = "f32314d851e86ec463967ddce78d051e3953b529878cbaeecf882c625ad29c75"
diff --git a/meta-oe/recipes-support/ode/ode/install.patch b/meta-oe/recipes-support/ode/ode/install.patch
new file mode 100644
index 0000000..2f6cdb0
--- /dev/null
+++ b/meta-oe/recipes-support/ode/ode/install.patch
@@ -0,0 +1,23 @@
+--- ode-0.9.orig/Makefile.am	2007-02-21 15:54:54.000000000 +0100
++++ ode-0.9/Makefile.am	2010-08-21 16:15:55.000000000 +0200
+@@ -25,13 +25,13 @@
+ 
+ if USE_SONAME
+ install-exec-hook:
+-	ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+-	$(libdir)/libode.so
+-	ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+-	$(libdir)/@ODE_SONAME@
+-	ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+-	$(libdir)/@ODE_SONAME@.@ODE_REVISION@
+-	/sbin/ldconfig
++	ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
++	$(DESTDIR)/$(libdir)/libode.so
++	ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
++	$(DESTDIR)/$(libdir)/@ODE_SONAME@
++	ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
++	$(DESTDIR)/$(libdir)/@ODE_SONAME@.@ODE_REVISION@
++	echo /sbin/ldconfig
+ else
+ install-exec-hook:
+ endif
diff --git a/meta-oe/recipes-support/ode/ode_0.9.bb b/meta-oe/recipes-support/ode/ode_0.9.bb
new file mode 100644
index 0000000..d076abb
--- /dev/null
+++ b/meta-oe/recipes-support/ode/ode_0.9.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "ODE is an Open Source Physics Engine."
+SECTION = "libs"
+HOMEPAGE = "http://www.ode.org"
+LICENSE = "LGPLv2.1 & BSD"
+LIC_FILES_CHKSUM = "file://LICENSE-BSD.TXT;md5=c74e6304a772117e059458fb9763a928 \
+                    file://LICENSE.TXT;md5=771782cb6245c7fbbe74bc0ec059beff"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \
+           file://install.patch"
+
+SRC_URI[md5sum] = "4c03759b76a0649a6d5108c8e172e1e4"
+SRC_URI[sha256sum] = "460d0851b743b1f144ef2a8259004d6774504c95d08e9357a96a296111496feb"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "--disable-demos --enable-soname"
+
+do_configure_append() {
+    echo "#define dInfinity DBL_MAX" >>include/ode/config.h
+}
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.23/initscript b/meta-oe/recipes-support/openldap/openldap-2.4.23/initscript
new file mode 100644
index 0000000..40881cd
--- /dev/null
+++ b/meta-oe/recipes-support/openldap/openldap-2.4.23/initscript
@@ -0,0 +1,29 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/openldap and type
+# > update-rc.d openldap defaults 60
+#
+
+
+slapd=/usr/libexec/slapd
+test -x "$slapd" || exit 0
+
+
+case "$1" in
+  start)
+    echo -n "Starting OpenLDAP: "
+    start-stop-daemon --start --quiet --exec $slapd
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping OpenLDAP: "
+    start-stop-daemon --stop --quiet --pidfile /var/run/slapd.pid
+    echo "."
+    ;;
+  *)
+    echo "Usage: /etc/init.d/openldap {start|stop}"
+    exit 1
+esac
+
+exit 0
\ No newline at end of file
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch b/meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch
new file mode 100644
index 0000000..9d7640c
--- /dev/null
+++ b/meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch
@@ -0,0 +1,14 @@
+# This patch ensures that the install operations which strip
+# programs and libraries (LTINSTALL) work in a cross build
+# environment.
+--- openldap-2.2.24/.pc/install-strip.patch/build/top.mk	2005-01-20 09:00:55.000000000 -0800
++++ openldap-2.2.24/build/top.mk	2005-04-16 13:48:20.536710376 -0700
+@@ -116,7 +116,7 @@
+ LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \
+ 	$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD)
+ 
+-LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
++LTINSTALL = STRIPPROG="@STRIP@" $(LIBTOOL) --mode=install $(top_srcdir)/contrib/ldapc++/install-sh -c
+ LTFINISH = $(LIBTOOL) --mode=finish
+ 
+ # Misc UNIX commands used in build environment
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.23/openldap-m4-pthread.patch b/meta-oe/recipes-support/openldap/openldap-2.4.23/openldap-m4-pthread.patch
new file mode 100644
index 0000000..b669b72
--- /dev/null
+++ b/meta-oe/recipes-support/openldap/openldap-2.4.23/openldap-m4-pthread.patch
@@ -0,0 +1,20 @@
+--- openldap-2.3.11/build/openldap.m4.orig	2005-11-11 00:11:18.604322590 -0800
++++ openldap-2.3.11/build/openldap.m4	2005-11-11 00:26:21.621145856 -0800
+@@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
+ ]])
+ 
+ AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
+-AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
++[AC_LANG_SOURCE([[OL_PTHREAD_TEST_INCLUDES
+ 
+ int main(argc, argv)
+ 	int argc;
+@@ -796,7 +796,7 @@ int main(argc, argv)
+ {
+ OL_PTHREAD_TEST_FUNCTION
+ }
+-]))
++]])])
+ dnl --------------------------------------------------------------------
+ AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2)
+ if test "$ol_link_threads" = no ; then
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
new file mode 100644
index 0000000..3ef12d3
--- /dev/null
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
@@ -0,0 +1,270 @@
+# OpenLDAP, a license free (see http://www.OpenLDAP.org/license.html)
+#
+DESCRIPTION = "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol."
+HOMEPAGE = "http://www.OpenLDAP.org/license.html"
+# The OpenLDAP Public License - see the HOMEPAGE - defines
+# the license.  www.openldap.org claims this is Open Source
+# (see http://www.openldap.org), the license appears to be
+# basically BSD.  opensource.org does not record this license
+# at present (so it is apparently not OSI certified).
+LICENSE = "OpenLDAP"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3d82d3085f228af211a6502c7ea7c3c7"
+SECTION = "libs"
+
+LDAP_VER = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
+
+SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz"
+SRC_URI += "file://openldap-m4-pthread.patch"
+SRC_URI += "file://initscript"
+SRC_URI[md5sum] = "90150b8c0d0192e10b30157e68844ddf"
+SRC_URI[sha256sum] = "5a5ede91d5e8ab3c7f637620aa29a3b96eb34318a8b26c8eef2d2c789fc055e3"
+
+# The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when
+# installing .so and executables, this fails in cross compilation
+# environments
+SRC_URI += "file://install-strip.patch"
+
+inherit autotools
+
+# OPTIONS
+# The following two variables can be set in a distro or local.conf
+# to switch features on.  Each feature foo defines OPENLDAP_OPTION_foo
+# and OPENLDAP_DEPENDS_foo in this file - to include feature foo add
+# the two variables into the setting of the options below (please use
+# += because that means this can be done in *both* distro.conf and
+# local.conf!
+OPENLDAP_OPTIONS ?= ""
+OPENLDAP_DEPENDS ?= ""
+
+# CV SETTINGS
+# Required to work round AC_FUNC_MEMCMP which gets the wrong answer
+# when cross compiling (should be in site?)
+EXTRA_OECONF += "ac_cv_func_memcmp_working=yes"
+
+# CONFIG DEFINITIONS
+# The following is necessary because it cannot be determined for a
+# cross compile automagically.  Select should yield fine on all OE
+# systems...
+EXTRA_OECONF += "--with-yielding-select=yes"
+# Shared libraries are nice...
+EXTRA_OECONF += "--enable-dynamic"
+#
+# Disable TLS to remove the need for openssl/libcrypto
+OPENLDAP_OPTION_tls  ?= "--with-tls"
+# set the following to "openssl" to build tls support
+OPENLDAP_DEPENDS_tls ?= "gnutls"
+EXTRA_OECONF += "${OPENLDAP_OPTION_tls}"
+DEPENDS += "${OPENLDAP_DEPENDS_tls}"
+#
+# Disable Cyrus SASL, which may or may not be working at present...
+OPENLDAP_OPTION_sasl  ?= "--without-cyrus-sasl"
+# set the following to "cyrus-sasl" to build SASL support
+OPENLDAP_DEPENDS_sasl ?= ""
+EXTRA_OECONF += "${OPENLDAP_OPTION_sasl}"
+DEPENDS += "${OPENLDAP_DEPENDS_sasl}"
+
+# SLAPD options
+#
+# UNIX crypt(3) passwd support:
+EXTRA_OECONF += "--enable-crypt"
+#
+# Enable dynamic module loading.  If this is *disabled* the
+# dependency on libtool is removed (to disable set the following
+# to variables to "" in a .conf file).
+OPENLDAP_OPTION_modules += "lt_cv_dlopen_self=yes --enable-modules"
+OPENLDAP_DEPENDS_modules += "libtool"
+EXTRA_OECONF += " ${OPENLDAP_OPTION_modules}"
+DEPENDS += "${OPENLDAP_DEPENDS_modules}"
+
+# SLAPD BACKEND
+#
+# The backend must be set by the configuration.  This controls the
+# required database, the default database, bdb, is turned off but
+# can be turned back on again and it *is* below!  The monitor backend
+# is also disabled.  If you try to change the backends but fail to
+# enable a single one the build will fail in an obvious way.
+#
+EXTRA_OECONF += "--disable-bdb --disable-hdb --disable-monitor"
+#
+# Backends="bdb dnssrv hdb ldap ldbm meta monitor null passwd perl shell sql"
+#
+# Note that multiple backends can be built.  The ldbm backend requires a
+# build-time choice of database API.  The bdb backend forces this to be
+# DB4.  To use the gdbm (or other) API the Berkely database module must
+# be removed from the build.
+md = "${libexecdir}/openldap"
+#
+#--enable-bdb          enable Berkeley DB backend no|yes|mod yes
+# The Berkely DB is the standard choice.  This version of OpenLDAP requires
+# the version 4 implementation or better.
+# To disable this set all three of the following variables to <empty> in
+# a .conf file (this will allow ldbm to be build with gdbm).
+#OPENLDAP_OPTION_bdb   ?= "--enable-bdb=mod"
+OPENLDAP_DEPENDS_bdb  ?= "db"
+EXTRA_OECONF += "${OPENLDAP_OPTION_bdb}"
+DEPENDS += "${OPENLDAP_DEPENDS_bdb}"
+#
+#--enable-dnssrv       enable dnssrv backend no|yes|mod no
+# This has no dependencies.
+EXTRA_OECONF += "--enable-dnssrv=mod"
+#
+#--enable-hdb          enable Hierarchical DB backend no|yes|mod no
+# This forces ldbm to use Berkeley too, remove to use gdbm
+#OPENLDAP_OPTION_hdb   ?= "--enable-hdb=mod"
+OPENLDAP_DEPENDS_hdb  ?= "db"
+OPENLDAP_PACKAGE_hdb  ?= "${PN}-backend-hdb"
+EXTRA_OECONF += "${OPENLDAP_OPTION_hdb}"
+DEPENDS += "${OPENLDAP_DEPENDS_hdb}"
+#
+#--enable-ldap         enable ldap backend no|yes|mod no
+# This has no dependencies
+EXTRA_OECONF += "--enable-ldap=mod"
+#
+#--enable-ldbm         enable ldbm backend no|yes|mod no
+# ldbm requires further specification of the underlying database API, because
+# bdb is enabled above this must be set to berkeley, however the config
+# defaults this correctly so --with-ldbm-api is *not* set.  The build will
+# fail if bdb is removed (above) but not database is built to provide the
+# support for ldbm (because the 'DEPENDS_ldbm' is empty below.)
+#
+# So to use gdbm set:
+OPENLDAP_OPTION_ldbm = "--enable-ldbm=mod --with-ldbm-api=gdbm"
+OPENLDAP_DEPENDS_ldbm = "gdbm"
+# And clear the bdb and hdb settings.
+OPENLDAP_OPTION_ldbm ?= "--enable-ldbm=mod"
+OPENLDAP_DEPENDS_ldbm ?= ""
+EXTRA_OECONF += "${OPENLDAP_OPTION_ldbm}"
+DEPENDS += "${OPENLDAP_DEPENDS_ldbm}"
+#
+#--enable-meta         enable metadirectory backend no|yes|mod no
+# No dependencies
+EXTRA_OECONF += "--enable-meta=mod"
+#
+#--enable-monitor      enable monitor backend no|yes|mod yes
+EXTRA_OECONF += "--enable-monitor=mod"
+#
+#--enable-null         enable null backend no|yes|mod no
+EXTRA_OECONF += "--enable-null=mod"
+#
+#--enable-passwd       enable passwd backend no|yes|mod no
+EXTRA_OECONF += " --enable-passwd=mod"
+#
+#--enable-perl         enable perl backend no|yes|mod no
+#  This requires a loadable perl dynamic library, if enabled without
+#  doing something appropriate (building perl?) the build will pick
+#  up the build machine perl - not good.
+OPENLDAP_OPTION_perl ?= "--enable-perl=mod"
+OPENLDAP_DEPENDS_perl ?= "perl"
+#EXTRA_OECONF += "${OPENLDAP_OPTION_perl}"
+#DEPENDS += "${OPENLDAP_DEPENDS_perl}"
+#
+#--enable-shell        enable shell backend no|yes|mod no
+EXTRA_OECONF += "--enable-shell=mod"
+#
+#--enable-sql          enable sql backend no|yes|mod no
+# sql requires some sql backend which provides sql.h, sqlite* provides
+# sqlite.h (which may be compatible but hasn't been tried.)
+OPENLDAP_OPTION_sql ?= "--enable-sql=mod"
+OPENLDAP_DEPENDS_sql ?= "sql"
+#EXTRA_OECONF += "${OPENLDAP_OPTION_sql}"
+#DEPENDS += "${OPENLDAP_DEPENDS_sql}"
+#
+#--enable-dyngroup     Dynamic Group overlay no|yes|mod no
+#  This is a demo, Proxy Cache defines init_module which conflicts with the
+#  same symbol in dyngroup
+#EXTRA_OECONF += "--enable-dyngroup=mod"
+#
+#--enable-proxycache   Proxy Cache overlay no|yes|mod no
+EXTRA_OECONF += "--enable-proxycache=mod"
+FILES_${PN}-overlay-proxycache = "${md}/pcache-*.so.*"
+PACKAGES += "${PN}-overlay-proxycache"
+#
+# LOCAL OPTION OVERRIDES
+# The distro/lcoal options must be added in *last*
+EXTRA_OECONF += "${OPENLDAP_OPTIONS}"
+DEPENDS      += "${OPENLDAP_DEPENDS}"
+
+CPPFLAGS_append = " -D_GNU_SOURCE"
+
+do_configure() {
+    cp ${STAGING_DATADIR_NATIVE}/libtool/config/ltmain.sh ${S}/build
+    rm -f ${S}/libtool
+    aclocal
+    libtoolize --force --copy
+    gnu-configize
+    autoconf
+    oe_runconf
+}
+
+#FIXME: this is a hack, at present an openldap build will pick up the header
+# files from staging rather than the local ones (bad -I order), so remove
+# the headers (from openldap-old.x) before compiling...
+do_compile_prepend() {
+    (
+        cd ${STAGING_INCDIR}
+        rm -f ldap.h ldap_*.h
+    )
+    (
+        cd ${STAGING_LIBDIR}
+        rm -f libldap* liblber*
+    )
+}
+
+LEAD_SONAME = "libldap-${LDAP_VER}.so.*"
+
+# The executables go in a separate package.  This allows the
+# installation of the libraries with no daemon support.
+# Each module also has its own package - see above.
+PACKAGES += "${PN}-slapd ${PN}-slurpd ${PN}-bin"
+
+# Package contents - shift most standard contents to -bin
+FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/openldap-data"
+FILES_${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run \
+    ${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \
+    ${sysconfdir}/openldap/DB_CONFIG.example"
+FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp ${localstatedir}/run"
+FILES_${PN}-bin = "${bindir}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so"
+FILES_${PN}-dbg += "${libexecdir}/openldap/.debug"
+
+do_install_append() {
+    install -d ${D}${sysconfdir}/init.d
+    cat ${WORKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap
+    chmod 755 ${D}${sysconfdir}/init.d/openldap
+    # This is duplicated in /etc/openldap and is for slapd
+    rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example
+}
+
+pkg_postinst_${PN}-slapd () {
+    if test -n "${D}"; then
+        D="-r $D"
+    fi
+    update-rc.d $D openldap defaults
+}
+
+pkg_prerm_${PN}-slapd () {
+    if test -n "${D}"; then
+        D="-r $D"
+    fi
+    update-rc.d $D openldap remove
+}
+
+PACKAGES_DYNAMIC = "openldap-backends openldap-backend-*"
+
+python populate_packages_prepend () {
+    backend_dir    = bb.data.expand('${libexecdir}/openldap', d)
+    do_split_packages(d, backend_dir, 'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True)
+
+    metapkg = "openldap-backends"
+    bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
+    bb.data.setVar('FILES_' + metapkg, "", d)
+    metapkg_rdepends = []
+    packages = bb.data.getVar('PACKAGES', d, 1).split()
+    for pkg in packages[1:]:
+        if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"):
+            metapkg_rdepends.append(pkg)
+    bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
+    bb.data.setVar('DESCRIPTION_' + metapkg, 'OpenLDAP backends meta package', d)
+    packages.append(metapkg)
+    bb.data.setVar('PACKAGES', ' '.join(packages), d)
+}
diff --git a/meta-oe/recipes-support/opensync/libsyncml_0.5.4.bb b/meta-oe/recipes-support/opensync/libsyncml_0.5.4.bb
new file mode 100644
index 0000000..0575058
--- /dev/null
+++ b/meta-oe/recipes-support/opensync/libsyncml_0.5.4.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Libsyncml is an implementation of the SyncML protocol."
+HOMEPAGE = "https://libsyncml.opensync.org/"
+SECTION = "libs"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
+
+DEPENDS = "libxml2 glib-2.0"
+RRECOMMENDS_${PN} = "wbxml2 openobex libsoup-2.4"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libsyncml/libsyncml-${PV}.tar.gz"
+SRC_URI[md5sum] = "84879ed7cb94618530fbcb801a1a4f95"
+SRC_URI[sha256sum] = "05d6513637adb1300a3a58b6e29d53ab6373c8f370807d0d925bae72b2920e53"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE += " . -B${WORKDIR}/build "
+
+PACKAGES += "${PN}-tools"
+
+FILES_${PN}-tools = "${bindir}"
+FILES_${PN} = "${libdir}/*.so.*"
+
+do_build_prepend() {
+    cd ${WORKDIR}/build
+}
+
+do_install_prepend() {
+    cd ${WORKDIR}/build
+}
diff --git a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
new file mode 100644
index 0000000..c87e477
--- /dev/null
+++ b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "WBXML parsing and encoding library."
+HOMEPAGE = "http://libwbxml.opensync.org/"
+SECTION = "libs"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c1128ee5341ccd5927d8bafe4b6266e1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libwbxml/libwbxml-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "f5031e9f730ffd9dc6a2d1ded585e1d1"
+SRC_URI[sha256sum] = "a057daa098f12838eb4e635bb28413027f1b73819872c3fbf64e3207790a3f7d"
+
+S = "${WORKDIR}/libwbxml-${PV}"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE += " . -B${WORKDIR}/build "
+
+PACKAGES += "${PN}-tools"
+
+FILES_${PN}-tools = "${bindir}"
+FILES_${PN} = "${libdir}/*.so.*"
+
+do_build_prepend() {
+    cd ${WORKDIR}/build
+}
+
+do_install_prepend() {
+    cd ${WORKDIR}/build
+}
diff --git a/meta-oe/recipes-support/xchat/xchat-2.8.8/glib-2.32.patch b/meta-oe/recipes-support/xchat/xchat-2.8.8/glib-2.32.patch
new file mode 100644
index 0000000..c9bce6a
--- /dev/null
+++ b/meta-oe/recipes-support/xchat/xchat-2.8.8/glib-2.32.patch
@@ -0,0 +1,44 @@
+--- xchat-2.8.8.orig/src/common/xchat.h	2009-08-16 11:40:16.000000000 +0200
++++ xchat-2.8.8/src/common/xchat.h	2012-05-06 08:30:16.125755497 +0200
+@@ -1,10 +1,6 @@
+ #include "../../config.h"
+ 
+-#include <glib/gslist.h>
+-#include <glib/glist.h>
+-#include <glib/gutils.h>
+-#include <glib/giochannel.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <time.h>			/* need time_t */
+ 
+ #ifndef XCHAT_H
+--- xchat-2.8.8.orig/src/common/servlist.c	2010-05-16 09:24:26.000000000 +0200
++++ xchat-2.8.8/src/common/servlist.c	2012-05-06 08:30:45.681758019 +0200
+@@ -24,7 +24,6 @@
+ #include <unistd.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
+ 
+ #include "cfgfiles.h"
+ #include "fe.h"
+--- xchat-2.8.8.orig/src/common/util.c	2009-08-16 11:40:16.000000000 +0200
++++ xchat-2.8.8/src/common/util.c	2012-05-06 08:31:10.389760122 +0200
+@@ -39,7 +39,6 @@
+ #include <errno.h>
+ #include "xchat.h"
+ #include "xchatc.h"
+-#include <glib/gmarkup.h>
+ #include <ctype.h>
+ #include "util.h"
+ #include "../../config.h"
+--- xchat-2.8.8.orig/src/common/text.c	2010-05-30 04:14:41.000000000 +0200
++++ xchat-2.8.8/src/common/text.c	2012-05-06 08:31:22.300761137 +0200
+@@ -28,7 +28,6 @@
+ #include <sys/mman.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
+ #include "cfgfiles.h"
+ #include "chanopt.h"
+ #include "plugin.h"
diff --git a/meta-oe/recipes-support/xchat/xchat_2.8.8.bb b/meta-oe/recipes-support/xchat/xchat_2.8.8.bb
new file mode 100644
index 0000000..3346e18
--- /dev/null
+++ b/meta-oe/recipes-support/xchat/xchat_2.8.8.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Full-featured IRC chat client with scripting support"
+LICENSE = "GPLv2+"
+HOMEPAGE = "http://www.xchat.org"
+SECTION = "x11/network"
+DEPENDS = "libgcrypt zlib gtk+"
+DEPENDS += "gdk-pixbuf-native"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
+
+PR = "r1"
+
+SRC_URI = "http://xchat.org/files/source/2.8/xchat-${PV}.tar.bz2 \
+  file://glib-2.32.patch \
+"
+
+inherit autotools gettext
+
+EXTRA_OECONF = "\
+  --disable-perl \
+  --disable-python \
+  --disable-tcl \
+"
+do_configure_prepend(){
+    rm -f ${S}/po/Makefile.in.in
+}
+
+FILES_${PN} += "${datadir}/dbus-1"
+FILES_${PN}-dbg += "${libdir}/xchat/plugins/.debug"
+
+SRC_URI[md5sum] = "6775c44f38e84d06c06c336b32c4a452"
+SRC_URI[sha256sum] = "0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0"
-- 
1.7.8.6

[meta-oe][PATCH 20/24] liblockfile, libungif: import from oe-classic

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../liblockfile/liblockfile-1.06/configure.patch   |   25 +++++++
 .../liblockfile/liblockfile-1.06/glibc-2.4.patch   |   70 ++++++++++++++++++++
 .../liblockfile/liblockfile-1.06/install.patch     |   48 +++++++++++++
 .../liblockfile/liblockfile-1.06/ldflags.patch     |   21 ++++++
 .../liblockfile/liblockfile_1.06.bb                |   21 ++++++
 .../recipes-extended/libungif/libungif_4.1.3.bb    |   14 ++++
 6 files changed, 199 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.06/configure.patch
 create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.06/glibc-2.4.patch
 create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.06/install.patch
 create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.06/ldflags.patch
 create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile_1.06.bb
 create mode 100644 meta-oe/recipes-extended/libungif/libungif_4.1.3.bb

diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/configure.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/configure.patch
new file mode 100644
index 0000000..ea13e11
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/configure.patch
@@ -0,0 +1,25 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- liblockfile-1.05/./configure.in~configure
++++ liblockfile-1.05/./configure.in
+@@ -1,4 +1,5 @@
+-AC_INIT(lockfile.c)
++AC_INIT
++AC_CONFIG_SRCDIR([lockfile.c])
+ AC_CONFIG_HEADER(autoconf.h)
+ AC_REVISION($Revision: 1.0 $)dnl
+ 
+@@ -111,7 +112,8 @@
+ AC_SUBST(INSTALL_TARGETS)
+ AC_SUBST(nfslockdir)
+ 
+-AC_OUTPUT(\
++AC_CONFIG_FILES([\
+ 	./Makefile \
+ 	./maillock.h \
+-)
++])
++AC_OUTPUT
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/glibc-2.4.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/glibc-2.4.patch
new file mode 100644
index 0000000..e3c4aaa
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/glibc-2.4.patch
@@ -0,0 +1,70 @@
+The local function eaccess conflicts with a glibc function of the same name.
+Rename the function so that this can be build under glibc 2.4, and older
+revisions, without any problems.
+
+--- liblockfile-1.06/dotlockfile.c	2006/07/10 03:17:40	1.1
++++ liblockfile-1.06/dotlockfile.c	2006/07/10 03:18:26
+@@ -42,7 +42,7 @@
+ extern int optind;
+ #endif
+ 
+-extern int eaccess(char *, gid_t, struct stat *);
++extern int xeaccess(char *, gid_t, struct stat *);
+ 
+ /*
+  *	Sleep for an amout of time while regulary checking if
+@@ -252,14 +252,14 @@
+ 		return L_ERROR;
+ 	}
+ 	gid = getgid();
+-	if (eaccess(dir, gid, &st) < 0) {
++	if (xeaccess(dir, gid, &st) < 0) {
+ 		if (errno == ENOENT) {
+ enoent:
+ 			if (!quiet) fprintf(stderr,
+ 				"dotlockfile: %s: no such directory\n", dir);
+ 			return L_TMPLOCK;
+ 		}
+-		if ((r = eaccess(dir, getegid(), &st) < 0) && errno == ENOENT)
++		if ((r = xeaccess(dir, getegid(), &st) < 0) && errno == ENOENT)
+ 			goto enoent;
+ 		if (r < 0 || !ismaillock(lockfile, pwd->pw_name)) {
+ 			if (!quiet) fprintf(stderr,
+@@ -272,7 +272,7 @@
+ 	/*
+ 	 *	Now we should be able to chdir() to the lock directory.
+ 	 *	When we stat("."), it should be the same as at the
+-	 *	eaccess() check or someone played symlink() games on us.
++	 *	xeaccess() check or someone played symlink() games on us.
+ 	 */
+ 	if (chdir(dir) < 0 || stat(".", &st2) < 0) {
+ 		if (!quiet) fprintf(stderr,
+--- liblockfile-1.06/lockfile.c	2006/07/10 03:17:40	1.1
++++ liblockfile-1.06/lockfile.c	2006/07/10 03:18:26
+@@ -54,7 +54,7 @@
+ #ifdef LIB
+ static
+ #endif
+-int eaccess(char *fn, gid_t gid, struct stat *st)
++int xeaccess(char *fn, gid_t gid, struct stat *st)
+ {
+ 	struct stat	tmp;
+ 	uid_t		uid = geteuid();
+@@ -96,7 +96,7 @@
+ 		*p = 0;
+ 	else
+ 		strcpy(dir, ".");
+-	if (eaccess(dir, egid, NULL) >= 0) {
++	if (xeaccess(dir, egid, NULL) >= 0) {
+ 		free(dir);
+ 		return 0;
+ 	}
+@@ -111,7 +111,7 @@
+ 			return 0;
+ 		mailgid = st.st_gid;
+ 	}
+-	ret = eaccess(dir, mailgid, NULL) >= 0;
++	ret = xeaccess(dir, mailgid, NULL) >= 0;
+ 	free (dir);
+ 	return ret;
+ }
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/install.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/install.patch
new file mode 100644
index 0000000..a9319ff
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/install.patch
@@ -0,0 +1,48 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- liblockfile-1.05/Makefile.in~install
++++ liblockfile-1.05/Makefile.in
+@@ -20,6 +20,7 @@
+ includedir	= @includedir@
+ 
+ MAILGROUP	= @MAILGROUP@
++INSTGRP		= $(if $(MAILGROUP),-g $(MAILGROUP))
+ 
+ all:		@TARGETS@
+ install:	@INSTALL_TARGETS@
+@@ -50,25 +51,27 @@
+ 		$(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
+ 
+ install_static:	static install_common
++		install -d $(ROOT)$(libdir)
+ 		install -m 644 liblockfile.a $(ROOT)$(libdir)
+ 
+ install_shared:	shared install_common
++		install -d $(ROOT)$(libdir)
+ 		install -m 755 liblockfile.so \
+ 			$(ROOT)$(libdir)/liblockfile.so.$(VER)
+ 		ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
+ 		if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+ 
+ install_common:
++		install -d $(ROOT)$(includedir)
+ 		install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
+-		if [ "$(MAILGROUP)" != "" ]; then\
+-		  install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
+-		else \
+-		  install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
+-		fi
++		install -d $(ROOT)$(bindir)
++		install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir)
++		install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3
+ 		install -m 644 *.1 $(ROOT)$(mandir)/man1
+ 		install -m 644 *.3 $(ROOT)$(mandir)/man3
+ 
+ install_nfslib:	nfslib
++		install -d $(ROOT)$(nfslockdir)
+ 		install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
+ 		if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+ 
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/ldflags.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/ldflags.patch
new file mode 100644
index 0000000..eb1d147
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/ldflags.patch
@@ -0,0 +1,21 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- liblockfile-1.05/Makefile.in~ldflags
++++ liblockfile-1.05/Makefile.in
+@@ -34,11 +34,11 @@
+ 
+ liblockfile.so: liblockfile.a
+ 		$(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
+-			-o liblockfile.so lockfile.o -lc
++			-o liblockfile.so lockfile.o $(LDFLAGS) -lc
+ 
+ nfslock.so.$(VER):	nfslock.o
+ 		$(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
+-			-o nfslock.so.$(NVER) nfslock.o
++			-o nfslock.so.$(NVER) nfslock.o $(LDFLAGS)
+ 
+ dotlockfile:	dotlockfile.o xlockfile.o
+ 		$(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.06.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.06.bb
new file mode 100644
index 0000000..971eff1
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.06.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "File locking library."
+SECTION = "libs"
+LICENSE = "LGPLv2+ & GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=35127b30003a121544b5d13a2ac868b6"
+
+SRC_URI = "http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/libl/liblockfile/liblockfile_${PV}.tar.gz \
+	   file://install.patch \
+	   file://configure.patch \
+	   file://ldflags.patch \
+	   file://glibc-2.4.patch"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-shared --enable-static"
+
+do_install () {
+	oe_runmake 'ROOT=${D}' INSTGRP='' install
+}
+
+SRC_URI[md5sum] = "2de88389da013488bfd31356523070c0"
+SRC_URI[sha256sum] = "14f9690328318d11f9ba13a9356a2c008bdd169b7a817f38cb7f9eb32cf7240e"
diff --git a/meta-oe/recipes-extended/libungif/libungif_4.1.3.bb b/meta-oe/recipes-extended/libungif/libungif_4.1.3.bb
new file mode 100644
index 0000000..0e9bf9b
--- /dev/null
+++ b/meta-oe/recipes-extended/libungif/libungif_4.1.3.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "shared library for GIF images"
+SECTION = "libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/libungif-${PV}.tar.bz2"
+SRC_URI[md5sum] = "8c198831cc0495596c78134b8849e9ad"
+SRC_URI[sha256sum] = "59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36"
+
+inherit autotools lib_package
+
+PACKAGES =+ "${PN}-utils"
+
+FILES_${PN}-utils = "${bindir}/*"
-- 
1.7.8.6

[meta-oe][PATCH 21/24] emacs: fix dso build

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../emacs/emacs-23.1/fix.dso.build.patch           |   39 ++++++++++++++++++++
 meta-oe/recipes-support/emacs/emacs_23.1.bb        |    4 ++-
 2 files changed, 42 insertions(+), 1 deletions(-)
 create mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch

diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch b/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch
new file mode 100644
index 0000000..0396c0c
--- /dev/null
+++ b/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch
@@ -0,0 +1,39 @@
+Upstream-Status: Backport
+
+from bzr changeset 99307
+
+=== modified file 'ChangeLog'
+--- ChangeLog	2010-01-12 05:11:05 +0000
++++ ChangeLog	2010-01-12 16:25:08 +0000
+@@ -1,3 +1,7 @@
++2010-01-12  Chong Yidong  <cyd@stupidchicken.com>
++
++	* configure.in: Explicitly check for and link to -lXrender.
++
+ 2010-01-12  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug
+
+=== modified file 'configure.in'
+--- configure.in	2010-01-04 05:35:18 +0000
++++ configure.in	2010-01-12 16:25:08 +0000
+@@ -1984,12 +1984,17 @@
+     if test "x${with_xft}" != "xno"; then
+ 
+       PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
+-      if test "$HAVE_XFT" != no; then
++      ## Because xftfont.c uses XRenderQueryExtension, we also
++      ## need to link to -lXrender.
++      HAVE_XRENDER=no
++      AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes)
++      if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then
+ 	OLD_CPPFLAGS="$CPPFLAGS"
+ 	OLD_CFLAGS="$CFLAGS"
+ 	OLD_LIBS="$LIBS"
+ 	CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
+ 	CFLAGS="$CFLAGS $XFT_CFLAGS"
++	XFT_LIBS="-lXrender $XFT_LIBS"
+ 	LIBS="$XFT_LIBS $LIBS"
+ 	AC_CHECK_HEADER(X11/Xft/Xft.h,
+ 	  AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))
+
diff --git a/meta-oe/recipes-support/emacs/emacs_23.1.bb b/meta-oe/recipes-support/emacs/emacs_23.1.bb
index fe134f8..fa7c872 100644
--- a/meta-oe/recipes-support/emacs/emacs_23.1.bb
+++ b/meta-oe/recipes-support/emacs/emacs_23.1.bb
@@ -3,6 +3,8 @@ require emacs.inc
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
            file://use-qemu.patch \
            file://nostdlib-unwind.patch \
-           file://configure.in.lost.backslashes.patch"
+           file://configure.in.lost.backslashes.patch \
+           file://fix.dso.build.patch \
+"
 SRC_URI[tarball.md5sum] = "a620d4452769d04ad8864d662f34f8dd"
 SRC_URI[tarball.sha256sum] = "a94cd46301f000d2d1dcd3fd7ef08ad952846d01ca5d4168b4ec3e38e857da47"
-- 
1.7.8.6

[meta-oe][PATCH 22/24] emacs: upgrade to 23.4

[Martin Jansa]

* package icons in PN
* pass --with-crt-dir option to resolve crt* used from host system

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../emacs/emacs-23.4/nostdlib-unwind.patch         |   16 +++
 .../emacs/emacs-23.4/use-qemu.patch                |  104 ++++++++++++++++++++
 meta-oe/recipes-support/emacs/emacs.inc            |    4 +-
 meta-oe/recipes-support/emacs/emacs_23.4.bb        |   10 ++
 4 files changed, 132 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch
 create mode 100644 meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch
 create mode 100644 meta-oe/recipes-support/emacs/emacs_23.4.bb

diff --git a/meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch b/meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch
new file mode 100644
index 0000000..4200301
--- /dev/null
+++ b/meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch
@@ -0,0 +1,16 @@
+Fix linking problem:
+undefined reference to `__aeabi_unwind_cpp_pr0'
+undefined reference to `__aeabi_unwind_cpp_pr1'
+Index: emacs/src/Makefile.in
+===================================================================
+--- emacs.orig/src/Makefile.in	2008-08-16 14:20:18.000000000 +0000
++++ emacs/src/Makefile.in	2008-08-16 14:51:25.000000000 +0000
+@@ -443,7 +443,7 @@
+    ask GCC explicitly where to find libgcc.a.  */
+ 
+ #ifndef LINKER
+-#define LINKER $(CC) -nostdlib
++#define LINKER $(CC) -nostdlib -lgcc_s
+ #endif
+ 
+ #ifndef LIB_GCC
diff --git a/meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch b/meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch
new file mode 100644
index 0000000..c15207a
--- /dev/null
+++ b/meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch
@@ -0,0 +1,104 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+diff -uNr emacs-23.4/Makefile.in emacs-23.4.new/Makefile.in
+--- emacs-23.4/Makefile.in	2012-01-11 13:35:01.000000000 +0100
++++ emacs-23.4.new/Makefile.in	2012-07-31 00:54:07.223590866 +0200
+@@ -336,7 +336,7 @@
+ # all preloaded elisp files, and only then dump the actual src/emacs, which
+ # is not wrong, but is overkill in 99.99% of the cases.
+ src: Makefile FRC
+-	boot=bootstrap-emacs$(EXEEXT);                         \
++	boot=${QEMU} bootstrap-emacs$(EXEEXT);                         \
+ 	if [ ! -x "src/$$boot" ]; then                                     \
+ 	    cd $@; $(MAKE) all $(MFLAGS)                                   \
+ 	      CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}'         \
+diff -uNr emacs-23.4/leim/Makefile.in emacs-23.4.new/leim/Makefile.in
+--- emacs-23.4/leim/Makefile.in	2012-01-11 13:35:01.000000000 +0100
++++ emacs-23.4.new/leim/Makefile.in	2012-07-31 00:54:07.179590866 +0200
+@@ -51,7 +51,7 @@
+ 
+ # How to run Emacs.
+ RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
+-	${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
++	${QEMU} ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
+ 
+ # Subdirectories to be made if ${srcdir} is different from the current
+ # directory.
+diff -uNr emacs-23.4/lib-src/Makefile.in emacs-23.4.new/lib-src/Makefile.in
+--- emacs-23.4/lib-src/Makefile.in	2012-01-11 13:35:01.000000000 +0100
++++ emacs-23.4.new/lib-src/Makefile.in	2012-07-31 00:54:07.180590866 +0200
+@@ -23,7 +23,7 @@
+ SHELL = /bin/sh
+ 
+ # Following ../lisp/Makefile.in.
+-EMACS = ../src/emacs
++EMACS = ${QEMU} ../src/emacs
+ EMACSOPT = -batch --no-site-file --multibyte
+ 
+ # ==================== Things `configure' will edit ====================
+@@ -372,7 +372,7 @@
+    clobbered too.  */
+ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
+ 	$(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
+-	./test-distrib ${srcdir}/testfile
++	${QEMU} ./test-distrib ${srcdir}/testfile
+ 
+ /* We need the following in order to create a <getopt.h> when the system
+    does not have one that works with the given compiler.  */
+diff -uNr emacs-23.4/lisp/Makefile.in emacs-23.4.new/lisp/Makefile.in
+--- emacs-23.4/lisp/Makefile.in	2012-01-11 13:35:01.000000000 +0100
++++ emacs-23.4.new/lisp/Makefile.in	2012-07-31 00:54:07.195590866 +0200
+@@ -26,8 +26,7 @@
+ # You can specify a different executable on the make command line,
+ # e.g. "make EMACS=../src/emacs ...".
+ 
+-EMACS = ../src/emacs
+-
++EMACS = "${QEMU} ../src/emacs"
+ # Command line flags for Emacs.  This must include --multibyte,
+ # otherwise some files will not compile.
+ 
+diff -uNr emacs-23.4/src/Makefile.in emacs-23.4.new/src/Makefile.in
+--- emacs-23.4/src/Makefile.in	2012-01-12 11:27:54.000000000 +0100
++++ emacs-23.4.new/src/Makefile.in	2012-07-31 00:55:30.344593847 +0200
+@@ -482,7 +482,7 @@
+    this with the shell''s ``for'' construct.
+    Note that some people do not have '.'  in their paths, so we must
+    use ./prefix-args.  */
+-#define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags`
++#define YMF_PASS_LDFLAGS(flags) `${QEMU} ./prefix-args -Xlinker flags`
+ #else
+ #define YMF_PASS_LDFLAGS(flags) flags
+ #endif
+@@ -919,9 +919,9 @@
+    $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
+ 
+ #ifdef HAVE_SHM
+-RUN_TEMACS = `/bin/pwd`/temacs -nl
++RUN_TEMACS = ${QEMU} temacs -nl
+ #else
+-RUN_TEMACS = `/bin/pwd`/temacs
++RUN_TEMACS = ${QEMU} temacs
+ #endif
+ 
+ all: emacs${EXEEXT} $(OTHER_FILES)
+@@ -936,7 +936,7 @@
+ 	@: This new Emacs is as functional and more efficient then
+ 	@: bootstrap-emacs, so let us replace it.
+ 	-ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
+-	-./emacs -q -batch -f list-load-path-shadows
++	-${QEMU} ./emacs -q -batch -f list-load-path-shadows
+ #endif /* ! defined (CANNOT_DUMP) */
+ 
+ /* We run make-docfile twice because the command line may get too long
+@@ -954,8 +954,8 @@
+    only in order to reduce the command line length.  --Stef  */
+ ${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${lisp} ${SOME_MACHINE_LISP}
+ 	-rm -f ${etc}DOC
+-	${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC
+-	${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}
++	${QEMU}${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC
++	${QEMU} ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}
+ 
+ ${libsrc}make-docfile${EXEEXT}:
+ 	cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT}
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc
index 5883719..f6cd461 100644
--- a/meta-oe/recipes-support/emacs/emacs.inc
+++ b/meta-oe/recipes-support/emacs/emacs.inc
@@ -10,7 +10,7 @@ DEPENDS +=" liblockfile"
 
 X11DEPENDS = "gtk+ libungif dbus"
 
-EXTRA_OECONF =  "--without-sound "
+EXTRA_OECONF =  "--without-sound --with-crt-dir=${STAGING_LIBDIR} "
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x,${X11DEPENDS}"
@@ -22,7 +22,7 @@ PACKAGES =+ "${PN}-el"
 FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \
                   ${datadir}/emacs/*/*/*/*.el.gz"
 
-FILES_${PN} += "${datadir}/emacs"
+FILES_${PN} += "${datadir}/emacs ${datadir}/icons"
 
 FILES_${PN}-dbg += "${libexecdir}/emacs/*/*/.debug ${datadir}/emacs/*/*/.debug"
 
diff --git a/meta-oe/recipes-support/emacs/emacs_23.4.bb b/meta-oe/recipes-support/emacs/emacs_23.4.bb
new file mode 100644
index 0000000..3c97e9e
--- /dev/null
+++ b/meta-oe/recipes-support/emacs/emacs_23.4.bb
@@ -0,0 +1,10 @@
+require emacs.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
+           file://use-qemu.patch \
+           file://nostdlib-unwind.patch \
+"
+SRC_URI[tarball.md5sum] = "34405165fcd978fbc8b304cbd99ccf4f"
+SRC_URI[tarball.sha256sum] = "b9a2b8434052771f797d2032772eba862ff9aa143029efc72295170607289c18"
-- 
1.7.8.6

[meta-oe][PATCH 23/24] pixman: add patch to fix SEGFAULT when parsing auxv

[Martin Jansa]

* without this patch emacs won't build
* temacs is executed in qemu and fails like this:
qemu: uncaught target signal 11 (Segmentation fault) - core dumped
Segmentation fault
which is actually:
Program received signal SIGSEGV, Segmentation fault.
__GI_strncmp (s1=s1@entry=0x0, s2=s2@entry=0x40d68638 "v7l", n=n@entry=3) at strncmp.c:64
64      strncmp.c: No such file or directory.
(gdb) bt
Backtrace stopped: previous frame identical to this frame (corrupt stack?)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...lated-workarounds-in-cpu-features-detecti.patch |  121 ++++++++++++++++++++
 .../xorg-lib/pixman_0.26.2.bbappend                |    6 +-
 2 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch

diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
new file mode 100644
index 0000000..b56e690
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
@@ -0,0 +1,121 @@
+From dad8537110c27b45795f8879a3e0a54aa77546b9 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Tue, 11 Jan 2011 18:10:39 +0200
+Subject: [PATCH] ARM: qemu related workarounds in cpu features detection code
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ pixman/pixman-cpu.c |   67 +++++++++++++++++++++++++++++++++++++++++---------
+ 1 files changed, 55 insertions(+), 12 deletions(-)
+
+diff --git a/pixman/pixman-cpu.c b/pixman/pixman-cpu.c
+index aa9036f..a8f2494 100644
+--- a/pixman/pixman-cpu.c
++++ b/pixman/pixman-cpu.c
+@@ -333,15 +333,30 @@ pixman_arm_read_auxv_or_cpu_features ()
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
++#include <sys/utsname.h>
+ #include <fcntl.h>
+ #include <string.h>
+ #include <elf.h>
+ 
++/*
++ * The whole CPU capabilities detection is a bit ugly: when running in
++ * userspace qemu, we see /proc/self/auxv from the host system. To make
++ * everything even worse, the size of each value is 64-bit when running
++ * on a 64-bit host system. So the data is totally bogus because we expect
++ * 32-bit values. As AT_PLATFORM value is used as a pointer, it may cause
++ * segfault (null pointer dereference on x86-64 host). So in order to be
++ * on a safe side, we require that AT_PLATFORM value is found only once,
++ * and it has non-zero value (this is still not totally reliable for a big
++ * endian 64-bit host system running qemu and may theoretically fail).
++ */
+ static void
+ pixman_arm_read_auxv_or_cpu_features ()
+ {
+     int fd;
+     Elf32_auxv_t aux;
++    uint32_t hwcap = 0;
++    const char *plat = NULL;
++    int plat_cnt = 0;
+ 
+     fd = open ("/proc/self/auxv", O_RDONLY);
+     if (fd >= 0)
+@@ -350,32 +365,60 @@ pixman_arm_read_auxv_or_cpu_features ()
+ 	{
+ 	    if (aux.a_type == AT_HWCAP)
+ 	    {
+-		uint32_t hwcap = aux.a_un.a_val;
+-		/* hardcode these values to avoid depending on specific
+-		 * versions of the hwcap header, e.g. HWCAP_NEON
+-		 */
+-		arm_has_vfp = (hwcap & 64) != 0;
+-		arm_has_iwmmxt = (hwcap & 512) != 0;
+-		/* this flag is only present on kernel 2.6.29 */
+-		arm_has_neon = (hwcap & 4096) != 0;
++		hwcap = aux.a_un.a_val;
+ 	    }
+ 	    else if (aux.a_type == AT_PLATFORM)
+ 	    {
+-		const char *plat = (const char*) aux.a_un.a_val;
+-		if (strncmp (plat, "v7l", 3) == 0)
++		plat = (const char*) aux.a_un.a_val;
++		plat_cnt++;
++	    }
++	}
++	close (fd);
++
++	if (plat == NULL || plat_cnt != 1 || *plat != 'v')
++	{
++	    /*
++	     * Something seems to be really wrong, most likely we are
++	     * running under qemu. Let's use machine type from "uname" for
++	     * CPU capabilities detection:
++	     * http://www.mail-archive.com/qemu-devel at nongnu.org/msg22212.html
++	     */
++	    struct utsname u;
++	    hwcap = 0; /* clear hwcap, because it is bogus */
++	    if (uname (&u) == 0)
++	    {
++		if (strcmp (u.machine, "armv7l") == 0)
+ 		{
+ 		    arm_has_v7 = TRUE;
+ 		    arm_has_v6 = TRUE;
++		    hwcap |= 64; /* qemu is supposed to emulate vfp */
++		    hwcap |= 4096; /* qemu is supposed to emulate neon */
+ 		}
+-		else if (strncmp (plat, "v6l", 3) == 0)
++		else if (strcmp (u.machine, "armv6l") == 0)
+ 		{
+ 		    arm_has_v6 = TRUE;
++		    hwcap |= 64; /* qemu is supposed to emulate vfp */
+ 		}
+ 	    }
+ 	}
+-	close (fd);
++	else if (strncmp (plat, "v7l", 3) == 0)
++	{
++	    arm_has_v7 = TRUE;
++	    arm_has_v6 = TRUE;
++	}
++	else if (strncmp (plat, "v6l", 3) == 0)
++	{
++	    arm_has_v6 = TRUE;
++	}
+     }
+ 
++    /* hardcode these values to avoid depending on specific
++     * versions of the hwcap header, e.g. HWCAP_NEON
++     */
++    arm_has_vfp = (hwcap & 64) != 0;
++    arm_has_iwmmxt = (hwcap & 512) != 0;
++    arm_has_neon = (hwcap & 4096) != 0;
++
+     arm_tests_initialized = TRUE;
+ }
+ 
+-- 
+1.7.8.6
+
diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman_0.26.2.bbappend b/meta-oe/recipes-graphics/xorg-lib/pixman_0.26.2.bbappend
index 579d508..b5be2b5 100644
--- a/meta-oe/recipes-graphics/xorg-lib/pixman_0.26.2.bbappend
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman_0.26.2.bbappend
@@ -1,8 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-PRINC := "${@int(PRINC) + 9}"
+PRINC := "${@int(PRINC) + 10}"
 
-SRC_URI += " file://0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch"
+SRC_URI += " file://0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+  file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
+"
 
 NEON = " --disable-arm-neon "
 NEON_armv7a = " "
-- 
1.7.8.6

[meta-oe][PATCH 24/24] emacs: drop older version 23.1

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../emacs-23.1/configure.in.lost.backslashes.patch |   24 -----
 .../emacs/emacs-23.1/fix.dso.build.patch           |   39 -------
 .../emacs/emacs-23.1/nostdlib-unwind.patch         |   16 ---
 .../emacs/emacs-23.1/use-qemu.patch                |  107 --------------------
 meta-oe/recipes-support/emacs/emacs_23.1.bb        |   10 --
 meta-oe/recipes-support/emacs/emacs_23.4.bb        |    2 -
 6 files changed, 0 insertions(+), 198 deletions(-)
 delete mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch
 delete mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch
 delete mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch
 delete mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch
 delete mode 100644 meta-oe/recipes-support/emacs/emacs_23.1.bb

diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch b/meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch
deleted file mode 100644
index 2d29f17..0000000
--- a/meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-pending upstream, fixed in 23.2
-http://debbugs.gnu.org/cgi-bin/bugreport.cgi?bug=5047
-https://bugzilla.redhat.com/show_bug.cgi?id=540921
-diff -up emacs-23.1/configure.in.cpp emacs-23.1/configure.in
---- emacs-23.1/configure.in.cpp	2009-11-30 13:24:53.000000000 +0100
-+++ emacs-23.1/configure.in	2009-11-30 13:25:45.000000000 +0100
-@@ -2983,7 +2983,7 @@ echo creating lib-src/Makefile
-   sed -e '1,/start of cpp stuff/d'\
-       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
-       < Makefile.c > junk.c
--  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-+  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	\f]*$/d' > junk2.c
-   cat junk1.c junk2.c > Makefile.new
-   rm -f junk.c junk1.c junk2.c
-@@ -2999,7 +2999,7 @@ echo creating src/Makefile
-   sed -e '1,/start of cpp stuff/d'\
-       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
-       < Makefile.c > junk.c
--  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-+  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	\f]*$/d' > junk2.c
-   cat junk1.c junk2.c > Makefile.new
-   rm -f junk.c junk1.c junk2.c
diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch b/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch
deleted file mode 100644
index 0396c0c..0000000
--- a/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream-Status: Backport
-
-from bzr changeset 99307
-
-=== modified file 'ChangeLog'
---- ChangeLog	2010-01-12 05:11:05 +0000
-+++ ChangeLog	2010-01-12 16:25:08 +0000
-@@ -1,3 +1,7 @@
-+2010-01-12  Chong Yidong  <cyd@stupidchicken.com>
-+
-+	* configure.in: Explicitly check for and link to -lXrender.
-+
- 2010-01-12  Glenn Morris  <rgm@gnu.org>
- 
- 	* INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug
-
-=== modified file 'configure.in'
---- configure.in	2010-01-04 05:35:18 +0000
-+++ configure.in	2010-01-12 16:25:08 +0000
-@@ -1984,12 +1984,17 @@
-     if test "x${with_xft}" != "xno"; then
- 
-       PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
--      if test "$HAVE_XFT" != no; then
-+      ## Because xftfont.c uses XRenderQueryExtension, we also
-+      ## need to link to -lXrender.
-+      HAVE_XRENDER=no
-+      AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes)
-+      if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then
- 	OLD_CPPFLAGS="$CPPFLAGS"
- 	OLD_CFLAGS="$CFLAGS"
- 	OLD_LIBS="$LIBS"
- 	CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
- 	CFLAGS="$CFLAGS $XFT_CFLAGS"
-+	XFT_LIBS="-lXrender $XFT_LIBS"
- 	LIBS="$XFT_LIBS $LIBS"
- 	AC_CHECK_HEADER(X11/Xft/Xft.h,
- 	  AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))
-
diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch b/meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch
deleted file mode 100644
index 4200301..0000000
--- a/meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix linking problem:
-undefined reference to `__aeabi_unwind_cpp_pr0'
-undefined reference to `__aeabi_unwind_cpp_pr1'
-Index: emacs/src/Makefile.in
-===================================================================
---- emacs.orig/src/Makefile.in	2008-08-16 14:20:18.000000000 +0000
-+++ emacs/src/Makefile.in	2008-08-16 14:51:25.000000000 +0000
-@@ -443,7 +443,7 @@
-    ask GCC explicitly where to find libgcc.a.  */
- 
- #ifndef LINKER
--#define LINKER $(CC) -nostdlib
-+#define LINKER $(CC) -nostdlib -lgcc_s
- #endif
- 
- #ifndef LIB_GCC
diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch b/meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch
deleted file mode 100644
index 255b07f..0000000
--- a/meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Index: emacs-23.1/leim/Makefile.in
-===================================================================
---- emacs-23.1.orig/leim/Makefile.in
-+++ emacs-23.1/leim/Makefile.in
-@@ -51,7 +51,7 @@ buildlisppath=${srcdir}/${dot}${dot}/lis
- 
- # How to run Emacs.
- RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
--	${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
-+	${QEMU} ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
- 
- # Subdirectories to be made if ${srcdir} is different from the current
- # directory.
-Index: emacs-23.1/lib-src/Makefile.in
-===================================================================
---- emacs-23.1.orig/lib-src/Makefile.in
-+++ emacs-23.1/lib-src/Makefile.in
-@@ -23,7 +23,7 @@
- SHELL = /bin/sh
- 
- # Following ../lisp/Makefile.in.
--EMACS = ../src/emacs
-+EMACS = ${QEMU} ../src/emacs
- EMACSOPT = -batch --no-site-file --multibyte
- 
- # ==================== Things `configure' will edit ====================
-@@ -371,7 +371,7 @@ TAGS: etags${EXEEXT}
-    clobbered too.  */
- test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
- 	$(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
--	./test-distrib ${srcdir}/testfile
-+	${QEMU} ./test-distrib ${srcdir}/testfile
- 
- /* We need the following in order to create a <getopt.h> when the system
-    does not have one that works with the given compiler.  */
-Index: emacs-23.1/lisp/Makefile.in
-===================================================================
---- emacs-23.1.orig/lisp/Makefile.in
-+++ emacs-23.1/lisp/Makefile.in
-@@ -26,8 +26,7 @@ srcdir=@srcdir@/..
- # You can specify a different executable on the make command line,
- # e.g. "make EMACS=../src/emacs ...".
- 
--EMACS = ../src/emacs
--
-+EMACS = "${QEMU} ../src/emacs"
- # Command line flags for Emacs.  This must include --multibyte,
- # otherwise some files will not compile.
- 
-Index: emacs-23.1/Makefile.in
-===================================================================
---- emacs-23.1.orig/Makefile.in
-+++ emacs-23.1/Makefile.in
-@@ -336,7 +336,7 @@ lib-src lisp: Makefile FRC
- # all preloaded elisp files, and only then dump the actual src/emacs, which
- # is not wrong, but is overkill in 99.99% of the cases.
- src: Makefile FRC
--	boot=bootstrap-emacs$(EXEEXT);                         \
-+	boot=${QEMU} bootstrap-emacs$(EXEEXT);                         \
- 	if [ ! -x "src/$$boot" ]; then                                     \
- 	    cd $@; $(MAKE) all $(MFLAGS)                                   \
- 	      CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}'         \
-Index: emacs-23.1/src/Makefile.in
-===================================================================
---- emacs-23.1.orig/src/Makefile.in
-+++ emacs-23.1/src/Makefile.in
-@@ -497,7 +497,7 @@
-    this with the shell''s ``for'' construct.
-    Note that some people do not have '.'  in their paths, so we must
-    use ./prefix-args.  */
--#define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags`
-+#define YMF_PASS_LDFLAGS(flags) `${QEMU} ./prefix-args -Xlinker flags`
- #else
- #define YMF_PASS_LDFLAGS(flags) flags
- #endif
-@@ -895,9 +895,9 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(L
- #endif
- 
- #ifdef HAVE_SHM
--RUN_TEMACS = `/bin/pwd`/temacs -nl
-+RUN_TEMACS = ${QEMU} temacs -nl
- #else
--RUN_TEMACS = `/bin/pwd`/temacs
-+RUN_TEMACS = ${QEMU} temacs
- #endif
- 
- all: emacs${EXEEXT} OTHER_FILES
-@@ -912,7 +912,7 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DO
- 	@: bootstrap-emacs, so let us replace it.
- 	-ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
- #endif /* ! defined (CANNOT_DUMP) */
--	-./emacs -q -batch -f list-load-path-shadows
-+	-${QEMU} ./emacs -q -batch -f list-load-path-shadows
- 
- /* We run make-docfile twice because the command line may get too long
-    on some systems.  */
-@@ -929,8 +929,8 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DO
-    only in order to reduce the command line length.  --Stef  */
- ${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${lisp} ${SOME_MACHINE_LISP}
- 	-rm -f ${etc}DOC
--	${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC
--	${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}
-+	${QEMU}${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC
-+	${QEMU} ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}
- 
- ${libsrc}make-docfile${EXEEXT}:
- 	cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT}
diff --git a/meta-oe/recipes-support/emacs/emacs_23.1.bb b/meta-oe/recipes-support/emacs/emacs_23.1.bb
deleted file mode 100644
index fa7c872..0000000
--- a/meta-oe/recipes-support/emacs/emacs_23.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require emacs.inc
-
-SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
-           file://use-qemu.patch \
-           file://nostdlib-unwind.patch \
-           file://configure.in.lost.backslashes.patch \
-           file://fix.dso.build.patch \
-"
-SRC_URI[tarball.md5sum] = "a620d4452769d04ad8864d662f34f8dd"
-SRC_URI[tarball.sha256sum] = "a94cd46301f000d2d1dcd3fd7ef08ad952846d01ca5d4168b4ec3e38e857da47"
diff --git a/meta-oe/recipes-support/emacs/emacs_23.4.bb b/meta-oe/recipes-support/emacs/emacs_23.4.bb
index 3c97e9e..625a4b9 100644
--- a/meta-oe/recipes-support/emacs/emacs_23.4.bb
+++ b/meta-oe/recipes-support/emacs/emacs_23.4.bb
@@ -1,7 +1,5 @@
 require emacs.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
            file://use-qemu.patch \
            file://nostdlib-unwind.patch \
-- 
1.7.8.6