[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: qt: Backport a patch to fix compiling with latest libc++

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch 3.0.x at VideoLAN / VLC


Commits:
c4150b4d by Martin Storsjö at 2022-06-28T18:54:59+03:00
contrib: qt: Backport a patch to fix compiling with latest libc++

The class std::unary_function was deprecated in C++11 and is removed
in C++17. The latest libc++ has caught up with this and now hides
this class when building in C++17 or C++20 mode.

Backport a patch from Qt v5.11.1 that removes usage of this class.

- - - - -


2 changed files:

- + contrib/src/qt/0014-QtTest-compile-in-C-17-mode-no-more-std-unary_functi.patch
- contrib/src/qt/rules.mak


Changes:

=====================================
contrib/src/qt/0014-QtTest-compile-in-C-17-mode-no-more-std-unary_functi.patch
=====================================
@@ -0,0 +1,29 @@
+From b2d7268a3e0725b282c9c5b798778489713b679d Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira at intel.com>
+Date: Tue, 8 May 2018 10:54:24 -0700
+Subject: [PATCH 14/14] QtTest: compile in C++17 mode: no more
+ std::unary_function
+
+Change-Id: I5d0ee9389a794d80983efffd152cbce4da448ddf
+Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart at woboq.com>
+Backport-Of: 2c93ff91bebaffec5d1adc6575521f0d4507fe8a (v5.11.1)
+---
+ src/testlib/qtesttable.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/testlib/qtesttable.cpp b/src/testlib/qtesttable.cpp
+index 05cce37a47..4e50089898 100644
+--- a/src/testlib/qtesttable.cpp
++++ b/src/testlib/qtesttable.cpp
+@@ -132,7 +132,7 @@ QTestData *QTestTable::testData(int index) const
+     return size_t(index) < d->dataList.size() ? d->dataList[index] : Q_NULLPTR;
+ }
+ 
+-class NamePredicate : public std::unary_function<QTestTablePrivate::Element, bool>
++class NamePredicate
+ {
+ public:
+     explicit NamePredicate(const char *needle) : m_needle(needle) {}
+-- 
+2.25.1
+


=====================================
contrib/src/qt/rules.mak
=====================================
@@ -35,6 +35,7 @@ qt: qt-$(QT_VERSION).tar.xz .sum-qt
 	$(APPLY) $(SRC)/qt/0011-qCount-Leading-Trailing-ZeroBits-Use-__builtin_clzs-.patch
 	$(APPLY) $(SRC)/qt/0012-Remove-_bit_scan_-forward-reverse.patch
 	$(APPLY) $(SRC)/qt/0013-qsimd-Fix-compilation-with-trunk-clang-for-mingw.patch
+	$(APPLY) $(SRC)/qt/0014-QtTest-compile-in-C-17-mode-no-more-std-unary_functi.patch
 	$(APPLY) $(SRC)/qt/systray-no-sound.patch
 	$(MOVE)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/c4150b4d03467d336aa7590efd501bee51d7042e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/c4150b4d03467d336aa7590efd501bee51d7042e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance