[meta-oe][meta-efl][meta-gnome 00/10] Small fixes

[meta-oe][meta-efl][meta-gnome 00/10] Small fixes

[Martin Jansa]

The following changes since commit 1b170fa28c9c52d4c8d87e9cbe07af1e664a96c3:

  digitemp: add 3.6.0 version (2011-10-17 16:32:18 +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 (10):
  syslog-ng: move conflicting file modules.conf to own packages and fix
    unpackaged files
  xf86-input-tslib: fix build with newer xserver
  e-wm-illume-dict-pl: fix licensing information
  e-tasks: fix licensing information
  ttf-droid: add LIC_FILES_CHKSUM, switch to github.com
  abiword: add LIC_FILES_CHKSUM
  abiword: add SRC_URI checksums
  abiword: fix install, newer versions doesn't allow to overwrite just
    installed files
  wv: add SRC_URI checksums and drop deprecated patch=1 param
  efm-nav, efm-path, efm-pathbar: drop from meta-efl, now are part of
    efm itself

 meta-efl/recipes-efl/e17/e-tasks_svn.bb            |    3 +-
 meta-efl/recipes-efl/e17/efm-nav_svn.bb            |   14 --
 meta-efl/recipes-efl/e17/efm-path_svn.bb           |   15 --
 meta-efl/recipes-efl/e17/efm-pathbar_svn.bb        |   15 --
 .../recipes-efl/efl/e-wm-illume-dict-pl_git.bb     |    5 +-
 meta-gnome/recipes-gnome/abiword/abiword-2.5.inc   |    7 +-
 .../abiword/abiword-2.5/fix.double.install.patch   |   34 ++++
 .../abiword/abiword-embedded_2.5.2.bb              |    4 +-
 meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb  |    4 +-
 meta-gnome/recipes-gnome/wv/wv_1.2.0.bb            |    4 +-
 .../recipes-graphics/ttf-fonts/ttf-droid_git.bb    |   14 +-
 .../xf86-input-tslib-port-ABI-12-r48.patch         |  196 ++++++++++++++++++++
 .../xorg-driver/xf86-input-tslib_0.0.6.bb          |    3 +-
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc    |   11 +
 .../recipes-support/syslog-ng/syslog-ng_3.2.2.bb   |    2 +-
 15 files changed, 268 insertions(+), 63 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/efm-nav_svn.bb
 delete mode 100644 meta-efl/recipes-efl/e17/efm-path_svn.bb
 delete mode 100644 meta-efl/recipes-efl/e17/efm-pathbar_svn.bb
 create mode 100644 meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch
 create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch

-- 
1.7.7

[meta-oe][meta-efl][meta-gnome 01/10] syslog-ng: move conflicting file modules.conf to own packages and fix unpackaged files

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc    |   11 +++++++++++
 .../recipes-support/syslog-ng/syslog-ng_3.2.2.bb   |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index c3a36c1..073b6d6 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -38,6 +38,17 @@ do_install_append() {
         install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN}
 }
 
+PACKAGES =+ "${PN}-config"
+FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
+            ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+            ${base_bindir}/* ${base_sbindir}/* \
+            ${base_libdir}/*${SOLIBS} \
+            ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \
+            ${datadir}/include/scl/ ${datadir}/xsd"
+FILES_${PN}-dev += "${libdir}/${BPN}/lib*.la ${libdir}/${BPN}/*${SOLIBSDEV}"
+# moved intentionaly to ${PN}-config without RDEPENDing on it, because it breaks update-modules 
+# see http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-October/035537.html
+FILES_${PN}-config += "${syconfdir}/modules.conf"
 CONFFILES_${PN} = "${sysconfdir}/${PN}.conf"
 
 pkg_postinst_${PN} () {
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb
index f9eef24..c8b5ac8 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb
@@ -1,5 +1,5 @@
 require syslog-ng.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRC_URI += " \
   file://syslog-ng.conf \
-- 
1.7.7

[meta-oe][meta-efl][meta-gnome 02/10] xf86-input-tslib: fix build with newer xserver

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../xf86-input-tslib-port-ABI-12-r48.patch         |  196 ++++++++++++++++++++
 .../xorg-driver/xf86-input-tslib_0.0.6.bb          |    3 +-
 2 files changed, 198 insertions(+), 1 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch

diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch
new file mode 100644
index 0000000..6a6d5b9
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch
@@ -0,0 +1,196 @@
+Upstream-Status: Pending
+
+Taken from debian:
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627075
+
+Index: xf86-input-tslib-trunk/src/tslib.c
+===================================================================
+--- xf86-input-tslib-trunk/src/tslib.c	(revision 48)
++++ xf86-input-tslib-trunk/src/tslib.c	(working copy)
+@@ -69,6 +69,13 @@
+ #define DEFAULT_HEIGHT		240
+ #define DEFAULT_WIDTH		320
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
++#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options), NULL)
++#else
++#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options))
++#endif
++
++
+ enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 };
+ 
+ enum button_state { BUTTON_NOT_PRESSED = 0, BUTTON_1_PRESSED = 1, BUTTON_3_CLICK = 3, BUTTON_3_CLICKED=4, BUTTON_EMULATION_OFF=-1 };
+@@ -106,7 +113,7 @@
+ }
+ 
+ static Bool
+-ConvertProc( LocalDevicePtr local,
++ConvertProc( InputInfoPtr local,
+ 			 int first,
+ 			 int num,
+ 			 int v0,
+@@ -135,7 +142,7 @@
+     return t;
+ }
+ 
+-static void ReadInput (LocalDevicePtr local)
++static void ReadInput (InputInfoPtr local)
+ {
+ 	struct ts_priv *priv = (struct ts_priv *) (local->private);
+ 	struct ts_sample samp;
+@@ -382,7 +389,11 @@
+ 					       axiswidth - 1,	/* max val */
+ 					       axiswidth,	/* resolution */
+ 					       0,		/* min_res */
+-					       axiswidth);	/* max_res */
++					       axiswidth	/* max_res */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++					       ,Absolute
++#endif
++					       );
+ 
+ 		InitValuatorAxisStruct(device, 1,
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+@@ -392,7 +403,11 @@
+ 					       axisheight - 1,	/* max val */
+ 					       axisheight,	/* resolution */
+ 					       0,		/* min_res */
+-					       axisheight);	/* max_res */
++					       axisheight	/* max_res */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++					       ,Absolute
++#endif
++					       );
+ 
+ 		if (InitProximityClassDeviceStruct (device) == FALSE) {
+ 			ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n");
+@@ -434,7 +449,7 @@
+ 	ErrorF("%s\n", __FUNCTION__);
+ 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
+ 	ts_close(priv->ts);
+-	xfree(pInfo->private);
++	free(pInfo->private);
+ 	pInfo->private = NULL;
+ 	xf86DeleteInput(pInfo, 0);
+ }
+@@ -444,47 +459,57 @@
+  *
+  * called when the module subsection is found in XF86Config
+  */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++static int 
++xf86TslibInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
++#else
+ static InputInfoPtr
+ xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
++#endif
+ {
+ 	struct ts_priv *priv;
+ 	char *s;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ 	InputInfoPtr pInfo;
++#endif
+ 
+-	priv = xcalloc (1, sizeof (struct ts_priv));
++	priv = calloc (1, sizeof (struct ts_priv));
+         if (!priv)
+-                return NULL;
++                return BadValue;
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ 	if (!(pInfo = xf86AllocateInput(drv, 0))) {
+-		xfree(priv);
+-		return NULL;
++		free(priv);
++		return BadValue;
+ 	}
+ 
+ 	/* Initialise the InputInfoRec. */
+ 	pInfo->name = dev->identifier;
+-	pInfo->type_name = XI_TOUCHSCREEN;
+ 	pInfo->flags =
+ 	    XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE |
+ 	    XI86_SEND_DRAG_EVENTS;
+-	pInfo->device_control = xf86TslibControlProc;
+-	pInfo->read_input = ReadInput;
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+ 	pInfo->motion_history_proc = xf86GetMotionEvents;
+ 	pInfo->history_size = 0;
+ #endif
+-	pInfo->control_proc = NULL;
++	pInfo->conf_idev = dev;
+ 	pInfo->close_proc = NULL;
+-	pInfo->switch_mode = NULL;
+ 	pInfo->conversion_proc = ConvertProc;
+ 	pInfo->reverse_conversion_proc = NULL;
+-	pInfo->dev = NULL;
+ 	pInfo->private_flags = 0;
+ 	pInfo->always_core_feedback = 0;
+-	pInfo->conf_idev = dev;
++#endif
++
++	pInfo->type_name = XI_TOUCHSCREEN;
++	pInfo->control_proc = NULL;
++	pInfo->read_input = ReadInput;
++	pInfo->device_control = xf86TslibControlProc;
++	pInfo->switch_mode = NULL;
+ 	pInfo->private = priv;
++	pInfo->dev = NULL;
+ 
+ 	/* Collect the options, and process the common options. */
+-	xf86CollectInputOptions(pInfo, NULL, NULL);
++	COLLECT_INPUT_OPTIONS(pInfo, NULL);
+ 	xf86ProcessCommonOptions(pInfo, pInfo->options);
+ 
+ 	priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 );
+@@ -510,23 +535,31 @@
+ 		priv->rotate = TSLIB_ROTATE_NONE;
+ 	}
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+  	s = xf86CheckStrOption(dev->commonOptions, "path", NULL);
++#else
++	s = xf86CheckStrOption(pInfo->options, "path", NULL);
++#endif
+   	if (!s)
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ 		s = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
++#else
++		s = xf86CheckStrOption(pInfo->options, "Device", NULL);
++#endif
+  
+ 	priv->ts = ts_open(s, 1);
+-	xfree(s);
++	free(s);
+ 
+ 	if (!priv->ts) {
+ 		ErrorF("ts_open failed (device=%s)\n",s);
+ 		xf86DeleteInput(pInfo, 0);
+-		return NULL;
++		return BadValue;
+ 	}
+ 
+ 	if (ts_config(priv->ts)) {
+ 		ErrorF("ts_config failed\n");
+ 		xf86DeleteInput(pInfo, 0);
+-		return NULL;
++		return BadValue;
+ 	}
+ 
+ 	pInfo->fd = ts_fd(priv->ts);
+@@ -536,11 +569,13 @@
+ 		priv->state = BUTTON_EMULATION_OFF;
+ 	}
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ 	/* Mark the device configured */
+ 	pInfo->flags |= XI86_CONFIGURED;
++#endif
+ 
+ 	/* Return the configured device */
+-	return (pInfo);
++	return Success;
+ }
+ 
+ _X_EXPORT InputDriverRec TSLIB = {
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
index 9ce5093..de0eb6f 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
@@ -8,13 +8,14 @@ RSUGGESTS_${PN} += "hal"
 LIC_FILES_CHKSUM = "file://src/tslib.c;endline=28;md5=bd62eaef222dcf5cd59e490a12bd795e \
                     file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2;name=archive \
            file://double-free-crash.patch \
            file://10-x11-input-tslib.fdi \
            file://xserver-174-XGetPointerControl.patch \
            file://99-xf86-input-tslib.rules \
+           file://xf86-input-tslib-port-ABI-12-r48.patch \
 "
 SRC_URI[md5sum] = "b7a4d2f11637ee3fcf432e044b1d017f"
 SRC_URI[sha256sum] = "5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105"
-- 
1.7.7

[meta-oe][meta-efl][meta-gnome 03/10] e-wm-illume-dict-pl: fix licensing information

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-efl/efl/e-wm-illume-dict-pl_git.bb     |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb b/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb
index e07de94..bfab3c9 100644
--- a/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb
+++ b/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "Polish dictionary for Illume keyboard"
 SECTION = "x11/data"
-SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV = "38fdd9bb0d8296e984bb6443466801eea6f62f00"
 PV = "1.0+gitr${SRCPV}"
 PE = "1"
 PR = "r0"
-LICENSE = "unknown"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
 
-- 
1.7.7

[meta-oe][meta-efl][meta-gnome 04/10] e-tasks: fix licensing information

[Martin Jansa]

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

diff --git a/meta-efl/recipes-efl/e17/e-tasks_svn.bb b/meta-efl/recipes-efl/e17/e-tasks_svn.bb
index eff0275..b79353b 100644
--- a/meta-efl/recipes-efl/e17/e-tasks_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-tasks_svn.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "e-tasks is a todo program for Openmoko phones"
 HOMEPAGE = "http://code.google.com/p/e-tasks/"
 AUTHOR = "cchandel"
-LICENSE = "GPLv2"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
 SECTION = "e/apps"
 DEPENDS = "elementary eina edbus sqlite3"
 
-- 
1.7.7

[meta-oe][meta-efl][meta-gnome 05/10] ttf-droid: add LIC_FILES_CHKSUM, switch to github.com

[Martin Jansa]

* android.git.kernel.org seems not available
* SRCREV magic didn't work for me with fetch2
* PV changed to get upgradable path

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-graphics/ttf-fonts/ttf-droid_git.bb    |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
index a23170a..e0a6c65 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
@@ -3,18 +3,16 @@ require ttf.inc
 DESCRIPTION = "Droid fonts - TTF Edition"
 HOMEPAGE = "http://www.droidfonts.com/"
 LICENSE = "Apache-2.0"
-PR = "r1"
-# git magic below - SRCREV is an ID of /data/fonts subtree
-# (so we don't need to fetch full platform/frameworks/base.git)
-SRCREV = "31f255e44e618ff3b923f332e8fcb83403fd39f5"
-PV = "0.0+${PR}+gitr${SRCREV}"
+LIC_FILES_CHKSUM = "file://README.txt;md5=83544262a86f1f1ec761e75897df92bc"
+SRCREV = "21e6e2de1f0062f949fcc52d0b4559dfa3246e0e"
+PV = "0.1+gitr${SRCPV}"
 
-SRC_URI = "git://android.git.kernel.org/platform/frameworks/base.git;protocol=git;branch=master"
+SRC_URI = "git://github.com/android/platform_frameworks_base.git;protocol=git;branch=master"
 
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/data/fonts"
 
 do_install_prepend() {
-	rm ${S}/Ahem.ttf # we're not packaging it
+	rm ${S}/Ahem.ttf MTLc3m.ttf DroidSansArabic.ttf DroidSansThai.ttf Clockopia.ttf MTLmr3m.ttf DroidSansHebrew.ttf DroidSansFallbackLegacy.ttf # we're not packaging it
 }
 
 PACKAGES = "${PN}-dbg ttf-droid-sans ttf-droid-sans-mono \
-- 
1.7.7

[meta-oe][meta-efl][meta-gnome 06/10] abiword: add LIC_FILES_CHKSUM

[Martin Jansa]

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

diff --git a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
index 7da9dee..86c55f0 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
+++ b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
@@ -2,6 +2,7 @@ DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) W
 HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
 DEPENDS     = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
 RDEPENDS_${PN}    = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
                glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-- 
1.7.7

[meta-oe][meta-efl][meta-gnome 07/10] abiword: add SRC_URI checksums

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/abiword/abiword-2.5.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
index 86c55f0..c469369 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
+++ b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
@@ -8,6 +8,8 @@ RDEPENDS_${PN}    = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
                glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
+SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b"
+SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f"
 
 #want 2.x from 2.x.y for the installation directory
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
-- 
1.7.7

[meta-oe][meta-efl][meta-gnome 08/10] abiword: fix install, newer versions doesn't allow to overwrite just installed files

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/abiword/abiword-2.5.inc   |    4 ++-
 .../abiword/abiword-2.5/fix.double.install.patch   |   34 ++++++++++++++++++++
 .../abiword/abiword-embedded_2.5.2.bb              |    4 +-
 meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb  |    4 +-
 4 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch

diff --git a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
index c469369..67a5ef4 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
+++ b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
@@ -7,7 +7,9 @@ DEPENDS     = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
 RDEPENDS_${PN}    = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
                glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
 
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+           file://fix.double.install.patch \
+"
 SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b"
 SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f"
 
diff --git a/meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch b/meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch
new file mode 100644
index 0000000..67db139
--- /dev/null
+++ b/meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch
@@ -0,0 +1,34 @@
+Upstream-Status: Pending
+
+Without this patch it fails with:
+| make[6]: Entering directory `/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.5.2-r2/abiword-2.5.2/src/wp/ap/unix'
+| make[6]: Nothing to be done for `install-exec-am'.
+| test -z "/usr/share/abiword-2.5/glade" || /bin/mkdir -p "/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.5.2-r2/image/usr/share/abiword-2.5/glade"
+|  /usr/bin/install -c -m 644 ap_UnixDialog_Break.glade ap_UnixDialog_Field.glade ap_UnixDialog_FormatTOC.glade ap_UnixDialog_FormatFootnotes.glade ap_UnixDialog_FormatTable.glade ap_UnixDialog_FormatFrame.gla
+de ap_UnixDialog_Goto.glade ap_UnixDialog_InsertTable.glade ap_UnixDialog_Insert_DateTime.glade ap_UnixDialog_MailMerge.glade ap_UnixDialog_MetaData.glade ap_UnixDialog_Options.glade ap_UnixDialog_HdrFtr.glade
+ ap_UnixDialog_Options_ColorSel.glade ap_UnixDialog_PageNumbers.glade ap_UnixDialog_PageSetup.glade ap_UnixDialog_Replace.glade ap_UnixDialog_New.glade ap_UnixDialog_Styles.glade ap_UnixDialog_Stylist.glade ap
+ _UnixDialog_Stylist_modal.glade ap_UnixDialog_Tab.glade ap_UnixDialog_WordCount.glade ap_UnixDialog_Latex.glade ap_UnixDialog_Options.glade ap_UnixDialog_HdrFtr.glade '/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-
+ linux-gnueabi/abiword-2.5.2-r2/image/usr/share/abiword-2.5/glade'
+ | /usr/bin/install: will not overwrite just-created `/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.5.2-r2/image/usr/share/abiword-2.5/glade/ap_UnixDialog_Options.glade' with `ap_UnixDialog_O
+ ptions.glade'
+ | /usr/bin/install: will not overwrite just-created `/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.5.2-r2/image/usr/share/abiword-2.5/glade/ap_UnixDialog_HdrFtr.glade' with `ap_UnixDialog_Hd
+ rFtr.glade'
+ | make[6]: *** [install-gladeDATA] Error 1
+ | make[6]: Leaving directory `/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.5.2-r2/abiword-2.5.2/src/wp/ap/unix'
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
+diff -uNr abiword-2.5.2.orig/src/wp/ap/unix/GNUmakefile.am abiword-2.5.2/src/wp/ap/unix/GNUmakefile.am
+--- abiword-2.5.2.orig/src/wp/ap/unix/GNUmakefile.am	2007-06-04 17:17:01.000000000 +0200
++++ abiword-2.5.2/src/wp/ap/unix/GNUmakefile.am	2011-10-18 00:48:05.247378444 +0200
+@@ -69,9 +69,7 @@
+ 	ap_UnixDialog_Stylist_modal.glade	\
+ 	ap_UnixDialog_Tab.glade	\
+ 	ap_UnixDialog_WordCount.glade \
+-	ap_UnixDialog_Latex.glade \
+-	ap_UnixDialog_Options.glade \
+-	ap_UnixDialog_HdrFtr.glade
++	ap_UnixDialog_Latex.glade
+ 
+ if ENABLE_SPELL
+ spellsrc=	ap_UnixDialog_Spell.cpp
diff --git a/meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb b/meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
index 7ee0f86..edb55dd 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
@@ -1,6 +1,6 @@
 require abiword-2.5.inc
-
-PR = "r1"
+FILESEXTRAPATHS_prepend := "${THISDIR}/abiword-${SHRT_VER}:"
+PR = "r2"
 
 EXTRA_OECONF += "--enable-embedded"
 
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb
index c10d761..91e05d3 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb
@@ -1,5 +1,5 @@
 require abiword-2.5.inc
-
-PR = "r2"
+FILESEXTRAPATHS_prepend := "${THISDIR}/abiword-${SHRT_VER}:"
+PR = "r3"
 
 RCONFLICTS_${PN} = "abiword-embedded"
-- 
1.7.7

[meta-oe][meta-efl][meta-gnome 09/10] wv: add SRC_URI checksums and drop deprecated patch=1 param

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/wv/wv_1.2.0.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb
index cef7660..b20a556 100644
--- a/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb
+++ b/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb
@@ -7,7 +7,9 @@ DEPENDS = "libgsf glib-2.0"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
-           file://pkgconfig.patch;patch=1"
+           file://pkgconfig.patch"
+SRC_URI[md5sum] = "b6319d5e75611fe2210453b5feb82c0c"
+SRC_URI[sha256sum] = "a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4"
 
 inherit autotools pkgconfig
 
-- 
1.7.7

[meta-oe][meta-efl][meta-gnome 10/10] efm-nav, efm-path, efm-pathbar: drop from meta-efl, now are part of efm itself

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/efm-nav_svn.bb     |   14 --------------
 meta-efl/recipes-efl/e17/efm-path_svn.bb    |   15 ---------------
 meta-efl/recipes-efl/e17/efm-pathbar_svn.bb |   15 ---------------
 3 files changed, 0 insertions(+), 44 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/efm-nav_svn.bb
 delete mode 100644 meta-efl/recipes-efl/e17/efm-path_svn.bb
 delete mode 100644 meta-efl/recipes-efl/e17/efm-pathbar_svn.bb

diff --git a/meta-efl/recipes-efl/e17/efm-nav_svn.bb b/meta-efl/recipes-efl/e17/efm-nav_svn.bb
deleted file mode 100644
index e6a8e6f..0000000
--- a/meta-efl/recipes-efl/e17/efm-nav_svn.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "MIT"
-PV = "0.0.1+svnr${SRCPV}"
-
-require e-module.inc
-
-SRCNAME = "E-MODULES-EXTRA/efm_nav"
-
-do_configure_prepend() {
-    sed -i -e /po/d configure.ac
-    sed -i -e s:\ po::g Makefile.am
-}
-
-FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
-FILES_${PN} += "${libdir}/enlightenment/modules/"
diff --git a/meta-efl/recipes-efl/e17/efm-path_svn.bb b/meta-efl/recipes-efl/e17/efm-path_svn.bb
deleted file mode 100644
index 685513f..0000000
--- a/meta-efl/recipes-efl/e17/efm-path_svn.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "MIT"
-PV = "0.0.1+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-
-require e-module.inc
-
-SRCNAME = "E-MODULES-EXTRA/efm_path"
-
-do_configure_prepend() {
-    sed -i -e /po/d configure.ac
-    sed -i -e s:\ po::g Makefile.am
-}
-
-FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
-FILES_${PN} += "${libdir}/enlightenment/modules/"
diff --git a/meta-efl/recipes-efl/e17/efm-pathbar_svn.bb b/meta-efl/recipes-efl/e17/efm-pathbar_svn.bb
deleted file mode 100644
index 54c5a0b..0000000
--- a/meta-efl/recipes-efl/e17/efm-pathbar_svn.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "MIT"
-PV = "0.0.1+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-
-require e-module.inc
-
-SRCNAME = "E-MODULES-EXTRA/efm_pathbar"
-
-do_configure_prepend() {
-    sed -i -e /po/d configure.ac
-    sed -i -e s:\ po::g Makefile.am
-}
-
-FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
-FILES_${PN} += "${libdir}/enlightenment/modules/"
-- 
1.7.7

Re: [meta-oe][meta-efl][meta-gnome 00/10] Small fixes

[Khem Raj]

On Mon, Oct 17, 2011 at 4:35 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> The following changes since commit 1b170fa28c9c52d4c8d87e9cbe07af1e664a96c3:
>
>  digitemp: add 3.6.0 version (2011-10-17 16:32:18 +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 (10):
>  syslog-ng: move conflicting file modules.conf to own packages and fix
>    unpackaged files
>  xf86-input-tslib: fix build with newer xserver
>  e-wm-illume-dict-pl: fix licensing information
>  e-tasks: fix licensing information
>  ttf-droid: add LIC_FILES_CHKSUM, switch to github.com
>  abiword: add LIC_FILES_CHKSUM
>  abiword: add SRC_URI checksums
>  abiword: fix install, newer versions doesn't allow to overwrite just
>    installed files
>  wv: add SRC_URI checksums and drop deprecated patch=1 param
>  efm-nav, efm-path, efm-pathbar: drop from meta-efl, now are part of
>    efm itself
>
>  meta-efl/recipes-efl/e17/e-tasks_svn.bb            |    3 +-
>  meta-efl/recipes-efl/e17/efm-nav_svn.bb            |   14 --
>  meta-efl/recipes-efl/e17/efm-path_svn.bb           |   15 --
>  meta-efl/recipes-efl/e17/efm-pathbar_svn.bb        |   15 --
>  .../recipes-efl/efl/e-wm-illume-dict-pl_git.bb     |    5 +-
>  meta-gnome/recipes-gnome/abiword/abiword-2.5.inc   |    7 +-
>  .../abiword/abiword-2.5/fix.double.install.patch   |   34 ++++
>  .../abiword/abiword-embedded_2.5.2.bb              |    4 +-
>  meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb  |    4 +-
>  meta-gnome/recipes-gnome/wv/wv_1.2.0.bb            |    4 +-
>  .../recipes-graphics/ttf-fonts/ttf-droid_git.bb    |   14 +-
>  .../xf86-input-tslib-port-ABI-12-r48.patch         |  196 ++++++++++++++++++++
>  .../xorg-driver/xf86-input-tslib_0.0.6.bb          |    3 +-
>  meta-oe/recipes-support/syslog-ng/syslog-ng.inc    |   11 +
>  .../recipes-support/syslog-ng/syslog-ng_3.2.2.bb   |    2 +-
>  15 files changed, 268 insertions(+), 63 deletions(-)
>  delete mode 100644 meta-efl/recipes-efl/e17/efm-nav_svn.bb
>  delete mode 100644 meta-efl/recipes-efl/e17/efm-path_svn.bb
>  delete mode 100644 meta-efl/recipes-efl/e17/efm-pathbar_svn.bb
>  create mode 100644 meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch
>  create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch
>

seems good. Whole series

Acked-by: Khem Raj <raj.khem@gmail.com>

> --
> 1.7.7
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>