Patchwork [5/7] matchbox-keyboard: Update to 0.0+gitAUTOINCa+a17b1135daab9eb4cd3647c02e82687f96d93619

login
register
mail settings
Submitter Ionut Radu
Date May 24, 2013, 9:18 a.m.
Message ID <378bb703a42148959f40a19e2e0a64c13ecdb482.1369386157.git.ionutx.radu@intel.com>
Download mbox | patch
Permalink /patch/50469/
State New
Headers show

Comments

Ionut Radu - May 24, 2013, 9:18 a.m.
Signed-off-by: Ionut Radu <ionutx.radu@intel.com>

matchbox-keyboard: png-fix.patch was backported. (The newest version
contains 'png-fix.patch' changes).

---
 .../matchbox-keyboard/matchbox-keyboard_git.bb          |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
Martin Jansa - May 24, 2013, 9:24 a.m.
On Fri, May 24, 2013 at 12:18:09PM +0300, Ionut Radu wrote:
> Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
> 
> matchbox-keyboard: png-fix.patch was backported. (The newest version
> contains 'png-fix.patch' changes).

do we need 0.0+gitAUTOINCa+ in subject? and where did it get 'a' after
AUTOINC?

> 
> ---
>  .../matchbox-keyboard/matchbox-keyboard_git.bb          |   15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
> index 6944a07..e6ffad7 100644
> --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
> +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
> @@ -4,21 +4,19 @@ BUGTRACKER = "http://bugzilla.openedhand.com/"
>  SECTION = "x11"
>  
>  LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> -                    file://src/matchbox-keyboard.h;endline=20;md5=4ba16ff913ad245dd6d95a6c67f72526 \
> -                    file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
> +                    file://src/matchbox-keyboard.h;endline=20;md5=d12cc878e2a99870458c83c61714d99e \
> +                    file://applet/applet.c;endline=20;md5=16d84e4d1572415c1295d37ca6d05dd4"
>  
>  DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
>  
> -SRCREV = "b38f24036cff3be6c2fbcf9ca9881803e69003ac"
> +SRCREV = "a17b1135daab9eb4cd3647c02e82687f96d93619"
>  PV = "0.0+git${SRCPV}"
> -PR = "r4"
>  
>  SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
>             file://configure_fix.patch;maxrev=1819 \
>             file://single-instance.patch \
> -           file://80matchboxkeyboard.shbg \
> -           file://png-fix.patch"
> +           file://80matchboxkeyboard.shbg"
>  
>  S = "${WORKDIR}/git"
>  
> @@ -32,7 +30,8 @@ FILES_${PN} = "${bindir}/ \
>  	       ${sysconfdir} \
>  	       ${datadir}/applications \
>  	       ${datadir}/pixmaps \
> -	       ${datadir}/matchbox-keyboard"
> +	       ${datadir}/matchbox-keyboard \
> +           ${libdir}/libmatchbox-keyboard.so.*"

don't mix tabs and spaces on the same line, multiline variables should 
use only spaces.

>  FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
>  
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton - May 24, 2013, 9:26 a.m.
On 24 May 2013 10:18, Ionut Radu <ionutx.radu@intel.com> wrote:
> Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
>
> matchbox-keyboard: png-fix.patch was backported. (The newest version
> contains 'png-fix.patch' changes).

Did you test this worked on a device/qemu?  There's been some heavy
work upstream that hasn't been tested in our environment.

Ross
Ionut Radu - May 24, 2013, 9:31 a.m.

Patch

diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index 6944a07..e6ffad7 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -4,21 +4,19 @@  BUGTRACKER = "http://bugzilla.openedhand.com/"
 SECTION = "x11"
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://src/matchbox-keyboard.h;endline=20;md5=4ba16ff913ad245dd6d95a6c67f72526 \
-                    file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+                    file://src/matchbox-keyboard.h;endline=20;md5=d12cc878e2a99870458c83c61714d99e \
+                    file://applet/applet.c;endline=20;md5=16d84e4d1572415c1295d37ca6d05dd4"
 
 DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
 
-SRCREV = "b38f24036cff3be6c2fbcf9ca9881803e69003ac"
+SRCREV = "a17b1135daab9eb4cd3647c02e82687f96d93619"
 PV = "0.0+git${SRCPV}"
-PR = "r4"
 
 SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
            file://configure_fix.patch;maxrev=1819 \
            file://single-instance.patch \
-           file://80matchboxkeyboard.shbg \
-           file://png-fix.patch"
+           file://80matchboxkeyboard.shbg"
 
 S = "${WORKDIR}/git"
 
@@ -32,7 +30,8 @@  FILES_${PN} = "${bindir}/ \
 	       ${sysconfdir} \
 	       ${datadir}/applications \
 	       ${datadir}/pixmaps \
-	       ${datadir}/matchbox-keyboard"
+	       ${datadir}/matchbox-keyboard \
+           ${libdir}/libmatchbox-keyboard.so.*"
 
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"