[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-3-9-g07c3ced

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 07c3ced3fb370c2bbdf52de133009b56d6983302
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Oct 28 16:48:33 2015 +0300

    Rename the patch to a more readable name, and refresh it.
    
    The previous name also had an error: the "not" in "do not hide/show" was incorrect.
---
 debian/changelog                                                   | 3 +--
 debian/patches/series                                              | 2 +-
 ...idgets.patch => set_WA_OutsideWSRange_for_native_widgets.patch} | 7 +------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a4c8f6..4e80ea7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
 qtbase-opensource-src (5.5.1+dfsg-5) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Add upstream's
-    qtwidgets_do_not-hide_show_via_WA_OutsideWSRange_for_native_widgets.patch
+  * Add upstream's set_WA_OutsideWSRange_for_native_widgets.patch
     to avoid invalidating the backing store (Closes: #798661).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 28 Oct 2015 09:54:53 -0300
diff --git a/debian/patches/series b/debian/patches/series
index 9498875..c1c5afc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
 # Backported stuff
 Fix-compile-error-on-big-endian.patch
 set_positionautomatic.diff
-qtwidgets_do_not-hide_show_via_WA_OutsideWSRange_for_native_widgets.patch
+set_WA_OutsideWSRange_for_native_widgets.patch
 
 # To be forwarded upstream
 bsd_volumeinfo.diff
diff --git a/debian/patches/qtwidgets_do_not-hide_show_via_WA_OutsideWSRange_for_native_widgets.patch b/debian/patches/set_WA_OutsideWSRange_for_native_widgets.patch
similarity index 82%
rename from debian/patches/qtwidgets_do_not-hide_show_via_WA_OutsideWSRange_for_native_widgets.patch
rename to debian/patches/set_WA_OutsideWSRange_for_native_widgets.patch
index 45fa7df..66ec649 100644
--- a/debian/patches/qtwidgets_do_not-hide_show_via_WA_OutsideWSRange_for_native_widgets.patch
+++ b/debian/patches/set_WA_OutsideWSRange_for_native_widgets.patch
@@ -15,11 +15,9 @@ Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c
  src/widgets/kernel/qwidget.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
-index 7734715..4286130 100644
 --- a/src/widgets/kernel/qwidget.cpp
 +++ b/src/widgets/kernel/qwidget.cpp
-@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
+@@ -7149,7 +7149,7 @@
  
      bool needsShow = false;
  
@@ -28,6 +26,3 @@ index 7734715..4286130 100644
          if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) {
              q->setAttribute(Qt::WA_OutsideWSRange, true);
              if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
--- 
-2.1.4
-

-- 
qtbase packaging