Chakra_Linux/lib32
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/lib32.git synced 2025-02-03 02:37:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated lib32-qt to version 4.7.4

Browse Source
This commit is contained in:
Giuseppe 2011-10-19 16:43:56 +00:00
parent f97ec394d6
commit 626e330072
2 changed files with 1415 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lib32-qt/PKGBUILD
View File

@ -5,9 +5,9 @@
_pkgbasename=qt
pkgname=lib32-$_pkgbasename
pkgver=4.7.1
pkgver=4.7.4
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,27 +19,28 @@ 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"
"appmenu.patch")
md5sums=('6f88d96507c84e9fea5bf3a71ebeb6d7'
'cc361e2dff48a56cff9a1649cfc004b2'
'dba7f852bce6e1ebd78f6a78f9979c68')
md5sums=('9831cf1dfa8d0689a06c2c54c5c65aaf'
# 'cc361e2dff48a56cff9a1649cfc004b2'
'7ca519c824d67cfae0281ec50af24ad8')
_create-kdeqt-patch() {
#Create patches
echo "creating kde-qt patches"
local codir=$(mktemp -d)
mkdir -p "${codir}/kde-qt"
git clone git://gitorious.org/+kde-developers/qt/kde-qt.git "${codir}/kde-qt"
pushd "${codir}/kde-qt"
git checkout --track -b ${pkgver}-patched origin/${pkgver}-patched
local kdeqtver=$(git --no-pager show --format='%H' "${pkgver}-patched" | head -1)
git diff "v${pkgver}..${pkgver}-patched" | gzip > "${codir}/kde-qt-${kdeqtver}.patch.gz"
popd
mv "${codir}/kde-qt-${kdeqtver}.patch.gz" .
rm -rf "${codir}"
md5sum kde-qt-${kdeqtver}.patch.gz
#Create patches
echo "creating kde-qt patches"
local codir=$(mktemp -d)
mkdir -p "${codir}/kde-qt"
git clone git://gitorious.org/+kde-developers/qt/kde-qt.git "${codir}/kde-qt"
pushd "${codir}/kde-qt"
git checkout --track -b ${pkgver}-patched origin/${pkgver}-patched
local kdeqtver=$(git --no-pager show --format='%H' "${pkgver}-patched" | head -1)
git diff "v${pkgver}..${pkgver}-patched" | gzip > "${codir}/kde-qt-${kdeqtver}.patch.gz"
popd
mv "${codir}/kde-qt-${kdeqtver}.patch.gz" .
rm -rf "${codir}"
md5sum kde-qt-${kdeqtver}.patch.gz
echo "change kdeqtver to $kdeqtver"
}
build() {
@ -51,14 +52,15 @@ 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
msg "apply other patches"
# apply appmenu patch from Aurelien Gateau
patch -Np1 -i ${srcdir}/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|" \
sed -e "s|-O2|$CXXFLAGS -m32|" \
-e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \
-e "/^QMAKE_LINK\s/s|g++|g++ -m32|g" \
-e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \
@ -101,8 +103,8 @@ build() {
-no-openvg \
-glib
msg "starting the build"
make
msg "starting the build"
make
}
package() {

1385
lib32-qt/appmenu.patch Normal file
View File

File diff suppressed because it is too large Load Diff