[neon/qt/qtbase/Neon/testing] debian: Build with libxcb-util-dev 0.4.0 which Debian now has.

[Dmitry Shachnev]

Git commit 994bb2846dfd521a7ce2c62b6ed48367e0b26ab1 by Dmitry Shachnev.
Committed on 01/12/2020 at 18:13.
Pushed by sitter into branch 'Neon/testing'.

Build with libxcb-util-dev 0.4.0 which Debian now has.

Drop loosen_xcb-util_requirement.diff, no longer needed.

M  +4    -0    debian/changelog
M  +1    -1    debian/control
D  +0    -24   debian/patches/loosen_xcb-util_requirement.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/994bb2846dfd521a7ce2c62b6ed48367e0b26ab1

diff --git a/debian/changelog b/debian/changelog
index 37d4943..2c42beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ qtbase-opensource-src (5.15.2+dfsg-2) UNRELEASED; urgency=medium
   * Backport upstream patch xcb_screens_uaf.patch in order to fix
     use-after-free in the xcb plugin.
 
+  [ Dmitry Shachnev ]
+  * Build with libxcb-util-dev 0.4.0 which Debian now has.
+    - Drop loosen_xcb-util_requirement.diff, no longer needed.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 23 Nov 2020 15:10:47 -0300
 
 qtbase-opensource-src (5.15.2+dfsg-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 71344a3..358b998 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Build-Depends: debhelper-compat (= 13),
                libxcb-shape0-dev,
                libxcb-shm0-dev,
                libxcb-sync-dev,
-               libxcb-util0-dev,
+               libxcb-util-dev,
                libxcb-xfixes0-dev,
                libxcb-xinerama0-dev,
                libxcb-xinput-dev,
diff --git a/debian/patches/loosen_xcb-util_requirement.diff b/debian/patches/loosen_xcb-util_requirement.diff
deleted file mode 100644
index 77e9571..0000000
--- a/debian/patches/loosen_xcb-util_requirement.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: loosen xcb-util requirement to 0.3.8
- Debian has an ancient version, but there are no major changes between
- 0.3.8 and 0.3.9.
- .
- Drop this patch when https://bugs.debian.org/975259 is fixed.
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-needed
-Last-Update: 2020-11-19
-
---- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -602,10 +602,10 @@
-             "use": "xcb"
-         },
-         "xcb_util": {
--            "label": "XCB Util >= 0.3.9",
-+            "label": "XCB Util >= 0.3.8",
-             "headers": "xcb/xcb_util.h",
-             "sources": [
--                { "type": "pkgConfig", "args": "xcb-util >= 0.3.9" },
-+                { "type": "pkgConfig", "args": "xcb-util >= 0.3.8" },
-                 "-lxcb-util"
-             ],
-             "use": "xcb"
diff --git a/debian/patches/series b/debian/patches/series
index 207c382..fa92882 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,3 @@ qdoc_default_incdirs.diff
 path_max.diff
 qstorageinfo_linux.diff
 cross_build_mysql.diff
-loosen_xcb-util_requirement.diff