From 80def85257e9676f6ad870f5adc2797349919f0f Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Fri, 17 Jun 2016 12:23:37 -0400 Subject: geis: add a patch to fix incorrect indentation issues and remove -Wno-error=misleading-indentation Signed-off-by: Derek Straka Signed-off-by: Martin Jansa --- .../geis/fix-indentation-for-gcc6.patch | 14 ++++++++++++++ .../recipes-support/canonical-multitouch/geis_2.2.17.bb | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch diff --git a/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch b/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch new file mode 100644 index 0000000000..389e1b3fd7 --- /dev/null +++ b/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch @@ -0,0 +1,14 @@ +--- geis-2.2.17/libgeis/geis_subscription.c.orig 2016-06-17 12:04:21.062938443 -0400 ++++ geis-2.2.17/libgeis/geis_subscription.c 2016-06-17 12:05:02.934939172 -0400 +@@ -237,9 +237,10 @@ + GeisSize i; + for (i = 0; i < bag->sub_store_size; ++i) + { +- if (bag->sub_store[i]) ++ if (bag->sub_store[i]) { + _subscription_unref(bag->sub_store[i]); + bag->sub_store[i] = NULL; ++ } + } + } + diff --git a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb index 9b087a8b2e..f71d3248bb 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb +++ b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb @@ -19,13 +19,13 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "grail dbus-glib python3 virtual/libx11 libxext libxi libxcb dbus frame" -SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.xz" +SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.xz\ + file://fix-indentation-for-gcc6.patch \ +" SRC_URI[md5sum] = "2ff9d76a3ea5794516bb02c9d1924faf" SRC_URI[sha256sum] = "8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb" EXTRA_OECONF = "--disable-integration-tests" -TARGET_CFLAGS += "-Wno-error=misleading-indentation" - FILES_${PN}-bin = "${bindir}" RDEPENDS_${PN}-bin = " \ -- cgit 1.2.3-korg