Commit aae93642 authored by Phil's avatar Phil

update qt to 4.7.1

parent dbd7eabc
......@@ -16,9 +16,9 @@ pkgname=('qt'
'qt-demos'
'qt-tools')
pkgver=4.7.0
pkgrel=2
kdeqtver=7abde40e7484d0ab7d61de3531bc0aeedf24aa85
pkgver=4.7.1
pkgrel=1
kdeqtver=b427b5e64483612122e56104552a9704f6013680
pkgdesc="A cross-platform application and UI framework"
arch=('i686' 'x86_64')
......@@ -63,22 +63,16 @@ source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
'linguist.desktop'
'qtconfig.desktop'
'http://chakra-project.org/sources/qt/qt-any-demosexamples-manual-install.patch'
'http://chakra-project.org/sources/qt/qt-any-appmenu.patch'
'http://chakra-project.org/sources/qt/qt-4.7.0-qmake-linker-flags-as-needed.patch'
'http://chakra-project.org/sources/qt/qt-4.7.0-fix-scroll-when-last-item-is-removed.patch'
'http://chakra-project.org/sources/qt/qt-4.7.0-fix-opengl-multisampling-for-some-graphics-drivers.patch')
'http://chakra-project.org/sources/qt/qt-any-appmenu.patch')
md5sums=('3a2f25b9b115037277f4fb759194a7a5'
'9d665e17a64c9e32b374ba5b1eafb350' # kde-qt-7abde40e7484d0ab7d61de3531bc0aeedf24aa85.patch.gz
md5sums=('6f88d96507c84e9fea5bf3a71ebeb6d7'
'cc361e2dff48a56cff9a1649cfc004b2' # kde-qt-b427b5e64483612122e56104552a9704f6013680.patch.gz
'20d333282c43f9e643cb8e91b6307dcc'
'bf89ee0bdd178933f19d8bc4090173ec'
'a9bfeeffab8ba103bc8153fdb31474a1'
'83b2a4aece6c9d86301c53a979af0b63'
'579e63488320a8d692d25502551787af'
'dba7f852bce6e1ebd78f6a78f9979c68'
'c436732fc467271e8a3838145c122070'
'ef20c34afc5be5ed62f2935be66d9402'
'b2e0f134bbb848ebef41134a45a36ee9')
'dba7f852bce6e1ebd78f6a78f9979c68')
# source PKGBUILD && _create-kdeqt-patch
_create-kdeqt-patch() {
......@@ -95,6 +89,7 @@ _create-kdeqt-patch() {
mv "${codir}/kde-qt-${kdeqtver}.patch.gz" .
rm -rf "${codir}"
md5sum kde-qt-${kdeqtver}.patch.gz
echo "change kdeqtver to $kdeqtver"
}
build() {
......@@ -114,18 +109,13 @@ build() {
sed -i -e 's/^.*kde-qt .*/ echo " kde-qt '${kdeqtver}'"/' $startdir/qt.install
msg "apply other patches"
# Already fixed in 4.7.1
patch -Np1 -i ${srcdir}/qt-4.7.0-fix-scroll-when-last-item-is-removed.patch || return 1
patch -Np1 -i ${srcdir}/qt-4.7.0-qmake-linker-flags-as-needed.patch || return 1
patch -Np1 -i ${srcdir}/qt-4.7.0-fix-opengl-multisampling-for-some-graphics-drivers.patch
# apply appmenu patch from Aurelien Gateau
patch -Np1 -i ${srcdir}/qt-any-appmenu.patch || return 1
# we want our cflags etc
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
# undash it in 4.7.1
# sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
msg "starting configure"
......
post_install() {
echo " "
echo " > Qt 4.7.0"
echo " kde-qt 7abde40e7484d0ab7d61de3531bc0aeedf24aa85"
echo " > Qt 4.7.1"
echo " kde-qt b427b5e64483612122e56104552a9704f6013680"
echo " "
echo " Prefix: /usr"
echo " "
......
......@@ -5,7 +5,7 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=xorg-server
pkgver=1.9.3.901
pkgver=1.9.4
pkgrel=1
pkgdesc="X.Org X servers"
arch=('i686' 'x86_64')
......@@ -26,7 +26,7 @@ source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
xvfb-run.1
10-evdev.conf
10-quirks.conf)
md5sums=('f22831fdddecbe4eecf006380d659ac8'
md5sums=('040f091dfdfb4e335116eb0032cc690b'
'1a336eb22e27cbf443ec5a2ecddfa93c'
'52fd3effd80d7bc6c1660d4ecf23d31c'
'376c70308715cd2643f7bff936d9934b'
......
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