[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.6+git64-g5dc8b2b+dfsg-3-14-g8fa4460
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Wed Apr 8 22:06:41 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=8fa4460
The following commit has been merged in the experimental branch:
commit 8fa4460987ca1b2a248b420d93d5f06297da77f1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed Apr 8 19:06:25 2015 -0300
Refresh multiple patches.
---
debian/changelog | 1 +
debian/patches/08_configure_quilt_compat.diff | 2 +-
...n_Qt_applications_not_clickable_when_run_under_gnome-shell.patch | 6 +++---
.../QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch | 6 +++++-
debian/patches/powerpcspe.diff | 2 +-
debian/patches/qtdebug_syslog.patch | 6 +++---
debian/patches/sh.diff | 2 +-
7 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9781391..68b3b16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ qt4-x11 (4:4.8.6+git155-g716fbae+dfsg-1) UNRELEASED; urgency=medium
- fix_libmng_test.patch
- ppc64el_configure_support.patch
- cve-2015-0295.diff
+ * Refresh multiple patches.
[ Dmitry Shachnev ]
* Make qt4-qmake suggest libqtcore4, as that package contains configuration
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 62883e0..97d3210 100644
--- a/debian/patches/08_configure_quilt_compat.diff
+++ b/debian/patches/08_configure_quilt_compat.diff
@@ -7,7 +7,7 @@ It breaks qmake projects search.
--- a/configure
+++ b/configure
-@@ -9228,7 +9228,7 @@ fi
+@@ -9235,7 +9235,7 @@ fi
# .projects.3 -> the rest
rm -f .projects .projects.1 .projects.2 .projects.3
diff --git a/debian/patches/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch b/debian/patches/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
index c60836a..51df1eb 100644
--- a/debian/patches/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
+++ b/debian/patches/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
@@ -42,7 +42,7 @@ Bug: https://bugreports.qt.nokia.com/browse/QTBUG-21900
static void qt_x11_create_intern_atoms()
{
const char *names[QX11Data::NAtoms];
-@@ -5304,8 +5325,11 @@ bool QETWidget::translateConfigEvent(con
+@@ -5310,8 +5331,11 @@ bool QETWidget::translateConfigEvent(con
if (d->extra->compress_events) {
// ConfigureNotify compression for faster opaque resizing
XEvent otherEvent;
@@ -56,7 +56,7 @@ Bug: https://bugreports.qt.nokia.com/browse/QTBUG-21900
if (qt_x11EventFilter(&otherEvent))
continue;
-@@ -5318,13 +5342,19 @@ bool QETWidget::translateConfigEvent(con
+@@ -5324,13 +5348,19 @@ bool QETWidget::translateConfigEvent(con
newSize.setWidth(otherEvent.xconfigure.width);
newSize.setHeight(otherEvent.xconfigure.height);
@@ -77,7 +77,7 @@ Bug: https://bugreports.qt.nokia.com/browse/QTBUG-21900
}
#ifndef QT_NO_XSYNC
qt_sync_request_event_data sync_event;
-@@ -5337,9 +5367,14 @@ bool QETWidget::translateConfigEvent(con
+@@ -5343,9 +5373,14 @@ bool QETWidget::translateConfigEvent(con
}
if (!isCPos) {
diff --git a/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch b/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
index bdb555d..f88151a 100644
--- a/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
+++ b/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
@@ -8,9 +8,13 @@ Bug-Debian: http://bugs.debian.org/679874
Forwarded: not-needed
Last-Update: 2012-06-20
+---
+ tools/assistant/tools/assistant/mainwindow.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
-@@ -945,8 +945,7 @@ void MainWindow::updateApplicationFont()
+@@ -947,8 +947,7 @@ void MainWindow::updateApplicationFont()
if (helpEngine.usesAppFont())
font = helpEngine.appFont();
diff --git a/debian/patches/powerpcspe.diff b/debian/patches/powerpcspe.diff
index a138be6..afedbaa 100644
--- a/debian/patches/powerpcspe.diff
+++ b/debian/patches/powerpcspe.diff
@@ -11,7 +11,7 @@ Last-Update: 2011-04-27
--- a/configure
+++ b/configure
-@@ -3277,7 +3277,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3278,7 +3278,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
CFG_HOST_ARCH=x86_64
fi
;;
diff --git a/debian/patches/qtdebug_syslog.patch b/debian/patches/qtdebug_syslog.patch
index 6b3f131..bc7c8e4 100644
--- a/debian/patches/qtdebug_syslog.patch
+++ b/debian/patches/qtdebug_syslog.patch
@@ -8,7 +8,7 @@ Author: Thiago Macieira <thiago at kde.org>
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
-@@ -50,6 +50,7 @@
+@@ -52,6 +52,7 @@
#ifndef QT_NO_QOBJECT
#include <private/qthread_p.h>
@@ -16,7 +16,7 @@ Author: Thiago Macieira <thiago at kde.org>
#endif
#include <stdio.h>
-@@ -92,6 +93,8 @@
+@@ -94,6 +95,8 @@
_LIT(qt_S60Filter, "Series60v?.*.sis");
_LIT(qt_symbianSystemInstallDir, "z:\system\install\");
@@ -25,7 +25,7 @@ Author: Thiago Macieira <thiago at kde.org>
#endif
QT_BEGIN_NAMESPACE
-@@ -2327,6 +2330,27 @@ void qt_message_output(QtMsgType msgType
+@@ -2388,6 +2391,27 @@ void qt_message_output(QtMsgType msgType
#else
fprintf(stderr, "%s
", buf);
fflush(stderr);
diff --git a/debian/patches/sh.diff b/debian/patches/sh.diff
index 1fe6f21..df92c5e 100644
--- a/debian/patches/sh.diff
+++ b/debian/patches/sh.diff
@@ -11,7 +11,7 @@ Last-Update: 2011-04-27
--- a/configure
+++ b/configure
-@@ -3323,6 +3323,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3324,6 +3324,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
;;
esac
;;
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list