[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-15-g515364a
Felix Geyer
debfx-guest at alioth.debian.org
Wed Apr 4 11:06:48 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=66aca5d
The following commit has been merged in the experimental branch:
commit 66aca5db6e49aa303131aee46ba3f551238fccc5
Author: Felix Geyer <debfx-pkg at fobos.de>
Date: Tue Apr 3 18:00:10 2012 +0200
Refresh patches for the new upstream version.
---
debian/changelog | 1 +
debian/patches/0195-compositing-properties.diff | 6 +++---
debian/patches/01_debian_append_qt4_suffix.diff | 6 +++---
debian/patches/08_configure_quilt_compat.diff | 2 +-
.../patches/16_hide_std_symbols_on_qtwebkit.diff | 2 +-
debian/patches/92_armel_gcc43_valist_compat.diff | 2 +-
.../99_hppa_bug561203_decrease_failure_rate.diff | 10 +++++-----
..._support_for_QT_USE_DRAG_DISTANCE_env_var.patch | 2 +-
..._not_clickable_when_run_under_gnome-shell.patch | 6 +++---
debian/patches/s390x_jscore.diff | 2 +-
10 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 50ad2cb..1c4ed10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ qt4-x11 (4:4.8.1-1) UNRELEASED; urgency=low
[ Felix Geyer ]
* Drop fix_ftbfs_format-security.patch, fixed upstream.
+ * Refresh patches for the new upstream version.
-- Fathi Boudra <fabo at debian.org> Wed, 04 Jan 2012 22:15:56 +0200
diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff
index c823bbd..70be833 100644
--- a/debian/patches/0195-compositing-properties.diff
+++ b/debian/patches/0195-compositing-properties.diff
@@ -13,7 +13,7 @@ bugs.kde.org number : none
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -768,6 +768,11 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -773,6 +773,11 @@ void QWidgetPrivate::create_sys(WId wind
Q_ASSERT(id);
XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa);
@@ -25,7 +25,7 @@ bugs.kde.org number : none
} else if (topLevel && !desktop) { // top-level widget
if (!X11->wm_client_leader)
create_wm_client_leader();
-@@ -821,13 +826,21 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -826,13 +831,21 @@ void QWidgetPrivate::create_sys(WId wind
// set EWMH window types
setNetWmWindowTypes();
@@ -49,7 +49,7 @@ bugs.kde.org number : none
// declare the widget's window role
if (QTLWExtra *topData = maybeTopData()) {
-@@ -843,10 +856,6 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -848,10 +861,6 @@ void QWidgetPrivate::create_sys(WId wind
XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
XA_WINDOW, 32, PropModeReplace,
(unsigned char *)&X11->wm_client_leader, 1);
diff --git a/debian/patches/01_debian_append_qt4_suffix.diff b/debian/patches/01_debian_append_qt4_suffix.diff
index 176ee73..30f1b8e 100644
--- a/debian/patches/01_debian_append_qt4_suffix.diff
+++ b/debian/patches/01_debian_append_qt4_suffix.diff
@@ -102,7 +102,7 @@ Forwarded: not-needed
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -8515,8 +8515,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -8517,8 +8517,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -113,7 +113,7 @@ Forwarded: not-needed
QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -8919,11 +8919,11 @@ EXEC=""
+@@ -8921,11 +8921,11 @@ EXEC=""
echo "Finding project files. Please wait..."
if [ "$CFG_NOPROCESS" != "yes" ]; then
@@ -127,7 +127,7 @@ Forwarded: not-needed
fi
fi
-@@ -9114,7 +9114,7 @@ for file in .projects .projects.3; do
+@@ -9112,7 +9112,7 @@ for file in .projects .projects.3; do
QMAKE_SPEC_ARGS="-spec $SPEC"
echo $ECHO_N " for $a$ECHO_C"
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index a7370a3..0a37abf 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
-@@ -8976,7 +8976,7 @@ fi
+@@ -8978,7 +8978,7 @@ fi
# .projects.3 -> the rest
rm -f .projects .projects.1 .projects.2 .projects.3
diff --git a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
index d13947b..f264f11 100644
--- a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
+++ b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
@@ -17,7 +17,7 @@ Author: Sune Vuorela <debian at pusling.com>
+
# Treat warnings as errors on x86/Linux/GCC
linux-g++* {
- isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
+ !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
--- /dev/null
+++ b/src/3rdparty/webkit/Source/symbols.filter
@@ -0,0 +1,5 @@
diff --git a/debian/patches/92_armel_gcc43_valist_compat.diff b/debian/patches/92_armel_gcc43_valist_compat.diff
index ba62c17..092b89b 100644
--- a/debian/patches/92_armel_gcc43_valist_compat.diff
+++ b/debian/patches/92_armel_gcc43_valist_compat.diff
@@ -20,7 +20,7 @@ Forward: not-needed
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
-@@ -5554,6 +5554,11 @@ QString &QString::vsprintf(const char* c
+@@ -5560,6 +5560,11 @@ QString &QString::vsprintf(const char* c
return *this;
}
diff --git a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
index fcd93e1..1c58001 100644
--- a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
+++ b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
@@ -17,7 +17,7 @@ Last-Update: 2011-12-26
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
-@@ -525,6 +525,13 @@ static char **_q_dupEnvironment(const QP
+@@ -526,6 +526,13 @@ static char **_q_dupEnvironment(const QP
return envp;
}
@@ -31,15 +31,15 @@ Last-Update: 2011-12-26
#ifdef Q_OS_MAC
Q_GLOBAL_STATIC(QMutex, cfbundleMutex);
#endif
-@@ -650,6 +657,7 @@ void QProcessPrivate::startProcess()
+@@ -647,6 +654,7 @@ void QProcessPrivate::startProcess()
#if defined(Q_OS_QNX)
pid_t childPid = spawnChild(workingDirPtr, argv, envp);
#else
+ debbug_561203();
pid_t childPid = fork();
- #endif
int lastForkErrno = errno;
-@@ -1352,6 +1360,7 @@ bool QProcessPrivate::startDetached(cons
+ #endif
+@@ -1340,6 +1348,7 @@ bool QProcessPrivate::startDetached(cons
int pidPipe[2];
qt_safe_pipe(pidPipe);
@@ -47,7 +47,7 @@ Last-Update: 2011-12-26
pid_t childPid = fork();
if (childPid == 0) {
struct sigaction noaction;
-@@ -1364,6 +1373,7 @@ bool QProcessPrivate::startDetached(cons
+@@ -1352,6 +1361,7 @@ bool QProcessPrivate::startDetached(cons
qt_safe_close(startedPipe[0]);
qt_safe_close(pidPipe[0]);
diff --git a/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch b/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
index 97df13c..00956e6 100644
--- a/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
+++ b/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
@@ -8,7 +8,7 @@ Author: Joonas Tanskanen <joonas.tanskanen at sasken.com>
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
-@@ -1027,6 +1027,11 @@ void QApplicationPrivate::initialize()
+@@ -1031,6 +1031,11 @@ void QApplicationPrivate::initialize()
q->setAttribute(Qt::AA_S60DisablePartialScreenInputMode);
#endif
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 2152dbb..4d9834a 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];
-@@ -5273,8 +5294,11 @@ bool QETWidget::translateConfigEvent(con
+@@ -5281,8 +5302,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;
-@@ -5287,13 +5311,19 @@ bool QETWidget::translateConfigEvent(con
+@@ -5295,13 +5319,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;
-@@ -5306,9 +5336,14 @@ bool QETWidget::translateConfigEvent(con
+@@ -5314,9 +5344,14 @@ bool QETWidget::translateConfigEvent(con
}
if (!isCPos) {
diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff
index 96ec0f4..f6e87cb 100644
--- a/debian/patches/s390x_jscore.diff
+++ b/debian/patches/s390x_jscore.diff
@@ -29,7 +29,7 @@ Last-Update: 2011-08-03
/* CPU(X86) - i386 / x86 32-bit */
#if defined(__i386__) \
|| defined(i386) \
-@@ -873,7 +885,7 @@
+@@ -884,7 +896,7 @@
#endif
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list