[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-14-11-gf6b7d98

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=f6b7d98

The following commit has been merged in the master branch:
commit f6b7d98406529a28cf341e74d522295c4b39a27e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Mar 3 20:38:08 2016 +0300

    Refresh all patches.
---
 .../patches/Fix-falsely-reported-style-for-fallback-font.patch   | 7 +------
 .../patches/Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch   | 9 ++-------
 .../Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch   | 7 +------
 .../xcb-fix-yet-another-crash-when-screens-are-disconnec.patch   | 7 +------
 4 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/debian/patches/Fix-falsely-reported-style-for-fallback-font.patch b/debian/patches/Fix-falsely-reported-style-for-fallback-font.patch
index cbd4657..46eb557 100644
--- a/debian/patches/Fix-falsely-reported-style-for-fallback-font.patch
+++ b/debian/patches/Fix-falsely-reported-style-for-fallback-font.patch
@@ -34,11 +34,9 @@ Reviewed-by: Konstantin Ritt <ritt.ks at gmail.com>
  src/gui/text/qfontengine.cpp | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
-index 3208a19..f267b2d 100644
 --- a/src/gui/text/qfontengine.cpp
 +++ b/src/gui/text/qfontengine.cpp
-@@ -1835,7 +1835,10 @@ QFontEngine *QFontEngineMulti::loadEngine(int at)
+@@ -1752,7 +1752,10 @@
      request.family = fallbackFamilyAt(at - 1);
  
      if (QFontEngine *engine = QFontDatabase::findFont(request, m_script)) {
@@ -50,6 +48,3 @@ index 3208a19..f267b2d 100644
          return engine;
      }
  
--- 
-2.6.2
-
diff --git a/debian/patches/Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch b/debian/patches/Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch
index 8227bbc..4a1c007 100644
--- a/debian/patches/Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch
+++ b/debian/patches/Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch
@@ -24,11 +24,9 @@ Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart at woboq.com>
  src/corelib/kernel/qcoreapplication.cpp | 23 ++++++++++++-----------
  1 file changed, 12 insertions(+), 11 deletions(-)
 
-diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
-index e08f709..e9fdb8c 100644
 --- a/src/corelib/kernel/qcoreapplication.cpp
 +++ b/src/corelib/kernel/qcoreapplication.cpp
-@@ -2541,17 +2541,6 @@ QStringList QCoreApplication::libraryPaths()
+@@ -2470,17 +2470,6 @@
      QMutexLocker locker(libraryPathMutex());
      if (!coreappdata()->app_libpaths) {
          QStringList *app_libpaths = coreappdata()->app_libpaths = new QStringList;
@@ -46,7 +44,7 @@ index e08f709..e9fdb8c 100644
  
          const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
          if (!libPathEnv.isEmpty()) {
-@@ -2564,6 +2553,18 @@ QStringList QCoreApplication::libraryPaths()
+@@ -2498,6 +2487,18 @@
                  }
              }
          }
@@ -65,6 +63,3 @@ index e08f709..e9fdb8c 100644
      }
      return *(coreappdata()->app_libpaths);
  }
--- 
-2.6.2
-
diff --git a/debian/patches/Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch b/debian/patches/Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch
index 9cff019..9d448af 100644
--- a/debian/patches/Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch
+++ b/debian/patches/Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch
@@ -27,11 +27,9 @@ Reviewed-by: Konstantin Ritt <ritt.ks at gmail.com>
  src/gui/text/qfontengine.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
-index 6567859..a0eedee 100644
 --- a/src/gui/text/qfontengine.cpp
 +++ b/src/gui/text/qfontengine.cpp
-@@ -961,7 +961,7 @@ QImage QFontEngine::alphaMapForGlyph(glyph_t glyph)
+@@ -875,7 +875,7 @@
      pt.x = -glyph_x;
      pt.y = -glyph_y; // the baseline
      QPainterPath path;
@@ -40,6 +38,3 @@ index 6567859..a0eedee 100644
      im.fill(Qt::transparent);
      QPainter p(&im);
      p.setRenderHint(QPainter::Antialiasing);
--- 
-2.6.2
-
diff --git a/debian/patches/xcb-fix-yet-another-crash-when-screens-are-disconnec.patch b/debian/patches/xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
index 303120e..e5ded03 100644
--- a/debian/patches/xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
+++ b/debian/patches/xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
@@ -13,11 +13,9 @@ Reviewed-by: Laszlo Agocs <laszlo.agocs at theqtcompany.com>
  src/plugins/platforms/xcb/qxcbconnection.cpp | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
-index f65437f..c35b019 100644
 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp
 +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
-@@ -1300,10 +1300,12 @@ void QXcbConnection::sendConnectionEvent(QXcbAtom::Atom a, uint id)
+@@ -1288,10 +1288,12 @@
      memset(&event, 0, sizeof(event));
  
      const xcb_window_t eventListener = xcb_generate_id(m_connection);
@@ -32,6 +30,3 @@ index f65437f..c35b019 100644
  
      event.response_type = XCB_CLIENT_MESSAGE;
      event.format = 32;
--- 
-2.7.0.rc3
-

-- 
qtbase packaging