summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-keyboard/files
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-11-21 16:27:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-22 12:03:01 +0000
commit5968a7b7b0e9e15f4c73126eafcc689650163d05 (patch)
tree220b7efea983f472d1e2c06585316870d6512fd5 /meta/recipes-sato/matchbox-keyboard/files
parentd60b4ff3517487bd111c6d7e1410882280229377 (diff)
downloadpoky-5968a7b7b0e9e15f4c73126eafcc689650163d05.tar.gz
matcbox-keyboard: bump SRCREV
Bump to the latest commit on the 0.1 branch. Drop two redundant patches, and update the license data since upstream has been re-licensed to LGPL v2.1. (From OE-Core rev: a9bc6140e6cf24a5bad942f68348c02c446eac17) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/matchbox-keyboard/files')
-rw-r--r--meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch15
-rw-r--r--meta/recipes-sato/matchbox-keyboard/files/png-fix.patch49
2 files changed, 0 insertions, 64 deletions
diff --git a/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch b/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
deleted file mode 100644
index 800bf3b559..0000000000
--- a/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: matchbox-window-manager/configure.ac
4===================================================================
5--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
6+++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000
7@@ -283,7 +283,7 @@
8 yes)
9
10 case "$expat" in
11- yes)
12+ yes|"")
13 EXPAT_LIBS="-lexpat"
14 ;;
15 *)
diff --git a/meta/recipes-sato/matchbox-keyboard/files/png-fix.patch b/meta/recipes-sato/matchbox-keyboard/files/png-fix.patch
deleted file mode 100644
index e3834f5e46..0000000000
--- a/meta/recipes-sato/matchbox-keyboard/files/png-fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1Change matchbox-keyboard to look for "libpng" instead of "libpng12", and fix the
2code so that it works with the 1.2 and 1.5 API.
3
4Upstream-Status: Backport
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7diff --git a/configure.ac b/configure.ac
8index 9678cf7..9bbbd76 100644
9--- a/configure.ac
10+++ b/configure.ac
11@@ -171,24 +171,7 @@ dnl ------ Expat ------------------------------------------------------------
12
13 dnl ------ Check for PNG ---------------------------------------------------
14
15-AC_MSG_CHECKING(for libpng12)
16-
17-if $PKG_CONFIG --exists libpng12; then
18- AC_MSG_RESULT(yes)
19- PNG_LIBS=`$PKG_CONFIG --libs libpng12`
20- PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12`
21-else
22- AC_MSG_RESULT(no)
23- AC_CHECK_LIB([png], [png_create_read_struct],
24- [have_png="yes"], [have_png="no"])
25-
26- if test x$have_png=xyes && test x$have_png_h=xyes; then
27- PNG_LIBS="-lpng -lz"
28- else
29- AC_MSG_ERROR([*** Cannot find libpng12 ****])
30- fi
31-fi
32-
33+PKG_CHECK_MODULES(PNG, libpng)
34
35 dnl ------ Debug Build ------------------------------------------------------
36
37diff --git a/src/matchbox-keyboard-image.c b/src/matchbox-keyboard-image.c
38index 8accc3e..6b4b0e8 100644
39--- a/src/matchbox-keyboard-image.c
40+++ b/src/matchbox-keyboard-image.c
41@@ -65,7 +65,7 @@ png_file_load (const char *file,
42 return NULL;
43 }
44
45- if ( setjmp( png_ptr->jmpbuf ) ) {
46+ if (setjmp (png_jmpbuf (png_ptr))) {
47 png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
48 fclose(fd);
49 return NULL;