[SCM] vlc/master: Drop obsolete patch
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Tue Nov 1 11:40:59 UTC 2016
The following commit has been merged in the master branch:
commit 97a831595933d63fbd4ec98d7c615d8fbc640400
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Tue Nov 1 12:38:33 2016 +0100
Drop obsolete patch
diff --git a/debian/patches/drop-check-qt-check.patch b/debian/patches/drop-check-qt-check.patch
deleted file mode 100644
index dc6c98a..0000000
--- a/debian/patches/drop-check-qt-check.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 9b43cdd..0343604 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
fix-translation.patch
-drop-check-qt-check.patch
generated-mimetypes.patch
vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch
vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list