From 17e2a46e89d856bec7e597c269fd3e214d87a54c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 4 Jul 2018 23:46:51 +1000
Subject: [PATCH] GoldenDict: fix build for gcc7 and ffmpeg4

---
 .../goldendict/goldendict-1.5.0rc2.recipe     |  3 +-
 .../patches/goldendict-1.5.0rc2.patchset      | 76 ++++++++++++++++++-
 2 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/app-text/goldendict/goldendict-1.5.0rc2.recipe b/app-text/goldendict/goldendict-1.5.0rc2.recipe
index 568a115c4..6b4316b43 100644
--- a/app-text/goldendict/goldendict-1.5.0rc2.recipe
+++ b/app-text/goldendict/goldendict-1.5.0rc2.recipe
@@ -8,7 +8,7 @@ accents or correct case."
 HOMEPAGE="http://goldendict.org/"
 COPYRIGHT="2008-2016 Konstantiv Isakov"
 LICENSE="GNU GPL v3"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz"
 CHECKSUM_SHA256="bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde"
 SOURCE_DIR="goldendict-1.5.0-RC2"
@@ -29,6 +29,7 @@ REQUIRES="
 	lib:libavformat$secondaryArchSuffix
 	lib:libavutil$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
+	lib:libexecinfo$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libhunspell_1.6$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
diff --git a/app-text/goldendict/patches/goldendict-1.5.0rc2.patchset b/app-text/goldendict/patches/goldendict-1.5.0rc2.patchset
index 16082a9ac..eb2ae00fa 100644
--- a/app-text/goldendict/patches/goldendict-1.5.0rc2.patchset
+++ b/app-text/goldendict/patches/goldendict-1.5.0rc2.patchset
@@ -1,11 +1,11 @@
-From f5b6f4c4cb4bea8b1144f8f8a6d10ebe07466541 Mon Sep 17 00:00:00 2001
+From cc931443433db7d12619cb8371bac8757bad857c Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Tue, 8 Aug 2017 11:27:18 +0300
 Subject: Haiku patch
 
 
 diff --git a/goldendict.pro b/goldendict.pro
-index 9ba9e69..e8e2300 100644
+index 9ba9e69..4ccdeb4 100644
 --- a/goldendict.pro
 +++ b/goldendict.pro
 @@ -138,7 +138,19 @@ win32 {
@@ -92,7 +92,7 @@ index a27873e..e2bdf22 100644
  
    /// Emitted from the thread
 diff --git a/keyboardstate.cc b/keyboardstate.cc
-index 29c986f..18dd949 100644
+index 29c986f..f3787d7 100644
 --- a/keyboardstate.cc
 +++ b/keyboardstate.cc
 @@ -40,6 +40,7 @@ bool KeyboardState::checkModifiersPressed( int mask )
@@ -138,5 +138,73 @@ index cf31e63..91f799e 100644
      // Make hunspells
      {
 -- 
-2.13.1
+2.16.4
+
+
+From afd589bf531c2509c57a0c437ca1fdb4546ff53b Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 4 Jul 2018 23:37:22 +1000
+Subject: Fix build for gcc7
+
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index 04c35d8..7e803d1 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -143,7 +143,7 @@ bool DecoderContext::openCodec( QString & errorString )
+     return false;
+   }
+ 
+-  unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
++  unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
+   if ( !avioBuffer )
+   {
+     errorString = QObject::tr( "av_malloc() failed." );
+@@ -380,7 +380,7 @@ bool DecoderContext::play( QString & errorString )
+   }
+ 
+   if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
+-       codecContext_->codec->capabilities & CODEC_CAP_DELAY )
++       codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY )
+   {
+     av_init_packet( &packet );
+     int gotFrame = 0;
+diff --git a/fulltextsearch.hh b/fulltextsearch.hh
+index cedeed6..36e5ce4 100644
+--- a/fulltextsearch.hh
++++ b/fulltextsearch.hh
+@@ -6,6 +6,7 @@
+ #include <QRegExp>
+ #include <QAbstractListModel>
+ #include <QList>
++#include <QAction>
+ 
+ #include "dictionary.hh"
+ #include "ui_fulltextsearch.h"
+diff --git a/groups_widgets.hh b/groups_widgets.hh
+index ce442fa..ce21c32 100644
+--- a/groups_widgets.hh
++++ b/groups_widgets.hh
+@@ -10,6 +10,7 @@
+ 
+ #include <QListWidget>
+ #include <QSortFilterProxyModel>
++#include <QAction>
+ 
+ #include "config.hh"
+ #include "dictionary.hh"
+diff --git a/initializing.cc b/initializing.cc
+index 0db6909..f467925 100644
+--- a/initializing.cc
++++ b/initializing.cc
+@@ -3,6 +3,7 @@
+ 
+ #include "initializing.hh"
+ #include <QCloseEvent>
++#include <QIcon>
+ 
+ #if ( QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) ) && defined( Q_OS_WIN32 )
+ #include <QtWidgets/QStyleFactory>
+-- 
+2.16.4