Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a5d7868abe7a02c70ae877d4a06698050be27810
commit a5d7868abe7a02c70ae877d4a06698050be27810 Author: crazy <[email protected]> Date: Mon Feb 1 18:59:00 2010 +0100 qt4-4.6.1-2-x86_64 * pkgrel++ * sorry guys I didn't notice the typos in qt's source , unix/*test folder :| * added patch to fix these also * removed that config patch and pass --as-needed in g++.conf with our LDFLAGS diff --git a/source/xlib-extra/qt4/09_qmake_lflags_as-needed.diff b/source/xlib-extra/qt4/09_qmake_lflags_as-needed.diff deleted file mode 100644 index 5fb7a7f..0000000 --- a/source/xlib-extra/qt4/09_qmake_lflags_as-needed.diff +++ /dev/null @@ -1,16 +0,0 @@ -author: Fathi Boudra <[email protected]> - -workaround as LDFLAGS isn't honored by configure script. -Bug reported to Trolltech. - ---- a/configure -+++ b/configure -@@ -583,6 +583,8 @@ mkdir -p "$outpath/config.tests" - rm -f "$outpath/config.tests/.qmake.cache" - cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" - -+QMakeVar add QMAKE_LFLAGS -Wl,--as-needed -+ - QMakeVar add styles "cde mac motif plastique cleanlooks windows" - QMakeVar add decorations "default windows styled" - QMakeVar add gfx-drivers "linuxfb" diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild index d714698..fdccb15 100644 --- a/source/xlib-extra/qt4/FrugalBuild +++ b/source/xlib-extra/qt4/FrugalBuild @@ -6,7 +6,7 @@ USE_DEMOS=${USE_DEMOS:-"n"} pkgname=qt4 _F_archive_name=qt-everywhere-opensource-src pkgver=4.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="The QT4 GUI toolkit." url="http://qt.nokia.com/products/"; depends=() @@ -20,10 +20,10 @@ options=('scriptlet' 'nodocs') up2date="Flasttar ftp://ftp.qt.nokia.com/qt/source/"; source=(ftp://ftp.qt.nokia.com/qt/source/$_F_archive_name-$pkgver.tar.gz \ frugalware.patch \ - 09_qmake_lflags_as-needed.diff) + fix-config.tests.patch) sha1sums=('d3b44ae6d9bc9c44fc57f32e545b92daf0b54775' \ '49521d8fa88b725708073caad4f861c10edd4c6d' \ - '8430ce10eca4b0347db22e2f7f80e6c269d33b10') + 'a1165099df3d282a4c19c1ec30a4def39e8d46c6') export LD_LIBRARY_PATH=$Fsrcdir/$_F_archive_name-$pkgver/lib:${LD_LIBRARY_PATH} export YACC='yacc -d' @@ -483,7 +483,7 @@ build() ## fw LD/C/CXX FLAGS and fw PATHS right ? we do not have /usr/X11R.. NOR DO WE ## WANT *MULTILIB* STUFF!! Fsed "FW_CFLAGS" "${CFLAGS} -Wno-deprecated" mkspecs/common/g++.conf - Fsed "FW_LDFLAGS" "${LDFLAGS}" mkspecs/common/g++.conf + Fsed "FW_LDFLAGS" "${LDFLAGS} -Wl,--as-needed" mkspecs/common/g++.conf ## find out if we use ccache and use it .. Qt is tupit and won't get the ENV vars :| if [ "$NOCCACHE" = "0" -a -d /usr/lib/ccache/bin ]; then diff --git a/source/xlib-extra/qt4/fix-config.tests.patch b/source/xlib-extra/qt4/fix-config.tests.patch new file mode 100644 index 0000000..e333507 --- /dev/null +++ b/source/xlib-extra/qt4/fix-config.tests.patch @@ -0,0 +1,54 @@ +diff -Naur qt-everywhere-opensource-src-4.6.1/config.tests/unix/bsymbolic_functions.test qt-everywhere-opensource-src-4.6.1-p/config.tests/unix/bsymbolic_functions.test +--- qt-everywhere-opensource-src-4.6.1/config.tests/unix/bsymbolic_functions.test 2010-01-15 18:01:36.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.1-p/config.tests/unix/bsymbolic_functions.test 2010-02-01 18:46:39.000000000 +0100 +@@ -8,7 +8,7 @@ + int main() { return 0; } + EOF + +-"$COMPILER" -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes ++$COMPILER -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes + rm -f bsymbolic_functions.c libtest.so + + # done +diff -Naur qt-everywhere-opensource-src-4.6.1/config.tests/unix/fvisibility.test qt-everywhere-opensource-src-4.6.1-p/config.tests/unix/fvisibility.test +--- qt-everywhere-opensource-src-4.6.1/config.tests/unix/fvisibility.test 2010-01-15 18:01:36.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.1-p/config.tests/unix/fvisibility.test 2010-02-01 18:46:39.000000000 +0100 +@@ -15,14 +15,14 @@ + EOF + + if [ "$VERBOSE" = "yes" ] ; then +- "$COMPILER" -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes ++ $COMPILER -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes + else +- "$COMPILER" -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes ++ $COMPILER -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes + fi + rm -f fvisibility.c fvisibility.o + } + +-case "$COMPILER" in ++case $COMPILER in + aCC*) + ;; + +diff -Naur qt-everywhere-opensource-src-4.6.1/config.tests/unix/precomp.test qt-everywhere-opensource-src-4.6.1-p/config.tests/unix/precomp.test +--- qt-everywhere-opensource-src-4.6.1/config.tests/unix/precomp.test 2010-01-15 18:01:36.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.1-p/config.tests/unix/precomp.test 2010-02-01 18:46:39.000000000 +0100 +@@ -4,7 +4,7 @@ + COMPILER=$1 + VERBOSE=$2 + +-case "$COMPILER" in ++case $COMPILER in + icpc) + cat >header.h <<EOF + #define HEADER_H +@@ -28,7 +28,7 @@ + ;; + + *g++*|c++) +- case `"$COMPILER" -dumpversion 2>/dev/null` in ++ case `$COMPILER -dumpversion 2>/dev/null` in + 3.*) + ;; + *) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
