[SCM] qtbase packaging branch, experimental, updated. debian/5.8.0+dfsg-3-7-g35075f1
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Fri Apr 7 07:27:37 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=03ee103
The following commit has been merged in the experimental branch:
commit 03ee103f0b991189c80be3105cf116ccf62e1a8d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Thu Apr 6 18:51:10 2017 +0300
Bump version to 5.9.0~beta and update patches.
---
debian/changelog | 5 +-
debian/patches/armv4.diff | 4 +-
debian/patches/gnukfreebsd.diff | 2 +-
debian/patches/hurd_tilde.diff | 17 --
debian/patches/link_fbclient.diff | 2 +-
debian/patches/qsettings_XDG_CONFIG_DIRS.diff | 171 ------------
debian/patches/qsettings_simplify_logic.diff | 372 --------------------------
debian/patches/series | 6 -
debian/patches/vnc_big_endian.diff | 75 ------
9 files changed, 8 insertions(+), 646 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dd3662b..0ca549e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
-qtbase-opensource-src (5.8.0+dfsg-4) UNRELEASED; urgency=medium
+qtbase-opensource-src (5.9.0~beta+dfsg-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* Update debian/watch to track experimental releases.
+ * New upstream beta release.
+ * Drop all patches which were backported from upstream.
+ * Refresh other patches.
* Bump dpkg-dev build-dependency to 1.17.14, for build profiles.
* Disable debug logging in /etc/xdg/QtProject/qtlogging.ini (closes:
#805399).
diff --git a/debian/patches/armv4.diff b/debian/patches/armv4.diff
index d4c2146..987ad42 100644
--- a/debian/patches/armv4.diff
+++ b/debian/patches/armv4.diff
@@ -5,7 +5,7 @@ Last-Update: 2016-07-01
--- a/src/corelib/global/qprocessordetection.h
+++ b/src/corelib/global/qprocessordetection.h
-@@ -127,6 +127,8 @@
+@@ -130,6 +130,8 @@
# elif defined(__ARM_ARCH_5TEJ__) \
|| defined(__ARM_ARCH_5TE__)
# define Q_PROCESSOR_ARM 5
@@ -14,7 +14,7 @@ Last-Update: 2016-07-01
# else
# define Q_PROCESSOR_ARM 0
# endif
-@@ -141,6 +143,9 @@
+@@ -144,6 +146,9 @@
# endif
# if Q_PROCESSOR_ARM >= 5
# define Q_PROCESSOR_ARM_V5
diff --git a/debian/patches/gnukfreebsd.diff b/debian/patches/gnukfreebsd.diff
index 5f90cbd..0ab6f72 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
-@@ -191,6 +191,8 @@
+@@ -193,6 +193,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/hurd_tilde.diff b/debian/patches/hurd_tilde.diff
deleted file mode 100644
index bc222e0..0000000
--- a/debian/patches/hurd_tilde.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: undef TILDE to fix compilation on Hurd
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=a373a01ed73b29b2
-Last-Update: 2017-02-10
-
---- a/src/gui/text/qcssparser_p.h
-+++ b/src/gui/text/qcssparser_p.h
-@@ -75,6 +75,10 @@
- #if defined(Q_OS_INTEGRITY)
- # undef Value
- #endif
-+// Hurd has #define TILDE 0x00080000 from <sys/ioctl.h>
-+#if defined(TILDE)
-+# undef TILDE
-+#endif
-
- #define QT_CSS_DECLARE_TYPEINFO(Class, Type) \
- } /* namespace QCss */ \
diff --git a/debian/patches/link_fbclient.diff b/debian/patches/link_fbclient.diff
index 11d353d..d012f14 100644
--- a/debian/patches/link_fbclient.diff
+++ b/debian/patches/link_fbclient.diff
@@ -6,7 +6,7 @@ Last-Update: 2016-01-24
--- a/src/sql/configure.json
+++ b/src/sql/configure.json
-@@ -51,7 +51,7 @@
+@@ -50,7 +50,7 @@
"test": "unix/ibase",
"sources": [
{ "libs": "-lgds32_ms", "condition": "config.win32" },
diff --git a/debian/patches/qsettings_XDG_CONFIG_DIRS.diff b/debian/patches/qsettings_XDG_CONFIG_DIRS.diff
deleted file mode 100644
index 4bc7492..0000000
--- a/debian/patches/qsettings_XDG_CONFIG_DIRS.diff
+++ /dev/null
@@ -1,171 +0,0 @@
-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: 2017-01-24
-
---- a/src/corelib/io/qsettings.cpp
-+++ b/src/corelib/io/qsettings.cpp
-@@ -128,7 +128,18 @@
-
- typedef QHash<QString, QConfFile *> ConfFileHash;
- typedef QCache<QString, QConfFile> ConfFileCache;
--typedef QHash<int, QString> PathHash;
-+namespace {
-+ struct Path
-+ {
-+ // Note: Defining constructors explicitly because of buggy C++11
-+ // implementation in MSVC (uniform initialization).
-+ Path() {}
-+ Path(const QString & p, bool ud) : path(p), userDefined(ud) {}
-+ QString path;
-+ bool userDefined; //!< true - user defined, overridden by setPath
-+ };
-+}
-+typedef QHash<int, Path> PathHash;
- typedef QVector<QConfFileCustomFormat> CustomFormatVector;
-
- Q_GLOBAL_STATIC(ConfFileHash, usedHashFunc)
-@@ -1070,22 +1081,22 @@
- const QString programDataFolder = windowsConfigPath(FOLDERID_ProgramData);
- # endif
- pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::UserScope),
-- roamingAppDataFolder + QDir::separator());
-+ Path(roamingAppDataFolder + QDir::separator(), false));
- pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::SystemScope),
-- programDataFolder + QDir::separator());
-+ Path(programDataFolder + QDir::separator(), false));
- #else
- const QString userPath = make_user_path();
-- pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::UserScope), userPath);
-- pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::SystemScope), systemPath);
-+ pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::UserScope), Path(userPath, false));
-+ pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::SystemScope), Path(systemPath, false));
- #ifndef Q_OS_MAC
-- pathHash->insert(pathHashKey(QSettings::NativeFormat, QSettings::UserScope), userPath);
-- pathHash->insert(pathHashKey(QSettings::NativeFormat, QSettings::SystemScope), systemPath);
-+ pathHash->insert(pathHashKey(QSettings::NativeFormat, QSettings::UserScope), Path(userPath, false));
-+ pathHash->insert(pathHashKey(QSettings::NativeFormat, QSettings::SystemScope), Path(systemPath, false));
- #endif
- #endif // Q_OS_WIN
- }
- }
-
--static QString getPath(QSettings::Format format, QSettings::Scope scope)
-+static Path getPath(QSettings::Format format, QSettings::Scope scope)
- {
- Q_ASSERT((int)QSettings::NativeFormat == 0);
- Q_ASSERT((int)QSettings::IniFormat == 1);
-@@ -1095,14 +1106,23 @@
- if (pathHash->isEmpty())
- initDefaultPaths(&locker);
-
-- QString result = pathHash->value(pathHashKey(format, scope));
-- if (!result.isEmpty())
-+ Path result = pathHash->value(pathHashKey(format, scope));
-+ if (!result.path.isEmpty())
- return result;
-
- // fall back on INI path
- return pathHash->value(pathHashKey(QSettings::IniFormat, scope));
- }
-
-+#if defined(QT_BUILD_INTERNAL) && defined(Q_XDG_PLATFORM) && !defined(QT_NO_STANDARDPATHS)
-+// Note: Suitable only for autotests.
-+void Q_AUTOTEST_EXPORT clearDefaultPaths()
-+{
-+ QMutexLocker locker(&settingsGlobalMutex);
-+ pathHashFunc()->clear();
-+}
-+#endif // QT_BUILD_INTERNAL && Q_XDG_PLATFORM && !QT_NO_STANDARDPATHS
-+
- QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format,
- QSettings::Scope scope,
- const QString &organization,
-@@ -1122,16 +1142,44 @@
- QString orgFile = org + extension;
-
- if (scope == QSettings::UserScope) {
-- QString userPath = getPath(format, QSettings::UserScope);
-+ Path userPath = getPath(format, QSettings::UserScope);
- if (!application.isEmpty())
-- confFiles.append(QConfFile::fromName(userPath + appFile, true));
-- confFiles.append(QConfFile::fromName(userPath + orgFile, true));
-+ confFiles.append(QConfFile::fromName(userPath.path + appFile, true));
-+ confFiles.append(QConfFile::fromName(userPath.path + orgFile, true));
- }
-
-- QString systemPath = getPath(format, QSettings::SystemScope);
-- if (!application.isEmpty())
-- confFiles.append(QConfFile::fromName(systemPath + appFile, false));
-- confFiles.append(QConfFile::fromName(systemPath + orgFile, false));
-+ Path systemPath = getPath(format, QSettings::SystemScope);
-+#if defined(Q_XDG_PLATFORM) && !defined(QT_NO_STANDARDPATHS)
-+ // check if the systemPath wasn't overridden by QSettings::setPath()
-+ if (!systemPath.userDefined) {
-+ // Note: We can't use QStandardPaths::locateAll() as we need all the
-+ // possible files (not just the existing ones) and there is no way
-+ // to exclude user specific (XDG_CONFIG_HOME) directory from the search.
-+ QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation);
-+ // remove the QStandardLocation::writableLocation() (XDG_CONFIG_HOME)
-+ if (!dirs.isEmpty())
-+ dirs.takeFirst();
-+ QStringList paths;
-+ if (!application.isEmpty()) {
-+ paths.reserve(dirs.size() * 2);
-+ for (const auto &dir : qAsConst(dirs))
-+ paths.append(dir + QLatin1Char('/') + appFile);
-+ } else {
-+ paths.reserve(dirs.size());
-+ }
-+ for (const auto &dir : qAsConst(dirs))
-+ paths.append(dir + QLatin1Char('/') + orgFile);
-+
-+ // Note: No check for existence of files is done intentionaly.
-+ for (const auto &path : qAsConst(paths))
-+ confFiles.append(QConfFile::fromName(path, false));
-+ } else
-+#endif // Q_XDG_PLATFORM && !QT_NO_STANDARDPATHS
-+ {
-+ if (!application.isEmpty())
-+ confFiles.append(QConfFile::fromName(systemPath.path + appFile, false));
-+ confFiles.append(QConfFile::fromName(systemPath.path + orgFile, false));
-+ }
-
- initAccess();
- }
-@@ -2174,9 +2222,10 @@
- \list 1
- \li
--
qtbase packaging
More information about the pkg-kde-commits
mailing list