Author: arekm Date: Tue Nov 9 21:51:14 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 4.7.1
---- Files affected:
packages/qt4:
qt4-kde-git.patch (1.8 -> 1.9) , qt4.spec (1.270 -> 1.271) ,
qt4-qtbug-13567.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/qt4/qt4-kde-git.patch
diff -u packages/qt4/qt4-kde-git.patch:1.8 packages/qt4/qt4-kde-git.patch:1.9
--- packages/qt4/qt4-kde-git.patch:1.8 Tue Sep 21 22:41:50 2010
+++ packages/qt4/qt4-kde-git.patch Tue Nov 9 22:51:09 2010
@@ -428,21 +428,6 @@
static inline Sender *setCurrentSender(QObject *receiver,
Sender *sender);
-diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
-index 2f5adaf..63df1c5 100644
---- a/src/gui/kernel/qapplication.cpp
-+++ b/src/gui/kernel/qapplication.cpp
-@@ -783,8 +783,9 @@ void QApplicationPrivate::construct(
- qt_is_gui_used = (qt_appType != QApplication::Tty);
- process_cmdline();
- // the environment variable has the lowest precedence of runtime
graphicssystem switches
-- if (graphics_system_name.isEmpty())
-+ if (graphics_system_name.isEmpty()) {
- graphics_system_name =
QString::fromLocal8Bit(qgetenv("QT_GRAPHICSSYSTEM"));
-+ }
- // Must be called before initialize()
- qt_init(this, qt_appType
- #ifdef Q_WS_X11
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 9662a9e..3160911 100644
--- a/src/gui/kernel/qwidget_p.h
================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.270 packages/qt4/qt4.spec:1.271
--- packages/qt4/qt4.spec:1.270 Wed Nov 3 20:02:40 2010
+++ packages/qt4/qt4.spec Tue Nov 9 22:51:09 2010
@@ -52,20 +52,20 @@
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.0
-Release: 4
+Version: 4.7.1
+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: 3a2f25b9b115037277f4fb759194a7a5
+# Source0-md5: 6f88d96507c84e9fea5bf3a71ebeb6d7
Source2: %{name}-qtconfig.desktop
Source3: %{name}-designer.desktop
Source4: %{name}-assistant.desktop
Source5: %{name}-linguist.desktop
# git clone git://gitorious.org/+kde-developers/qt/kde-qt.git
-# git checkout -b 4.7.0-patched origin/4.7.0-patched
-# git diff v4.7.0..4.7.0-patched > ~/rpm/packages/qt4/qt4-kde-git.patch
+# git checkout -b 4.7.1-patched origin/4.7.1-patched
+# git diff v4.7.1..4.7.1-patched > ~/rpm/packages/qt4/qt4-kde-git.patch
Patch100: %{name}-kde-git.patch
Patch0: %{name}-tools.patch
@@ -78,7 +78,6 @@
Patch7: %{name}-x11_fonts.patch
Patch8: %{name}-pl-update.patch
Patch9: %{name}-ibase.patch
-Patch10: %{name}-qtbug-13567.patch
URL: http://www.qtsoftware.com/
%{?with_ibase:BuildRequires: Firebird-devel}
BuildRequires: OpenGL-GLU-devel
@@ -1392,7 +1391,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
@@ -2322,6 +2320,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.271 2010/11/09 21:51:09 arekm
+- up to 4.7.1
+
Revision 1.270 2010/11/03 19:02:40 shadzik
- rel 4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4-kde-git.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.270&r2=1.271&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
