Author: arekm Date: Fri Feb 10 14:38:57 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.3.8.d from trinity
---- Files affected:
packages/qt:
qt.spec (1.411 -> 1.412) , 0001-dnd_optimization.patch (1.2 -> NONE)
(REMOVED), 0002-dnd_active_window_fix.patch (1.1 -> NONE) (REMOVED),
0005-qpixmap_mitshm.patch (1.2 -> NONE) (REMOVED),
0007-qpixmap_constants.patch (1.2 -> NONE) (REMOVED),
0015-qiconview-finditem.patch (1.1 -> NONE) (REMOVED),
0016-qiconview-rebuildcontainer.patch (1.1 -> NONE) (REMOVED),
0017-qiconview-ctrl_rubber.patch (1.1 -> NONE) (REMOVED),
0020-designer-deletetabs.patch (1.1 -> NONE) (REMOVED),
0032-fix_rotated_randr.diff (1.1 -> NONE) (REMOVED),
0035-qvaluelist-streaming-operator.patch (1.1 -> NONE) (REMOVED),
0036-qprogressbar-optimization.patch (1.1 -> NONE) (REMOVED),
0038-dragobject-dont-prefer-unknown.patch (1.1 -> NONE) (REMOVED),
0044-qscrollview-windowactivate-fix.diff (1.1 -> NONE) (REMOVED),
0046-qiconview-no-useless-scrollbar.diff (1.1 -> NONE) (REMOVED),
0047-fix-kmenu-width.diff (1.1 -> NONE) (REMOVED),
0048-qclipboard_hack_80072.patch (1.1 -> NONE) (REMOVED),
0049-qiconview-rubber_on_move.diff (1.1 -> NONE) (REMOVED),
0056-khotkeys_input_84434.patch (1.1 -> NONE) (REMOVED),
0059-qpopup_has_mouse.patch (1.1 -> NONE) (REMOVED),
0060-qpopup_ignore_mousepos.patch (1.1 -> NONE) (REMOVED),
0061-qscrollview-propagate-horizontal-wheelevent.patch (1.1 -> NONE)
(REMOVED), 0073-xinerama-aware-qpopup.patch (1.3 -> NONE) (REMOVED),
0078-argb-visual-hack.patch (1.1 -> NONE) (REMOVED),
0079-compositing-types.patch (1.1 -> NONE) (REMOVED),
0080-net-wm-sync-request.patch (1.1 -> NONE) (REMOVED),
0084-compositing-properties.patch (1.1 -> NONE) (REMOVED),
0085-fix-buildkey.diff (1.1 -> NONE) (REMOVED), 0086-revert-qt-khmer-fix.diff
(1.1 -> NONE) (REMOVED), 0087-use-xrandr-1.2.diff (1.1 -> NONE) (REMOVED),
0088-fix-xinput-clash.diff (1.1 -> NONE) (REMOVED), qt-gcc46.patch (1.1 ->
NONE) (REMOVED), qt-tools.patch (1.5 -> NONE) (REMOVED), qt-trinity.patch
(1.1 -> NONE) (REMOVED), qt-uic_colon_fix.patch (1.1 -> NONE) (REMOVED),
qt-x11-mono.patch (1.2 -> NONE) (REMOVED), qt-x11-qfontdatabase_x11.patch (1.1
-> NONE) (REMOVED), qt3-png14.patch (1.2 -> NONE) (REMOVED),
qtkdeintegration.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/qt/qt.spec
diff -u packages/qt/qt.spec:1.411 packages/qt/qt.spec:1.412
--- packages/qt/qt.spec:1.411 Tue Feb 7 23:06:58 2012
+++ packages/qt/qt.spec Fri Feb 10 15:38:51 2012
@@ -20,7 +20,7 @@
%define with_sql 1
%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine
with_sql}}}}}
-%define ver 3.3.8b
+%define ver 3.3.8.d
Summary: The Qt3 GUI application framework
Summary(es.UTF-8): Biblioteca para ejecutar aplicaciones GUI Qt
@@ -28,12 +28,12 @@
Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt
Name: qt
Version: %{ver}
-Release: 14
+Release: 1
Epoch: 6
License: QPL v1, GPL v2 or GPL v3
Group: X11/Libraries
-Source0:
ftp://ftp.trolltech.com/qt/source/%{name}-x11-free-%{version}.tar.gz
-# Source0-md5: 9f05b4125cfe477cc52c9742c3c09009
+Source0:
http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/qt3-%{version}.tar.gz
+# Source0-md5: 78dc675e84aed595375449818cbb589a
Source1: %{name}config.desktop
Source2: designer.desktop
Source3: assistant.desktop
@@ -45,39 +45,6 @@
Source8: qtkdeintegration_x11.cpp
Source9: qtkdeintegration_x11_p.h
-# 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
-Patch173: 0073-xinerama-aware-qpopup.patch
-Patch178: 0078-argb-visual-hack.patch
-Patch179: 0079-compositing-types.patch
-Patch180: 0080-net-wm-sync-request.patch
-Patch184: 0084-compositing-properties.patch
-Patch185: 0085-fix-buildkey.diff
-Patch186: 0086-revert-qt-khmer-fix.diff
-Patch187: 0087-use-xrandr-1.2.diff
-Patch188: 0088-fix-xinput-clash.diff
-Patch0: %{name}-tools.patch
Patch1: %{name}-FHS.patch
Patch2: %{name}-qmake-nostatic.patch
Patch3: %{name}-disable_tutorials.patch
@@ -89,18 +56,11 @@
Patch9: %{name}-support-cflags-with-commas.patch
# for troll only
Patch10: %{name}-antialias.patch
-#
-Patch12: %{name}-x11-free-quiet.patch
-Patch13: %{name}-x11-mono.patch
-Patch14: %{name}-x11-qfontdatabase_x11.patch
-Patch15: %{name}-uic_colon_fix.patch
-Patch16: %{name}-fvisibility.patch
-Patch17: qtkdeintegration.patch
-Patch18: qt3-png14.patch
-Patch19: qt-buildkey-fixed.patch
-Patch20: %{name}-gcc46.patch
-Patch21: %{name}-odbc.patch
-Patch22: %{name}-trinity.patch
+Patch11: %{name}-x11-free-quiet.patch
+Patch12: %{name}-fvisibility.patch
+Patch13: qt-buildkey-fixed.patch
+Patch14: %{name}-odbc.patch
+Patch15: qt-3.3.8.d-libpng15-1.patch
URL: http://www.trolltech.com/products/qt/
%{?with_ibase:BuildRequires: Firebird-devel >= 1.5.0}
BuildRequires: OpenGL-GLU-devel
@@ -694,40 +654,8 @@
graficznego - Qt Designer.
%prep
-%setup -q -n %{name}-x11-free-%{version}
+%setup -q -n qt3
-%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
-%patch173 -p0
-%patch178 -p0
-%patch179 -p0
-%patch180 -p0
-%patch184 -p0
-%patch185 -p0
-%patch186 -p0
-%patch187 -p0
-%patch188 -p0
-
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -738,18 +666,11 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch12 -p1
-# 13 and 14: break font size, commented out
-#%patch13 -p1
-#%patch14 -p1
-%patch15 -p0
-%patch16 -p0
-%patch17 -p0
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p2
+%patch11 -p1
+%patch12 -p0
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
# copy qt kde integration files
cp %{SOURCE8} %{SOURCE9} src/kernel
@@ -1149,6 +1070,11 @@
%dir %{_libdir}/%{name}/plugins-mt/crypto
%dir %{_libdir}/%{name}/plugins-mt/imageformats
%attr(755,root,root) %{_libdir}/%{name}/plugins-mt/imageformats/*.so
+%dir %{_libdir}/%{name}/plugins-mt/inputmethods
+%attr(755,root,root)
%{_libdir}/%{name}/plugins-mt/inputmethods/libqimsw-multi.so
+%attr(755,root,root)
%{_libdir}/%{name}/plugins-mt/inputmethods/libqimsw-none.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins-mt/inputmethods/libqsimple.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins-mt/inputmethods/libqxim.so
%dir %{_libdir}/%{name}/plugins-mt/network
%{?with_sql:%dir %{_libdir}/%{name}/plugins-mt/sqldrivers}
%dir %{_libdir}/%{name}/plugins-mt/styles
@@ -1307,6 +1233,7 @@
%files designer
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/createcw
%attr(755,root,root) %{_bindir}/designer
%attr(755,root,root) %{_libdir}/%{name}/plugins-?t/designer/*.so
%dir %{_libdir}/%{name}/plugins-?t/designer
@@ -1354,6 +1281,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.412 2012/02/10 14:38:51 arekm
+- up to 3.3.8.d from trinity
+
Revision 1.411 2012/02/07 22:06:58 arekm
- release 14
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt/qt.spec?r1=1.411&r2=1.412&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
