[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.7.1+dfsg-2ubuntu1
Timo Jyrinki
timo at moszumanska.debian.org
Tue Jan 10 07:32:15 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=0cbe16c
The following commit has been merged in the ubuntu branch:
commit 0cbe16c82416f8768da32ba3a5c314e2932c489f
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Mon Nov 7 11:44:19 2016 +0000
Drop patches merged upstream.
- fix-scalable-bitmap-factor-caching.patch - Make-sure-connection-is-not-null-before-using-it.patch - xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
- fix-scalable-bitmap-factor-caching.patch
- Make-sure-connection-is-not-null-before-using-it.patch
- xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
---
debian/changelog | 3 +
...re-connection-is-not-null-before-using-it.patch | 42 -----
...Server-delay-processing-of-D-Bus-messages.patch | 134 ----------------
.../fix-scalable-bitmap-factor-caching.patch | 175 ---------------------
debian/patches/series | 4 -
...so-text-plain-when-a-text-uri-list-is-dro.patch | 53 -------
6 files changed, 3 insertions(+), 408 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5a62586..a4cdc76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ qtbase-opensource-src (5.7.1~20161021+dfsg-6ubuntu1) UNRELEASED; urgency=medium
- dbusmenu_global_menu.diff
- dbustray_use_separate_connections.diff
- qplatformmenubar_createmenu.diff
+ - fix-scalable-bitmap-factor-caching.patch
+ - Make-sure-connection-is-not-null-before-using-it.patch
+ - xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
* Update symbols and mark private ones.
* Adjust tests enablement patch for Qt 5.7.
diff --git a/debian/patches/Make-sure-connection-is-not-null-before-using-it.patch b/debian/patches/Make-sure-connection-is-not-null-before-using-it.patch
deleted file mode 100644
index c0b22ab..0000000
--- a/debian/patches/Make-sure-connection-is-not-null-before-using-it.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3fa18bf8816ccbbdf43eed2759c9a223cec039e8 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <albert.astals at canonical.com>
-Date: Tue, 16 Aug 2016 11:42:42 +0200
-Subject: [PATCH] Make sure connection is not null before using it
-
-connectionFromId can return null if the id isn't found.
-
-This causes crashes like http://paste.ubuntu.com/23061009/
-
-Change-Id: Ib72412f61dc7661455394679b3e90662de505920
-Reviewed-by: Lorn Potter <lorn.potter at canonical.com>
----
- src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
-index 42037ffb..13b64a5 100644
---- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
-+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
-@@ -218,6 +218,10 @@ void QNetworkManagerEngine::disconnectFromId(const QString &id)
- QMutexLocker locker(&mutex);
-
- QNetworkManagerSettingsConnection *connection = connectionFromId(id);
-+
-+ if (!connection)
-+ return;
-+
- QNmSettingsMap map = connection->getSettings();
- bool connectionAutoconnect = map.value("connection").value("autoconnect",true).toBool(); //if not present is true !!
- if (connectionAutoconnect) { //autoconnect connections will simply be reconnected by nm
-@@ -563,7 +567,7 @@ bool QNetworkManagerEngine::isConnectionActive(const QString &settingsPath)
- }
-
- QNetworkManagerSettingsConnection *settingsConnection = connectionFromId(settingsPath);
-- if (settingsConnection->getType() == DEVICE_TYPE_MODEM) {
-+ if (settingsConnection && settingsConnection->getType() == DEVICE_TYPE_MODEM) {
- return isActiveContext(settingsConnection->path());
- }
-
---
-2.8.1
-
diff --git a/debian/patches/QDBusServer-delay-processing-of-D-Bus-messages.patch b/debian/patches/QDBusServer-delay-processing-of-D-Bus-messages.patch
deleted file mode 100644
index ff0a8e3..0000000
--- a/debian/patches/QDBusServer-delay-processing-of-D-Bus-messages.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From dbbb06c2757bdcb7d7c704d33ead730b50141704 Mon Sep 17 00:00:00 2001
-From: Alberto Mardegan <alberto.mardegan at canonical.com>
-Date: Tue, 9 Aug 2016 17:01:37 +0300
-Subject: [PATCH] QDBusServer: delay processing of D-Bus messages
-
-We must ensure that QDBusServer's newConnection() signal has been
-processed by the application, before starting processing messages on it.
-
-Task-number: QTBUG-55087
-Change-Id: I595329b2f98788dbf9f40558b8c230c0c0817ef8
----
- src/dbus/qdbusconnection.cpp | 20 --------------------
- src/dbus/qdbusconnection_p.h | 19 +++++++++++++++++++
- src/dbus/qdbusintegrator.cpp | 12 ++++++++++++
- src/dbus/qdbusserver.cpp | 2 ++
- 4 files changed, 33 insertions(+), 20 deletions(-)
-
-diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
-index 7cdacc1..c88cf89 100644
---- a/src/dbus/qdbusconnection.cpp
-+++ b/src/dbus/qdbusconnection.cpp
-@@ -68,24 +68,6 @@ static void preventDllUnload();
-
- Q_GLOBAL_STATIC(QDBusConnectionManager, _q_manager)
-
--// can be replaced with a lambda in Qt 5.7
--class QDBusConnectionDispatchEnabler : public QObject
--{
-- Q_OBJECT
-- QDBusConnectionPrivate *con;
--public:
-- QDBusConnectionDispatchEnabler(QDBusConnectionPrivate *con) : con(con) {}
--
--public slots:
-- void execute()
-- {
-- con->setDispatchEnabled(true);
-- if (!con->ref.deref())
-- con->deleteLater();
-- deleteLater();
-- }
--};
--
- struct QDBusConnectionManager::ConnectionRequestData
- {
- enum RequestType {
-@@ -1281,8 +1263,6 @@ QByteArray QDBusConnection::localMachineId()
-
- QT_END_NAMESPACE
-
--#include "qdbusconnection.moc"
--
- #ifdef Q_OS_WIN
- # include <qt_windows.h>
-
-diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
-index fff9f29..d16cd05 100644
---- a/src/dbus/qdbusconnection_p.h
-+++ b/src/dbus/qdbusconnection_p.h
-@@ -375,6 +375,25 @@ extern QDBusMessage qDBusPropertySet(const QDBusConnectionPrivate::ObjectTreeNod
- const QDBusMessage &msg);
- extern QDBusMessage qDBusPropertyGetAll(const QDBusConnectionPrivate::ObjectTreeNode &node,
- const QDBusMessage &msg);
-+
-+// can be replaced with a lambda in Qt 5.7
-+class QDBusConnectionDispatchEnabler : public QObject
-+{
-+ Q_OBJECT
-+ QDBusConnectionPrivate *con;
-+public:
-+ QDBusConnectionDispatchEnabler(QDBusConnectionPrivate *con) : con(con) {}
-+
-+public slots:
-+ void execute()
-+ {
-+ con->setDispatchEnabled(true);
-+ if (!con->ref.deref())
-+ con->deleteLater();
-+ deleteLater();
-+ }
-+};
-+
- #endif // QT_BOOTSTRAPPED
-
- QT_END_NAMESPACE
-diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
-index 147966b..878a582 100644
---- a/src/dbus/qdbusintegrator.cpp
-+++ b/src/dbus/qdbusintegrator.cpp
-@@ -309,9 +309,21 @@ static void qDBusNewConnection(DBusServer *server, DBusConnection *connection, v
- // setPeer does the error handling for us
- QDBusErrorInternal error;
- newConnection->setPeer(connection, error);
-+ newConnection->setDispatchEnabled(false);
-
- // this is a queued connection and will resume in the QDBusServer's thread
- emit serverConnection->newServerConnection(newConnection);
-+
-+ // we've disabled dispatching of events, so now we post an event to the
-+ // QDBusServer's thread in order to enable it after the
-+ // QDBusServer::newConnection() signal has been received by the
-+ // application's code
-+ newConnection->ref.ref();
-+ QReadLocker serverLock(&serverConnection->lock);
-+ QDBusConnectionDispatchEnabler *o = new QDBusConnectionDispatchEnabler(newConnection);
-+ QTimer::singleShot(0, o, SLOT(execute()));
-+ if (serverConnection->serverObject)
-+ o->moveToThread(serverConnection->serverObject->thread());
- }
-
- void QDBusConnectionPrivate::_q_newConnection(QDBusConnectionPrivate *newConnection)
-diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp
-index babb270..39d08b4 100644
---- a/src/dbus/qdbusserver.cpp
-+++ b/src/dbus/qdbusserver.cpp
-@@ -97,6 +97,7 @@ QDBusServer::QDBusServer(QObject *parent)
- */
- QDBusServer::~QDBusServer()
- {
-+ QWriteLocker locker(&d->lock);
- if (QDBusConnectionManager::instance()) {
- QMutexLocker locker(&QDBusConnectionManager::instance()->mutex);
- Q_FOREACH (const QString &name, d->serverConnectionNames) {
-@@ -104,6 +105,7 @@ QDBusServer::~QDBusServer()
- }
- d->serverConnectionNames.clear();
- }
-+ d->serverObject = nullptr;
- d->ref.store(0);
- d->deleteLater();
- }
---
-2.8.1
-
diff --git a/debian/patches/fix-scalable-bitmap-factor-caching.patch b/debian/patches/fix-scalable-bitmap-factor-caching.patch
deleted file mode 100644
index b41a0a4..0000000
--- a/debian/patches/fix-scalable-bitmap-factor-caching.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From 267c01390544ba12f81783c8b0e37ed38db231d6 Mon Sep 17 00:00:00 2001
-From: Michael Sheldon <elleo at gnu.org>
-Date: Thu, 26 May 2016 16:20:33 +0100
-Subject: [PATCH] Preserve the scale of fonts when caching the font engine
-
-Associates the scalableBitmapFactor with the freetype QFontEngine
-so that it is preserved when caching the engine
-
-Task-number: QTBUG-53652
-Change-Id: I010f9d235ccf30679b112e0c05e01bc247a3693f
-Reviewed-by: jian liang <jianliang79 at gmail.com>
-Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
----
- src/gui/text/qfontengine_ft.cpp | 36 ++++++++++++++++++------------------
- src/gui/text/qfontengine_ft_p.h | 4 ++--
- 2 files changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
-index e89522f..26ed81a 100644
---- a/src/gui/text/qfontengine_ft.cpp
-+++ b/src/gui/text/qfontengine_ft.cpp
-@@ -259,7 +259,6 @@ QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id,
- newFreetype->ref.store(1);
- newFreetype->xsize = 0;
- newFreetype->ysize = 0;
-- newFreetype->scalableBitmapScaleFactor = 1;
- newFreetype->matrix.xx = 0x10000;
- newFreetype->matrix.yy = 0x10000;
- newFreetype->matrix.xy = 0;
-@@ -335,10 +334,11 @@ void QFreetypeFace::release(const QFontEngine::FaceId &face_id)
- }
-
-
--void QFreetypeFace::computeSize(const QFontDef &fontDef, int *xsize, int *ysize, bool *outline_drawing)
-+void QFreetypeFace::computeSize(const QFontDef &fontDef, int *xsize, int *ysize, bool *outline_drawing, QFixed *scalableBitmapScaleFactor)
- {
- *ysize = qRound(fontDef.pixelSize * 64);
- *xsize = *ysize * fontDef.stretch / 100;
-+ *scalableBitmapScaleFactor = 1;
- *outline_drawing = false;
-
- if (!(face->face_flags & FT_FACE_FLAG_SCALABLE)) {
-@@ -376,7 +376,7 @@ void QFreetypeFace::computeSize(const QFontDef &fontDef, int *xsize, int *ysize,
- // to make sure we can select the desired bitmap strike index
- if (FT_Select_Size(face, best) == 0) {
- if (isScalableBitmap())
-- scalableBitmapScaleFactor = QFixed::fromReal((qreal)fontDef.pixelSize / face->available_sizes[best].height);
-+ *scalableBitmapScaleFactor = QFixed::fromReal((qreal)fontDef.pixelSize / face->available_sizes[best].height);
- *xsize = face->available_sizes[best].x_ppem;
- *ysize = face->available_sizes[best].y_ppem;
- } else {
-@@ -729,7 +729,7 @@ bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format,
- symbol = bool(fontDef.family.contains(QLatin1String("symbol"), Qt::CaseInsensitive));
- }
-
-- freetype->computeSize(fontDef, &xsize, &ysize, &defaultGlyphSet.outline_drawing);
-+ freetype->computeSize(fontDef, &xsize, &ysize, &defaultGlyphSet.outline_drawing, &scalableBitmapScaleFactor);
-
- FT_Face face = lockFace();
-
-@@ -1294,24 +1294,24 @@ int QFontEngineFT::synthesized() const
- QFixed QFontEngineFT::ascent() const
- {
- QFixed v = QFixed::fromFixed(metrics.ascender);
-- if (freetype->scalableBitmapScaleFactor != 1)
-- v *= freetype->scalableBitmapScaleFactor;
-+ if (scalableBitmapScaleFactor != 1)
-+ v *= scalableBitmapScaleFactor;
- return v;
- }
-
- QFixed QFontEngineFT::descent() const
- {
- QFixed v = QFixed::fromFixed(-metrics.descender);
-- if (freetype->scalableBitmapScaleFactor != 1)
-- v *= freetype->scalableBitmapScaleFactor;
-+ if (scalableBitmapScaleFactor != 1)
-+ v *= scalableBitmapScaleFactor;
- return v;
- }
-
- QFixed QFontEngineFT::leading() const
- {
- QFixed v = QFixed::fromFixed(metrics.height - metrics.ascender + metrics.descender);
-- if (freetype->scalableBitmapScaleFactor != 1)
-- v *= freetype->scalableBitmapScaleFactor;
-+ if (scalableBitmapScaleFactor != 1)
-+ v *= scalableBitmapScaleFactor;
- return v;
- }
-
-@@ -1326,7 +1326,7 @@ QFixed QFontEngineFT::xHeight() const
- return answer;
- }
- } else {
-- return QFixed(freetype->face->size->metrics.y_ppem) * freetype->scalableBitmapScaleFactor;
-+ return QFixed(freetype->face->size->metrics.y_ppem) * scalableBitmapScaleFactor;
- }
- return QFontEngine::xHeight();
- }
-@@ -1352,8 +1352,8 @@ QFixed QFontEngineFT::averageCharWidth() const
- qreal QFontEngineFT::maxCharWidth() const
- {
- QFixed max_advance = QFixed::fromFixed(metrics.max_advance);
-- if (freetype->scalableBitmapScaleFactor != 1)
-- max_advance *= freetype->scalableBitmapScaleFactor;
-+ if (scalableBitmapScaleFactor != 1)
-+ max_advance *= scalableBitmapScaleFactor;
- return max_advance.toReal();
- }
-
-@@ -1639,7 +1639,7 @@ bool QFontEngineFT::shouldUseDesignMetrics(QFontEngine::ShaperFlags flags) const
-
- QFixed QFontEngineFT::scaledBitmapMetrics(QFixed m) const
- {
-- return m * freetype->scalableBitmapScaleFactor;
-+ return m * scalableBitmapScaleFactor;
- }
-
- glyph_metrics_t QFontEngineFT::scaledBitmapMetrics(const glyph_metrics_t &m) const
-@@ -1677,8 +1677,8 @@ void QFontEngineFT::recalcAdvances(QGlyphLayout *glyphs, QFontEngine::ShaperFlag
- delete g;
- }
-
-- if (freetype->scalableBitmapScaleFactor != 1)
-- glyphs->advances[i] *= freetype->scalableBitmapScaleFactor;
-+ if (scalableBitmapScaleFactor != 1)
-+ glyphs->advances[i] *= scalableBitmapScaleFactor;
- }
- if (face)
- unlockFace();
-@@ -1981,9 +1981,9 @@ QImage QFontEngineFT::bitmapForGlyph(glyph_t g, QFixed subPixelPosition, const Q
- else if (defaultFormat == GlyphFormat::Format_Mono)
- img = QImage(glyph->data, glyph->width, glyph->height, QImage::Format_Mono).copy();
-
-- if (!img.isNull() && (!t.isIdentity() || freetype->scalableBitmapScaleFactor != 1)) {
-+ if (!img.isNull() && (!t.isIdentity() || scalableBitmapScaleFactor != 1)) {
- QTransform trans(t);
-- const qreal scaleFactor = freetype->scalableBitmapScaleFactor.toReal();
-+ const qreal scaleFactor = scalableBitmapScaleFactor.toReal();
- trans.scale(scaleFactor, scaleFactor);
- img = img.transformed(trans, Qt::SmoothTransformation);
- }
-diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
-index 3f4bf84..3cdf0cd 100644
---- a/src/gui/text/qfontengine_ft_p.h
-+++ b/src/gui/text/qfontengine_ft_p.h
-@@ -75,7 +75,7 @@ class QFontconfigDatabase;
- class QFreetypeFace
- {
- public:
-- void computeSize(const QFontDef &fontDef, int *xsize, int *ysize, bool *outline_drawing);
-+ void computeSize(const QFontDef &fontDef, int *xsize, int *ysize, bool *outline_drawing, QFixed *scalableBitmapScaleFactor);
- QFontEngine::Properties properties() const;
- bool getSfntTable(uint tag, uchar *buffer, uint *length) const;
-
-@@ -96,7 +96,6 @@ public:
- FT_Face face;
- int xsize; // 26.6
- int ysize; // 26.6
-- QFixed scalableBitmapScaleFactor;
- FT_Matrix matrix;
- FT_CharMap unicode_map;
- FT_CharMap symbol_map;
-@@ -340,6 +339,7 @@ private:
-
- FT_Size_Metrics metrics;
- mutable bool kerning_pairs_loaded;
-+ QFixed scalableBitmapScaleFactor;
- };
-
- inline uint qHash(const QFontEngineFT::GlyphAndSubPixelPosition &g)
---
-2.7.4
-
diff --git a/debian/patches/series b/debian/patches/series
index c279db0..1ae72ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,10 +2,6 @@
qsettings_simplify_logic.diff
qsettings_XDG_CONFIG_DIRS.diff
no_dbus_dependency.diff
-fix-scalable-bitmap-factor-caching.patch
-xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
-#QDBusServer-delay-processing-of-D-Bus-messages.patch
-Make-sure-connection-is-not-null-before-using-it.patch
# Debian specific.
gnukfreebsd.diff
diff --git a/debian/patches/xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch b/debian/patches/xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
deleted file mode 100644
index c1001a4..0000000
--- a/debian/patches/xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 3d621af54be7b34e6cc6357b48c4d15f911937ee Mon Sep 17 00:00:00 2001
-From: Urs Fleisch <ufleisch at users.sourceforge.net>
-Date: Sun, 15 May 2016 16:56:40 +0200
-Subject: [PATCH] xcb: Send also "text/plain" when a "text/uri-list" is
- dropped.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This will allow dropping of files from Qt applications to applications
-like Skype, which only accept "text/plain", but not "text/uri-list" or
-"text/x-moz-url".
-
-Task-number: QTBUG-53238
-Change-Id: I01bca5c8e20647cedfc9323f542ab07f0cc48658
-Reviewed-by: Dmitry Shachnev <mitya57 at gmail.com>
-Reviewed-by: Błażej Szczygieł <spaz16 at wp.pl>
-Reviewed-by: Gatis Paeglis <gatis.paeglis at qt.io>
----
- src/plugins/platforms/xcb/qxcbmime.cpp | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbmime.cpp b/src/plugins/platforms/xcb/qxcbmime.cpp
-index 7fea068..cc90da3 100644
---- a/src/plugins/platforms/xcb/qxcbmime.cpp
-+++ b/src/plugins/platforms/xcb/qxcbmime.cpp
-@@ -125,6 +125,11 @@ bool QXcbMime::mimeDataForAtom(QXcbConnection *connection, xcb_atom_t a, QMimeDa
- ret = true;
- } else if ((a == XCB_ATOM_PIXMAP || a == XCB_ATOM_BITMAP) && mimeData->hasImage()) {
- ret = true;
-+ } else if (atomName == QLatin1String("text/plain")
-+ && mimeData->hasFormat(QLatin1String("text/uri-list"))) {
-+ // Return URLs also as plain text.
-+ *data = QInternalMimeData::renderDataHelper(atomName, mimeData);
-+ ret = true;
- }
- return ret;
- }
-@@ -143,8 +148,10 @@ QVector<xcb_atom_t> QXcbMime::mimeAtomsForFormat(QXcbConnection *connection, con
- }
-
- // special cases for uris
-- if (format == QLatin1String("text/uri-list"))
-+ if (format == QLatin1String("text/uri-list")) {
- atoms.append(connection->internAtom("text/x-moz-url"));
-+ atoms.append(connection->internAtom("text/plain"));
-+ }
-
- //special cases for images
- if (format == QLatin1String("image/ppm"))
---
-2.8.1
-
--
qtbase packaging
More information about the pkg-kde-commits
mailing list