[PATCH 0/6] Bunch of version upgrades

[PATCH 0/6] Bunch of version upgrades

[Jussi Kukkonen]

libinput goes to 0.21 which should be last release before 1.0. Other
upgrades are minor.

The vte change is just for LICENSE variable: our version is still
LGPL2.0 instead of LGPL2.1+ like recent releases.



The following changes since commit a8b723498c9a7106210db140452886894494b4d6:

  bitbake: cooker: Resolve file monitoring race issues when using memres bitbake (2015-08-03 07:36:25 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/upgrades
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/upgrades

Jussi Kukkonen (6):
  gtk+3: Upgrade 3.16.4 -> 3.16.6
  gtk-icon-utils-native: Upgrade 3.16.4 -> 3.16.6
  fontconfig: Upgrade 2.11.93 -> 2.11.94
  vte: Fix LICENSE to LGPL2.0
  libinput: Upgrade 0.18.0 -> 0.21.0
  which: Upgrade 2.20 -> 2.21

 .../which/which-2.20/remove-declaration.patch      | 18 ------
 .../{which-2.20 => which-2.21}/automake.patch      | 14 +++--
 .../which/{which_2.20.bb => which_2.21.bb}         |  6 +-
 meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch  | 28 ---------
 .../gtk+/{gtk+3_3.16.4.bb => gtk+3_3.16.6.bb}      |  5 +-
 ...e_3.16.4.bb => gtk-icon-utils-native_3.16.6.bb} |  4 +-
 ...fontconfig_2.11.93.bb => fontconfig_2.11.94.bb} |  4 +-
 ...ics-need-to-fake-new-touches-on-TRIPLETAP.patch | 72 ++++++++++++++++++++++
 .../{libinput_0.18.0.bb => libinput_0.21.0.bb}     |  8 ++-
 meta/recipes-support/vte/vte.inc                   |  2 +-
 10 files changed, 96 insertions(+), 65 deletions(-)
 delete mode 100644 meta/recipes-extended/which/which-2.20/remove-declaration.patch
 rename meta/recipes-extended/which/{which-2.20 => which-2.21}/automake.patch (56%)
 rename meta/recipes-extended/which/{which_2.20.bb => which_2.21.bb} (84%)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch
 rename meta/recipes-gnome/gtk+/{gtk+3_3.16.4.bb => gtk+3_3.16.6.bb} (77%)
 rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.16.4.bb => gtk-icon-utils-native_3.16.6.bb} (94%)
 rename meta/recipes-graphics/fontconfig/{fontconfig_2.11.93.bb => fontconfig_2.11.94.bb} (92%)
 create mode 100644 meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch
 rename meta/recipes-graphics/wayland/{libinput_0.18.0.bb => libinput_0.21.0.bb} (63%)

-- 
2.1.4

[PATCH 1/6] gtk+3: Upgrade 3.16.4 -> 3.16.6

[Jussi Kukkonen]

Remove a backported patch.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch  | 28 ----------------------
 .../gtk+/{gtk+3_3.16.4.bb => gtk+3_3.16.6.bb}      |  5 ++--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch
 rename meta/recipes-gnome/gtk+/{gtk+3_3.16.4.bb => gtk+3_3.16.6.bb} (77%)

diff --git a/meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch b/meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch
deleted file mode 100644
index 1d6f12b..0000000
--- a/meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 802b006b3768ddc8c8cdf0af27428e7042c36509 Mon Sep 17 00:00:00 2001
-From: nick <oavc-fujie@yandex.com>
-Date: Mon, 29 Jun 2015 20:37:26 +0100
-Subject: settings: Include pangofc-fontmap.h header on Wayland
-
-In case the X11 backend is not enabled, we still need to include the
-pangofc-fontmap.h header file, as we use the Pango/FontConfig API in
-both the X11 and Wayland case.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=751625
-
-diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
-index 327faf5..a40cb84 100644
---- a/gtk/gtksettings.c
-+++ b/gtk/gtksettings.c
-@@ -41,6 +41,7 @@
- 
- #ifdef GDK_WINDOWING_WAYLAND
- #include "wayland/gdkwayland.h"
-+#include <pango/pangofc-fontmap.h>
- #endif
- 
- #ifdef GDK_WINDOWING_BROADWAY
--- 
-cgit v0.10.2
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb b/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb
similarity index 77%
rename from meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb
index 4bb6b0c..1d736a4 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb
@@ -5,11 +5,10 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
            file://hardcoded_libtool.patch \
            file://Dont-force-csd.patch \
-           file://wayland-pango.patch \
           "
 
-SRC_URI[md5sum] = "c7497aaf6730524a127597b768a73bd7"
-SRC_URI[sha256sum] = "1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e"
+SRC_URI[md5sum] = "fc59e5c8b5a4585b60623dd708df400b"
+SRC_URI[sha256sum] = "4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe"
 
 S = "${WORKDIR}/gtk+-${PV}"
 
-- 
2.1.4

[PATCH 2/6] gtk-icon-utils-native: Upgrade 3.16.4 -> 3.16.6

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 ...tk-icon-utils-native_3.16.4.bb => gtk-icon-utils-native_3.16.6.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.16.4.bb => gtk-icon-utils-native_3.16.6.bb} (94%)

diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.4.bb b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.6.bb
similarity index 94%
rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.4.bb
rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.6.bb
index d433b90..cba3815 100644
--- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.4.bb
+++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.6.bb
@@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
           file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch"
-SRC_URI[md5sum] = "c7497aaf6730524a127597b768a73bd7"
-SRC_URI[sha256sum] = "1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e"
+SRC_URI[md5sum] = "fc59e5c8b5a4585b60623dd708df400b"
+SRC_URI[sha256sum] = "4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
                     file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
-- 
2.1.4

[PATCH 3/6] fontconfig: Upgrade 2.11.93 -> 2.11.94

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../fontconfig/{fontconfig_2.11.93.bb => fontconfig_2.11.94.bb}       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/fontconfig/{fontconfig_2.11.93.bb => fontconfig_2.11.94.bb} (92%)

diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb
similarity index 92%
rename from meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb
rename to meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb
index e024adb..9bbff20 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb
@@ -23,8 +23,8 @@ DEPENDS = "expat freetype zlib"
 SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
            file://revert-static-pkgconfig.patch \
            "
-SRC_URI[md5sum] = "622f94f0f74e40775ea72d7d5f17a36d"
-SRC_URI[sha256sum] = "296b5e83189589e537992d65ff01e0cd74eba9a91eb16a6890ce942e3695c526"
+SRC_URI[md5sum] = "479be870c7f83f15f87bac085b61d641"
+SRC_URI[sha256sum] = "73f6d323c7bcfbde25d78397675191d55b8f4139132c6a9444410f3a2d8a9a95"
 
 PACKAGES =+ "fontconfig-utils"
 FILES_${PN} =+ "${datadir}/xml/*"
-- 
2.1.4

[PATCH 4/6] vte: Fix LICENSE to LGPL2.0

[Jussi Kukkonen]

Current releases of vte are LGPL 2.1+ but the one we have is still
LGPL 2.0.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-support/vte/vte.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 4081a7f..874062a 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -1,6 +1,6 @@
 SUMMARY = "Virtual terminal emulator GTK+ widget library"
 BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
-LICENSE = "LGPLv2.1+"
+LICENSE = "LGPLv2.0"
 DEPENDS = " glib-2.0 gtk+ intltool-native ncurses gobject-introspection-stub"
 RDEPENDS_libvte = "vte-termcap"
 
-- 
2.1.4

Re: [PATCH 4/6] vte: Fix LICENSE to LGPL2.0

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]


> On Aug 6, 2015, at 1:42 AM, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
> 
> Current releases of vte are LGPL 2.1+ but the one we have is still
> LGPL 2.0.
> 
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> ---
> meta/recipes-support/vte/vte.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
> index 4081a7f..874062a 100644
> --- a/meta/recipes-support/vte/vte.inc
> +++ b/meta/recipes-support/vte/vte.inc
> @@ -1,6 +1,6 @@
> SUMMARY = "Virtual terminal emulator GTK+ widget library"
> BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
> -LICENSE = "LGPLv2.1+"
> +LICENSE = “LGPLv2.0"

this brings to notice that this recipe needs upgrade
latest vte srcs already use LGPL2.1 may be updating to latest version is 0.40
http://ftp.gnome.org/pub/gnome/sources/vte/0.40/

> DEPENDS = " glib-2.0 gtk+ intltool-native ncurses gobject-introspection-stub"
> RDEPENDS_libvte = "vte-termcap"
> 
> --
> 2.1.4
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [PATCH 4/6] vte: Fix LICENSE to LGPL2.0

[Jussi Kukkonen]

On 7 August 2015 at 06:34, Khem Raj <raj.khem@gmail.com> wrote:
>
>> On Aug 6, 2015, at 1:42 AM, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
>>
>> Current releases of vte are LGPL 2.1+ but the one we have is still
>> LGPL 2.0.
>>
>> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
>> ---
>> meta/recipes-support/vte/vte.inc | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
>> index 4081a7f..874062a 100644
>> --- a/meta/recipes-support/vte/vte.inc
>> +++ b/meta/recipes-support/vte/vte.inc
>> @@ -1,6 +1,6 @@
>> SUMMARY = "Virtual terminal emulator GTK+ widget library"
>> BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
>> -LICENSE = "LGPLv2.1+"
>> +LICENSE = “LGPLv2.0"
>
> this brings to notice that this recipe needs upgrade
> latest vte srcs already use LGPL2.1 may be updating to latest version is 0.40
> http://ftp.gnome.org/pub/gnome/sources/vte/0.40/

Yep, working on the upgrade lead me to finding this mistake...

Anything above our current version of libvte will depend on GTK+3.
That in itself is fine but I wanted to make sure I know the effects of
that change before I send it: Not just if something will fail to
compile (because it depends on GTK+2 and vte) but also if we end up
compiling two versions of gtk+ in cases where we used to manage with
one.

Jussi

>> DEPENDS = " glib-2.0 gtk+ intltool-native ncurses gobject-introspection-stub"
>> RDEPENDS_libvte = "vte-termcap"
>>
>> --
>> 2.1.4
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[PATCH 5/6] libinput: Upgrade 0.18.0 -> 0.21.0

[Jussi Kukkonen]

Include a workaround patch suggested by upstream when using
kernel 4.1.x.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 ...ics-need-to-fake-new-touches-on-TRIPLETAP.patch | 72 ++++++++++++++++++++++
 .../{libinput_0.18.0.bb => libinput_0.21.0.bb}     |  8 ++-
 2 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch
 rename meta/recipes-graphics/wayland/{libinput_0.18.0.bb => libinput_0.21.0.bb} (63%)

diff --git a/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch b/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch
new file mode 100644
index 0000000..97c63bd
--- /dev/null
+++ b/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch
@@ -0,0 +1,72 @@
+This is a workaround upstream suggests for use with kernel 4.1.
+
+Upstream-Status: Inappropriate [temporary work-around]
+Signed-Off-By: Jussi Kukkonen <jussi.kukkonen@intel.com>
+
+
+
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Aug 3 18:23:12 PDT 2015
+Subject: [PATCH v3 libinput] touchpad: serial synaptics need to fake new touches on TRIPLETAP
+
+On the 4.1 kernels synaptics pretends to have 3 slots (the serial fw only does
+2). This was added to avoid cursor jumps but has since been reverted for 4.2
+(kernel commit dbf3c37086, 4.1.3 is still buggy). In some cases a TRIPLETAP
+may be triggered without slot 2 ever activating.
+
+While there are still those kernels out there, work around this bug by opening
+a new touch point where none exists if the fake finger count exceeds the slot
+count.
+
+Reported-by: Jan Alexander Steffens <jan.steffens at gmail.com>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+Tested-by: Jan Alexander Steffens <jan.steffens at gmail.com>
+Reviewed-by: Hans de Goede <hdegoede at redhat.com>
+---
+Changes to v2:
+- split out the handling instead of having a tmp state variable, see Hans'
+  comments from v2
+
+Mainly sending this to the list again so I have a link to point people to.
+If you're on 4.1.x add this patch to your distribution package.
+
+ src/evdev-mt-touchpad.c | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
+index a683d9a..5ef03d5 100644
+--- a/src/evdev-mt-touchpad.c
++++ b/src/evdev-mt-touchpad.c
+@@ -369,13 +369,23 @@ tp_restore_synaptics_touches(struct tp_dispatch *tp,
+ 	for (i = 0; i < tp->num_slots; i++) {
+ 		struct tp_touch *t = tp_get_touch(tp, i);
+ 
+-		if (t->state != TOUCH_END)
++		switch(t->state) {
++		case TOUCH_HOVERING:
++		case TOUCH_BEGIN:
++		case TOUCH_UPDATE:
+ 			continue;
+-
+-		/* new touch, move it through begin to update immediately */
+-		tp_new_touch(tp, t, time);
+-		tp_begin_touch(tp, t, time);
+-		t->state = TOUCH_UPDATE;
++		case TOUCH_NONE:
++			/* new touch, move it through to begin immediately */
++			tp_new_touch(tp, t, time);
++			tp_begin_touch(tp, t, time);
++			break;
++		case TOUCH_END:
++			/* touch just ended ,we need need to restore it to update */
++			tp_new_touch(tp, t, time);
++			tp_begin_touch(tp, t, time);
++			t->state = TOUCH_UPDATE;
++			break;
++		}
+ 	}
+ }
+ 
+-- 
+2.4.3
+
diff --git a/meta/recipes-graphics/wayland/libinput_0.18.0.bb b/meta/recipes-graphics/wayland/libinput_0.21.0.bb
similarity index 63%
rename from meta/recipes-graphics/wayland/libinput_0.18.0.bb
rename to meta/recipes-graphics/wayland/libinput_0.21.0.bb
index 0fe1c6c..179596f 100644
--- a/meta/recipes-graphics/wayland/libinput_0.18.0.bb
+++ b/meta/recipes-graphics/wayland/libinput_0.21.0.bb
@@ -7,9 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2184aef38ff137ed33ce9a63b9d1eb8f"
 
 DEPENDS = "libevdev udev mtdev"
 
-SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz"
-SRC_URI[md5sum] = "0ddbb0d53d58dec0a86de6791560011a"
-SRC_URI[sha256sum] = "64a70f96bab17a22eaf2fd7af17cf83def3388374096c7623be9448f62808cda"
+SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
+           file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \
+           "
+SRC_URI[md5sum] = "f91d8f4ced986f1ae16d52ea02bc7837"
+SRC_URI[sha256sum] = "7cce7a9e510dfe5c4a19ad00e9350808d4f59f8611fd2b5e87213c507283f550"
 
 inherit autotools pkgconfig
 
-- 
2.1.4

[PATCH 6/6] which: Upgrade 2.20 -> 2.21

[Jussi Kukkonen]

* Drop one upstreamed patch, update the other one

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../which/which-2.20/remove-declaration.patch          | 18 ------------------
 .../which/{which-2.20 => which-2.21}/automake.patch    | 14 +++++++++-----
 .../which/{which_2.20.bb => which_2.21.bb}             |  6 +++---
 3 files changed, 12 insertions(+), 26 deletions(-)
 delete mode 100644 meta/recipes-extended/which/which-2.20/remove-declaration.patch
 rename meta/recipes-extended/which/{which-2.20 => which-2.21}/automake.patch (56%)
 rename meta/recipes-extended/which/{which_2.20.bb => which_2.21.bb} (84%)

diff --git a/meta/recipes-extended/which/which-2.20/remove-declaration.patch b/meta/recipes-extended/which/which-2.20/remove-declaration.patch
deleted file mode 100644
index d3340a3..0000000
--- a/meta/recipes-extended/which/which-2.20/remove-declaration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Remove the declaration of group_member since it has already been
-declared in unistd.h
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-
-Upstream-Status: Inappropriate [embedded specific]
-
-diff -ruN which-2.20-orig/bash.c which-2.20/bash.c
---- which-2.20-orig/bash.c	2010-08-03 12:59:08.897088878 +0800
-+++ which-2.20/bash.c	2010-08-03 13:17:23.406097212 +0800
-@@ -46,7 +46,6 @@
-  * - changed all occurences of 'gid_t' into 'GID_T'.
-  * - exported functions needed in which.c
-  */
--static int group_member (GID_T gid);
- static char* extract_colon_unit (char const* string, int* p_index);
- 
- /*===========================================================================
diff --git a/meta/recipes-extended/which/which-2.20/automake.patch b/meta/recipes-extended/which/which-2.21/automake.patch
similarity index 56%
rename from meta/recipes-extended/which/which-2.20/automake.patch
rename to meta/recipes-extended/which/which-2.21/automake.patch
index ef00bc9..4d0f2e4 100644
--- a/meta/recipes-extended/which/which-2.20/automake.patch
+++ b/meta/recipes-extended/which/which-2.21/automake.patch
@@ -7,9 +7,13 @@ diff --git a/configure.ac b/configure.ac
 index d974461..a20dfa8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2,2 +2,3 @@ dnl Process this file with autoconf to produce a configure script.
--AC_INIT(which.c)
--AM_INIT_AUTOMAKE(which, 2.20)
-+AC_INIT([which],[2.20])
-+AC_CONFIG_SRCDIR(which.c)
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT([which], [2.21])
+ AC_CONFIG_SRCDIR(which.c)
+-AM_INIT_AUTOMAKE
 +AM_INIT_AUTOMAKE([foreign])
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+ 
+
diff --git a/meta/recipes-extended/which/which_2.20.bb b/meta/recipes-extended/which/which_2.21.bb
similarity index 84%
rename from meta/recipes-extended/which/which_2.20.bb
rename to meta/recipes-extended/which/which_2.21.bb
index 7483554..a7687f6 100644
--- a/meta/recipes-extended/which/which_2.20.bb
+++ b/meta/recipes-extended/which/which_2.21.bb
@@ -19,10 +19,10 @@ EXTRA_OECONF = "--disable-iberty"
 
 SRC_URI = "${GNU_MIRROR}/which/which-${PV}.tar.gz \
            file://automake.patch \
-           file://remove-declaration.patch"
+           "
 
-SRC_URI[md5sum] = "95be0501a466e515422cde4af46b2744"
-SRC_URI[sha256sum] = "d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8"
+SRC_URI[md5sum] = "097ff1a324ae02e0a3b0369f07a7544a"
+SRC_URI[sha256sum] = "f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad"
 
 do_configure_prepend() {
 	sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am
-- 
2.1.4