From 232aeaf6f3262f90b625d80870cc736fe8d23cbc Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Sat, 29 Dec 2018 17:18:46 +0100 Subject: [PATCH] main/qt5-qtvirtualkeyboard: fix build, remove patch (!118) Remove a patch that fixed a compilation error, it is not needed anymore and does not apply to 5.12. --- .../0001-include-sys-time.h-for-timeval.patch | 12 ------------ main/qt5-qtvirtualkeyboard/APKBUILD | 10 ++++------ 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 main/qt5-qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch diff --git a/main/qt5-qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch b/main/qt5-qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch deleted file mode 100644 index 03dc61176..000000000 --- a/main/qt5-qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h b/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h -index 1b9673f..924be7b 100644 ---- a/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h -+++ b/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h -@@ -24,6 +24,7 @@ - // Debug performance for operations - // #define ___DEBUG_PERF___ - -+#include - #ifdef _WIN32 - #include // timeval - #else diff --git a/main/qt5-qtvirtualkeyboard/APKBUILD b/main/qt5-qtvirtualkeyboard/APKBUILD index 0b388b281..874ffda3c 100644 --- a/main/qt5-qtvirtualkeyboard/APKBUILD +++ b/main/qt5-qtvirtualkeyboard/APKBUILD @@ -8,10 +8,9 @@ url='http://qt-project.org/' license="GPL-3.0 GPL-2.0 LGPL-3.0" pkgdesc='Virtual keyboard framework' depends="" -depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev" -makedepends="$depends_dev hunspell-dev" -source="http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${pkgname/qt5-/}-everywhere-src-$pkgver.tar.xz - 0001-include-sys-time.h-for-timeval.patch" +depends_dev="qt5-qtsvg-dev" +makedepends="$depends_dev hunspell-dev qt5-qtbase-dev qt5-qtdeclarative-dev" +source="http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${pkgname/qt5-/}-everywhere-src-$pkgver.tar.xz" subpackages="$pkgname-dev" builddir="$srcdir/${pkgname/qt5-/}-everywhere-src-$pkgver" options="!check" @@ -32,5 +31,4 @@ package() { install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname } -sha512sums="984a4d8eb7fd4aaaee956c65e818467be93540769867023f6a9bb8a6d53bab7fe30d372aaa21cc3fb3642b9e6fa672669d4caacfaa0ed7500dcb126ee4be40f8 qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz -e801336b9aaf0facdcf7347fa8cf7223362312c92ea5725c5260d777045cc9da9a6de514dc4c17904aab77ae799bdd154c4615b8f2a39d92ce55ca10ad218efb 0001-include-sys-time.h-for-timeval.patch" +sha512sums="984a4d8eb7fd4aaaee956c65e818467be93540769867023f6a9bb8a6d53bab7fe30d372aaa21cc3fb3642b9e6fa672669d4caacfaa0ed7500dcb126ee4be40f8 qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"