SPECS: qt.spec - rel 9; fresh qt-copy patches

[arekm]

Author: arekm                        Date: Mon Feb  5 17:35:49 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 9; fresh qt-copy patches

---- Files affected:
SPECS:
   qt.spec (1.370 -> 1.371) 

---- Diffs:

================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.370 SPECS/qt.spec:1.371
--- SPECS/qt.spec:1.370	Sat Jan 27 16:32:06 2007
+++ SPECS/qt.spec	Mon Feb  5 18:35:43 2007
@@ -28,23 +28,50 @@
 Summary(pt_BR):	Estrutura para rodar aplicaçőes GUI Qt
 Name:		qt
 Version:	%{_ver}
-Release:	8
+Release:	9
 Epoch:		6
 License:	GPL/QPL
 Group:		X11/Libraries
-#Source0:	http://ep09.pld-linux.org/~%{_packager}/kde/%{name}-copy-%{_snap}.tar.bz2
 Source0:	ftp://ftp.trolltech.com/qt/source/%{name}-x11-free-%{version}.tar.bz2
 # Source0-md5:	655e21cf6a7e66daf8ec6ceda81aae1e
-Source1:	http://ep09.pld-linux.org/~arekm/%{name}-copy-patches-060404.tar.bz2
-# Source1-md5:	7cd0cf968a3610f2da55a7945eaa076f
-Source2:	%{name}config.desktop
-Source3:	designer.desktop
-Source4:	assistant.desktop
-Source5:	linguist.desktop
-Source6:	%{name}-apply_patches.sh
-Source7:	designer.png
-Source8:	assistant.png
-Source9:	linguist.png
+Source1:	%{name}config.desktop
+Source2:	designer.desktop
+Source3:	assistant.desktop
+Source4:	linguist.desktop
+Source5:	designer.png
+Source6:	assistant.png
+Source7:	linguist.png
+
+# qt-copy patches
+# http://websvn.kde.org/branches/qt/3.3/qt-copy/patches/
+Patch101:	0001-dnd_optimization.patch
+Patch102:	0002-dnd_active_window_fix.patch
+Patch105:	0005-qpixmap_mitshm.patch
+Patch107:	0007-qpixmap_constants.patch
+Patch115:	0015-qiconview-finditem.patch
+Patch116:	0016-qiconview-rebuildcontainer.patch
+Patch117:	0017-qiconview-ctrl_rubber.patch
+Patch120:	0020-designer-deletetabs.patch
+Patch132:	0032-fix_rotated_randr.diff
+Patch135:	0035-qvaluelist-streaming-operator.patch
+Patch136:	0036-qprogressbar-optimization.patch
+Patch138:	0038-dragobject-dont-prefer-unknown.patch
+Patch144:	0044-qscrollview-windowactivate-fix.diff
+Patch146:	0046-qiconview-no-useless-scrollbar.diff
+Patch147:	0047-fix-kmenu-width.diff
+Patch148:	0048-qclipboard_hack_80072.patch
+Patch149:	0049-qiconview-rubber_on_move.diff
+Patch156:	0056-khotkeys_input_84434.patch
+Patch159:	0059-qpopup_has_mouse.patch
+Patch160:	0060-qpopup_ignore_mousepos.patch
+Patch161:	0061-qscrollview-propagate-horizontal-wheelevent.patch
+Patch169:	0069-fix-minsize.patch
+Patch170:	0070-fix-broken-fonts.patch
+Patch171:	0071-fix-qtextedit-performance.patch
+Patch173:	0073-xinerama-aware-qpopup.patch
+Patch174:	0074-indic-script-fix.patch
+Patch175:	0075-fix-array-underrun.diff
+
 Patch0:		%{name}-tools.patch
 Patch1:		%{name}-FHS.patch
 Patch2:		%{name}-qmake-nostatic.patch
@@ -657,6 +684,35 @@
 
 %prep
 %setup -q -n %{name}-x11-free-%{version} -a1
+
+%patch101 -p0
+%patch102 -p0
+%patch105 -p0
+%patch107 -p0
+%patch115 -p0
+%patch116 -p0
+%patch117 -p0
+%patch120 -p0
+%patch132 -p0
+%patch135 -p0
+%patch136 -p0
+%patch138 -p0
+%patch144 -p0
+%patch146 -p0
+%patch147 -p0
+%patch148 -p0
+%patch149 -p0
+%patch156 -p0
+%patch159 -p0
+%patch160 -p0
+%patch161 -p0
+%patch169 -p0
+%patch170 -p0
+%patch171 -p0
+%patch173 -p0
+%patch174 -p0
+%patch175 -p0
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -675,11 +731,6 @@
 %patch15 -p0
 %patch16 -p0
 
-install %{SOURCE6} ./apply_patches
-chmod +x ./apply_patches
-./apply_patches
-rm ../.qt-x11-free-%{version}.applied
-
 # change QMAKE_CFLAGS_RELEASE to build
 # properly optimized libs
 plik="mkspecs/linux-g++/qmake.conf"
@@ -937,17 +988,17 @@
 cp -R plugins-st/*		$RPM_BUILD_ROOT%{_libdir}/qt/plugins-st
 %endif
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 %if %{with designer}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/designer.desktop
-install %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/designer.desktop
+install %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir}
 %endif
 
+install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
 
-install %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE6} %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 install tools/qtconfig/images/appicon.png \
 	$RPM_BUILD_ROOT%{_pixmapsdir}/qtconfig.png
@@ -1255,6 +1306,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.371  2007/02/05 17:35:43  arekm
+- rel 9; fresh qt-copy patches
+
 Revision 1.370  2007/01/27 15:32:06  pluto
 - disable single-threaded build ( it won't work with OpenGL ).
 - enable precompiled headers ( Th's gcc supports this ).
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qt.spec?r1=1.370&r2=1.371&f=u