Author: arekm                        Date: Thu Apr 23 22:05:01 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 4.5.1

---- Files affected:
SPECS:
   qt4.spec (1.208 -> 1.209) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.208 SPECS/qt4.spec:1.209
--- SPECS/qt4.spec:1.208        Tue Mar 31 12:20:18 2009
+++ SPECS/qt4.spec      Fri Apr 24 00:04:55 2009
@@ -76,12 +76,12 @@
 Summary(pl.UTF-8):     Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):  Estrutura para rodar aplicações GUI Qt
 Name:          qt4
-Version:       4.5.0
-Release:       7
+Version:       4.5.1
+Release:       1
 License:       LGPL v2.1 or GPL v3.0
 Group:         X11/Libraries
 Source0:       
http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
-# Source0-md5: d6d1555b7a074e0a746f6247af402e11
+# Source0-md5: f81a94e2ab7713b2d375d4e5cfc8e051
 Source2:       %{name}-qtconfig.desktop
 Source3:       %{name}-designer.desktop
 Source4:       %{name}-assistant.desktop
@@ -94,14 +94,11 @@
 Patch104:      0216-allow-isystem-for-headers.diff
 Patch105:      0225-invalidate-tabbar-geometry-on-refresh.patch
 Patch107:      0234-fix-mysql-threaded.diff
-Patch108:      0245-fix-randr-changes-detecting.diff
 Patch109:      0253-qmake_correct_path_separators.diff
 Patch110:      0255-qtreeview-selection-columns-hidden.diff
 Patch111:      0269-msvc-webkit-compile.diff
 Patch112:      0273-odbc-64bit-compile.diff
 Patch113:      0274-shm-native-image-fix.diff
-Patch114:      0275-qtconcurrent-threadcount.diff
-Patch115:      0278-X11-Use-legacy-LCD-filtering-if-specified-in-font-c.diff
 
 Patch0:                %{name}-tools.patch
 Patch1:                %{name}-qt_copy.patch
@@ -113,7 +110,6 @@
 Patch7:                %{name}-x11_fonts.patch
 Patch8:                %{name}-pl-update.patch
 Patch9:                %{name}-ibase.patch
-Patch10:       %{name}-ppc.patch
 # svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches
 URL:           http://www.qtsoftware.com/
 %{?with_ibase:BuildRequires:   Firebird-devel}
@@ -1329,14 +1325,11 @@
 %patch104 -p0
 %patch105 -p0
 %patch107 -p0
-%patch108 -p0
 %patch109 -p0
 %patch110 -p0
 %patch111 -p0
 %patch112 -p0
 %patch113 -p0
-%patch114 -p0
-%patch115 -p0
 
 %patch0 -p1
 %patch1 -p0
@@ -1348,7 +1341,6 @@
 %patch7 -p1
 #%patch8 -p1
 %patch9 -p1
-%patch10 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
        mkspecs/common/linux.conf
@@ -1455,12 +1447,8 @@
        -%{!?with_ibase:no}%{?with_ibase:qt}-sql-ibase \
        -static"
 
-echo "yes" | ./configure $COMMONOPT $OPT
-
-# hack for tools/qstring.cpp:2329: internal compiler error: in output_369, at 
config/rs6000/rs6000.md:11495
-%ifarch ppc ppc64
-sed -i -e 's#qstring.o tools/qstring.cpp#qstring.o -O1 tools/qstring.cpp#g' 
src/corelib/Makefile
-%endif
+echo "o
+yes" | ./configure $COMMONOPT $OPT
 
 %{__make} -C src
 %{__make} -C tools/assistant/lib
@@ -1485,11 +1473,8 @@
        -%{!?with_ibase:no}%{?with_ibase:plugin}-sql-ibase \
        -shared" 
 
-echo "yes" | ./configure $COMMONOPT $OPT
-
-%ifarch ppc ppc64
-sed -i -e 's#qstring.o tools/qstring.cpp#qstring.o -O1 tools/qstring.cpp#g' 
src/corelib/Makefile
-%endif
+echo "o
+yes" | ./configure $COMMONOPT $OPT
 
 %{__make}
 %{__make} \
@@ -2195,6 +2180,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.209  2009/04/23 22:04:55  arekm
+- up to 4.5.1
+
 Revision 1.208  2009/03/31 10:20:18  glen
 - multilib conflict (hurts with kde4 desktop and skype)
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt4.spec?r1=1.208&r2=1.209&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to