From be2e712f8c68891ab05a3957fbcc340f3679fae6 Mon Sep 17 00:00:00 2001 From: Aleksandar Samardzic Date: Tue, 11 May 2010 22:24:18 +0200 Subject: [PATCH] libraries/qt4: Updated for version 4.4.3 --- libraries/qt4/qt4.SlackBuild | 19 ++++++++++++------- libraries/qt4/qt4.info | 12 ++++++------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/libraries/qt4/qt4.SlackBuild b/libraries/qt4/qt4.SlackBuild index ed178d9ec2..0b3a335db5 100644 --- a/libraries/qt4/qt4.SlackBuild +++ b/libraries/qt4/qt4.SlackBuild @@ -1,11 +1,11 @@ #!/bin/sh # Slackware build script for Qt 4 -# Written by Aleksandar B. Samardzic +# Written by Aleksandar Samardzic # Modified by Robby Workman PRGNAM=qt4 -VERSION=4.3.4 +VERSION=${VERSION:-4.4.3} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -19,6 +19,8 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" fi set -e @@ -30,13 +32,18 @@ rm -rf qt-x11-opensource-src-$VERSION tar xvf $CWD/qt-x11-opensource-src-$VERSION.tar.gz cd qt-x11-opensource-src-$VERSION chown -R root:root . -chmod -R u+w,go+r-w,a-s . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" echo "yes" | ./configure \ -prefix /usr/lib/qt-$VERSION \ + -no-separate-debug-info \ -nomake examples \ -nomake demos @@ -52,9 +59,7 @@ make install INSTALL_ROOT=$PKG mkdir -p $PKG/usr/bin ( cd $PKG/usr/bin - for file in assistant designer linguist lrelease lupdate \ - moc pixeltool qdbus qdbuscpp2xml qdbusviewer \ - qdbusxml2cpp qmake qt3to4 qtconfig rcc uic uic3 ; + for file in assistant assistant_adp designer linguist lrelease lupdate moc pixeltool qcollectiongenerator qdbus qdbuscpp2xml qdbusviewer qdbusxml2cpp qhelpconverter qhelpgenerator qmake qt3to4 qtconfig rcc uic uic3 xmlpatterns; do ln -sf /usr/lib/qt-$VERSION/bin/$file ${file}-qt4 ; done @@ -72,7 +77,7 @@ mkdir -p $PKG/usr/lib/pkgconfig mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT INSTALL LICENSE.GPL* \ - LICENSE.QPL OPENSOURCE-NOTICE.TXT README changes-$VERSION \ + OPENSOURCE-NOTICE.TXT README changes-$VERSION \ $PKG/usr/doc/$PRGNAM-$VERSION ( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -sf /usr/lib/qt-$VERSION/doc/html . ) diff --git a/libraries/qt4/qt4.info b/libraries/qt4/qt4.info index ba91f56522..4306dfb1fb 100644 --- a/libraries/qt4/qt4.info +++ b/libraries/qt4/qt4.info @@ -1,8 +1,8 @@ PRGNAM="qt4" -VERSION="4.3.4" +VERSION="4.4.3" HOMEPAGE="http://trolltech.com/products/qt" -DOWNLOAD="ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.4.tar.gz" -MD5SUM="9499101ec54eb7b0de195b3c5e3ffa93" -MAINTAINER="Aleksandar B. Samardzic" -EMAIL="asamardzic@matf.bg.ac.yu" -APPROVED="David Somero" +DOWNLOAD="ftp://ftp.trolltech.no/qt/source/qt-x11-opensource-src-4.4.3.tar.gz" +MD5SUM="376c003317c4417326ba2116370227d0" +MAINTAINER="Aleksandar Samardzic" +EMAIL="asamardzic@gmail.com" +APPROVED="dsomero,Michiel"