packages: qt4/qt4.spec, qt4/0283-do-not-deduce-scrollbar-extent-twice.diff ...

Fri Jun 26 20:15:29 CEST 2009

Author: arekm                        Date: Fri Jun 26 18:15:29 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 4.5.2

---- Files affected:
packages/qt4:
   qt4.spec (1.217 -> 1.218) , 0283-do-not-deduce-scrollbar-extent-twice.diff (NONE -> 1.1)  (NEW), 0285-qgv-dontshowchildren.diff (NONE -> 1.1)  (NEW), 0234-fix-mysql-threaded.diff (1.1 -> NONE)  (REMOVED), 0274-shm-native-image-fix.diff (1.1 -> NONE)  (REMOVED), 0279-svg-rendering-regression.diff (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.217 packages/qt4/qt4.spec:1.218

--- packages/qt4/qt4.spec:1.217	Sat May 16 20:30:09 2009
+++ packages/qt4/qt4.spec	Fri Jun 26 20:15:23 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.1
-Release:	7
+Version:	4.5.2
+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:	f81a94e2ab7713b2d375d4e5cfc8e051
+# Source0-md5:	d8bcc070a58db25c228b7729ffad4550
 Source2:	%{name}-qtconfig.desktop
 Source3:	%{name}-designer.desktop
 Source4:	%{name}-assistant.desktop
@@ -93,15 +93,12 @@
 Patch103:	0209-prevent-qt-mixing.diff
 Patch104:	0216-allow-isystem-for-headers.diff
 Patch105:	0225-invalidate-tabbar-geometry-on-refresh.patch
-Patch106:	0279-svg-rendering-regression.diff
-Patch107:	0234-fix-mysql-threaded.diff
 Patch108:	0280-deserialization-custom-dbus-properties.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:	0281-syncqt-create-phonon-global.diff
+Patch115:	0283-do-not-deduce-scrollbar-extent-twice.diff
+Patch116:	0285-qgv-dontshowchildren.diff
 
 Patch0:		%{name}-tools.patch
 Patch1:		%{name}-qt_copy.patch
@@ -1327,15 +1324,12 @@
 %patch103 -p0
 %patch104 -p0
 %patch105 -p0
-%patch106 -p0
-%patch107 -p0
 %patch108 -p0
 %patch109 -p0
 %patch110 -p0
 %patch111 -p0
-%patch112 -p0
-%patch113 -p0
-%patch114 -p0
+%patch115 -p0
+%patch116 -p0
 
 %patch0 -p1
 %patch1 -p0
@@ -1562,6 +1556,11 @@
 rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*.qm
 for file in translations/*.qm tools/assistant/*.qm tools/designer/designer/*.qm tools/linguist/linguist/*.qm; do
 	[ ! -f $file ] && continue
+	case "$file" in
+		*untranslated*)
+			continue;
+			;;
+	esac
 	eval "`echo $file | sed -r 's:.*/([a-zA-Z]+(_[a-zA-Z]{3,}){0,1})_(((ja)_jp)|([a-z]{2}_[A-Z]{2,})|([a-z]{2}))\.qm$:MOD=\1 ; lang=\5\6\7:'`"
 	[ "$lang" == "iw" ] && lang=he
 	MOD=qt4-$MOD
@@ -2190,6 +2189,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2009/06/26 18:15:23  arekm
+- up to 4.5.2
+
 Revision 1.217  2009/05/16 18:30:09  arekm
 - new qt-copy patches
 

================================================================
Index: packages/qt4/0283-do-not-deduce-scrollbar-extent-twice.diff
diff -u /dev/null packages/qt4/0283-do-not-deduce-scrollbar-extent-twice.diff:1.1
--- /dev/null	Fri Jun 26 20:15:29 2009
+++ packages/qt4/0283-do-not-deduce-scrollbar-extent-twice.diff	Fri Jun 26 20:15:23 2009
@@ -0,0 +1,35 @@
+qt-bugs@ issue : none
+Qt Software task ID : none
+bugs.kde.org number : none
+applied: no
+author: Aurélien Gâteau <agateau at kde.org>
+
+Do not deduce scrollbar extent twice if scrollbar policy is
+Qt::ScrollBarAlwaysOn.
+
+This patch has been merged in master but won't be in 4.5.
+http://qt.gitorious.org/qt/qt/merge_requests/432
+
+--- src/gui/itemviews/qlistview.cpp
++++ src/gui/itemviews/qlistview.cpp
+@@ -1969,10 +1969,16 @@ void QListViewPrivate::prepareItemsLayout()
+     int frameAroundContents = 0;
+     if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents))
+         frameAroundContents = q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2;
+-    int verticalMargin = vbarpolicy==Qt::ScrollBarAlwaysOff ? 0 :
+-        q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->verticalScrollBar()) + frameAroundContents;
+-    int horizontalMargin =  hbarpolicy==Qt::ScrollBarAlwaysOff ? 0 :
+-        q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->horizontalScrollBar()) + frameAroundContents;
++
++    // maximumViewportSize() already takes scrollbar into account if policy is
++    // Qt::ScrollBarAlwaysOn but scrollbar extent must be deduced if policy
++    // is Qt::ScrollBarAsNeeded
++    int verticalMargin = vbarpolicy==Qt::ScrollBarAsNeeded
++        ? q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->verticalScrollBar()) + frameAroundContents
++        : 0;
++    int horizontalMargin =  hbarpolicy==Qt::ScrollBarAsNeeded
++        ? q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->horizontalScrollBar()) + frameAroundContents
++        : 0;
+ 
+     layoutBounds.adjust(0, 0, -verticalMargin, -horizontalMargin);
+ 

================================================================
Index: packages/qt4/0285-qgv-dontshowchildren.diff
diff -u /dev/null packages/qt4/0285-qgv-dontshowchildren.diff:1.1
--- /dev/null	Fri Jun 26 20:15:29 2009
+++ packages/qt4/0285-qgv-dontshowchildren.diff	Fri Jun 26 20:15:23 2009
@@ -0,0 +1,24 @@
+qt-bugs@ issue : unknows
+Qt Software task ID : 197802
+bugs.kde.org number : bugs on the issue not reported yed
+applied: no
+author: Marco Martin <notmart at gmail.com>
+
+This patch makes children items of an hidden qgraphicsitem not be shown if show() is called on them. fixes several issues like the opensocial plasma widget and the Plasma desktop toolbox behaviour.
+
+Index: src/gui/graphicsview/qgraphicsitem.cpp
+===================================================================
+--- src/gui/graphicsview/qgraphicsitem.cpp	(revision 958522)
++++ src/gui/graphicsview/qgraphicsitem.cpp	(working copy)
+@@ -1522,6 +1522,11 @@
+     if (visible == quint32(newVisible))
+         return;
+ 
++    QGraphicsItem *parent(q_ptr->parentItem());
++    if (parent && newVisible && !parent->d_ptr->visible) {
++        return;
++    }
++
+     // Modify the property.
+     const QVariant newVisibleVariant(q_ptr->itemChange(QGraphicsItem::ItemVisibleChange,
+                                                        quint32(newVisible)));
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.217&r2=1.218&f=u

