This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via d74a823a8f95180a1929d26c141198677da32dc2 (commit) via 16d8ba54d66ffebb4765186fa2a4bed4a7ca4516 (commit) via 0b4754034b8586835a8637397afb258ca1802d4c (commit) via c8f41310593e53d7121bce3fd51dd98f19ab307e (commit) via 18733c60dddc65f46ab39176f7555ead25d3551d (commit) from 3efbf9a8458e8b64ce281430ef6f100764fa2cfd (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit d74a823a8f95180a1929d26c141198677da32dc2 Merge: 3efbf9a 16d8ba5 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 24 10:40:45 2012 +0200

Merge remote-tracking branch 'stevee/qt'

commit 16d8ba54d66ffebb4765186fa2a4bed4a7ca4516 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed May 23 22:01:09 2012 +0200

python-qtermwidget: Add qt-devel as build dependency.

qt-devel was missing, so the build allways fails an each architecture.

commit 0b4754034b8586835a8637397afb258ca1802d4c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed May 23 21:58:25 2012 +0200

pyQt: Update to 4.9.1.

Update to latest stable version.

commit c8f41310593e53d7121bce3fd51dd98f19ab307e Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed May 23 21:55:57 2012 +0200

sip: Update to 4.13.2.

Update to latest stable version. Add download url for source tarball.

commit 18733c60dddc65f46ab39176f7555ead25d3551d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed May 23 18:32:09 2012 +0200

qt: Update to version 4.8.1.

Update to latest stable release. Change project url to new home. Add download url for source tarball. Fix build error on armv7hl.

We have to enable openssl support ( use system libssl and link against it ), because the new pyQt only compile with openssl suport. The old pyQt doesn't compile anymore with qt 4.8.1.

-----------------------------------------------------------------------

Summary of changes: .../PyQt-x11-gpl-4.6.2-timestamp-multilib.patch | 13 --- pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch | 8 -- pyQt/pyQt.nm | 17 ++-- python-qtermwidget/python-qtermwidget.nm | 7 +- ...makes-override-redirect-windows-popup-men.patch | 67 ------------- ...adds-support-for-using-isystem-to-allow-p.patch | 56 ----------- ...tabs-are-inserted-or-removed-in-a-QTabBar.patch | 47 --------- ...0012-Add-context-to-tr-calls-in-QShortcut.patch | 70 -------------- qt/patches/qt-4.6.3-bn-rendering-bz562049.patch | 15 --- qt/patches/qt-4.6.3-bn-rendering-bz562058.patch | 12 --- qt/patches/qt-4.6.3-indic-rendering-bz631732.patch | 14 --- qt/patches/qt-4.6.3-indic-rendering-bz636399.patch | 30 ------ qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch | 12 +++ .../qt-4.8.1-fix-no-xshape-broken-build.patch | 51 ++++++++++ qt/patches/qt-4.8.1-webkit-no_Werror.patch | 12 +++ ...source-src-4.6.3-glib_eventloop_nullcheck.patch | 58 ++++++++++- ...e-src-4.7.0-CVE-2010-1822-crash-svg-image.patch | 26 ----- ...pensource-src-4.7.0-QTBUG-13567-QTreeView.patch | 31 ------ ...verywhere-opensource-src-4.7.0-QTBUG-6185.patch | 34 ------- ...ource-src-4.7.0-beta1-qtwebkit_pluginpath.patch | 19 ---- ...erywhere-opensource-src-4.7.0-beta1-s390x.patch | 61 ------------ ...e-opensource-src-4.7.0-beta1-uic_multilib.patch | 36 ------- ...e-opensource-src-4.7.0-beta2-kde4_plugins.patch | 19 ---- ...ource-src-4.7.0-beta2-phonon_servicesfile.patch | 40 -------- .../qt-everywhere-opensource-src-4.7.0-bpp24.patch | 15 --- ...erywhere-opensource-src-4.7.1-QTBUG-14467.patch | 27 +++++ ...ensource-src-4.7.4-tds_no_strict_aliasing.patch | 12 +++ ...erywhere-opensource-src-4.8.0-QTBUG-14724.patch | 11 ++ ...erywhere-opensource-src-4.8.0-QTBUG-21900.patch | 101 ++++++++++++++++++++ ...erywhere-opensource-src-4.8.0-QTBUG-22037.patch | 41 ++++++++ ...verywhere-opensource-src-4.8.0-beta1-s390.patch | 31 ++++++ ...t-everywhere-opensource-src-4.8.0-gcc-4.7.patch | 27 +++++ ...t-everywhere-opensource-src-4.8.0-ld-gold.patch | 22 ++++ .../qt-everywhere-opensource-src-4.8.0-qvfb.patch | 12 +++ ...ere-opensource-src-4.8.0-rc1-moc-boost148.patch | 11 ++ ...erywhere-opensource-src-4.8.0-s390-atomic.patch | 20 ++++ ...everywhere-opensource-src-4.8.0-timestamp.patch | 75 +++++++++++++++ ...opensource-src-4.8.0-tp-multilib-optflags.patch | 36 +++++++ ...-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch | 12 +++ ...erywhere-opensource-src-4.8.1-QTBUG-24718.patch | 14 +++ ...rywhere-opensource-src-4.8.1-icu_no_debug.patch | 23 +++++ ...e-opensource-src-4.8.1-linguist_qmake-qt4.patch | 24 +++++ ...source-src-4.8.1-qdbusconnection_no_debug.patch | 14 +++ ...opensource-src-4.8.1-qt3support_debuginfo.patch | 10 ++ ...verywhere-opensource-src-4.8.1-qtgahandle.patch | 53 ++++++++++ .../qt-everywhere-opensource-src-4.8.1-type.patch | 26 +++++ ...11-opensource-src-4.2.2-multilib-optflags.patch | 33 ------- qt/qt.nm | 16 ++- sip/sip.nm | 7 +- 49 files changed, 757 insertions(+), 671 deletions(-) delete mode 100644 pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch delete mode 100644 pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch delete mode 100644 qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch delete mode 100644 qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch delete mode 100644 qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch delete mode 100644 qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch delete mode 100644 qt/patches/qt-4.6.3-bn-rendering-bz562049.patch delete mode 100644 qt/patches/qt-4.6.3-bn-rendering-bz562058.patch delete mode 100644 qt/patches/qt-4.6.3-indic-rendering-bz631732.patch delete mode 100644 qt/patches/qt-4.6.3-indic-rendering-bz636399.patch create mode 100644 qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch create mode 100644 qt/patches/qt-4.8.1-fix-no-xshape-broken-build.patch create mode 100644 qt/patches/qt-4.8.1-webkit-no_Werror.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-ld-gold.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-qvfb.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-timestamp.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-qtgahandle.patch create mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-type.patch delete mode 100644 qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch

Difference in files: diff --git a/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch b/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch deleted file mode 100644 index 91ddb7f..0000000 --- a/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp.orig PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp ---- PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp.orig 2010-02-23 12:33:44.000000000 +0100 -+++ PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp 2010-02-23 12:45:03.000000000 +0100 -@@ -399,8 +399,7 @@ RCCResourceLibrary::writeHeader(FILE *ou - fprintf(out, "# -*- coding: utf-8 -*-\n\n"); - fprintf(out, "# Resource object code\n"); - fprintf(out, "#\n"); -- fprintf(out, "# Created: %s\n", QDateTime::currentDateTime().toString().toLatin1().constData()); -- fprintf(out, "# by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR); -+ fprintf(out, "# Created by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR); - fprintf(out, "#\n"); - fprintf(out, "# WARNING! All changes made in this file will be lost!\n"); - fprintf(out, "\n"); diff --git a/pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch b/pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch deleted file mode 100644 index 58a64f6..0000000 --- a/pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -up PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py.pyuic_shbang PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py ---- PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py.pyuic_shbang 2011-01-14 21:44:29.000000000 -0600 -+++ PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py 2011-01-15 08:56:58.371972273 -0600 -@@ -1,3 +1,4 @@ -+#!/usr/bin/python -tt - ############################################################################# - ## - ## Copyright (c) 2011 Riverbank Computing Limited info@riverbankcomputing.com diff --git a/pyQt/pyQt.nm b/pyQt/pyQt.nm index 5171e48..884c6f5 100644 --- a/pyQt/pyQt.nm +++ b/pyQt/pyQt.nm @@ -4,9 +4,8 @@ ###############################################################################

name = pyQt -version = 4.8.6 -release = 2 -epoch = 0 +version = 4.9.1 +release = 1

groups = Development/Languages url = http://www.riverbankcomputing.com/software/pyqt/ @@ -26,8 +25,8 @@ build libX11-devel libXext-devel python-devel - qt-devel - sip-devel>=4.13 + qt-devel>=4.8.1 + sip-devel>=4.13.1 end

DIR_APP = %{DIR_SRC}/PyQt-x11-gpl-%{version} @@ -61,10 +60,10 @@ packages template DEVEL

files - /usr/bin - /usr/lib/python*/site-packages/PyQt4/pyqtconfig* - /usr/lib/python*/site-packages/PyQt4/uic/pyuic.py* - /usr/share/sip + %{bindir} + %{libdir}/python*/site-packages/PyQt4/pyqtconfig* + %{libdir}/python*/site-packages/PyQt4/uic/pyuic.py* + %{datadir}/sip end end

diff --git a/python-qtermwidget/python-qtermwidget.nm b/python-qtermwidget/python-qtermwidget.nm index 5c314ff..a3b0c5e 100644 --- a/python-qtermwidget/python-qtermwidget.nm +++ b/python-qtermwidget/python-qtermwidget.nm @@ -16,7 +16,7 @@ description PyQt4 Bindings for QTermWidget. end

-source_dl = +source_dl = http://pyqt4-extrawidgets.googlecode.com/files/ sources = qtermwidget-%{version}.tar.gz

build @@ -24,10 +24,9 @@ build gcc-c++ libX11-devel libXext-devel - pyQt - pyQt-devel + pyQt-devel>=4.9.1 python-devel - qt + qt-devel>=4.8.1 qtermwidget-devel sip-devel end diff --git a/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch b/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch deleted file mode 100644 index bb2588d..0000000 --- a/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 339e220e29ff39b86705438b4be6f90e5618d27b Mon Sep 17 00:00:00 2001 -From: Lubos Lunak l.lunak@kde.org -Date: Tue, 2 Oct 2007 16:08:32 +0200 -Subject: [PATCH 02/13] This patch makes override-redirect windows (popup menu, dropdown menu, - tooltip, combobox, etc.) also have more window properties like WM_CLASS, - so they can be used when compositing. - -qt-bugs@ issue : none -bugs.kde.org number : none ---- - src/gui/kernel/qwidget_x11.cpp | 21 +++++++++++++++------ - 1 files changed, 15 insertions(+), 6 deletions(-) - -diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp -index 79ee8c9..a74a849 100644 ---- a/src/gui/kernel/qwidget_x11.cpp -+++ b/src/gui/kernel/qwidget_x11.cpp -@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO - Q_ASSERT(id); - XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder, - &wsa); -+ XClassHint class_hint; -+ QByteArray appName = qAppName().toLatin1(); -+ class_hint.res_name = appName.data(); // application name -+ class_hint.res_class = const_cast<char *>(QX11Info::appClass()); // application class -+ XSetWMProperties(dpy, id, 0, 0, 0, 0, 0, 0, &class_hint); - } else if (topLevel && !desktop) { // top-level widget - if (!X11->wm_client_leader) - create_wm_client_leader(); -@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO - // set EWMH window types - setNetWmWindowTypes(); - -+ // when we create a toplevel widget, the frame strut should be dirty -+ data.fstrut_dirty = 1; -+ -+ } else { -+ // non-toplevel widgets don't have a frame, so no need to -+ // update the strut -+ data.fstrut_dirty = 0; -+ } -+ -+ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows - // set _NET_WM_PID - long curr_pid = getpid(); - XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace, - (unsigned char *) &curr_pid, 1); - -- // when we create a toplevel widget, the frame strut should be dirty -- data.fstrut_dirty = 1; - - // declare the widget's window role - if (QTLWExtra *topData = maybeTopData()) { -@@ -791,10 +804,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO - XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER), - XA_WINDOW, 32, PropModeReplace, - (unsigned char *)&X11->wm_client_leader, 1); -- } else { -- // non-toplevel widgets don't have a frame, so no need to -- // update the strut -- data.fstrut_dirty = 0; - } - - if (initializeWindow && q->internalWinId()) { --- -1.6.5.1 - diff --git a/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch b/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch deleted file mode 100644 index 4005734..0000000 --- a/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001 -From: Benjamin Reed rangerrick@befunk.com -Date: Tue, 19 Feb 2008 17:37:37 +0100 -Subject: [PATCH 04/13] This patch adds support for using -isystem to allow putting an include - directory at the end of the compiler's header search path. - -I don't have the exact output anymore (I've since patched Qt's configure) but -essentially, since I have pcre.h in /opt/kde4-deps/include, it was -conflicting with Qt's (modified) pcre.h in the WebKit bits, since --I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it -comes *before* the specific locations in INCPATH on the compile line, and you -end up with a conflict with the system-installed pcre.h. - -Presumably, if your pcre.h is in /usr/include as on most Linux systems, you -wouldn't notice this issue since /usr/include's already in your include path -and people likely don't pass -I /usr/include to configure. I suspect that on -any platform with a regular, system-installed pcre.h (or clucene headers), -adding -I /usr/include would exhibit this bug, just as a custom-installed -pcre/clucene in another root would. - -qt-bugs@ issue : 199610 -Trolltech task ID : -bugs.kde.org number : ---- - configure | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/configure b/configure -index 2c108ad..610a201 100755 ---- a/configure -+++ b/configure -@@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do - VAL=`echo $1 | sed 's,-D,,'` - fi - ;; -+ -isystem) -+ VAR="add_isystempath" -+ shift -+ VAL="$1" -+ ;; - -I?*|-I) - VAR="add_ipath" - if [ "$1" = "-I" ]; then -@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do - add_ipath) - I_FLAGS="$I_FLAGS -I"${VAL}"" - ;; -+ add_isystempath) -+ I_FLAGS="$I_FLAGS -isystem "${VAL}"" -+ ;; - add_lpath) - L_FLAGS="$L_FLAGS -L"${VAL}"" - ;; --- -1.6.5.1 - diff --git a/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch b/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch deleted file mode 100644 index 0386a47..0000000 --- a/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 733d1afd03908d695aa8a6518f453b9ff0e5b8a2 Mon Sep 17 00:00:00 2001 -From: Robert Knight robertknight@gmail.com -Date: Sun, 20 Apr 2008 16:28:31 +0200 -Subject: [PATCH 05/13] When tabs are inserted or removed in a QTabBar, - QTabBarPrivate::refresh() is called to update the layout. If the - tabbar widget is hidden, this just sets a boolean variable - (layoutDirty) and returns, so the parent widget's layout is not - notified about the possible geometry change. - -Prior to Qt 4.4 this was not a problem because the geometry was -recalculated in QTabBar::sizeHint() if the layoutDirty variable was -set. In Qt 4.4 however the layout caches size hint information in -QWidgetItemV2. Since the cache information is not invalidated, the -layout may end up using out-of-date size hint information to compute -the widget size. - -If the QTabBar is empty when QTabBar::sizeHint() is called, it will -return a size with a height of 0, which will be kept in the cache and -so the tab bar will never be shown. - -This patch fixes the problem by calling updateGeometry() whenever the -tab bar's layout is refreshed. - -qt-bugs@ issue : 208185 -Trolltech task ID : 208349 -bugs.kde.org number : 159014 ---- - src/gui/widgets/qtabbar.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp -index 419d456..41107a0 100644 ---- a/src/gui/widgets/qtabbar.cpp -+++ b/src/gui/widgets/qtabbar.cpp -@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh() - layoutTabs(); - makeVisible(currentIndex); - q->update(); -- q->updateGeometry(); - } -+ q->updateGeometry(); - } - - /*! --- -1.6.5.1 - diff --git a/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch b/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch deleted file mode 100644 index 2b552d3..0000000 --- a/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 9eb3560cfd5cd0bc9c7bf79f2c27657ee07b8f95 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid aacid@kde.org -Date: Sat, 8 Aug 2009 14:40:25 +0200 -Subject: [PATCH 12/13] Add context to tr calls in QShortcut - -Some languages have special rules for using "+" to concatenate strings and -for example it needs to be Ctrl + Shift instead of Ctrl+Shift, adding -context to these strings helps creating a more correct translation ---- - src/gui/kernel/qkeysequence.cpp | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp -index 894f663..c17f253 100644 ---- a/src/gui/kernel/qkeysequence.cpp -+++ b/src/gui/kernel/qkeysequence.cpp -@@ -991,10 +991,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence - - QList<QModifKeyName> modifs; - if (nativeText) { -- modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+'))) -- << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+'))) -- << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+'))) -- << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+'))); -+ modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts").toLower().append(QLatin1Char('+'))) -+ << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift", "Shift key, used for shortcuts").toLower().append(QLatin1Char('+'))) -+ << QModifKeyName(Qt::ALT, QShortcut::tr("Alt", "Alt key, used for shortcuts").toLower().append(QLatin1Char('+'))) -+ << QModifKeyName(Qt::META, QShortcut::tr("Meta", "Meta key, used for shortcuts").toLower().append(QLatin1Char('+'))); - } - modifs += *gmodifs; // Test non-translated ones last - -@@ -1086,7 +1086,7 @@ QString QKeySequence::encodeString(int key) - static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format) - { - if (!str.isEmpty()) -- str += (format == QKeySequence::NativeText) ? QShortcut::tr("+") -+ str += (format == QKeySequence::NativeText) ? QShortcut::tr("+", "Symbol used to concatenate keys in shortcuts") - : QString::fromLatin1("+"); - str += theKey; - } -@@ -1111,13 +1111,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat - { - // On other systems the order is Meta, Control, Alt, Shift - if ((key & Qt::META) == Qt::META) -- s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta"); -+ s = nativeText ? QShortcut::tr("Meta", "Meta key, used for shortcuts") : QString::fromLatin1("Meta"); - if ((key & Qt::CTRL) == Qt::CTRL) -- addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format); -+ addKey(s, nativeText ? QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts") : QString::fromLatin1("Ctrl"), format); - if ((key & Qt::ALT) == Qt::ALT) -- addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format); -+ addKey(s, nativeText ? QShortcut::tr("Alt", "Alt key, used for shortcuts") : QString::fromLatin1("Alt"), format); - if ((key & Qt::SHIFT) == Qt::SHIFT) -- addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format); -+ addKey(s, nativeText ? QShortcut::tr("Shift", "Shift key, used for shortcuts") : QString::fromLatin1("Shift"), format); - } - - -@@ -1132,7 +1132,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat - p += QChar((key-0x10000)%400+0xdc00); - } - } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) { -- p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1) -+ p = nativeText ? QShortcut::tr("F%1", "Fx key, used for shortcuts").arg(key - Qt::Key_F1 + 1) - : QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1); - } else if (key) { - int i=0; --- -1.6.5.1 - diff --git a/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch b/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch deleted file mode 100644 index 0e562e4..0000000 --- a/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rup qt-everywhere-opensource-src-4.6.3/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp qt-everywhere-opensource-src-4.6.3_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp ---- qt-everywhere-opensource-src-4.6.3/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-06-02 07:33:13.000000000 +0530 -+++ qt-everywhere-opensource-src-4.6.3_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-09-04 13:27:33.000000000 +0530 -@@ -1741,6 +1741,11 @@ static int indic_nextSyllableBoundary(HB - if (state == Halant && uc[pos] == 0x200d /* ZWJ */) - break; - // the control character should be the last char in the item -+ if (state == Consonant && script == HB_Script_Bengali && uc[pos-1] == 0x09B0 && uc[pos] == 0x200d /* ZWJ */) -+ break; -+ if (state == Consonant && script == HB_Script_Kannada && uc[pos-1] == 0x0CB0 && uc[pos] == 0x200d /* ZWJ */) -+ break; -+ // Bengali and Kannada has a special exception for rendering yaphala with ra (to avoid reph) see http://www.unicode.org/faq/indic.html#15 - ++pos; - goto finish; - case Consonant: diff --git a/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch b/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch deleted file mode 100644 index ee76927..0000000 --- a/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp qt-everywhere-opensource-src-4.7.0-beta2_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp ---- qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-06-30 07:23:12.000000000 +0530 -+++ qt-everywhere-opensource-src-4.7.0-beta2_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-09-22 14:33:33.000000000 +0530 -@@ -37,7 +37,7 @@ static HB_Bool isLetter(HB_UChar16 ucs) - FLAG(HB_Letter_Titlecase) | - FLAG(HB_Letter_Modifier) | - FLAG(HB_Letter_Other); -- return FLAG(HB_GetUnicodeCharCategory(ucs)) & test; -+ return (FLAG(HB_GetUnicodeCharCategory(ucs)) & test) != 0; - } - - static HB_Bool isMark(HB_UChar16 ucs) diff --git a/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch b/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch deleted file mode 100644 index 507f876..0000000 --- a/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rup qt-everywhere-opensource-src-4.6.3/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp qt-everywhere-opensource-src-4.6.3_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp ---- qt-everywhere-opensource-src-4.6.3/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-06-02 07:33:13.000000000 +0530 -+++ qt-everywhere-opensource-src-4.6.3_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-09-10 18:37:23.000000000 +0530 -@@ -1779,10 +1779,6 @@ static int indic_nextSyllableBoundary(HB - case Matra: - if (state == Consonant || state == Nukta) - break; -- if (state == Matra) { -- // ### needs proper testing for correct two/three part matras -- break; -- } - // ### not sure if this is correct. If it is, does it apply only to Bengali or should - // it work for all Indic languages? - // the combination Independent_A + Vowel Sign AA is allowed. diff --git a/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch b/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch deleted file mode 100644 index bf49f30..0000000 --- a/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rup qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp qt-everywhere-opensource-src-4.7.0-beta2_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp ---- qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-06-30 07:23:12.000000000 +0530 -+++ qt-everywhere-opensource-src-4.7.0-beta2_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-09-20 11:40:58.000000000 +0530 -@@ -660,18 +660,18 @@ static const unsigned char indicPosition - None, None, None, None, - - None, None, None, None, -- None, None, None, None, -- None, None, None, None, -- None, None, None, None, -+ None, Below, Below, Below, -+ Below, Below, Below, Below, -+ Below, Below, None, Below, - -- None, None, None, None, -- Below, None, None, None, -- Below, None, None, None, -+ Below, Below, Below, Below, -+ Below, Below, Below, Below, -+ Below, None, Below, Below, - Below, Below, Below, Post, - - Below, None, Below, Below, -- None, None, None, None, -- None, None, None, None, -+ None, Below, Below, Below, -+ Below, Below, None, None, - None, None, Post, Above, - - Post, Below, Below, Below, diff --git a/qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch b/qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch new file mode 100644 index 0000000..31f3b9f --- /dev/null +++ b/qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch @@ -0,0 +1,12 @@ +--- qt-4/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c.bz#772125 2012-01-09 10:16:08.000000000 +0100 ++++ qt-4/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c 2012-01-09 10:16:47.000000000 +0100 +@@ -359,7 +359,8 @@ + if (kinzi >= 0 && i > base && (cc & Mymr_CF_AFTER_KINZI)) { + reordered[len] = Mymr_C_NGA; + reordered[len+1] = Mymr_C_VIRAMA; +- properties[len-1] = AboveForm; ++ if (len > 0) ++ properties[len-1] = AboveForm; + properties[len] = AboveForm; + len += 2; + kinzi = -1; diff --git a/qt/patches/qt-4.8.1-fix-no-xshape-broken-build.patch b/qt/patches/qt-4.8.1-fix-no-xshape-broken-build.patch new file mode 100644 index 0000000..c4a4453 --- /dev/null +++ b/qt/patches/qt-4.8.1-fix-no-xshape-broken-build.patch @@ -0,0 +1,51 @@ +diff -Nur a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp +--- a/src/gui/kernel/qdnd_x11.cpp 2012-03-14 15:01:16.000000000 +0100 ++++ b/src/gui/kernel/qdnd_x11.cpp 2012-05-20 17:19:38.992247206 +0200 +@@ -1422,6 +1422,7 @@ + global_accepted_action = Qt::IgnoreAction; + } + ++#ifndef QT_NO_SHAPE + static + bool windowInteractsWithPosition(const QPoint & pos, Window w, int shapeType) + { +@@ -1436,6 +1437,7 @@ + } + return interacts; + } ++#endif + + static + Window findRealWindow(const QPoint & pos, Window w, int md) +@@ -1462,6 +1464,8 @@ + XGetWindowProperty(X11->display, w, ATOM(XdndAware), 0, 0, False, + AnyPropertyType, &type, &f,&n,&a,&data); + if (data) XFree(data); ++ ++#ifndef QT_NO_SHAPE + if (type) { + // When ShapeInput and ShapeBounding are not set they return a single rectangle with the geometry of the window, this is why we + // need an && here so that in the case one is set and the other is not we still get the correct result. +@@ -1469,6 +1473,9 @@ + if (windowContainsMouse) + return w; + } ++#else ++ return w; ++#endif + } + + Window r, p; +@@ -1488,10 +1495,12 @@ + // innermost window. + } + ++#ifndef QT_NO_SHAPE + // No children! + if (!windowContainsMouse) + return 0; + else ++#endif + return w; + } + } diff --git a/qt/patches/qt-4.8.1-webkit-no_Werror.patch b/qt/patches/qt-4.8.1-webkit-no_Werror.patch new file mode 100644 index 0000000..ef5d55d --- /dev/null +++ b/qt/patches/qt-4.8.1-webkit-no_Werror.patch @@ -0,0 +1,12 @@ +diff -up qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri +--- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-03-14 15:01:29.000000000 +0100 ++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri 2012-03-28 17:12:33.391294004 +0200 +@@ -102,8 +102,6 @@ CONFIG -= warn_on + + # Treat warnings as errors on x86/Linux/GCC + linux-g++* { +- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror +- + greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { + if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { + # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr). diff --git a/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch b/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch index f0c9eaa..d4e5924 100644 --- a/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch +++ b/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch @@ -1,7 +1,7 @@ -diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp ---- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck 2010-06-01 21:03:15.000000000 -0500 -+++ qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp 2010-06-29 14:58:12.299073784 -0500 -@@ -76,7 +76,7 @@ static gboolean x11EventSourcePrepare(GS +diff -ur qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck/src/gui/kernel/qguieventdispatcher_glib.cpp +--- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp 2010-06-02 04:03:15.000000000 +0200 ++++ qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck/src/gui/kernel/qguieventdispatcher_glib.cpp 2010-12-08 22:22:38.000000000 +0100 +@@ -76,7 +76,7 @@ GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s); return (XEventsQueued(X11->display, QueuedAfterFlush) || (!(source->flags & QEventLoop::ExcludeUserInputEvents) @@ -10,7 +10,7 @@ diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_g }

static gboolean x11EventSourceCheck(GSource *s) -@@ -84,7 +84,7 @@ static gboolean x11EventSourceCheck(GSou +@@ -84,7 +84,7 @@ GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s); return (XEventsQueued(X11->display, QueuedAfterFlush) || (!(source->flags & QEventLoop::ExcludeUserInputEvents) @@ -19,3 +19,51 @@ diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_g }

static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointer user_data) +@@ -95,7 +95,7 @@ + do { + XEvent event; + if (!(source->flags & QEventLoop::ExcludeUserInputEvents) +- && !source->d->queuedUserInputEvents.isEmpty()) { ++ && source->d && !source->d->queuedUserInputEvents.isEmpty()) { + // process a pending user input event + event = source->d->queuedUserInputEvents.takeFirst(); + } else if (XEventsQueued(X11->display, QueuedAlready)) { +@@ -112,7 +112,8 @@ + case XKeyRelease: + case EnterNotify: + case LeaveNotify: +- source->d->queuedUserInputEvents.append(event); ++ if (source->d) ++ source->d->queuedUserInputEvents.append(event); + continue; + + case ClientMessage: +@@ -127,7 +128,8 @@ + break; + } + } +- source->d->queuedUserInputEvents.append(event); ++ if (source->d) ++ source->d->queuedUserInputEvents.append(event); + continue; + + default: +@@ -140,7 +142,7 @@ + } + + // send through event filter +- if (source->q->filterEvent(&event)) ++ if (source->q && source->q->filterEvent(&event)) + continue; + + if (qApp->x11ProcessEvent(&event) == 1) +@@ -152,7 +154,8 @@ + + out: + +- source->d->runTimersOnceWithNormalPriority(); ++ if (source->d) ++ source->d->runTimersOnceWithNormalPriority(); + + if (callback) + callback(user_data); diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch deleted file mode 100644 index 32b9713..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.cpp.CVE-2010-1822-crash-svg-image qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.cpp ---- qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.cpp.CVE-2010-1822-crash-svg-image 2010-09-10 11:05:20.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.cpp 2010-10-25 14:22:06.542771102 +0200 -@@ -86,6 +86,11 @@ RenderObject* SVGGElement::createRendere - return new (arena) RenderSVGTransformableContainer(this); - } - -+bool SVGGElement::rendererIsNeeded(RenderStyle*) -+{ -+ return parentNode() && parentNode()->isSVGElement(); -+} -+ - } - - #endif // ENABLE(SVG) -diff -up qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.h.CVE-2010-1822-crash-svg-image qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.h ---- qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.h.CVE-2010-1822-crash-svg-image 2010-09-10 11:05:21.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.h 2010-10-25 14:28:37.467854695 +0200 -@@ -43,6 +43,7 @@ namespace WebCore { - virtual void parseMappedAttribute(MappedAttribute*); - virtual void svgAttributeChanged(const QualifiedName&); - virtual void synchronizeProperty(const QualifiedName&); -+ virtual bool rendererIsNeeded(RenderStyle*); - virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0); - - virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch deleted file mode 100644 index d517de5..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001 -From: Frank Reininghaus frank78ac@googlemail.com -Date: Wed, 22 Sep 2010 10:19:59 +0200 -Subject: [PATCH] QTreeView: do not scroll to top if last item is removed - -When the last item is the current item and is removed, -QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's -viewItems member is cleared. This commit makes sure that viewItems is -restored by calling QTreeView::doItemsLayout() in this case, preventing -that the scroll bar range is set to zero temporarily and the view is -scrolled to the top unexpectedly (this was a regression in 4.7.0: -QTBUG-13567). - -Merge-request: 2481 -Reviewed-by: Olivier Goffart olivier.goffart@nokia.com - -diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp -index b797776..40b51fe 100644 ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp -@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() - if (!viewportSize.isValid()) - viewportSize = QSize(0, 0); - -+ if (viewItems.isEmpty()) { -+ q->doItemsLayout(); -+ } -+ - int itemsInViewport = 0; - if (uniformRowHeights) { - if (defaultItemHeight <= 0) diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch deleted file mode 100644 index 0b99d08..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9e9a7bc29319d52c3e563bc2c5282cb7e6890eba Mon Sep 17 00:00:00 2001 -From: Denis Dzyubenko denis.dzyubenko@nokia.com -Date: Wed, 29 Sep 2010 14:02:10 +0200 -Subject: [PATCH] Fixes cursor shape when widget becomes native on X11. - -When a native window handle is created for a widget that has override -cursor set, we should reset the cursor on the parent and set the cursor -on the new window handle. - -Task-number: QTBUG-6185 -Reviewed-by: Olivier Goffart ---- - src/gui/kernel/qwidget_x11.cpp | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp -index e01489f..8d80e10 100644 ---- a/src/gui/kernel/qwidget_x11.cpp -+++ b/src/gui/kernel/qwidget_x11.cpp -@@ -889,8 +889,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO - q->setWindowOpacity(maybeTopData()->opacity/255.); - - } -- } else if (q->testAttribute(Qt::WA_SetCursor) && q->internalWinId()) { -+ } else if (q->internalWinId()) { - qt_x11_enforce_cursor(q); -+ if (QWidget *p = q->parentWidget()) // reset the cursor on the native parent -+ qt_x11_enforce_cursor(p); - } - - if (extra && !extra->mask.isEmpty() && q->internalWinId()) --- -1.6.1 - diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch deleted file mode 100644 index 016b3b4..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp.pluginpath qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp ---- qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp.pluginpath 2010-05-03 19:43:20.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp 2010-06-18 10:02:37.004788646 -0500 -@@ -345,6 +345,7 @@ Vector<String> PluginDatabase::defaultPl - paths.append("/usr/lib/firefox/plugins"); - paths.append("/usr/lib64/browser-plugins"); - paths.append("/usr/lib/browser-plugins"); -+ paths.append("/usr/lib/mozilla/plugins-wrapped"); - paths.append("/usr/lib/mozilla/plugins"); - paths.append("/usr/local/netscape/plugins"); - paths.append("/opt/mozilla/plugins"); -@@ -355,6 +356,7 @@ Vector<String> PluginDatabase::defaultPl - paths.append("/usr/lib/netscape/plugins-libc5"); - paths.append("/usr/lib/netscape/plugins-libc6"); - paths.append("/usr/lib64/netscape/plugins"); -+ paths.append("/usr/lib64/mozilla/plugins-wrapped"); - paths.append("/usr/lib64/mozilla/plugins"); - paths.append("/usr/lib/nsbrowser/plugins"); - paths.append("/usr/lib64/nsbrowser/plugins"); diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch deleted file mode 100644 index 1eedf83..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390x qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ---- qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390x 2010-06-16 13:54:50.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2010-06-16 13:53:43.000000000 +0200 -@@ -179,6 +179,18 @@ - #define WTF_CPU_SPARC 1 - #endif - -+/* CPU(S390X) - S390 64-bit */ -+#if defined(__s390x__) -+#define WTF_CPU_S390X 1 -+#define WTF_CPU_BIG_ENDIAN 1 -+#endif -+ -+/* CPU(S390) - S390 32-bit */ -+#if defined(__s390__) -+#define WTF_CPU_S390 1 -+#define WTF_CPU_BIG_ENDIAN 1 -+#endif -+ - /* CPU(X86) - i386 / x86 32-bit */ - #if defined(__i386__) \ - || defined(i386) \ -@@ -860,7 +872,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) -+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X) - #define WTF_USE_JSVALUE64 1 - #elif CPU(ARM) || CPU(PPC64) - #define WTF_USE_JSVALUE32 1 -diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h.s390x qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h ---- qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h.s390x 2010-06-16 13:49:00.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h 2010-06-16 13:50:01.000000000 +0200 -@@ -169,6 +169,18 @@ - #define WTF_CPU_SPARC 1 - #endif - -+/* CPU(S390X) - S390 64-bit */ -+#if defined(__s390x__) -+#define WTF_CPU_S390X 1 -+#define WTF_CPU_BIG_ENDIAN 1 -+#endif -+ -+/* CPU(S390) - S390 32-bit */ -+#if defined(__s390__) -+#define WTF_CPU_S390 1 -+#define WTF_CPU_BIG_ENDIAN 1 -+#endif -+ - /* CPU(X86) - i386 / x86 32-bit */ - #if defined(__i386__) \ - || defined(i386) \ -@@ -874,6 +886,7 @@ - #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ - || (CPU(IA64) && !CPU(IA64_32)) \ - || CPU(ALPHA) \ -+ || CPU(S390X) \ - || CPU(SPARC64) - #define WTF_USE_JSVALUE64 1 - #elif CPU(ARM) || CPU(PPC64) || CPU(MIPS) diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch deleted file mode 100644 index 09670c1..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp ---- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp.uic_multilib 2010-05-03 19:43:25.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp 2010-06-25 14:11:21.815474310 -0500 -@@ -152,7 +152,7 @@ void Ui3Reader::embed(const char *projec - for ( it = images.begin(); it != images.end(); ++it ) - out << "** " << *it << "\n"; - out << "**\n"; -- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; -+ out << "** Created: " << "\n"; - out << "** by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n"; - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost!\n"; -diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp ---- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp.uic_multilib 2010-05-03 19:43:25.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp 2010-06-25 14:11:32.910460623 -0500 -@@ -146,7 +146,7 @@ void Uic::writeCopyrightHeader(DomUI *ui - out << "/********************************************************************************\n"; - out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; - out << "**\n"; -- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; -+ out << "** Created: " << "\n"; - out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; -diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp ---- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp.uic_multilib 2010-05-03 19:43:25.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp 2010-06-25 14:10:45.360711498 -0500 -@@ -139,7 +139,7 @@ void Uic::writeCopyrightHeader(DomUI *ui - out << "/********************************************************************************\n"; - out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; - out << "**\n"; -- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; -+ out << "** Created: " << "\n"; - out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch deleted file mode 100644 index 822ace8..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp ---- qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins 2010-06-29 20:53:15.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp 2010-07-08 08:24:12.714604479 -0500 -@@ -2262,6 +2262,15 @@ QStringList QCoreApplication::libraryPat - if (!app_libpaths->contains(installPathPlugins)) - app_libpaths->append(installPathPlugins); - } -+ -+ // hack in support for kde4 plugin paths -- Rex -+ QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins"); -+ if (QFile::exists(kde4PathPlugins)) { -+ // Make sure we convert from backslashes to slashes. -+ // kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath(); -+ if (!app_libpaths->contains(kde4PathPlugins)) -+ app_libpaths->append(kde4PathPlugins); -+ } - #endif - - // If QCoreApplication is not yet instantiated, diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch deleted file mode 100644 index e5ef6a0..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop.servicesfile qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop ---- qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop.servicesfile 2010-06-29 20:53:12.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop 2010-07-08 08:25:50.419855085 -0500 -@@ -2,7 +2,7 @@ - Type=Service - X-KDE-ServiceTypes=PhononBackend - MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;x-mpegurl;audio/x-mpegurl;audio/mp3;audio/mpeg; --X-KDE-Library=phonon_gstreamer -+X-KDE-Library=libphonon_gstreamer - X-KDE-PhononBackendInfo-InterfaceVersion=1 - X-KDE-PhononBackendInfo-Version=0.1 - X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/ -diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro.servicesfile qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro ---- qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro.servicesfile 2010-06-29 20:53:13.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro 2010-07-08 08:26:58.307612257 -0500 -@@ -122,6 +122,11 @@ contains(QT_CONFIG, dbus) { - DEFINES += QT_NO_DBUS - } - -+# install dbus service file -+sources.files = $$PHONON_DIR/org.kde.Phonon.AudioOutput.xml -+sources.path = /usr/share/dbus-1/interfaces -+INSTALLS += sources -+ - contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols - - unix:!isEmpty(QT_CFLAGS_PULSEAUDIO) { -diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro.servicesfile qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro ---- qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro.servicesfile 2010-06-29 20:53:14.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro 2010-07-08 08:25:50.387854526 -0500 -@@ -64,6 +64,8 @@ SOURCES += $$PHONON_GSTREAMER_DIR/abstra - } - - target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend --INSTALLS += target -+services.files = $$PHONON_GSTREAMER_DIR/gstreamer.desktop -+services.path = /usr/share/kde4/services/phononbackends -+INSTALLS += target services - - include(../../qpluginbase.pri) diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch deleted file mode 100644 index 910e15f..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.7.0/src/gui/image/qpixmap_x11.cpp.me qt-everywhere-opensource-src-4.7.0/src/gui/image/qpixmap_x11.cpp ---- qt-everywhere-opensource-src-4.7.0/src/gui/image/qpixmap_x11.cpp.me 2010-10-15 22:04:09.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0/src/gui/image/qpixmap_x11.cpp 2010-10-15 22:04:18.000000000 +0200 -@@ -900,9 +900,9 @@ void QX11PixmapData::fromImage(const QIm - case BPP24_888: // 24 bit MSB - CYCLE( - for (int x=0; x<w; x++) { -- *dst++ = qRed (*p); -+ *dst++ = qBlue (*p); - *dst++ = qGreen(*p); -- *dst++ = qBlue (*p++); -+ *dst++ = qRed (*p++); - } - ) - break; diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch b/qt/patches/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch new file mode 100644 index 0000000..1283f50 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch @@ -0,0 +1,27 @@ + +Fails to create debug build of Qt projects on mingw +http://bugzilla.redhat.com/653674 +http://bugreports.qt.nokia.com/browse/QTBUG-14467 + +--- qt-everywhere-opensource-src-4.7.1/mkspecs/features/qt_functions.prf.orig 2010-11-16 03:12:17.000000000 +0500 ++++ qt-everywhere-opensource-src-4.7.1/mkspecs/features/qt_functions.prf 2010-11-16 03:12:50.000000000 +0500 +@@ -62,7 +62,7 @@ defineTest(qtAddLibrary) { + } + isEmpty(LINKAGE) { + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { +- win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d ++ win32:LINKAGE = -l$${LIB_NAME}d$${QT_LIBINFIX} + mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug + } + isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX} +--- qt-everywhere-opensource-src-4.7.1/mkspecs/features/win32/windows.prf.orig 2010-11-16 03:11:34.000000000 +0500 ++++ qt-everywhere-opensource-src-4.7.1/mkspecs/features/win32/windows.prf 2010-11-16 03:11:51.000000000 +0500 +@@ -6,7 +6,7 @@ contains(TEMPLATE, ".*app"){ + + qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { + isEqual(entryLib, -lqtmain): { +- CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d ++ CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}d$${QT_LIBINFIX} + else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX} + } else { + QMAKE_LIBS += $${entryLib} diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch b/qt/patches/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch new file mode 100644 index 0000000..b675929 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch @@ -0,0 +1,12 @@ +diff -up qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri +--- qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing 2011-09-12 01:49:28.000000000 -0500 ++++ qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri 2011-11-03 13:04:34.271086323 -0500 +@@ -1,6 +1,8 @@ + HEADERS += $$PWD/qsql_tds.h + SOURCES += $$PWD/qsql_tds.cpp + ++*-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing ++ + unix|win32-g++*: { + LIBS *= $$QT_LFLAGS_TDS + !contains(LIBS, .*sybdb.*):LIBS += -lsybdb diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch new file mode 100644 index 0000000..3672ca7 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch @@ -0,0 +1,11 @@ +diff -up qt-everywhere-opensource-src-4.8.0/src/gui/painting/qpdf.cpp.QTBUG-14724 qt-everywhere-opensource-src-4.8.0/src/gui/painting/qpdf.cpp +--- qt-everywhere-opensource-src-4.8.0/src/gui/painting/qpdf.cpp.QTBUG-14724 2011-10-03 22:44:31.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.0/src/gui/painting/qpdf.cpp 2011-10-17 10:55:49.713265396 -0500 +@@ -1686,6 +1686,7 @@ bool QPdfBaseEnginePrivate::openPrintDev + cupsTempFile = ret.second; + outDevice = new QFile(); + static_cast<QFile *>(outDevice)->open(ret.first, QIODevice::WriteOnly); ++ fd = ret.first; + #endif + #ifndef QT_NO_LPR + } else { diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch new file mode 100644 index 0000000..29fc82e --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch @@ -0,0 +1,101 @@ +From a91e9dd202640598d8dec091c67ec94536390e7f Mon Sep 17 00:00:00 2001 +From: "Owen W. Taylor" otaylor@fishsoup.net +Date: Mon, 17 Oct 2011 17:27:43 -0400 +Subject: [PATCH] Fix logic for figuring out what ConfigureNotify positions + can be trusted + +When reading ahead in the queue for ConfigureNotify events, it's necessary +to look for intermediate ReparentNotify events as well, since they will +determine whether the position in the event can be trusted or not. +--- + src/gui/kernel/qapplication_x11.cpp | 47 ++++++++++++++++++++++++++++++---- + 1 files changed, 41 insertions(+), 6 deletions(-) + +diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp +index 408e9ac..3a1d3eb 100644 +--- a/src/gui/kernel/qapplication_x11.cpp ++++ b/src/gui/kernel/qapplication_x11.cpp +@@ -816,6 +816,27 @@ static Bool qt_sync_request_scanner(Display*, XEvent *event, XPointer arg) + #endif + #endif // QT_NO_XSYNC + ++struct qt_configure_event_data ++{ ++ WId window; ++ WId parent; ++}; ++ ++static Bool qt_configure_event_scanner(Display*, XEvent *event, XPointer arg) ++{ ++ qt_configure_event_data *data = ++ reinterpret_cast<qt_configure_event_data*>(arg); ++ if (event->type == ConfigureNotify && ++ event->xconfigure.window == data->window) { ++ return true; ++ } else if (event->type == ReparentNotify && ++ event->xreparent.window == data->window) { ++ data->parent = event->xreparent.parent; ++ } ++ ++ return false; ++} ++ + static void qt_x11_create_intern_atoms() + { + const char *names[QX11Data::NAtoms]; +@@ -5273,8 +5294,11 @@ bool QETWidget::translateConfigEvent(const XEvent *event) + if (d->extra->compress_events) { + // ConfigureNotify compression for faster opaque resizing + XEvent otherEvent; +- while (XCheckTypedWindowEvent(X11->display, internalWinId(), ConfigureNotify, +- &otherEvent)) { ++ qt_configure_event_data configureData; ++ configureData.window = internalWinId(); ++ configureData.parent = d->topData()->parentWinId; ++ while (XCheckIfEvent(X11->display, &otherEvent, ++ &qt_configure_event_scanner, (XPointer)&configureData)) { + if (qt_x11EventFilter(&otherEvent)) + continue; + +@@ -5287,13 +5311,19 @@ bool QETWidget::translateConfigEvent(const XEvent *event) + newSize.setWidth(otherEvent.xconfigure.width); + newSize.setHeight(otherEvent.xconfigure.height); + ++ trust = isVisible() ++ && (configureData.parent == XNone || ++ configureData.parent == QX11Info::appRootWindow()); ++ + if (otherEvent.xconfigure.send_event || trust) { + newCPos.rx() = otherEvent.xconfigure.x + + otherEvent.xconfigure.border_width; + newCPos.ry() = otherEvent.xconfigure.y + + otherEvent.xconfigure.border_width; + isCPos = true; +- } ++ } else { ++ isCPos = false; ++ } + } + #ifndef QT_NO_XSYNC + qt_sync_request_event_data sync_event; +@@ -5306,9 +5336,14 @@ bool QETWidget::translateConfigEvent(const XEvent *event) + } + + if (!isCPos) { +- // we didn't get an updated position of the toplevel. +- // either we haven't moved or there is a bug in the window manager. +- // anyway, let's query the position to be certain. ++ // If the last configure event didn't have a trustable position, ++ // it's necessary to query, see ICCCM 4.24: ++ // ++ // Any real ConfigureNotify event on a top-level window implies ++ // that the window’s position on the root may have changed, even ++ // though the event reports that the window’s position in its ++ // parent is unchanged because the window may have been reparented. ++ + int x, y; + Window child; + XTranslateCoordinates(X11->display, internalWinId(), +-- +1.7.6.4 + diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch new file mode 100644 index 0000000..4279ce2 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch @@ -0,0 +1,41 @@ +diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h.QTBUG-22037 qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h +--- qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h.QTBUG-22037 2011-10-03 22:44:32.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h 2011-10-15 14:25:52.238694974 -0500 +@@ -769,26 +769,18 @@ Q_OUTOFLINE_TEMPLATE void QList<T>::clea + template <typename T> + Q_OUTOFLINE_TEMPLATE int QList<T>::removeAll(const T &_t) + { +- int index = indexOf(_t); +- if (index == -1) +- return 0; +- ++ detachShared(); + const T t = _t; +- detach(); +- +- Node *i = reinterpret_cast<Node *>(p.at(index)); +- Node *e = reinterpret_cast<Node *>(p.end()); +- Node *n = i; +- node_destruct(i); +- while (++i != e) { +- if (i->t() == t) +- node_destruct(i); +- else +- *n++ = *i; +- } +- +- int removedCount = e - n; +- d->end -= removedCount; ++ int removedCount=0, i=0; ++ Node *n; ++ while (i < p.size()) ++ if ((n = reinterpret_cast<Node *>(p.at(i)))->t() == t) { ++ node_destruct(n); ++ p.remove(i); ++ ++removedCount; ++ } else { ++ ++i; ++ } + return removedCount; + } + diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch new file mode 100644 index 0000000..5f0bbf8 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch @@ -0,0 +1,31 @@ +diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 2011-07-28 11:12:48.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2011-07-28 11:13:56.000000000 +0200 +@@ -189,6 +189,18 @@ + #define WTF_CPU_SPARC 1 + #endif + ++/* CPU(S390X) - S390 64-bit */ ++#if defined(__s390x__) ++#define WTF_CPU_S390X 1 ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++ ++/* CPU(S390) - S390 32-bit */ ++#if defined(__s390__) ++#define WTF_CPU_S390 1 ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++ + /* CPU(X86) - i386 / x86 32-bit */ + #if defined(__i386__) \ + || defined(i386) \ +@@ -873,7 +885,7 @@ + #endif + + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) +-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) ++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X) + #define WTF_USE_JSVALUE64 1 + #elif CPU(ARM) || CPU(PPC64) + #define WTF_USE_JSVALUE32 1 diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch new file mode 100644 index 0000000..62c436e --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch @@ -0,0 +1,27 @@ +diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h +--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me 2012-01-24 11:24:14.729942043 +0100 ++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-01-24 14:28:39.848109534 +0100 +@@ -57,9 +57,7 @@ namespace JSC { + + class JSGlobalObject : public JSVariableObject { + protected: +- using JSVariableObject::JSVariableObjectData; +- +- struct JSGlobalObjectData : public JSVariableObjectData { ++ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { + // We use an explicit destructor function pointer instead of a + // virtual destructor because we want to avoid adding a vtable + // pointer to this struct. Adding a vtable pointer would force the +diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h +--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me 2012-01-24 11:40:07.167856677 +0100 ++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-01-24 14:28:34.640306629 +0100 +@@ -32,8 +32,7 @@ namespace JSC{ + + class JSStaticScopeObject : public JSVariableObject { + protected: +- using JSVariableObject::JSVariableObjectData; +- struct JSStaticScopeObjectData : public JSVariableObjectData { ++ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData { + JSStaticScopeObjectData() + : JSVariableObjectData(&symbolTable, &registerStore + 1) + { diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-ld-gold.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-ld-gold.patch new file mode 100644 index 0000000..0e3897e --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.0-ld-gold.patch @@ -0,0 +1,22 @@ +diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri +--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me 2012-01-24 13:05:50.460890750 +0100 ++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri 2012-01-24 13:19:08.836799974 +0100 +@@ -3,12 +3,12 @@ + contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 + contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 + +-linux-g++ { +-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { +- message(Using gold linker) +- QMAKE_LFLAGS+=-fuse-ld=gold +-} +-} ++#linux-g++ { ++#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { ++# message(Using gold linker) ++# QMAKE_LFLAGS+=-fuse-ld=gold ++#} ++#} + + # We use this flag on production branches + # See https://bugs.webkit.org/show_bug.cgi?id=60824 diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-qvfb.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-qvfb.patch new file mode 100644 index 0000000..2fffb8a --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.0-qvfb.patch @@ -0,0 +1,12 @@ +diff -up qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro.qvfb qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro +--- qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro.qvfb 2011-12-27 21:02:19.765512041 -0600 ++++ qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro 2011-12-27 21:02:39.271268187 -0600 +@@ -38,8 +38,6 @@ SOURCES = qvfb.cpp \ + + !embedded { + DEFINES += QT_NO_QWS_SIGNALHANDLER +- HEADERS += ../../src/gui/embedded/qlock_p.h +- SOURCES += ../../src/gui/embedded/qlock.cpp + } + + include(../shared/deviceskin/deviceskin.pri) diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch new file mode 100644 index 0000000..f0ce656 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch @@ -0,0 +1,11 @@ +diff -ur qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp +--- qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp 2011-10-04 05:44:32.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp 2011-12-04 00:11:25.000000000 +0100 +@@ -187,6 +187,7 @@ + Moc moc; + pp.macros["Q_MOC_RUN"]; + pp.macros["__cplusplus"]; ++ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // rh#756395 + QByteArray filename; + QByteArray output; + FILE *in = 0; diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch new file mode 100644 index 0000000..6fedcc8 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch @@ -0,0 +1,20 @@ +diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h.s390-atomic qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h +--- qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h.s390-atomic 2011-12-18 16:15:20.000000000 +0100 ++++ qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h 2011-12-18 16:17:34.000000000 +0100 +@@ -400,6 +400,16 @@ Q_INLINE_TEMPLATE T* QBasicAtomicPointer + + + template <typename T> ++Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd) ++{ ++#ifndef __s390x__ ++ return (T *)__CS_OLD_LOOP(&_q_value, valueToAdd * sizeof(T), "ar", "", "bcr 15,0\n"); ++#else ++ return (T *)__CSG_OLD_LOOP(&_q_value, valueToAdd * sizeof(T), "agr", "", "bcr 15,0\n"); ++#endif ++} ++ ++template <typename T> + Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd) + { + return fetchAndAddOrdered(valueToAdd); diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-timestamp.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-timestamp.patch new file mode 100644 index 0000000..2307353 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.0-timestamp.patch @@ -0,0 +1,75 @@ +diff -up qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp.uic_multilib qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp +--- qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp.uic_multilib 2011-12-08 06:06:03.000000000 +0100 ++++ qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp 2012-02-20 15:17:27.343005746 +0100 +@@ -152,8 +152,12 @@ void Ui3Reader::embed(const char *projec + for ( it = images.begin(); it != images.end(); ++it ) + out << "** " << *it << "\n"; + out << "**\n"; ++#ifdef TIMESTAMP + out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; + out << "** by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n"; ++#else ++ out << "** Created by: " << QT_VERSION_STR << "\n"; ++#endif + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost!\n"; + out << "****************************************************************************/\n"; +diff -up qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp +--- qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp.uic_multilib 2011-12-08 06:06:03.000000000 +0100 ++++ qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp 2012-02-20 15:20:13.584706037 +0100 +@@ -146,8 +146,12 @@ void Uic::writeCopyrightHeader(DomUI *ui + out << "/********************************************************************************\n"; + out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; + out << "**\n"; ++#ifdef TIMESTAMP + out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; + out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); ++#else ++ out << "** Created by: " << QString::fromLatin1("Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); ++#endif + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; + out << "********************************************************************************/\n\n"; +diff -up qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp +--- qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp.uic_multilib 2011-12-08 06:06:03.000000000 +0100 ++++ qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp 2012-02-20 15:13:44.175462520 +0100 +@@ -139,8 +139,12 @@ void Uic::writeCopyrightHeader(DomUI *ui + out << "/********************************************************************************\n"; + out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; + out << "**\n"; ++#ifdef TIMESTAMP + out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; + out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); ++#else ++ out << "** Created by: " << QString::fromLatin1("Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); ++#endif + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; + out << "********************************************************************************/\n\n"; +diff -up qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp.me qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp +--- qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp.me 2012-02-20 13:22:38.572628193 +0100 ++++ qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp 2012-02-20 14:46:09.981860726 +0100 +@@ -767,8 +767,10 @@ void Moc::parse() + void Moc::generate(FILE *out) + { + ++#ifdef TIMESTAMP + QDateTime dt = QDateTime::currentDateTime(); + QByteArray dstr = dt.toString().toLatin1(); ++#endif + QByteArray fn = filename; + int i = filename.length()-1; + while (i>0 && filename[i-1] != '/' && filename[i-1] != '\') +@@ -777,8 +779,12 @@ void Moc::generate(FILE *out) + fn = filename.mid(i); + fprintf(out, "/****************************************************************************\n" + "** Meta object code from reading C++ file '%s'\n**\n" , (const char*)fn); ++#ifdef TIMESTAMP + fprintf(out, "** Created: %s\n" + "** by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , dstr.data(), mocOutputRevision, QT_VERSION_STR); ++#else ++ fprintf(out, "** Created by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , mocOutputRevision, QT_VERSION_STR); ++#endif + fprintf(out, "** WARNING! All changes made in this file will be lost!\n" + "*****************************************************************************/\n\n"); + diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch new file mode 100644 index 0000000..5c8b5a1 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch @@ -0,0 +1,36 @@ +diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf +--- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf.multilib 2011-05-23 12:26:21.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf 2011-05-25 13:39:38.789054074 +0200 +@@ -12,6 +12,8 @@ QMAKE_INCREMENTAL_STYLE = sublib + QMAKE_CFLAGS = -m32 + QMAKE_LFLAGS = -m32 + ++QMAKE_CFLAGS_RELEASE += -O2 ++ + include(../common/linux.conf) + include(../common/gcc-base-unix.conf) + include(../common/g++-unix.conf) +diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf +--- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf.multilib 2011-05-23 12:26:21.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf 2011-05-25 13:39:47.460747770 +0200 +@@ -15,6 +15,8 @@ QMAKE_INCREMENTAL_STYLE = sublib + QMAKE_CFLAGS = -m64 + QMAKE_LFLAGS = -m64 + ++QMAKE_CFLAGS_RELEASE += -O2 ++ + include(../common/linux.conf) + include(../common/gcc-base-unix.conf) + include(../common/g++-unix.conf) +diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf +--- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf.multilib 2011-05-23 12:26:21.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf 2011-05-25 13:39:26.630088814 +0200 +@@ -9,6 +9,8 @@ CONFIG += qt warn_on release increment + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + ++QMAKE_CFLAGS_RELEASE += -O2 ++ + include(../common/linux.conf) + include(../common/gcc-base-unix.conf) + include(../common/g++-unix.conf) diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch new file mode 100644 index 0000000..947f758 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch @@ -0,0 +1,12 @@ +diff -up qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp.qtreeview-kpackagekit-crash qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp +--- qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp.qtreeview-kpackagekit-crash 2011-05-23 12:26:21.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp 2011-05-25 13:24:33.137315194 +0200 +@@ -3215,7 +3215,7 @@ int QTreeViewPrivate::itemHeight(int ite + return defaultItemHeight; + if (viewItems.isEmpty()) + return 0; +- const QModelIndex &index = viewItems.at(item).index; ++ QModelIndex index = viewItems.at(item).index; + if (!index.isValid()) + return 0; + int height = viewItems.at(item).height; diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch new file mode 100644 index 0000000..003a0a6 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch @@ -0,0 +1,14 @@ +diff -up qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp.QTBUG-24718 qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp +--- qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp.QTBUG-24718 2012-03-14 15:01:14.000000000 +0100 ++++ qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp 2012-04-03 10:53:12.973058622 +0200 +@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPo + int pos = *cursorPos; + int itm; + const HB_CharAttributes *attributes = eng->attributes(); ++ if (!attributes) { ++ *cursorPos = 0; ++ return x.toReal(); ++ } + while (pos < line.from + line.length && !attributes[pos].charStop) + pos++; + if (pos == line.from + (int)line.length) { diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch new file mode 100644 index 0000000..ddf3184 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch @@ -0,0 +1,23 @@ +diff -up qt-everywhere-opensource-src-4.8.1/src/corelib/tools/qlocale_icu.cpp.icu_no_spam qt-everywhere-opensource-src-4.8.1/src/corelib/tools/qlocale_icu.cpp +--- qt-everywhere-opensource-src-4.8.1/src/corelib/tools/qlocale_icu.cpp.icu_no_spam 2012-03-14 09:01:17.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.1/src/corelib/tools/qlocale_icu.cpp 2012-04-17 07:30:01.652251482 -0500 +@@ -83,7 +83,9 @@ bool qt_initIcu(const QString &localeStr + // resolve libicui18n + QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); + if (!lib.load()) { ++#ifndef QT_NO_DEBUG + qWarning() << "Unable to load library icui18n" << lib.errorString(); ++#endif + status = ErrorLoading; + return false; + } +@@ -112,7 +114,9 @@ bool qt_initIcu(const QString &localeStr + // resolve libicuuc + QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); + if (!ucLib.load()) { ++#ifndef QT_NO_DEBUG + qWarning() << "Unable to load library icuuc" << ucLib.errorString(); ++#endif + status = ErrorLoading; + return false; + } diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch new file mode 100644 index 0000000..91faeda --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch @@ -0,0 +1,24 @@ +diff -up qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp.qmake-qt4 qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp +--- qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp.qmake-qt4 2012-03-14 09:01:12.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp 2012-05-11 08:58:12.902149676 -0500 +@@ -316,7 +316,7 @@ int main(int argc, char **argv) + #ifdef QT_BOOTSTRAPPED + option.initProperties(binDir + QLatin1String("/qmake")); + #else +- option.initProperties(app.applicationDirPath() + QLatin1String("/qmake")); ++ option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4")); + #endif + ProFileParser parser(0, &parseHandler); + ProFileEvaluator visitor(&option, &parser, &evalHandler); +diff -up qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp.qmake-qt4 qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp +--- qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp.qmake-qt4 2012-03-14 09:01:12.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp 2012-05-11 09:02:47.393718054 -0500 +@@ -765,7 +765,7 @@ int main(int argc, char **argv) + + parseHandler.verbose = evalHandler.verbose = !!(options & Verbose); + ProFileOption option; +- option.initProperties(app.applicationDirPath() + QLatin1String("/qmake")); ++ option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4")); + option.setCommandLineArguments(QStringList() << QLatin1String("CONFIG+=lupdate_run")); + ProFileParser parser(0, &parseHandler); + diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch new file mode 100644 index 0000000..8d60dab --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch @@ -0,0 +1,14 @@ +diff -up qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp.qdbusconnection_nodebug qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp +--- qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp.qdbusconnection_nodebug 2012-04-17 07:18:51.536629078 -0500 ++++ qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp 2012-04-17 07:18:56.910561895 -0500 +@@ -1109,8 +1109,10 @@ public: + // make sure this connection is running on the main thread + QCoreApplication *instance = QCoreApplication::instance(); + if (!instance) { ++#ifndef QT_NO_DEBUG + qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.", + type == SessionBus ? "session" : type == SystemBus ? "system" : "generic"); ++#endif + } else { + QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread()); + } diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch new file mode 100644 index 0000000..7458314 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch @@ -0,0 +1,10 @@ +diff -up qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro.debuginfo qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro +--- qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro.debuginfo 2012-03-14 09:01:17.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro 2012-05-11 11:55:37.780070386 -0500 +@@ -34,6 +34,3 @@ MOCDIR = .moc + + *-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing + +-CONFIG -= separate_debug_info +-CONFIG += no_debug_info +- diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-qtgahandle.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-qtgahandle.patch new file mode 100644 index 0000000..64ffef3 --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.1-qtgahandle.patch @@ -0,0 +1,53 @@ +diff -up qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.cpp.me qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.cpp +--- qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.cpp.me 2012-03-30 21:54:59.921331145 +0200 ++++ qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.cpp 2012-03-30 21:58:14.516042067 +0200 +@@ -41,6 +41,7 @@ + + #include "qtgafile.h" + ++#include <QtCore/QBuffer> + #include <QtCore/QIODevice> + #include <QtCore/QDebug> + #include <QtCore/QDateTime> +@@ -264,3 +265,16 @@ QImage QTgaFile::readImage() + // TODO: add processing of TGA extension information - ie TGA 2.0 files + return im; + } ++/** ++ * Checks if device contains a valid tga image, *without* changing device ++ * position. ++ */ ++bool QTgaFile::canRead(QIODevice *device) ++{ ++ QByteArray header = device->peek(HeaderSize); ++ if (header.size() < HeaderSize) ++ return false; ++ QBuffer buffer(&header); ++ QTgaFile tga(&buffer); ++ return tga.isValid(); ++} +diff -up qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.h.me qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.h +--- qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.h.me 2012-03-30 21:58:39.670023189 +0200 ++++ qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.h 2012-03-30 21:59:06.202317384 +0200 +@@ -93,6 +93,8 @@ public: + inline QSize size() const; + inline Compression compression() const; + ++ static bool canRead(QIODevice *device); ++ + private: + static inline quint16 littleEndianInt(const unsigned char *d); + +diff -up qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgahandler.cpp.me qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgahandler.cpp +--- qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgahandler.cpp.me 2012-03-30 21:59:17.373303356 +0200 ++++ qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgahandler.cpp 2012-03-30 22:00:13.817226439 +0200 +@@ -77,8 +77,7 @@ bool QTgaHandler::canRead(QIODevice *dev + qWarning("QTgaHandler::canRead() called with no device"); + return false; + } +- QTgaFile tga(device); +- return tga.isValid(); ++ return QTgaFile::canRead(device); + } + + bool QTgaHandler::read(QImage *image) diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-type.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-type.patch new file mode 100644 index 0000000..99aafbe --- /dev/null +++ b/qt/patches/qt-everywhere-opensource-src-4.8.1-type.patch @@ -0,0 +1,26 @@ +diff -up qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.cpp.me qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.cpp +--- qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.cpp.me 2012-05-16 14:45:30.542709580 +0200 ++++ qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.cpp 2012-05-16 14:49:02.266017265 +0200 +@@ -61,8 +61,8 @@ const char *QElfParser::parseSectionHead + + sizeof(qelfaddr_t); // sh_addr + sh->offset = read<qelfoff_t>(data); + data += sizeof(qelfoff_t); // sh_offset +- sh->size = read<qelfword_t>(data); +- data += sizeof(qelfword_t); // sh_size ++ sh->size = read<qelfoff_t>(data); ++ data += sizeof(qelfoff_t); // sh_size + return data; + } + +diff -up qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.h.me qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.h +--- qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.h.me 2012-05-16 14:45:41.006724793 +0200 ++++ qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.h 2012-05-16 14:47:49.017910811 +0200 +@@ -80,7 +80,7 @@ public: + qelfword_t name; + qelfword_t type; + qelfoff_t offset; +- qelfword_t size; ++ qelfoff_t size; + }; + + int m_endian; diff --git a/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch b/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch deleted file mode 100644 index 099a8a2..0000000 --- a/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600 -+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf 2007-02-26 15:01:02.000000000 -0600 -@@ -14,6 +14,8 @@ - QMAKE_CFLAGS = -m64 - QMAKE_LFLAGS = -m64 - -+QMAKE_CFLAGS_RELEASE += -O2 -+ - include(../common/g++.conf) - include(../common/linux.conf) - ---- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600 -+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf 2007-02-26 15:01:34.000000000 -0600 -@@ -11,6 +11,8 @@ - QMAKE_CFLAGS = -m32 - QMAKE_LFLAGS = -m32 - -+QMAKE_CFLAGS_RELEASE += -O2 -+ - include(../common/g++.conf) - include(../common/linux.conf) - load(qt_config) ---- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600 -+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf 2007-02-26 15:01:26.000000000 -0600 -@@ -8,6 +8,8 @@ - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - -+QMAKE_CFLAGS_RELEASE += -O2 -+ - include(../common/g++.conf) - include(../common/linux.conf) - load(qt_config) diff --git a/qt/qt.nm b/qt/qt.nm index 7df524b..8d3f241 100644 --- a/qt/qt.nm +++ b/qt/qt.nm @@ -4,11 +4,11 @@ ###############################################################################

name = qt -version = 4.7.0 -release = 4 +version = 4.8.1 +release = 1

groups = System/Libraries -url = http://www.qtsoftware.com/ +url = http://qt-project.org/ license = LGPLv2 with exceptions or GPLv3 with exceptions summary = Qt toolkit.

@@ -16,11 +16,12 @@ description Qt is a software toolkit for developing applications. end

-source_dl = +source_dl = http://releases.qt-project.org/qt4/source/ sources = %{name}-everywhere-opensource-src-%{version}.tar.gz

build requires + /usr/bin/perl fontconfig-devel freetype-devel gcc-c++ @@ -34,6 +35,7 @@ build libXrandr-devel libXrender-devel libXi-devel + openssl-devel pcre-devel pkg-config xorg-x11-proto-devel @@ -64,7 +66,6 @@ build -no-multimedia \ -no-nas-sound \ -no-nis \ - -no-openssl \ -no-opengl \ -no-openvg \ -no-qt3support \ @@ -96,12 +97,17 @@ build -no-mmx \ -no-sse \ -no-sse2 \ + -no-sse3 \ + -no-ssse3 \ + -no-sse4.1 \ + -no-sse4.2 \ -no-3dnow \ -system-libjpeg \ -system-libmng \ -system-libpng \ -system-libtiff \ -system-zlib \ + -openssl-linked \ -nomake demos \ -nomake docs \ -nomake examples diff --git a/sip/sip.nm b/sip/sip.nm index e6a30dc..acd28a4 100644 --- a/sip/sip.nm +++ b/sip/sip.nm @@ -4,11 +4,14 @@ ###############################################################################

name = sip -version = %{major_ver}.13 -major_ver = 4 +version = %{major_ver}.%{minor_ver}.%{rev_ver} release = 1 epoch = 1

+major_ver = 4 +minor_ver = 13 +rev_ver = 2 + groups = Development/Tools url = http://www.riverbankcomputing.com/software/sip/intro license = GPLv2 or GPLv3

hooks/post-receive -- IPFire 3.x development tree