[SCM] qtbase packaging branch, experimental, updated. debian/5.7.1+dfsg-3-2-g6904dbc
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Tue Jan 24 12:48:49 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=6904dbc
The following commit has been merged in the experimental branch:
commit 6904dbc154ea07921c8dffe0cb2cdb3e87440a05
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Tue Jan 24 15:48:32 2017 +0300
Update patches for the new upstream release.
---
debian/changelog | 11 ++++
debian/patches/fix_accessibility_crash.diff | 79 ---------------------------
debian/patches/fix_build_on_x32.diff | 15 -----
debian/patches/gcc_6.3.diff | 31 -----------
debian/patches/gnukfreebsd.diff | 2 +-
debian/patches/gtkdialogs_wayland.diff | 26 ---------
debian/patches/link_fbclient.diff | 32 +++++------
debian/patches/no_dbus_dependency.diff | 4 +-
debian/patches/qsettings_XDG_CONFIG_DIRS.diff | 28 +++++-----
debian/patches/qsettings_simplify_logic.diff | 34 ++++++------
debian/patches/series | 5 --
debian/patches/stop_unloading_plugins.diff | 61 ---------------------
12 files changed, 58 insertions(+), 270 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8281596..d2ec862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,17 @@ qtbase-opensource-src (5.8.0+dfsg-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release.
+ * Drop patches, applied upstream in 5.8.0:
+ - fix_build_on_x32.diff
+ - gcc_6.3.diff
+ - fix_accessibility_crash.diff
+ - gtkdialogs_wayland.diff
+ - stop_unloading_plugins.diff
+ * Rebase patches against upstream changes:
+ - link_fbclient.diff
+ - no_dbus_dependency.diff
+ - qsettings_simplify_logic.diff
+ - qsettings_XDG_CONFIG_DIRS.diff
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 24 Jan 2017 14:24:16 +0300
diff --git a/debian/patches/fix_accessibility_crash.diff b/debian/patches/fix_accessibility_crash.diff
deleted file mode 100644
index 7df43cd..0000000
--- a/debian/patches/fix_accessibility_crash.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: use QPersistentModelIndex for storing a model index
- QModelIndex is not safe to be used to store an index as it is designed
- to be discarded right after use as the index information can change.
- .
- Therefore a QPersistentModelIndex should be used instead to store the
- index. Subsequently the m_index does not need to be updated whenever
- the model changes anymore as this is already done for us.
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=bd591064be388216
-Last-Update: 2017-01-04
-
---- a/src/widgets/accessible/itemviews.cpp
-+++ b/src/widgets/accessible/itemviews.cpp
-@@ -556,20 +556,8 @@
- QAccessible::Id id = iter.value();
- QAccessibleInterface *iface = QAccessible::accessibleInterface(id);
- Q_ASSERT(iface);
-- if (iface->role() == QAccessible::Cell || iface->role() == QAccessible::ListItem) {
-- Q_ASSERT(iface->tableCellInterface());
-- QAccessibleTableCell *cell = static_cast<QAccessibleTableCell*>(iface->tableCellInterface());
-- if (event->modelChangeType() == QAccessibleTableModelChangeEvent::RowsInserted
-- && cell->m_index.row() >= event->firstRow()) {
-- int newRow = cell->m_index.row() + newRows;
-- cell->m_index = cell->m_index.sibling(newRow, cell->m_index.column());
-- } else if (event->modelChangeType() == QAccessibleTableModelChangeEvent::ColumnsInserted
-- && cell->m_index.column() >= event->firstColumn()) {
-- int newColumn = cell->m_index.column() + newColumns;
-- cell->m_index = cell->m_index.sibling(cell->m_index.row(), newColumn);
-- }
-- } else if (event->modelChangeType() == QAccessibleTableModelChangeEvent::RowsInserted
-- && iface->role() == QAccessible::RowHeader) {
-+ if (event->modelChangeType() == QAccessibleTableModelChangeEvent::RowsInserted
-+ && iface->role() == QAccessible::RowHeader) {
- QAccessibleTableHeaderCell *cell = static_cast<QAccessibleTableHeaderCell*>(iface);
- if (cell->index >= event->firstRow()) {
- cell->index += newRows;
-@@ -608,27 +596,11 @@
- if (iface->role() == QAccessible::Cell || iface->role() == QAccessible::ListItem) {
- Q_ASSERT(iface->tableCellInterface());
- QAccessibleTableCell *cell = static_cast<QAccessibleTableCell*>(iface->tableCellInterface());
-- if (event->modelChangeType() == QAccessibleTableModelChangeEvent::RowsRemoved) {
-- if (cell->m_index.row() < event->firstRow()) {
-- newCache.insert(indexOfChild(cell), id);
-- } else if (cell->m_index.row() > event->lastRow()) {
-- int newRow = cell->m_index.row() - deletedRows;
-- cell->m_index = cell->m_index.sibling(newRow, cell->m_index.column());
-- newCache.insert(indexOfChild(cell), id);
-- } else {
-- QAccessible::deleteAccessibleInterface(id);
-- }
-- } else if (event->modelChangeType() == QAccessibleTableModelChangeEvent::ColumnsRemoved) {
-- if (cell->m_index.column() < event->firstColumn()) {
-- newCache.insert(indexOfChild(cell), id);
-- } else if (cell->m_index.column() > event->lastColumn()) {
-- int newColumn = cell->m_index.column() - deletedColumns;
-- cell->m_index = cell->m_index.sibling(cell->m_index.row(), newColumn);
-- newCache.insert(indexOfChild(cell), id);
-- } else {
-- QAccessible::deleteAccessibleInterface(id);
-- }
-- }
-+ // Since it is a QPersistentModelIndex, we only need to check if it is valid
-+ if (cell->m_index.isValid())
-+ newCache.insert(indexOfChild(cell), id);
-+ else
-+ QAccessible::deleteAccessibleInterface(id);
- } else if (event->modelChangeType() == QAccessibleTableModelChangeEvent::RowsRemoved
- && iface->role() == QAccessible::RowHeader) {
- QAccessibleTableHeaderCell *cell = static_cast<QAccessibleTableHeaderCell*>(iface);
---- a/src/widgets/accessible/itemviews_p.h
-+++ b/src/widgets/accessible/itemviews_p.h
-@@ -213,7 +213,7 @@
- QHeaderView *verticalHeader() const;
- QHeaderView *horizontalHeader() const;
- QPointer<QAbstractItemView > view;
-- QModelIndex m_index;
-+ QPersistentModelIndex m_index;
- QAccessible::Role m_role;
-
- void selectCell();
diff --git a/debian/patches/fix_build_on_x32.diff b/debian/patches/fix_build_on_x32.diff
deleted file mode 100644
index e42d952..0000000
--- a/debian/patches/fix_build_on_x32.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fix EGL break on Debian X32
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=92805a0e9c488e47
-Last-Update: 2016-11-15
-
---- a/src/platformsupport/eglconvenience/qt_egl_p.h
-+++ b/src/platformsupport/eglconvenience/qt_egl_p.h
-@@ -83,7 +83,7 @@
- { return v; }
- };
-
--#if Q_PROCESSOR_WORDSIZE > 4
-+#if QT_POINTER_SIZE > 4
- template <>
- struct QtEglConverter<uintptr_t, uint32_t>
- {
diff --git a/debian/patches/gcc_6.3.diff b/debian/patches/gcc_6.3.diff
deleted file mode 100644
index 9c3b6bc..0000000
--- a/debian/patches/gcc_6.3.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: fix build with gcc 6.3 and newer versions
- The builtins clzs and ctzs have been removed. Additionally they were
- never proper internal GCC builtins and shouldn't have been used in a
- constexpr function in the first place. This patch removes the assumption
- that they exist when BMI is available, and let GCC fall back to using
- __builtin_clz and __builtin_ctz.
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=bb0f29f82b934b48
- Manually rebased against the 5.7.1 release by Dmitry Shachnev.
-Bug: https://bugs.debian.org/846996
-Last-Update: 2016-12-23
-
---- a/src/corelib/tools/qalgorithms.h
-+++ b/src/corelib/tools/qalgorithms.h
-@@ -626,7 +626,7 @@
- Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint16 v) Q_DECL_NOTHROW
- {
- #if defined(Q_CC_GNU)
--# if QT_HAS_BUILTIN(__builtin_ctzs) || (defined(__LZCNT__) && defined(__BMI__))
-+# if QT_HAS_BUILTIN(__builtin_ctzs)
- return v ? __builtin_ctzs(v) : 16U;
- # else
- return v ? __builtin_ctz(v) : 16U;
-@@ -689,7 +689,7 @@
- Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint16 v) Q_DECL_NOTHROW
- {
- #if defined(Q_CC_GNU)
--# if QT_HAS_BUILTIN(__builtin_clzs) || (defined(__LZCNT__) && defined(__BMI__))
-+# if QT_HAS_BUILTIN(__builtin_clzs)
- return v ? __builtin_clzs(v) : 16U;
- # else
- return v ? __builtin_clz(v)-16U : 16U;
diff --git a/debian/patches/gnukfreebsd.diff b/debian/patches/gnukfreebsd.diff
index 0ab6f72..5f90cbd 100644
--- a/debian/patches/gnukfreebsd.diff
+++ b/debian/patches/gnukfreebsd.diff
@@ -157,7 +157,7 @@ Forwarded: no
+#endif // QPLATFORMDEFS_H
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
-@@ -193,6 +193,8 @@
+@@ -191,6 +191,8 @@
deppath.name = PATH
} else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) {
deppath.name = LD_LIBRARY_PATH
diff --git a/debian/patches/gtkdialogs_wayland.diff b/debian/patches/gtkdialogs_wayland.diff
deleted file mode 100644
index 06d65ff..0000000
--- a/debian/patches/gtkdialogs_wayland.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: QGtk3Dialog: don't crash on Wayland
- Check if it's an X11 window before calling XSetTransientForHint().
- No transient parent will be set for GTK+ dialogs on Wayland. That
- has to be implemented separately.
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84ea00d47049d882
-Last-Update: 2017-01-06
-
---- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
-+++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
-@@ -129,10 +129,12 @@
-
- GdkWindow *gdkWindow = gtk_widget_get_window(gtkWidget);
- if (parent) {
-- GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow);
-- XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay),
-- gdk_x11_window_get_xid(gdkWindow),
-- parent->winId());
-+ if (GDK_IS_X11_WINDOW(gdkWindow)) {
-+ GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow);
-+ XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay),
-+ gdk_x11_window_get_xid(gdkWindow),
-+ parent->winId());
-+ }
- }
-
- if (modality != Qt::NonModal) {
diff --git a/debian/patches/link_fbclient.diff b/debian/patches/link_fbclient.diff
index 6e2afef..11d353d 100644
--- a/debian/patches/link_fbclient.diff
+++ b/debian/patches/link_fbclient.diff
@@ -1,23 +1,17 @@
Description: build ibase sql plugin against firebird
Author: Fathi Boudra <fabo at debian.org>
+Author: Dmitry Shachnev <mitya57 at debian.org>
Forwarded: no
-Last-Update: 2015-08-14
+Last-Update: 2016-01-24
---- a/config.tests/unix/ibase/ibase.pro
-+++ b/config.tests/unix/ibase/ibase.pro
-@@ -1,3 +1,3 @@
- SOURCES = ibase.cpp
- CONFIG -= qt dylib
--LIBS += -lgds
-+LIBS += -lfbclient
---- a/src/sql/drivers/ibase/qsql_ibase.pri
-+++ b/src/sql/drivers/ibase/qsql_ibase.pri
-@@ -2,7 +2,7 @@
- SOURCES += $$PWD/qsql_ibase.cpp
-
- unix {
-- !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds
-+ !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lfbclient
- } else {
- !contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) {
- LIBS += -lgds32_ms
+--- a/src/sql/configure.json
++++ b/src/sql/configure.json
+@@ -51,7 +51,7 @@
+ "test": "unix/ibase",
+ "sources": [
+ { "libs": "-lgds32_ms", "condition": "config.win32" },
+- { "libs": "-lgds", "condition": "!config.win32" }
++ { "libs": "-lfbclient", "condition": "!config.win32" }
+ ]
+ },
+ "mysql": {
diff --git a/debian/patches/no_dbus_dependency.diff b/debian/patches/no_dbus_dependency.diff
index e5cd0c1..a1db8a9 100644
--- a/debian/patches/no_dbus_dependency.diff
+++ b/debian/patches/no_dbus_dependency.diff
@@ -5,7 +5,7 @@ Description: do not fail when D-Bus is not available on configure time
According to comments in https://codereview.qt-project.org/174643, upstream
have changed their mind since then.
Author: Dmitry Shachnev <mitya57 at debian.org>
-Last-Update: 2016-11-15
+Last-Update: 2017-01-24
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -13,7 +13,7 @@ Last-Update: 2016-11-15
# Disable the QtDBus tests if we can't connect to the session bus
!cross_compile:qtHaveModule(dbus) {
!system("dbus-send --session --type=signal / local.AutotestCheck.Hello >/dev/null 2>&1") {
-- contains(QT_CONFIG, dbus-linked): \
+- qtConfig(dbus-linked): \
- error("QtDBus is enabled but session bus is not available. Please check the installation.")
- else: \
- warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.")
diff --git a/debian/patches/qsettings_XDG_CONFIG_DIRS.diff b/debian/patches/qsettings_XDG_CONFIG_DIRS.diff
index 837ec35..4bc7492 100644
--- a/debian/patches/qsettings_XDG_CONFIG_DIRS.diff
+++ b/debian/patches/qsettings_XDG_CONFIG_DIRS.diff
@@ -2,11 +2,11 @@ Description: QSettings: add proper support for XDG_CONFIG_DIRS
Update fallback mechanism for Q_XDG_PLATFORM based systems to follow the
Xdg specification.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4758555f3e44af34
-Last-Update: 2016-10-22
+Last-Update: 2017-01-24
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
-@@ -137,7 +137,18 @@
+@@ -128,7 +128,18 @@
typedef QHash<QString, QConfFile *> ConfFileHash;
typedef QCache<QString, QConfFile> ConfFileCache;
@@ -26,15 +26,15 @@ Last-Update: 2016-10-22
typedef QVector<QConfFileCustomFormat> CustomFormatVector;
Q_GLOBAL_STATIC(ConfFileHash, usedHashFunc)
-@@ -1079,22 +1090,22 @@
- */
- #ifdef Q_OS_WIN
+@@ -1070,22 +1081,22 @@
+ const QString programDataFolder = windowsConfigPath(FOLDERID_ProgramData);
+ # endif
pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::UserScope),
-- windowsConfigPath(CSIDL_APPDATA) + QDir::separator());
-+ Path(windowsConfigPath(CSIDL_APPDATA) + QDir::separator(), false));
+- roamingAppDataFolder + QDir::separator());
++ Path(roamingAppDataFolder + QDir::separator(), false));
pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::SystemScope),
-- windowsConfigPath(CSIDL_COMMON_APPDATA) + QDir::separator());
-+ Path(windowsConfigPath(CSIDL_COMMON_APPDATA) + QDir::separator(), false));
+- programDataFolder + QDir::separator());
++ Path(programDataFolder + QDir::separator(), false));
#else
const QString userPath = make_user_path();
- pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::UserScope), userPath);
@@ -56,7 +56,7 @@ Last-Update: 2016-10-22
{
Q_ASSERT((int)QSettings::NativeFormat == 0);
Q_ASSERT((int)QSettings::IniFormat == 1);
-@@ -1104,14 +1115,23 @@
+@@ -1095,14 +1106,23 @@
if (pathHash->isEmpty())
initDefaultPaths(&locker);
@@ -82,7 +82,7 @@ Last-Update: 2016-10-22
QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format,
QSettings::Scope scope,
const QString &organization,
-@@ -1131,16 +1151,44 @@
+@@ -1122,16 +1142,44 @@
QString orgFile = org + extension;
if (scope == QSettings::UserScope) {
@@ -134,7 +134,7 @@ Last-Update: 2016-10-22
initAccess();
}
-@@ -2191,9 +2239,10 @@
+@@ -2174,9 +2222,10 @@
\list 1
\li
--
qtbase packaging
More information about the pkg-kde-commits
mailing list