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

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Wed Jan 6 14:24:24 UTC 2016


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

The following commit has been merged in the master branch:
commit ce966091a5ef8a5fafbc1fce9eaf9d3e6c232912
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jan 6 11:17:52 2016 -0300

    Refresh patches.
---
 debian/changelog                                              |  1 +
 .../patches/Fix-crash-on-exit-caused-by-QStringLiterals.patch | 11 +++--------
 .../xcb_dont_select_XInput_events_on_root_window.patch        |  9 ++-------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a6ffb0..056e236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtbase-opensource-src (5.5.1+dfsg-12) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Backport xcb_dont_select_XInput_events_on_root_window.patch
     (Closes: #807528).
+  * Refresh patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Jan 2016 11:10:50 -0300
 
diff --git a/debian/patches/Fix-crash-on-exit-caused-by-QStringLiterals.patch b/debian/patches/Fix-crash-on-exit-caused-by-QStringLiterals.patch
index b0cdb4c..e73885e 100644
--- a/debian/patches/Fix-crash-on-exit-caused-by-QStringLiterals.patch
+++ b/debian/patches/Fix-crash-on-exit-caused-by-QStringLiterals.patch
@@ -12,14 +12,12 @@ Reviewed-by: Albert Astals Cid <aacid at kde.org>
 Reviewed-by: Richard J. Moore <rich at kde.org>
 Reviewed-by: Frederik Gladhorn <frederik.gladhorn at theqtcompany.com>
 ---
- src/platformsupport/linuxaccessibility/dbusconnection.cpp | 9 ++++++---
+ src/platformsupport/linuxaccessibility/dbusconnection.cpp |    9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
-diff --git a/src/platformsupport/linuxaccessibility/dbusconnection.cpp b/src/platformsupport/linuxaccessibility/dbusconnection.cpp
-index 637b065..ae1ba18 100644
 --- a/src/platformsupport/linuxaccessibility/dbusconnection.cpp
 +++ b/src/platformsupport/linuxaccessibility/dbusconnection.cpp
-@@ -47,8 +47,11 @@
+@@ -44,8 +44,11 @@
  
  QT_BEGIN_NAMESPACE
  
@@ -33,7 +31,7 @@ index 637b065..ae1ba18 100644
  
  /*!
      
-- 
qtbase packaging



More information about the pkg-kde-commits mailing list