From 27b3ffea5f833fee9a97c7a41db9141c7643e54d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 24 Jun 2023 17:58:08 +0200
Subject: [PATCH] goldendict: update to 1.5.0.

---
 srcpkgs/goldendict/patches/endian.patch  | 18 ++++++++----------
 srcpkgs/goldendict/patches/ffmpeg4.patch | 21 ---------------------
 srcpkgs/goldendict/template              | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch

diff --git a/srcpkgs/goldendict/patches/endian.patch b/srcpkgs/goldendict/patches/endian.patch
index 2f7264d003e..e0dc17f6a33 100644
--- a/srcpkgs/goldendict/patches/endian.patch
+++ b/srcpkgs/goldendict/patches/endian.patch
@@ -10,16 +10,14 @@ Date:   Sat Jan 4 23:12:59 2020 +0100
 
     This will fail with undefined reference to qbswap<unsigned long>.
 
-diff --git ripemd.cc ripemd.cc
-index bad8fc7..24ac811 100644
---- a/ripemd.cc
-+++ b/ripemd.cc
-@@ -173,7 +173,7 @@ void RIPEMD128::update( const uint8_t * data, size_t len )
+--- goldendict-1.5.0/ripemd.cc	2023-05-29 16:51:31.000000000 +0200
++++ -	2023-06-24 18:02:27.579627739 +0200
+@@ -174,7 +174,7 @@
  
- void RIPEMD128::digest( uint8_t * digest )
+ void RIPEMD128::digest( uchar * digest )
  {
--  uint64_t finalcount = qFromLittleEndian( count << 3 );
-+  uint64_t finalcount = qFromLittleEndian<quint64>( count << 3 );
-   update( (const uint8_t *) "\200", 1 );
+-  quint64 finalcount = qFromLittleEndian( count << 3 );
++  quint64 finalcount = qFromLittleEndian<quint64>( count << 3 );
+   update( (const uchar *) "\200", 1 );
    while ( ( count & 63 ) != 56 )
-     update( ( const uint8_t * ) "", 1 );
+     update( ( const uchar * ) "", 1 );
diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch
deleted file mode 100644
index f045fa27f54..00000000000
--- a/srcpkgs/goldendict/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200
-+++ b/ffmpegaudio.cc      2018-05-09 22:16:50.748322790 +0200
-@@ -143,7 +143,7 @@
-     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 @@
-   }
-
-   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/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index 4544ae710ee..f4a05759f69 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -1,22 +1,25 @@
 # Template file for 'goldendict'
 pkgname=goldendict
-version=1.5.0RC2
-revision=6
+version=1.5.0
+revision=1
 build_style=qmake
-configure_args="CONFIG+=zim_support"
+configure_args="CONFIG+=zim_support goldendict.pro"
 hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="tiff-devel qt5-devel libvorbis-devel zlib-devel
  libXtst-devel hunspell-devel qt5-tools-devel qt5-declarative-devel
  qt5-webkit-devel lzo-devel bzip2-devel libao-devel qt5-svg-devel
- libeb-devel qt5-x11extras-devel ffmpeg-devel liblzma-devel"
+ libeb-devel qt5-x11extras-devel ffmpeg-devel liblzma-devel
+ qt5-multimedia-devel"
 short_desc="A feature-rich dictionary lookup program"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="http://goldendict.org/"
-distfiles="https://github.com/goldendict/goldendict/archive/${version/RC/-RC}.tar.gz"
-checksum=bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde
+distfiles="https://github.com/goldendict/goldendict/archive/${version}.tar.gz"
+checksum=f9f8e068ece74cc026fdc5f56615246228b4e70c97c7197ccd4c14ceae412c7c
 
-CXXFLAGS="-std=c++14 -Wno-deprecated"
+post_patch() {
+	vsed -e '/VERSION/ s/+git//' -i goldendict.pro
+}
 
 post_install() {
 	chmod 644 ${DESTDIR}/usr/share/pixmaps/goldendict.png