From 4a82435fff932711146b5c36342556fb8af7003c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 28 May 2013 13:02:25 +0200 Subject: qtbase: Refresh 0016-configure-add-tslib-support.patch from stable branch Signed-off-by: Martin Jansa --- ...w-tslib-to-be-specified-at-configure-time.patch | 72 ++++++++++++++++++++ .../0016-configure-add-tslib-support.patch | 78 ---------------------- recipes-qt/qt5/qtbase_5.0.2.bb | 2 +- 3 files changed, 73 insertions(+), 79 deletions(-) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0016-configure-add-tslib-support.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch b/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch new file mode 100644 index 00000000..387961b4 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch @@ -0,0 +1,72 @@ +From 665841d6c38faecbf7848c0f4bbf3b0537b6a0a1 Mon Sep 17 00:00:00 2001 +From: Michael Brasser +Date: Tue, 26 Mar 2013 09:22:51 -0500 +Subject: [PATCH 16/16] Allow tslib to be specified at configure time. + +Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e +Reviewed-by: Oswald Buddenhagen +--- + configure | 20 ++++++++++++++++++++ + src/plugins/generic/generic.pro | 4 ++++ + 2 files changed, 24 insertions(+) + +diff --git a/configure b/configure +index ac09bbf..188e941 100755 +--- a/configure ++++ b/configure +@@ -829,6 +829,7 @@ CFG_KMS=auto + CFG_LIBUDEV=auto + CFG_OBSOLETE_WAYLAND=no + CFG_EVDEV=auto ++CFG_TSLIB=no + CFG_NIS=auto + CFG_CUPS=auto + CFG_ICONV=auto +@@ -1805,6 +1806,13 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ tslib) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then ++ CFG_TSLIB="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + cups) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_CUPS="$VAL" +@@ -4815,6 +4823,18 @@ if [ "$CFG_EVDEV" = "no" ]; then + QMakeVar add DEFINES QT_NO_EVDEV + fi + ++if [ "$CFG_TSLIB" != "no" ]; then ++ if compileTest unix/tslib "tslib"; then ++ CFG_TSLIB=yes ++ QT_CONFIG="$QT_CONFIG tslib" ++ elif [ "$CFG_TSLIB" = "yes" ]; then ++ echo "The tslib functionality test failed!" ++ exit 1 ++ else ++ CFG_TSLIB=no ++ fi ++fi ++ + # Check we actually have X11 :-) + if compileTest x11/xlib "XLib"; then + QT_CONFIG="$QT_CONFIG xlib" +diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro +index 078db2f..18a8295 100644 +--- a/src/plugins/generic/generic.pro ++++ b/src/plugins/generic/generic.pro +@@ -5,3 +5,7 @@ TEMPLATE = subdirs + contains(QT_CONFIG, evdev) { + SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet + } ++ ++contains(QT_CONFIG, tslib) { ++ SUBDIRS += tslib ++} +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0016-configure-add-tslib-support.patch b/recipes-qt/qt5/qtbase-5.0.2/0016-configure-add-tslib-support.patch deleted file mode 100644 index f69b9adf..00000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0016-configure-add-tslib-support.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 3038a3c7678867f8a7a30de7973d0eca8c0d737f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Mon, 27 May 2013 18:45:03 +0200 -Subject: [PATCH 16/16] configure: add tslib support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Eric Bénard ---- - configure | 24 ++++++++++++++++++++++++ - src/plugins/generic/generic.pro | 4 ++++ - 2 files changed, 28 insertions(+) - -diff --git a/configure b/configure -index ac09bbf..f1252a0 100755 ---- a/configure -+++ b/configure -@@ -829,6 +829,7 @@ CFG_KMS=auto - CFG_LIBUDEV=auto - CFG_OBSOLETE_WAYLAND=no - CFG_EVDEV=auto -+CFG_TSLIB=auto - CFG_NIS=auto - CFG_CUPS=auto - CFG_ICONV=auto -@@ -1805,6 +1806,13 @@ while [ "$#" -gt 0 ]; do - UNKNOWN_OPT=yes - fi - ;; -+ tslib) -+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then -+ CFG_TSLIB="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi -+ ;; - cups) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_CUPS="$VAL" -@@ -4815,6 +4823,22 @@ if [ "$CFG_EVDEV" = "no" ]; then - QMakeVar add DEFINES QT_NO_EVDEV - fi - -+if [ "$CFG_TSLIB" != "no" ]; then -+ if compileTest unix/tslib "tslib"; then -+ CFG_TSLIB=yes -+ QT_CONFIG="$QT_CONFIG tslib" -+ elif [ "$CFG_TSLIB" = "yes" ]; then -+ echo "The tslib functionality test failed!" -+ exit 1 -+ else -+ CFG_TSLIB=no -+ fi -+fi -+if [ "$CFG_TSLIB" = "no" ]; then -+ QMakeVar add DEFINES QT_NO_TSLIB -+fi -+ -+ - # Check we actually have X11 :-) - if compileTest x11/xlib "XLib"; then - QT_CONFIG="$QT_CONFIG xlib" -diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro -index 078db2f..18a8295 100644 ---- a/src/plugins/generic/generic.pro -+++ b/src/plugins/generic/generic.pro -@@ -5,3 +5,7 @@ TEMPLATE = subdirs - contains(QT_CONFIG, evdev) { - SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet - } -+ -+contains(QT_CONFIG, tslib) { -+ SUBDIRS += tslib -+} --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index c93c0127..89cfb725 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb @@ -4,7 +4,7 @@ require ${PN}.inc PR = "${INC_PR}.0" SRC_URI += " \ - file://0016-configure-add-tslib-support.patch \ + file://0016-Allow-tslib-to-be-specified-at-configure-time.patch \ " SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" -- cgit v1.2.3