diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/qt5-qtbase/APKBUILD | 29 | ||||
| -rw-r--r-- | testing/qt5-qtbase/qt-uclibc-lib-names.patch | 41 |
2 files changed, 15 insertions, 55 deletions
diff --git a/testing/qt5-qtbase/APKBUILD b/testing/qt5-qtbase/APKBUILD index 394ee08eb..84be2f3d4 100644 --- a/testing/qt5-qtbase/APKBUILD +++ b/testing/qt5-qtbase/APKBUILD @@ -1,6 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtbase -pkgver=5.2.1 +pkgver=5.3.0_beta0 +_ver=${pkgver/_/-} +_ver=${_ver/beta0/beta} pkgrel=0 pkgdesc="Qt5 - QtBase components" url="http://qt-project.org/" @@ -41,13 +43,16 @@ install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-sqlite $pkgname-odbc $pkgname-postgresql $pkgname-mysql $pkgname-tds $pkgname-x11" -source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtbase-opensource-src-$pkgver.tar.xz +case $pkgver in +*_beta*) _rel=development_releases;; +*) _rel=official_releases;; +esac +source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtbase-opensource-src-$_ver.tar.xz qt-musl-iconv-no-bom.patch qt-musl-socklen.patch - qt-uclibc-lib-names.patch " -_builddir="$srcdir"/qtbase-opensource-src-$pkgver +_builddir="$srcdir"/qtbase-opensource-src-$_ver prepare() { cd "$_builddir" for i in $source; do @@ -80,7 +85,6 @@ build() { -no-openvg \ -no-rpath \ -no-separate-debug-info \ - -no-javascript-jit \ -nomake examples \ -opengl \ -openssl-linked \ @@ -180,15 +184,12 @@ x11() { return 0 } -md5sums="fa005301a2000b92b61b63edc042567b qtbase-opensource-src-5.2.1.tar.xz +md5sums="3324a23c982a02e1f37628bd6328032c qtbase-opensource-src-5.3.0-beta.tar.xz 077e31e0cb0d25637a3b3638fffbef3c qt-musl-iconv-no-bom.patch -bc83dc99f866423b4803453a0e2949d2 qt-musl-socklen.patch -9d26980d72160bed9b5d7da6f6f7d3d4 qt-uclibc-lib-names.patch" -sha256sums="acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0 qtbase-opensource-src-5.2.1.tar.xz +bc83dc99f866423b4803453a0e2949d2 qt-musl-socklen.patch" +sha256sums="cb91f49d5d09ff28f773a7c4e00ebf27149de63ed86ef6936bd0f910a9a0bdd6 qtbase-opensource-src-5.3.0-beta.tar.xz 40b337c16bbb1d259f315fe5a1b110f9917223aee53b82809934efa4fa5e62a3 qt-musl-iconv-no-bom.patch -e70bdddf67c358c02099bebee460e3c5456666562bff9ef9ebaacf9f4ea7a6df qt-musl-socklen.patch -8562bd3307009c1e06f0ca1bfc9dc380f6ce93459f81d70815ffa0aa1543de0c qt-uclibc-lib-names.patch" -sha512sums="72ef00e9828bf19b2a3daca1c0fa6b0f458c4847da79d4066c818526b8dac504fa4c54496b5d6c67dbea4e786bd811ee8f87614146e684a117d9b86df580e07d qtbase-opensource-src-5.2.1.tar.xz +e70bdddf67c358c02099bebee460e3c5456666562bff9ef9ebaacf9f4ea7a6df qt-musl-socklen.patch" +sha512sums="ed5c12fcd3c1739138e84c3b495da65a3131dd66aa8c7ed57d2e497e767cc8fcf0c6587ed54bcbb2d8db5aeeb27a19a2016b95405c6c5e427c726f1250e42215 qtbase-opensource-src-5.3.0-beta.tar.xz a185ea5e984d2636e3f9f6c4ed8fad66a17575da0679724da60a3dc519468ab45aa9369f43ce5c64f07cb730910e36623164aefafca3aabe0359c62becca870e qt-musl-iconv-no-bom.patch -fb621e9e5a60bb5bd4ad86fa41772fd8db7e8ad3a6e8d36a3d720d493d462db618e4bf3187e3eb66d123fceca64bbbd2df2afba506cc4c79bafa456cd67e82aa qt-musl-socklen.patch -7297d17f365335ac21292ad44a96e5653cb9072e69c7fe402128531a5c48c0b7581cc630670b2f375dfa0f8f60e2f0048b68869ad5c8f9943d4617e0158ac4b9 qt-uclibc-lib-names.patch" +fb621e9e5a60bb5bd4ad86fa41772fd8db7e8ad3a6e8d36a3d720d493d462db618e4bf3187e3eb66d123fceca64bbbd2df2afba506cc4c79bafa456cd67e82aa qt-musl-socklen.patch" diff --git a/testing/qt5-qtbase/qt-uclibc-lib-names.patch b/testing/qt5-qtbase/qt-uclibc-lib-names.patch deleted file mode 100644 index e3097d27c..000000000 --- a/testing/qt5-qtbase/qt-uclibc-lib-names.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7c65b1f6463f65931a77d760662deab63fcecb78 Mon Sep 17 00:00:00 2001 -From: Jorgen Lind <jorgen.lind@digia.com> -Date: Thu, 23 Jan 2014 12:16:20 +0100 -Subject: [PATCH] Don't include <gnu/lib-names.h> when compiling with uClibc - -Change-Id: I5264280b7ce1e94eaf410a070f9670984f7a655b -Reviewed-by: Peter Hartmann <phartmann@blackberry.com> ---- - src/network/kernel/qdnslookup_unix.cpp | 2 +- - src/network/kernel/qhostinfo_unix.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp -index 052c492..9fb488c 100644 ---- a/src/network/kernel/qdnslookup_unix.cpp -+++ b/src/network/kernel/qdnslookup_unix.cpp -@@ -52,7 +52,7 @@ - #include <arpa/nameser_compat.h> - #include <resolv.h> - --#ifdef __GNU_LIBRARY__ -+#if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__) - # include <gnu/lib-names.h> - #endif - -diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp -index dc2702b..32b7318 100644 ---- a/src/network/kernel/qhostinfo_unix.cpp -+++ b/src/network/kernel/qhostinfo_unix.cpp -@@ -63,7 +63,7 @@ - # include <resolv.h> - #endif - --#ifdef __GNU_LIBRARY__ -+#if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__) - # include <gnu/lib-names.h> - #endif - --- -1.7.1 - |