Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=e7008cf4c2416f58b75acc115addff616d0b96d8

commit e7008cf4c2416f58b75acc115addff616d0b96d8
Author: Devil505 <devil505li...@gmail.com>
Date:   Sun Dec 26 17:53:28 2010 +0100

qt4-4.7.1-1-i686
* version bump
* updating patchs

diff --git a/source/xlib-extra/qt4/FrugalBuild 
b/source/xlib-extra/qt4/FrugalBuild
index e729edb..45095b7 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -5,8 +5,8 @@ USE_DEMOS=${USE_DEMOS:-"n"}

pkgname=qt4
_F_archive_name=qt-everywhere-opensource-src
-pkgver=4.6.3
-pkgrel=2
+pkgver=4.7.1
+pkgrel=1
pkgdesc="The QT4 GUI toolkit."
url="http://qt.nokia.com/products/";
depends=()
@@ -21,14 +21,10 @@ _F_archive_grepv="-tp"
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 \
-       fix-config.tests.patch \
-       qlineedit.h_remove_ifdef_guards_while_it_breaks_kdebindings.patch \
-       
qpainter_stop_being_such_verbose_gigs_of_xsession_error_logs_are_not_funny.patch)
-sha1sums=('1c18a564df9296c7cb0e0dedde40b9843e1b30e8' \
-          '49521d8fa88b725708073caad4f861c10edd4c6d' \
-          'a1165099df3d282a4c19c1ec30a4def39e8d46c6' \
-          '5ec4642b226b008ac75b705a0f8d1032e06184f7' \
-          'e0240b85936bd0631c1115d30a37ef25bfb8d8f7')
+       fix-config.tests.patch)
+sha1sums=('fcf764d39d982c7f84703821582bd10c3192e341' \
+          '8d65e6bff36eb0b3219d30101ea7d062504aaaf8' \
+          'e2522839807839f1af77de7ccd4c9e8c7df4acd0')
export LD_LIBRARY_PATH=$Fsrcdir/$_F_archive_name-$pkgver/lib:${LD_LIBRARY_PATH}
export YACC='yacc -d'

@@ -651,3 +647,4 @@ build()
}

# optimization OK
+
diff --git a/source/xlib-extra/qt4/fix-config.tests.patch 
b/source/xlib-extra/qt4/fix-config.tests.patch
index e333507..73f14c9 100644
--- a/source/xlib-extra/qt4/fix-config.tests.patch
+++ b/source/xlib-extra/qt4/fix-config.tests.patch
@@ -1,39 +1,41 @@
-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 @@
+diff -Naur a//config.tests/unix/bsymbolic_functions.test 
b//config.tests/unix/bsymbolic_functions.test
+--- a//config.tests/unix/bsymbolic_functions.test      2010-11-06 
02:55:11.000000000 +0100
++++ b//config.tests/unix/bsymbolic_functions.test      2010-12-25 
22:51:25.000000000 +0100
+@@ -20,3 +20,4 @@
+     [ "$VERBOSE" = "yes" ] && echo "Symbolic function binding enabled."
+     exit 1
+ fi
++
+diff -Naur a//config.tests/unix/fvisibility.test 
b//config.tests/unix/fvisibility.test
+--- a//config.tests/unix/fvisibility.test      2010-11-06 02:55:11.000000000 
+0100
++++ b//config.tests/unix/fvisibility.test      2010-12-25 22:52:57.000000000 
+0100
+@@ -25,15 +25,15 @@
EOF

if [ "$VERBOSE" = "yes" ] ; then
--        "$COMPILER" -c -fvisibility=hidden fvisibility.c && 
FVISIBILITY_SUPPORT=yes
+-        "$COMPILER" -c $CMDLINE 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 $CMDLINE 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
+ *g++*|*c++*)
+     CMDLINE="-fvisibility=hidden"
+     RunCompileTest
+@@ -71,3 +71,4 @@
+     [ "$VERBOSE" = "yes" ] && echo "Symbol visibility control enabled."
+     exit 1
+ fi
++
+diff -Naur a//config.tests/unix/precomp.test b//config.tests/unix/precomp.test
+--- a//config.tests/unix/precomp.test  2010-11-06 02:55:11.000000000 +0100
++++ b//config.tests/unix/precomp.test  2010-12-25 22:53:41.000000000 +0100
@@ -4,7 +4,7 @@
COMPILER=$1
VERBOSE=$2
@@ -52,3 +54,8 @@ diff -Naur 
qt-everywhere-opensource-src-4.6.1/config.tests/unix/precomp.test qt-
3.*)
;;
*)
+@@ -52,3 +52,4 @@
+     [ "$VERBOSE" = "yes" ] && echo "Precompiled-headers support enabled."
+     exit 1
+ fi
++
diff --git a/source/xlib-extra/qt4/frugalware.patch 
b/source/xlib-extra/qt4/frugalware.patch
index 244cf03..3939375 100644
--- a/source/xlib-extra/qt4/frugalware.patch
+++ b/source/xlib-extra/qt4/frugalware.patch
@@ -1,16 +1,16 @@
-diff -Naur qt-everywhere-opensource-src-4.6.1/mkspecs/common/g++.conf 
qt-everywhere-opensource-src-4.6.1-p/mkspecs/common/g++.conf
---- qt-everywhere-opensource-src-4.6.1/mkspecs/common/g++.conf 2010-01-15 
18:01:28.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.1-p/mkspecs/common/g++.conf       
2010-01-31 21:12:07.000000000 +0100
+diff -Naur a//mkspecs/common/g++.conf b//mkspecs/common/g++.conf
+--- a//mkspecs/common/g++.conf 2010-11-06 02:55:11.000000000 +0100
++++ b//mkspecs/common/g++.conf 2010-12-25 22:02:51.000000000 +0100
@@ -7,7 +7,7 @@
QMAKE_CFLAGS_DEPS       += -M
QMAKE_CFLAGS_WARN_ON    += -Wall -W
QMAKE_CFLAGS_WARN_OFF   += -w
-QMAKE_CFLAGS_RELEASE   += -O2
+QMAKE_CFLAGS_RELEASE   += FW_CFLAGS
+ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
QMAKE_CFLAGS_DEBUG      += -g
QMAKE_CFLAGS_SHLIB      += -fPIC
- QMAKE_CFLAGS_STATIC_LIB       += -fPIC
-@@ -35,7 +35,7 @@
+@@ -37,7 +37,7 @@
QMAKE_LINK_C            = gcc
QMAKE_LINK_C_SHLIB      = gcc
QMAKE_LFLAGS            +=
@@ -19,10 +19,15 @@ diff -Naur 
qt-everywhere-opensource-src-4.6.1/mkspecs/common/g++.conf qt-everywh
QMAKE_LFLAGS_DEBUG      +=
QMAKE_LFLAGS_APP        +=
QMAKE_LFLAGS_SHLIB      += -shared
-diff -Naur qt-everywhere-opensource-src-4.6.1/mkspecs/common/linux.conf 
qt-everywhere-opensource-src-4.6.1-p/mkspecs/common/linux.conf
---- qt-everywhere-opensource-src-4.6.1/mkspecs/common/linux.conf       
2010-01-15 18:01:28.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.1-p/mkspecs/common/linux.conf     
2010-01-31 21:10:43.000000000 +0100
-@@ -7,12 +7,12 @@
+@@ -52,3 +52,4 @@
+ # -Bsymbolic-functions (ld) support
+ QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
+ QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
++
+diff -Naur a//mkspecs/common/linux.conf b//mkspecs/common/linux.conf
+--- a//mkspecs/common/linux.conf       2010-11-06 02:55:11.000000000 +0100
++++ b//mkspecs/common/linux.conf       2010-12-25 22:03:45.000000000 +0100
+@@ -7,19 +7,19 @@

QMAKE_INCDIR          =
QMAKE_LIBDIR          =
@@ -38,32 +43,48 @@ diff -Naur 
qt-everywhere-opensource-src-4.6.1/mkspecs/common/linux.conf qt-every
+QMAKE_LIBDIR_OPENGL   = /usr/lib
QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
- QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL
-diff -Naur qt-everywhere-opensource-src-4.6.1/mkspecs/linux-g++-32/qmake.conf 
qt-everywhere-opensource-src-4.6.1-p/mkspecs/linux-g++-32/qmake.conf
---- qt-everywhere-opensource-src-4.6.1/mkspecs/linux-g++-32/qmake.conf 
2010-01-15 18:01:28.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.1-p/mkspecs/linux-g++-32/qmake.conf       
2010-01-31 21:10:43.000000000 +0100
-@@ -8,8 +8,8 @@
+ QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+ QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+-QMAKE_INCDIR_EGL      =
++QMAKE_INCDIR_EGL      =
+ QMAKE_LIBDIR_EGL      =
+-QMAKE_INCDIR_OPENVG   =
++QMAKE_INCDIR_OPENVG   =
+ QMAKE_LIBDIR_OPENVG   =
+
+ QMAKE_LIBS            =
+@@ -59,3 +59,4 @@
+ QMAKE_INSTALL_PROGRAM = install -m 755 -p
+
+ include(unix.conf)
++
+diff -Naur a//mkspecs/linux-g++-32/qmake.conf 
b//mkspecs/linux-g++-32/qmake.conf
+--- a//mkspecs/linux-g++-32/qmake.conf 2010-11-06 02:55:11.000000000 +0100
++++ b//mkspecs/linux-g++-32/qmake.conf 2010-12-25 22:04:30.000000000 +0100
+@@ -9,9 +9,10 @@
QT                      += core gui
QMAKE_INCREMENTAL_STYLE = sublib

-QMAKE_CFLAGS           = -m32
-QMAKE_LFLAGS           = -m32
-+QMAKE_CFLAGS          =
-+QMAKE_LFLAGS          =
++QMAKE_CFLAGS          =
++QMAKE_LFLAGS          =

include(../common/g++.conf)
include(../common/linux.conf)
-diff -Naur qt-everywhere-opensource-src-4.6.1/mkspecs/linux-g++-64/qmake.conf 
qt-everywhere-opensource-src-4.6.1-p/mkspecs/linux-g++-64/qmake.conf
---- qt-everywhere-opensource-src-4.6.1/mkspecs/linux-g++-64/qmake.conf 
2010-01-15 18:01:28.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.1-p/mkspecs/linux-g++-64/qmake.conf       
2010-01-31 21:10:43.000000000 +0100
-@@ -11,13 +11,13 @@
+ load(qt_config)
++
+diff -Naur a//mkspecs/linux-g++-64/qmake.conf 
b//mkspecs/linux-g++-64/qmake.conf
+--- a//mkspecs/linux-g++-64/qmake.conf 2010-11-06 02:55:11.000000000 +0100
++++ b//mkspecs/linux-g++-64/qmake.conf 2010-12-25 22:05:22.000000000 +0100
+@@ -12,13 +12,14 @@
QT                      += core gui
QMAKE_INCREMENTAL_STYLE = sublib

-QMAKE_CFLAGS           = -m64
-QMAKE_LFLAGS           = -m64
+QMAKE_CFLAGS           =
-+QMAKE_LFLAGS          =
++QMAKE_LFLAGS          =

include(../common/g++.conf)
include(../common/linux.conf)
@@ -74,3 +95,4 @@ diff -Naur 
qt-everywhere-opensource-src-4.6.1/mkspecs/linux-g++-64/qmake.conf qt
+QMAKE_LIBDIR_OPENGL   = /usr/lib

load(qt_config)
++
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to