Skip to contentSkip to conversation

matcbox-keyboard: bump SRCREV

PATCH New Ross Burton 1 participant 1 message Nov 21, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
 .../matchbox-keyboard/files/configure_fix.patch    |   15 ------
 .../matchbox-keyboard/files/png-fix.patch          |   49 --------------------
 .../matchbox-keyboard/matchbox-keyboard_git.bb     |   14 +++---
 3 files changed, 6 insertions(+), 72 deletions(-)
 delete mode 100644 meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
 delete mode 100644 meta/recipes-sato/matchbox-keyboard/files/png-fix.patch
meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch deleted +0 -15
deleted file mode 100644
index 800bf3b..0000000
@@ -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"
- 		;;
- 	    *)
meta/recipes-sato/matchbox-keyboard/files/png-fix.patch deleted +0 -49

49 lines not on this page · raw message

meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +6 -8
index ffcabca..bcf6f6c 100644
@@ -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"
 
Signature · 1 line
1.7.10.4