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>
This commit is contained in:
parent
d60b4ff351
commit
5968a7b7b0
|
@ -1,15 +0,0 @@
|
|||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Index: matchbox-window-manager/configure.ac
|
||||
===================================================================
|
||||
--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
|
||||
+++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000
|
||||
@@ -283,7 +283,7 @@
|
||||
yes)
|
||||
|
||||
case "$expat" in
|
||||
- yes)
|
||||
+ yes|"")
|
||||
EXPAT_LIBS="-lexpat"
|
||||
;;
|
||||
*)
|
|
@ -1,49 +0,0 @@
|
|||
Change matchbox-keyboard to look for "libpng" instead of "libpng12", and fix the
|
||||
code so that it works with the 1.2 and 1.5 API.
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9678cf7..9bbbd76 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -171,24 +171,7 @@ dnl ------ Expat ------------------------------------------------------------
|
||||
|
||||
dnl ------ Check for PNG ---------------------------------------------------
|
||||
|
||||
-AC_MSG_CHECKING(for libpng12)
|
||||
-
|
||||
-if $PKG_CONFIG --exists libpng12; then
|
||||
- AC_MSG_RESULT(yes)
|
||||
- PNG_LIBS=`$PKG_CONFIG --libs libpng12`
|
||||
- PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12`
|
||||
-else
|
||||
- AC_MSG_RESULT(no)
|
||||
- AC_CHECK_LIB([png], [png_create_read_struct],
|
||||
- [have_png="yes"], [have_png="no"])
|
||||
-
|
||||
- if test x$have_png=xyes && test x$have_png_h=xyes; then
|
||||
- PNG_LIBS="-lpng -lz"
|
||||
- else
|
||||
- AC_MSG_ERROR([*** Cannot find libpng12 ****])
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
+PKG_CHECK_MODULES(PNG, libpng)
|
||||
|
||||
dnl ------ Debug Build ------------------------------------------------------
|
||||
|
||||
diff --git a/src/matchbox-keyboard-image.c b/src/matchbox-keyboard-image.c
|
||||
index 8accc3e..6b4b0e8 100644
|
||||
--- a/src/matchbox-keyboard-image.c
|
||||
+++ b/src/matchbox-keyboard-image.c
|
||||
@@ -65,7 +65,7 @@ png_file_load (const char *file,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- if ( setjmp( png_ptr->jmpbuf ) ) {
|
||||
+ if (setjmp (png_jmpbuf (png_ptr))) {
|
||||
png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
|
||||
fclose(fd);
|
||||
return NULL;
|
|
@ -3,22 +3,20 @@ HOMEPAGE = "http://matchbox-project.org"
|
|||
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"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
|
||||
file://src/matchbox-keyboard.h;endline=17;md5=9d6586c69e4a926f3cb0b4425f24ba3c \
|
||||
file://applet/applet.c;endline=18;md5=4a0f721724746b14d95b51ddd42b95e7"
|
||||
|
||||
DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
|
||||
|
||||
SRCREV = "b38f24036cff3be6c2fbcf9ca9881803e69003ac"
|
||||
SRCREV = "217f1bfe14c41cf7e291d04a63aa2d79cc13d063"
|
||||
PV = "0.0+git${SRCPV}"
|
||||
PR = "r4"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN} \
|
||||
file://configure_fix.patch;maxrev=1819 \
|
||||
file://single-instance.patch \
|
||||
file://80matchboxkeyboard.shbg \
|
||||
file://png-fix.patch"
|
||||
file://80matchboxkeyboard.shbg"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
Loading…
Reference in New Issue