Commit dc043a02 authored by Timo Teräs's avatar Timo Teräs

testing/qt5-*: upgrade to 5.2.1, fix musl build

parent 74532119
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt5-qtbase
pkgver=5.1.1
pkgrel=3
pkgver=5.2.1
pkgrel=0
pkgdesc="Qt5 - QtBase components"
url="http://qt-project.org/"
arch="all"
......@@ -42,7 +42,10 @@ 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
qt-musl-iconv-no-bom.patch
qt-musl-socklen.patch
"
_builddir="$srcdir"/qtbase-opensource-src-$pkgver
prepare() {
cd "$_builddir"
......@@ -176,6 +179,12 @@ x11() {
return 0
}
md5sums="955d1e4da875f3872ef3208f21a757dd qtbase-opensource-src-5.1.1.tar.xz"
sha256sums="d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9 qtbase-opensource-src-5.1.1.tar.xz"
sha512sums="db7e25a520584b10370d898747f2cfb84ebbce3a8b9027f373cac7ab713fe199da5465df2453d04107406101ad4eff8cd82871efab40377ff44d789a424667c3 qtbase-opensource-src-5.1.1.tar.xz"
md5sums="fa005301a2000b92b61b63edc042567b qtbase-opensource-src-5.2.1.tar.xz
077e31e0cb0d25637a3b3638fffbef3c qt-musl-iconv-no-bom.patch
bc83dc99f866423b4803453a0e2949d2 qt-musl-socklen.patch"
sha256sums="acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0 qtbase-opensource-src-5.2.1.tar.xz
40b337c16bbb1d259f315fe5a1b110f9917223aee53b82809934efa4fa5e62a3 qt-musl-iconv-no-bom.patch
e70bdddf67c358c02099bebee460e3c5456666562bff9ef9ebaacf9f4ea7a6df qt-musl-socklen.patch"
sha512sums="72ef00e9828bf19b2a3daca1c0fa6b0f458c4847da79d4066c818526b8dac504fa4c54496b5d6c67dbea4e786bd811ee8f87614146e684a117d9b86df580e07d qtbase-opensource-src-5.2.1.tar.xz
a185ea5e984d2636e3f9f6c4ed8fad66a17575da0679724da60a3dc519468ab45aa9369f43ce5c64f07cb730910e36623164aefafca3aabe0359c62becca870e qt-musl-iconv-no-bom.patch
fb621e9e5a60bb5bd4ad86fa41772fd8db7e8ad3a6e8d36a3d720d493d462db618e4bf3187e3eb66d123fceca64bbbd2df2afba506cc4c79bafa456cd67e82aa qt-musl-socklen.patch"
--- qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp.orig
+++ qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp
@@ -62,7 +62,7 @@
#elif defined(Q_OS_AIX)
# define NO_BOM
# define UTF16 "UCS-2"
-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__))
# define NO_BOM
# if Q_BYTE_ORDER == Q_BIG_ENDIAN
# define UTF16 "UTF-16BE"
--- qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h.orig
+++ qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h
@@ -86,11 +86,7 @@
#undef QT_SOCKLEN_T
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
#define QT_SOCKLEN_T socklen_t
-#else
-#define QT_SOCKLEN_T int
-#endif
#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
#define QT_SNPRINTF ::snprintf
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt5-qtdeclarative
pkgver=5.1.1
pkgver=5.2.1
pkgrel=0
pkgdesc="Qt5 - QtDeclarative component"
url="http://qt-project.org/"
......@@ -8,10 +8,10 @@ arch="all"
license="LGPLv2 with exceptions or GPLv3 with exceptions"
depends=""
depends_dev=""
makedepends="$depends_dev qt5-qtbase-dev qt5-qtjsbackend-dev"
makedepends="$depends_dev qt5-qtbase-dev"
install=""
subpackages="$pkgname-dev"
source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qtdeclarative-opensource-src-$pkgver.tar.xz"
source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtdeclarative-opensource-src-$pkgver.tar.xz"
_builddir="$srcdir"/qtdeclarative-opensource-src-$pkgver
prepare() {
......@@ -35,6 +35,6 @@ package() {
rm "$pkgdir"/usr/lib/*.la || return 1
}
md5sums="486fc16ad7b7d0c1488ba5482536d66c qtdeclarative-opensource-src-5.1.1.tar.xz"
sha256sums="0ee989a5d45a94e927609b22e2413c7f2788a7b4a23af66ecfa15c31db2a9b31 qtdeclarative-opensource-src-5.1.1.tar.xz"
sha512sums="279511624723d6774ef308b9029d950b0be951c1c3b6b09f8d67962c927617db67b023c81065875d65c1dd2c048e618aa8b6b13a311040c6d5ddf1c42a4718f9 qtdeclarative-opensource-src-5.1.1.tar.xz"
md5sums="a23fba03a4b48f36fe8b51d326d08acc qtdeclarative-opensource-src-5.2.1.tar.xz"
sha256sums="7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690 qtdeclarative-opensource-src-5.2.1.tar.xz"
sha512sums="ca7bf1b66516158267216c3a3e68abf9e1b063e3eb397b92fa48aecc1c4031397ad22066a4e91c7d0c32ef3ee309d5c3ac77dacdf9a10eca1c1cbd3bf819db42 qtdeclarative-opensource-src-5.2.1.tar.xz"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt5-qtgraphicaleffects
pkgver=5.1.1
pkgver=5.2.1
pkgrel=0
pkgdesc="Qt5 - QtGraphicalEffects component"
url="http://qt-project.org/"
......@@ -11,7 +11,7 @@ depends_dev=""
makedepends="$depends_dev qt5-qtbase-dev"
install=""
subpackages=""
source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qtgraphicaleffects-opensource-src-$pkgver.tar.xz"
source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtgraphicaleffects-opensource-src-$pkgver.tar.xz"
_builddir="$srcdir"/qtgraphicaleffects-opensource-src-$pkgver
prepare() {
......@@ -34,6 +34,6 @@ package() {
make install INSTALL_ROOT="$pkgdir" || return 1
}
md5sums="40d0989d68fb08c1184b7d5088da9c48 qtgraphicaleffects-opensource-src-5.1.1.tar.xz"
sha256sums="347c33ee496d67d98d64b6fa43797c45eae85752bb0026eb234bfb420f77febf qtgraphicaleffects-opensource-src-5.1.1.tar.xz"
sha512sums="3ccc9215169e83a1975d24455ad38e3224d14c11c849a0b796f7020be385ef78b9a99f1ec885916ed29bd46c7ac9d7aaf20fe8115bebb18cc3c1b74c208420c0 qtgraphicaleffects-opensource-src-5.1.1.tar.xz"
md5sums="8dde8593750e33a79f49c5a2f03caf0c qtgraphicaleffects-opensource-src-5.2.1.tar.xz"
sha256sums="5abb17ee60d68cf49c4f8f0b69c3f1e4d0a2f7b32cda8d6901d9c35447cc3482 qtgraphicaleffects-opensource-src-5.2.1.tar.xz"
sha512sums="4fa87eeb7f394b82446ae304c858e743f121e19a4d30f5eb1ce3d553efeb95fe5a328fe06b9ed6387fd421549cf432146bda7de7ca648aa7c31a97f31b3b56c0 qtgraphicaleffects-opensource-src-5.2.1.tar.xz"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt5-qtimageformats
pkgver=5.1.1
pkgver=5.2.1
pkgrel=0
pkgdesc="Qt5 - QtImageFormats component"
url="http://qt-project.org/"
......@@ -11,7 +11,7 @@ depends_dev=""
makedepends="$depends_dev qt5-qtbase-dev libmng-dev tiff-dev"
install=""
subpackages=""
source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qtimageformats-opensource-src-$pkgver.tar.xz"
source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtimageformats-opensource-src-$pkgver.tar.xz"
_builddir="$srcdir"/qtimageformats-opensource-src-$pkgver
prepare() {
......@@ -34,6 +34,6 @@ package() {
make install INSTALL_ROOT="$pkgdir"
}
md5sums="209edddd5899b36ea7ea7ad52204a593 qtimageformats-opensource-src-5.1.1.tar.xz"
sha256sums="3bbb7825c0298c7d95d26b205e48da02c5bac3b35d66a601f939f8ee8b3463a4 qtimageformats-opensource-src-5.1.1.tar.xz"
sha512sums="c42144fe39df5da69eec6b00e54bb0d0795a7f8c1617094c9dd9c5f79f96ff7ba5c447bbd931aa730bf5dcebac8a7e8e6f397501264d7279233876df6cbd2771 qtimageformats-opensource-src-5.1.1.tar.xz"
md5sums="9b88aa6f3888c7c7f5253c147ae4bf8f qtimageformats-opensource-src-5.2.1.tar.xz"
sha256sums="a6a0454769566fec1757fb09b1f33c9fc70d4016acbb04ebc6e493ddedfef124 qtimageformats-opensource-src-5.2.1.tar.xz"
sha512sums="4472077f8bd508ff77b0473ee63bfc2776060f729a40e5615db2b7aec6b44a2f249fe11173280f9bf0aa80567cffa164d097dd6b296ac4bdf4bdcc2cbf47c09f qtimageformats-opensource-src-5.2.1.tar.xz"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt5-qtjsbackend
pkgver=5.1.1
pkgrel=0
pkgdesc="Qt5 - QtJSBackend component"
url="http://qt-project.org/"
arch="all"
license="LGPLv2 with exceptions or GPLv3 with exceptions"
depends=""
depends_dev=""
makedepends="$depends_dev qt5-qtbase-dev python paxctl"
install=""
subpackages="$pkgname-dev"
source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qtjsbackend-opensource-src-$pkgver.tar.xz"
_builddir="$srcdir"/qtjsbackend-opensource-src-$pkgver
prepare() {
local i
cd "$_builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
}
build() {
cd "$_builddir"
# we need to pax mark mkv8snapshot
(cd src/tools && qmake && make) \
&& paxctl -c -m bin/mkv8snapshot \
&& qmake && make || return 1
}
package() {
cd "$_builddir"
make install INSTALL_ROOT="$pkgdir"
rm "$pkgdir"/usr/lib/*.la
}
md5sums="7225169d7d166cc5660384a85e4d4a2f qtjsbackend-opensource-src-5.1.1.tar.xz"
sha256sums="42628eac133738df30e9104c2014eb70478e8fcf2cc86c1f500359c12216b192 qtjsbackend-opensource-src-5.1.1.tar.xz"
sha512sums="5772b4fa73610a8c47ed07a46d020045e3f298b303e014772a2418af14350dbca6f7bc76db64cbcd1712f679e42ff4aa9d88feb658559fd7dd994c3810443b85 qtjsbackend-opensource-src-5.1.1.tar.xz"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt5-qtmultimedia
pkgver=5.1.1
pkgver=5.2.1
pkgrel=0
pkgdesc="Qt5 - Multimedia support"
url="http://qt-project.org/"
......@@ -12,7 +12,7 @@ makedepends="$depends_dev qt5-qtbase-dev qt5-qtdeclarative-dev
alsa-lib-dev libxv-dev gstreamer-dev gst-plugins-base-dev"
install=""
subpackages="$pkgname-dev"
source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qtmultimedia-opensource-src-$pkgver.tar.xz"
source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtmultimedia-opensource-src-$pkgver.tar.xz"
_builddir="$srcdir"/qtmultimedia-opensource-src-$pkgver
prepare() {
......@@ -36,6 +36,6 @@ package() {
rm "$pkgdir"/usr/lib/*.la
}
md5sums="4b6e74bd7752bc241617f41539632bba qtmultimedia-opensource-src-5.1.1.tar.xz"
sha256sums="df907a81c4ef15c9aec216c1f57aa72a7a7b274ea3cb3950f87fa1b04e369ebe qtmultimedia-opensource-src-5.1.1.tar.xz"
sha512sums="14e2ff2037d41220acca34534b947ae5918edbb878f118d34594b8bbc1c857a745b7a7eba21c063f18dc0d5de25cbee525d66cb203ab52165203ed4ccb185ec1 qtmultimedia-opensource-src-5.1.1.tar.xz"
md5sums="26dc22c59fbbad9fdf0699d5f887166a qtmultimedia-opensource-src-5.2.1.tar.xz"
sha256sums="62688cb7d8daa4d7050353fe39536c5edd97228a10185b9662a29b8c8cff1fa2 qtmultimedia-opensource-src-5.2.1.tar.xz"
sha512sums="89c7d04a00af99259877fee8181132b3dce2bd4a3f084a3fac1d5fc8d35e3d4d60c7ec33170968514d08e25e43d7c90c718925459878e33bf8c8c94f95f00aad qtmultimedia-opensource-src-5.2.1.tar.xz"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt5-qtquick1
pkgver=5.1.1
pkgver=5.2.1
pkgrel=0
pkgdesc="A declarative language for describing user interfaces in Qt5"
url="http://qt-project.org/"
......@@ -11,7 +11,7 @@ depends_dev="qt5-qtbase-dev qt5-qtscript-dev mesa-dev"
makedepends="$depends_dev"
install=""
subpackages="$pkgname-dev"
source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qtquick1-opensource-src-$pkgver.tar.xz"
source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtquick1-opensource-src-$pkgver.tar.xz"
_builddir="$srcdir"/qtquick1-opensource-src-$pkgver
prepare() {
......@@ -35,6 +35,6 @@ package() {
rm "$pkgdir"/usr/lib/*.la || return 1
}
md5sums="05956168e0a4bba44c31b61dd4fc5e6e qtquick1-opensource-src-5.1.1.tar.xz"
sha256sums="f5dc431fb33a195414d2d75d7dff1c101f4101489f38b4ea9c5e8782b1807a64 qtquick1-opensource-src-5.1.1.tar.xz"
sha512sums="d42334280d365308b7402120a2b828544787254283ac1cdc6c4abe66075a05092fb016eeae169a52a813f8cef240d1d39b863319ba7d0231c7c936b7d59aa02d qtquick1-opensource-src-5.1.1.tar.xz"
md5sums="6abbf131adffdf3cba63704d5d35f921 qtquick1-opensource-src-5.2.1.tar.xz"
sha256sums="8b2bb3250b9e09a4c568069bc4c7cfeddbdcda50b24f0bfecc7f85df3120ff65 qtquick1-opensource-src-5.2.1.tar.xz"
sha512sums="e5c30df44a184e6df9475eb6616cb75c459000de1190e2ddd00e151afaef1130c6ddcc18be955919e9d85dc4644f4cb63ffd844ac73c024e5212ce47ab1c382d qtquick1-opensource-src-5.2.1.tar.xz"
# Maintainer:
pkgname=qt5-qtquickcontrols
pkgver=5.1.1
pkgver=5.2.1
pkgrel=0
pkgdesc="Qt5 - module with set of QtQuick controls"
url="http://qt-project.org/"
arch="all"
license="BSD and (LGPLv2 with exceptions or GPLv3 with exceptions) and GFDL"
depends=""
depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtjsbackend-dev"
depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev"
makedepends="$depends_dev"
install=""
subpackages=""
source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qtquickcontrols-opensource-src-$pkgver.tar.xz"
source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtquickcontrols-opensource-src-$pkgver.tar.xz"
_builddir="$srcdir"/qtquickcontrols-opensource-src-$pkgver
prepare() {
......@@ -34,6 +34,6 @@ package() {
make install INSTALL_ROOT="$pkgdir" || return 1
}
md5sums="6482ee0c4b11119ae5cb5080e61c18c0 qtquickcontrols-opensource-src-5.1.1.tar.xz"
sha256sums="52fe58cb83f7b76d46abd12485713a7bd62a3b2739a7271098e0a1ea25d9fec3 qtquickcontrols-opensource-src-5.1.1.tar.xz"
sha512sums="d5afe06465606a65a012b003055a2566b16caa77328f77c4ce5b713d94dde04744093ef8894cc0c58741320427815abcebed7d7694f3ff8cbcfe64d99de25261 qtquickcontrols-opensource-src-5.1.1.tar.xz"
md5sums="027bc7d05fe740b21284dc909c9f11ac qtquickcontrols-opensource-src-5.2.1.tar.xz"
sha256sums="eb03a69402576984d588923e994c3cb672d8479ac9b68ed90da15d0c2fd82aac qtquickcontrols-opensource-src-5.2.1.tar.xz"
sha512sums="565a9a9771127c80f76e211ba63203600c74ec53d0f155fe1fde22801930a459bda4c5b028495c62123f89539bcee55b4b40fa2c8fd9b77561be35a436d46042 qtquickcontrols-opensource-src-5.2.1.tar.xz"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt5-qtscript
pkgver=5.1.1
pkgver=5.2.1
pkgrel=0
pkgdesc="Qt5 - QtScript component"
url="http://qt-project.org/"
......@@ -11,7 +11,7 @@ depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev"
install=""
subpackages="$pkgname-dev"
source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qtscript-opensource-src-$pkgver.tar.xz"
source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtscript-opensource-src-$pkgver.tar.xz"
_builddir="$srcdir"/qtscript-opensource-src-$pkgver
prepare() {
......@@ -35,6 +35,6 @@ package() {
rm "$pkgdir"/usr/lib/*.la || return 1
}
md5sums="5c0e8633fbf560f711b7af689f8bcb99 qtscript-opensource-src-5.1.1.tar.xz"
sha256sums="d80061f7652ae3992e2b9ffbc7052d54872f6042a7a258b50d22eadf0175f364 qtscript-opensource-src-5.1.1.tar.xz"
sha512sums="0435cd4fbbda6b14c750c563368658b781be0f8d73e88c290aae08ac0445ae6a8807765e30d1f2527b06a51ef95bc4f46dcbcead874f8930718ddab53b6ea632 qtscript-opensource-src-5.1.1.tar.xz"
md5sums="b8af09bb297d4c62e64df5418fe99dc9 qtscript-opensource-src-5.2.1.tar.xz"
sha256sums="6621350d5eff65cb6f9853247246f30a2d4cdb465c14923ff7ccbd8c3a9cdefa qtscript-opensource-src-5.2.1.tar.xz"
sha512sums="8b8e819a07ce0be9ebcfe02953d4f74f770085de28fb27c8881beb25056423565534ac325616e684157e655c91f18534a93a5b1f26af358b721dcef7419640ad qtscript-opensource-src-5.2.1.tar.xz"
# Contributor:
# Maintainer:
pkgname=qt5-qtsvg
pkgver=5.1.1
pkgver=5.2.1
pkgrel=0
pkgdesc="Qt5 - Support for rendering and displaying SVG"
url="http://qt-project.org/"
......@@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev zlib-dev"
install=""
subpackages="$pkgname-dev"
source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qtsvg-opensource-src-$pkgver.tar.xz"
source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtsvg-opensource-src-$pkgver.tar.xz"
_builddir="$srcdir"/qtsvg-opensource-src-$pkgver
prepare() {
......@@ -36,6 +36,6 @@ package() {
rm "$pkgdir"/usr/lib/*.la || return 1
}
md5sums="9db8209602b0ea942273e01a874ea5b7 qtsvg-opensource-src-5.1.1.tar.xz"
sha256sums="6bfe7705ff58391205ca797d84ca6dda57ebcce106fdff52d4908b0e443567bf qtsvg-opensource-src-5.1.1.tar.xz"
sha512sums="c6faa5e0e0815180e6183fd71caa19973d08707d729b83d269bedcfe62d9eaa1634d71a390ad11b3665601ec0d39b08728b0d14d07552fe7d7b81b9d930aa5b6 qtsvg-opensource-src-5.1.1.tar.xz"
md5sums="3f5487fe2bd5024f18f63a8d0eb4294d qtsvg-opensource-src-5.2.1.tar.xz"
sha256sums="788f69557ff6d28073d6ef2b3300b42b987fba1d122f7884ba0269023cab44ef qtsvg-opensource-src-5.2.1.tar.xz"
sha512sums="458ed10564214aa2304caf61d8abf957f98a6a8972565ff92805096969b0fe87d5d44c41dbea69967d464af927a611ef1f8619511c65c7f9074ca136b9d1f544 qtsvg-opensource-src-5.2.1.tar.xz"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt5-qttools
pkgver=5.1.1
pkgver=5.2.1
pkgrel=0
pkgdesc="Qt5 - QtTool components"
url="http://qt-project.org/"
......@@ -12,7 +12,7 @@ makedepends="$depends_dev qt5-qtwebkit-dev"
install=""
subpackages="$pkgname-dev qt5-assistant:_assistant qt5-qdbusviewer:_dbusviewer
qt5-designer-plugin-webkit:_webkit"
source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qttools-opensource-src-$pkgver.tar.xz
source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qttools-opensource-src-$pkgver.tar.xz
assistant.desktop
designer.desktop
linguist.desktop
......@@ -121,17 +121,17 @@ _webkit() {
_mv_files usr/lib/qt5/plugins/designer/libqwebview.so || return 1
}
md5sums="022073d32ff9d408de0182b5d1f01781 qttools-opensource-src-5.1.1.tar.xz
md5sums="f56b2e6c537f6853d9bf10380c39418b qttools-opensource-src-5.2.1.tar.xz
a445c6917086d80f1cfc1e40cb6b0132 assistant.desktop
d457f0a0ad68a3861c3cadefe3b42ded designer.desktop
668331d9798a0e2b94381efb7be4c513 linguist.desktop
60f6c5d2e7551790665d35778d1640f3 qdbusviewer.desktop"
sha256sums="2b42c6d5feeccffb67e890b86a150bae64dd2ff550be39a3cc449ee0e95462b6 qttools-opensource-src-5.1.1.tar.xz
sha256sums="ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5 qttools-opensource-src-5.2.1.tar.xz
1094300e3d69e55eb69d87cbaac6724f68b0618938c6eb1b0ddd22ba99c7f8a2 assistant.desktop
74c2c5d27a1c1ad08ab01122bcf333f75d0a014b4755d3ddd8764c2425f6e320 designer.desktop
1b9ecd839c1a5dfcec87653849287c31bf2f4044300958be802ebb943e896998 linguist.desktop
3da411f79ddc788a6b892ba1d61c0175c629e6e53fb9591a3cb12e4c6d983ac8 qdbusviewer.desktop"
sha512sums="9fdd3063357fc961c972e50f61e7b9b028e72dfca27830bd0316a02ca7898ce98e4170b4687d511aa12cd1c77aac6ac8900374f6bab28846a484dd9acbed6565 qttools-opensource-src-5.1.1.tar.xz
sha512sums="406588a84cdc3b5d68d31f5f0eae77618d730d69ab4383d10f70faf4f87ce3a21c86a1feeaea41f4b13714ed9cdd3981861a8e532a7eebd0601a9a6df761abb1 qttools-opensource-src-5.2.1.tar.xz
005ed6fe50b237e4541c0f30cbd87ec5425eff7e7c8d55d2b9b24ea8469e75e1fc8a3f26296841ab4cbd566517b3f1aa1fa7b36e1a9677d284cfff615fd24614 assistant.desktop
731aae6a0d776c1be5a49dadc5480b205ba5c8e056d108e2bb96a19dd52b6c6ca22387b37505cf97a2575228cd5dd65c773d0fde1c26299e47fdc11a49f651fd designer.desktop
70943d9ee9ac7ff6281079be14b741095c60428b30b27bafc42a8bb1729a6f7e8e163cff3d2b5d5a66bbdab464816eea479a3f822598ff2fe068d4025652a049 linguist.desktop
......
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt5-qttranslations
pkgver=5.1.1
pkgver=5.2.1
pkgrel=0
pkgdesc="Qt5 - QtTranslations module"
url="http://qt-project.org/"
......@@ -11,7 +11,7 @@ depends_dev=""
makedepends="$depends_dev qt5-qttools-dev"
install=""
subpackages=""
source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qttranslations-opensource-src-$pkgver.tar.xz"
source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qttranslations-opensource-src-$pkgver.tar.xz"
_builddir="$srcdir"/qttranslations-opensource-src-$pkgver
prepare() {
......@@ -34,6 +34,6 @@ package() {
make install INSTALL_ROOT="$pkgdir" || return 1
}
md5sums="5ab0f6c326b9dc0a952cc496df2679aa qttranslations-opensource-src-5.1.1.tar.xz"
sha256sums="7466f5202997c120a5a05bee4d4b39774731d1acab09bcc8fd0724e1a5835c93 qttranslations-opensource-src-5.1.1.tar.xz"
sha512sums="e57450d4cd5e0c5a4a49a192840f50db757c20747d68aac139e5b9b669f06f72f311e0c10ad11d7ddc8d58de6c0797f2f89fca22c5e09f10b22af42e451439ed qttranslations-opensource-src-5.1.1.tar.xz"
md5sums="4adcd85471b39e1680b035f15ec9910b qttranslations-opensource-src-5.2.1.tar.xz"
sha256sums="9a93fddb9c98bd5c85c9644603f4326f4cc991004f40df5432dc811a6b59b4e6 qttranslations-opensource-src-5.2.1.tar.xz"
sha512sums="65cc9c9350a338b870143bfef6a3801c63b543fe103be3e44a8eb9bfa5c0bceebee1c6bd2705b41e982b095ecfded8f82a4f2952631180a65a90d8ee5674dbb1 qttranslations-opensource-src-5.2.1.tar.xz"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt5-qtwebkit
pkgver=5.1.1
pkgrel=3
pkgver=5.2.1
pkgrel=0
pkgdesc="Qt5 - QtWebKit components"
url="http://qt-project.org/"
arch="all"
......@@ -26,10 +26,10 @@ makedepends="$depends_dev
"
install=""
subpackages="$pkgname-dev"
source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qtwebkit-opensource-src-$pkgver.tar.xz
bison3.patch
source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtwebkit-opensource-src-$pkgver.tar.xz
pic.patch
fix-rpath.patch
fix-execinfo.patch
"
_builddir="$srcdir"/qtwebkit-opensource-src-$pkgver
......@@ -43,10 +43,7 @@ prepare() {
done
# remove some bundled
mkdir Source/ThirdParty/orig
mv Source/ThirdParty/glu/ \
Source/ThirdParty/gtest/ \
Source/ThirdParty/gyp \
Source/ThirdParty/mt19937ar.c \
mv Source/ThirdParty/gtest/ \
Source/ThirdParty/qunit/ \
Source/ThirdParty/orig/ \
|| return 1
......@@ -66,15 +63,15 @@ package() {
sed -i -e 's:-L/home[^ ]\+::g' "$pkgdir"/usr/lib/pkgconfig/*.pc
}
md5sums="70e956dafcee1969de53d4de7b4691ad qtwebkit-opensource-src-5.1.1.tar.xz
6b162cd2bc104f0ae83ca039401be7bf bison3.patch
md5sums="a20d99a1c2afbd6a7c6f54e615f1bd63 qtwebkit-opensource-src-5.2.1.tar.xz
676350288efff119bee8513d9d0b2047 pic.patch
e86a2f40683cd0633cb35c56cfce16de fix-rpath.patch"
sha256sums="d6ee1e9111b0996277a512ae71736a05faa7c0de6d69ac2978adce79c3116a24 qtwebkit-opensource-src-5.1.1.tar.xz
774f685f14e5341a010dd41a30700b92c336e2500880c8e5024e92a2c42499f2 bison3.patch
0eb12ab99ceaea7f841d58193f5e6cce fix-rpath.patch
7a2a2592e64561fa0bc8c0552181bf00 fix-execinfo.patch"
sha256sums="ac089723489ee9146020bd8fc715358249d8cea7f2a2e92a692e2a5595a46b5c qtwebkit-opensource-src-5.2.1.tar.xz
51c0e843c5c6453526ee51ed69f2d4a7959767621da321f1082985dfe9f001ef pic.patch
340e1a9b89088683c782456a4ebbfff0d6a18e08832f56a6cc0ecd5baadc51e1 fix-rpath.patch"
sha512sums="aa7e310f1319902131dab5705a5bb2c02252f0d3d6b288ab13478ae42d38664578c52708cf3fa504ffc0b1f9f161e5bbcc65bdf6a7028c043b992211986a5f64 qtwebkit-opensource-src-5.1.1.tar.xz
daa7aa25caa2cc70f6227d01e4ffdf9374d2c418f2aa34072a430c2c891c1bc5d68c6911f61f24505d4b8e89e572b6405fbfa1cecd55f0c66baa7abc8d0893f1 bison3.patch
15eb66062e11fef891285b0a288bab9a1b03cd6984f701a7ad890fe6933c1d23 fix-rpath.patch
d8f6c84cf1a98174aa16660a422cd7b248a012e60bf37a9b5013f2bc61b6d63e fix-execinfo.patch"
sha512sums="edfc1c9f9eb51d14cd145cac041850d3627840cb405286864c3f0966742af2bb38310c44bc476be9354f2db2b58a89fbacead2667e0a37f691ab9a87fc3ee5bf qtwebkit-opensource-src-5.2.1.tar.xz
9a62a5e7af91c44311b517608262f88b5bc607e75dc5878dd08b0a0872ec03fb7a566df0a41413f7e60beb1b9880e24f084b90c38ed50d4219ec2ad6af9bd62f pic.patch
156db7c346db2bba15332f2e0ab13add1e8e71cf4c165ea1adcfdcf054c73590d28202699bce3a48a8a974081bd6b2bf1b04196014d47ee53a748a56063e2495 fix-rpath.patch"
28646d969c15f4ec7cec6bd483f9ead0c71becf42fb8e8261d0c209cb1b6973083515ea1c3fcf9ccaf80a22b81bab0401c4f7b4f29c1631b4433b3bf4aff0507 fix-rpath.patch
f17c2f4b90090c8f12e4ba1f2cbd7a9f496c8de024ba6e0d55b98e5b89ab89298aff84f39e81905e0491fe6bd11544633a8b191403a866e16ed654d44cf8dc6f fix-execinfo.patch"
From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@digia.com>
Date: Fri, 16 Aug 2013 18:27:07 +0200
Subject: [PATCH] ANGLE doesn't build with bison 3.0
https://bugs.webkit.org/show_bug.cgi?id=119798
Reviewed by Antti Koivisto.
Make glslang.y compatible with bison 3.0
by using %lex-param to set YYLEX_PARAM.
* src/compiler/glslang.y:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Task-number: QTBUG-32913
Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
---
Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
index 3cad335..b41e95a 100644
--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
%expect 1 /* One shift reduce conflict because of if | else */
%pure-parser
%parse-param {TParseContext* context}
+%lex-param {YYLEX_PARAM}
%union {
struct {
--
1.7.1
--- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp
+++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp
@@ -64,7 +64,7 @@
#include <windows.h>
#endif
-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) && !OS(ANDROID)
#include <cxxabi.h>
#include <dlfcn.h>
#include <execinfo.h>
@@ -242,7 +242,7 @@
void WTFGetBacktrace(void** stack, int* size)
{
-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) && !OS(ANDROID)
*size = backtrace(stack, *size);
#elif OS(WINDOWS) && !OS(WINCE)
// The CaptureStackBackTrace function is available in XP, but it is not defined
--- ./Tools/qmake/mkspecs/features/unix/default_post.prf.orig 2013-10-10 13:50:38.663745911 +0000
+++ ./Tools/qmake/mkspecs/features/unix/default_post.prf 2013-10-10 13:50:53.253909607 +0000
@@ -32,8 +32,6 @@
--- ./Tools/qmake/mkspecs/features/unix/default_post.prf.orig
+++ ./Tools/qmake/mkspecs/features/unix/default_post.prf
@@ -58,8 +58,6 @@
QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions
}
-contains(TEMPLATE, app): CONFIG += rpath
-
isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) {
# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory
CONFIG(debug, debug|release)|force_debug_info|separate_debug_info {
# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
!force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment