[SCM] vlc/master: Add drop-check-qt-check.patch: to ignore check qt version. * debian/control: Bump qtbase5-dev version.

[mati75-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0274c083ef621ff8d078c2b53b49518a64ae58ce
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Fri Apr 29 11:03:54 2016 +0200

    Add drop-check-qt-check.patch: to ignore check qt version.
      * debian/control: Bump qtbase5-dev version.

diff --git a/debian/changelog b/debian/changelog
index 2c28c66..36ad2ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ vlc (2.2.3-1) UNRELEASED; urgency=medium
     - Remove qt4-Fix-resume-where-you-left-off.patch,
       qt4-input_manager-Always-reset-lastURI-when-stopping.patch,
       avcodec-pass-consistent-dimensions-to-hardware-decod.patch: included upstream.
+    - Add drop-check-qt-check.patch: to ignore check qt version.
+  * debian/control: Bump qtbase5-dev version.
 
  -- Mateusz Łukasik <mati75 at linuxmint.pl>  Fri, 29 Apr 2016 08:45:23 +0200
 
diff --git a/debian/control b/debian/control
index 4b897c3..ce6c610 100644
--- a/debian/control
+++ b/debian/control
@@ -118,7 +118,7 @@ Build-Depends: autopoint,
                oss4-dev [kfreebsd-any],
                pkg-config,
                python3,
-               qtbase5-dev (>= 5.1),
+               qtbase5-dev (>= 5.5.1),
                zlib1g-dev,
                zsh,
 # for embedded ffmpeg
diff --git a/debian/patches/drop-check-qt-check.patch b/debian/patches/drop-check-qt-check.patch
new file mode 100644
index 0000000..dc6c98a
--- /dev/null
+++ b/debian/patches/drop-check-qt-check.patch
@@ -0,0 +1,16 @@
+Description: Drop check for qt version.
+Author: Mateusz Łukasik <mati75 at linuxmint.pl>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -3754,10 +3754,6 @@ AS_IF([test "${enable_qt}" != "no"], [
+           AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
+       ])
+ 
+-      PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
+-        AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
+-      ])
+-
+       QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
+       QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
+       AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
diff --git a/debian/patches/series b/debian/patches/series
index 6b3c93e..07a578e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 frenchtv-links.patch
 zsh-completion.patch
 fix-translation.patch
+drop-check-qt-check.patch

-- 
VLC media player packaging