summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-keyboard/files/png-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-sato/matchbox-keyboard/files/png-fix.patch')
-rw-r--r--meta/recipes-sato/matchbox-keyboard/files/png-fix.patch49
1 files changed, 0 insertions, 49 deletions
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;