From 61180d814dccc7099420abbaf50628983e8332de Mon Sep 17 00:00:00 2001
From: Larry Hajali <larryhaja@gmail.com>
Date: Wed, 25 Jan 2017 09:27:36 -0800
Subject: audio/acousticbrainz-gui: fix build against Qt 5.7.1

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
---
 .../acousticbrainz-gui.SlackBuild                  |  5 ++-
 audio/acousticbrainz-gui/qt5-5.7.patch             | 38 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 audio/acousticbrainz-gui/qt5-5.7.patch

(limited to 'audio')

diff --git a/audio/acousticbrainz-gui/acousticbrainz-gui.SlackBuild b/audio/acousticbrainz-gui/acousticbrainz-gui.SlackBuild
index 79f5f50d61..b4b4706631 100644
--- a/audio/acousticbrainz-gui/acousticbrainz-gui.SlackBuild
+++ b/audio/acousticbrainz-gui/acousticbrainz-gui.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=acousticbrainz-gui
 VERSION=${VERSION:-0.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -71,6 +71,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix build issues with qt5 >= 5.7.x.
+patch -p1 < $CWD/qt5-5.7.patch
+
 mkdir -p build
 cd build
   cmake \
diff --git a/audio/acousticbrainz-gui/qt5-5.7.patch b/audio/acousticbrainz-gui/qt5-5.7.patch
new file mode 100644
index 0000000000..bd7e07f673
--- /dev/null
+++ b/audio/acousticbrainz-gui/qt5-5.7.patch
@@ -0,0 +1,38 @@
+From 360aca397ad7230f102542ea3d67af95b7c8829e Mon Sep 17 00:00:00 2001
+From: Wieland Hoffmann <themineo@gmail.com>
+Date: Sun, 31 Jul 2016 15:55:46 +0200
+Subject: [PATCH] Fix build failure on gcc 6
+
+Array initializers for a char array fail for constants > 128
+on platforms where char is signed. Cast to fix it.
+
+This applies commit 632e87969c3a5562a5d4842b03613267ba6236b2 from the
+acoustid-fingerprinter repository.
+---
+ gzip.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/gzip.cpp b/gzip.cpp
+index 2aeaad3..d0b435a 100644
+--- a/gzip.cpp
++++ b/gzip.cpp
+@@ -23,12 +23,12 @@ inline unsigned long calculateCrc32(const QByteArray &data)
+ QByteArray gzipCompress(const QByteArray &data)
+ {
+ 	const char header[10] = {
+-		0x1f, 0x8b,	// ID1 + ID2
++		0x1f, static_cast<char>(0x8b),	// ID1 + ID2
+ 		8,			// Compression Method
+ 		0,			// Flags
+ 		0, 0, 0, 0, // Modification Time
+ 		2,			// Extra Flags
+-		255,		// Operating System
++		static_cast<char>(255),		// Operating System
+ 	};
+ 
+ 	QByteArray compressedData = qCompress(data);
+@@ -42,4 +42,3 @@ QByteArray gzipCompress(const QByteArray &data)
+ 	result.append(render32BitInt(data.size()));
+ 	return result;
+ }
+-
-- 
cgit v1.2.3