diff options
| author |   Larry Hajali <larryhaja@gmail.com> | 2017-01-25 09:31:13 -0800 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-01-28 07:38:31 +0700 |
| commit | 468a62df1534c8975ceb9ad0cbf16eade5b5a376 (patch) | |
| tree | 4b73bed3ae61b271f63949c1f4d9e4acdfe30be7 /multimedia/mlt/qt5-5.7.patch | |
| parent | b67bfa3061ae49cc101c96e5ea3e466eb139df32 (diff) | |
| download | slackbuilds-468a62df1534c8975ceb9ad0cbf16eade5b5a376.tar.gz slackbuilds-468a62df1534c8975ceb9ad0cbf16eade5b5a376.tar.xz | |
multimedia/mlt: fix build against Qt 5.7.1
Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
Diffstat (limited to '')
| -rw-r--r-- | multimedia/mlt/qt5-5.7.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/multimedia/mlt/qt5-5.7.patch b/multimedia/mlt/qt5-5.7.patch new file mode 100644 index 0000000000..69706ccbc0 --- /dev/null +++ b/multimedia/mlt/qt5-5.7.patch @@ -0,0 +1,27 @@ +From 053204f4a243559644af2c47ae9895810685cb5a Mon Sep 17 00:00:00 2001 +From: Dan Dennedy <dan@dennedy.org> +Date: Sun, 8 Jan 2017 10:22:33 -0800 +Subject: [PATCH] Only use --std=c++11 CXXFLAG for g++. + +The addition of --std=c++11 breaks build on my OS X 10.8 build agent, +which uses clang version "Apple LLVM version 8.0.0 (clang-800.0.42.1)" +--- + src/modules/qt/Makefile | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/modules/qt/Makefile b/src/modules/qt/Makefile +index e7b55ae..d88e519 100644 +--- a/src/modules/qt/Makefile ++++ b/src/modules/qt/Makefile +@@ -39,7 +39,11 @@ ifneq ($(targetos), MinGW) + endif + endif + + CXXFLAGS := $(QTCXXFLAGS) $(CXXFLAGS) $(CFLAGS) $(EXIFCXXFLAGS) $(KDECXXFLAGS) -Wno-deprecated ++ ++ifneq (, $(shell $(CXX) --version | grep -is gcc)) ++ CXXFLAGS += --std=c++11 ++endif + + LDFLAGS += $(QTLIBS) $(EXIFLIBS) $(KDELIBS) + |