Author: arekm Date: Tue Mar 1 20:01:24 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 4.7.2
---- Files affected:
packages/qt4:
qt4-kde-git.patch (1.10 -> 1.11) , qt4.spec (1.282 -> 1.283)
---- Diffs:
================================================================
Index: packages/qt4/qt4-kde-git.patch
diff -u packages/qt4/qt4-kde-git.patch:1.10 packages/qt4/qt4-kde-git.patch:1.11
--- packages/qt4/qt4-kde-git.patch:1.10 Fri Dec 17 20:51:23 2010
+++ packages/qt4/qt4-kde-git.patch Tue Mar 1 21:01:15 2011
@@ -384,13 +384,15 @@
index 2e2a0f4..239de2d 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
-@@ -1095,8 +1095,16 @@ void QObject::setObjectName(const QString &name)
- {
- Q_D(QObject);
- d->objectName = name;
+@@ -1101,8 +1101,18 @@
+
+ if (objectNameChanged)
+ d->declarativeData->objectNameChanged(d->declarativeData, this);
++
+#if defined(Q_WS_X11)
+ d->checkWindowRole();
+#endif
++
}
+#if defined(Q_WS_X11)
================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.282 packages/qt4/qt4.spec:1.283
--- packages/qt4/qt4.spec:1.282 Thu Feb 17 09:13:32 2011
+++ packages/qt4/qt4.spec Tue Mar 1 21:01:15 2011
@@ -67,12 +67,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.7.1
-Release: 6
+Version: 4.7.2
+Release: 1
License: LGPL v2.1 or GPL v3.0
Group: X11/Libraries
Source0:
http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
-# Source0-md5: 6f88d96507c84e9fea5bf3a71ebeb6d7
+# Source0-md5: 66b992f5c21145df08c99d21847f4fdb
Source2: %{name}-qtconfig.desktop
Source3: %{name}-designer.desktop
Source4: %{name}-assistant.desktop
@@ -93,7 +93,6 @@
Patch7: %{name}-x11_fonts.patch
Patch8: %{name}-pl-update.patch
Patch9: %{name}-ibase.patch
-Patch10: qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch
Patch11: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
URL: http://www.qtsoftware.com/
%{?with_ibase:BuildRequires: Firebird-devel}
@@ -1408,7 +1407,6 @@
%patch7 -p1
#%patch8 -p1
%patch9 -p1
-%patch10 -p1
%patch11 -p1
%{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
@@ -2359,6 +2357,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.283 2011/03/01 20:01:15 arekm
+- up to 4.7.2
+
Revision 1.282 2011/02/17 08:13:32 glen
- fix MimeType in .desktop files
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4-kde-git.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.282&r2=1.283&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
