updated lib32-qt to version 4.7.2

This commit is contained in:
Giuseppe 2011-03-24 14:59:08 +00:00
parent c89f04f524
commit a9d8190a1b

View File

@ -5,9 +5,9 @@
_pkgbasename=qt
pkgname=lib32-$_pkgbasename
pkgver=4.7.1
pkgver=4.7.2
pkgrel=1
kdeqtver=b427b5e64483612122e56104552a9704f6013680
#kdeqtver=b427b5e64483612122e56104552a9704f6013680
pkgdesc='A cross-platform application and UI framework (32-bit)'
arch=('x86_64')
url='http://qt.nokia.com/'
@ -19,12 +19,12 @@ makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes})
options=('!libtool')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
"http://chakra-project.org/sources/qt/kde-qt-${kdeqtver}.patch.gz"
'http://chakra-project.org/sources/qt/qt-any-appmenu.patch')
# "http://chakra-project.org/sources/qt/kde-qt-${kdeqtver}.patch.gz"
"http://chakra-project.org/sources/qt/qt-${pkgver}-appmenu.patch")
md5sums=('6f88d96507c84e9fea5bf3a71ebeb6d7'
'cc361e2dff48a56cff9a1649cfc004b2'
'dba7f852bce6e1ebd78f6a78f9979c68')
md5sums=('66b992f5c21145df08c99d21847f4fdb'
# 'cc361e2dff48a56cff9a1649cfc004b2'
'7ca519c824d67cfae0281ec50af24ad8')
_create-kdeqt-patch() {
#Create patches
@ -40,6 +40,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() {
@ -51,12 +52,13 @@ build() {
cd $srcdir/$_pkgfqn
msg "applying kde-qt patches"
patch -p1 -i $srcdir/kde-qt-${kdeqtver}.patch || return 1
# msg "applying kde-qt patches"
# patch -p1 -i $srcdir/kde-qt-${kdeqtver}.patch || return 1
msg "apply other patches"
# apply appmenu patch from Aurelien Gateau
patch -Np1 -i ${srcdir}/qt-any-appmenu.patch || return 1
patch -Np1 -i ${srcdir}/qt-${pkgver}-appmenu.patch || return 1
cp ${srcdir}/${_pkgfqn}/src/gui/widgets/qabstractmenubarimpl_p.h ${srcdir}/${_pkgfqn}/include/QtGui/private/ || return 1
sed -e "s|-O2|$CXXFLAGS -m32|" \
-e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \