From e247b7c5da34f0ec89cc0e61e2732b7407a78112 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 15 May 2019 22:21:56 +0200
Subject: [PATCH] gcc9 compatibility: qca, qscintilla2

---
 src/qca.mk         | 6 ++++--
 src/qscintilla2.mk | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/qca.mk b/src/qca.mk
index bef8d2b1..652236c9 100644
--- a/src/qca.mk
+++ b/src/qca.mk
@@ -22,7 +22,9 @@ define $(PKG)_BUILD
 
     # build test as qmake project
     mkdir '$(BUILD_DIR).test-qmake'
-    cd '$(BUILD_DIR).test-qmake' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qca-test.pro'
+    cd '$(BUILD_DIR).test-qmake' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' \
+        'greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy' \
+        '$(PWD)/src/qca-test.pro'
     $(MAKE) -C '$(BUILD_DIR).test-qmake' -j 1
     $(INSTALL) -m755 '$(BUILD_DIR).test-qmake/$(BUILD_TYPE)/test-qca-qmake.exe' '$(PREFIX)/$(TARGET)/bin/'
 
@@ -35,7 +37,7 @@ define $(PKG)_BUILD
 
     # build test manually
     '$(TARGET)-g++' \
-        -W -Wall -Werror -std=gnu++11 \
+        -W -Wall -Werror -std=gnu++11 -Wno-deprecated-copy \
         '$(PWD)/src/qca-test.cpp' \
         -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \
         $(if $(BUILD_STATIC), -L'$(PREFIX)/$(TARGET)/qt5/plugins/crypto' -lqca-ossl) \
diff --git a/src/qscintilla2.mk b/src/qscintilla2.mk
index f028b6f2..3de36f2a 100644
--- a/src/qscintilla2.mk
+++ b/src/qscintilla2.mk
@@ -26,7 +26,7 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' install
 
     '$(TARGET)-g++' \
-        -W -Wall -Werror -std=c++0x -pedantic \
+        -W -Wall -Werror -std=c++0x -pedantic -Wno-deprecated-copy \
         `'$(TARGET)-pkg-config' Qt5Widgets --cflags` \
         '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-qscintilla2.exe' -lqscintilla2_qt5 \
         `'$(TARGET)-pkg-config' Qt5Widgets --libs`