diff --git a/app-text/goldendict/goldendict-1.5.0rc2.recipe b/app-text/goldendict/goldendict-1.5.0rc2.recipe index 6b4316b43..a61980033 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="5" +REVISION="6" SOURCE_URI="https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz" CHECKSUM_SHA256="bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde" SOURCE_DIR="goldendict-1.5.0-RC2" @@ -31,7 +31,7 @@ REQUIRES=" lib:libbz2$secondaryArchSuffix lib:libexecinfo$secondaryArchSuffix lib:libGL$secondaryArchSuffix - lib:libhunspell_1.6$secondaryArchSuffix + lib:libhunspell_1.7$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:liblzo2$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix @@ -59,7 +59,7 @@ BUILD_REQUIRES=" devel:libbz2$secondaryArchSuffix devel:libexecinfo$secondaryArchSuffix devel:libGL$secondaryArchSuffix - devel:libhunspell_1.6$secondaryArchSuffix + devel:libhunspell_1.7$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:liblzo2$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix @@ -79,6 +79,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix cmd:qmake$secondaryArchSuffix >= 5 diff --git a/app-text/goldendict/patches/goldendict-1.5.0rc2.patchset b/app-text/goldendict/patches/goldendict-1.5.0rc2.patchset index 651eed881..b475301a4 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 b7d662630d522150ccf3aaffcb355b9023a74db1 Mon Sep 17 00:00:00 2001 +From ae6e135d9b91d12dc385e7980e5f516dc1676e15 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Tue, 8 Aug 2017 11:27:18 +0300 Subject: Haiku patch diff --git a/goldendict.pro b/goldendict.pro -index 9ba9e69..4ccdeb4 100644 +index 9ba9e69..2f427a5 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -138,7 +138,19 @@ win32 { @@ -19,7 +19,7 @@ index 9ba9e69..4ccdeb4 100644 + -lavformat \ + -lavcodec \ + -lao \ -+ -lhunspell-1.6 \ ++ -lhunspell-1.7 \ + -lvorbisfile \ + -lexecinfo + @@ -138,10 +138,10 @@ index cf31e63..91f799e 100644 // Make hunspells { -- -2.19.1 +2.21.0 -From 11598184c6b085b9803b9004b0a2a6fcf6ca22b5 Mon Sep 17 00:00:00 2001 +From 72200cd030b200514f4904dc8d7bc08e501581e2 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 @@ -206,17 +206,17 @@ index 0db6909..f467925 100644 #if ( QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) ) && defined( Q_OS_WIN32 ) #include -- -2.19.1 +2.21.0 -From 0e39b7226b93c5b919b303db904294c84f5e1295 Mon Sep 17 00:00:00 2001 +From 44f27246ddb4947bca977c248037742ba9f4bbff Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 29 Oct 2018 22:41:18 +0000 Subject: Fix config path diff --git a/config.cc b/config.cc -index 9b27b31..4ef5b05 100644 +index 9b27b31..318ac9c 100644 --- a/config.cc +++ b/config.cc @@ -37,6 +37,8 @@ namespace @@ -229,5 +229,31 @@ index 9b27b31..4ef5b05 100644 char const * pathInHome = ".goldendict"; #endif -- -2.19.1 +2.21.0 + + +From ce0ce7bb4e3617a6a53d92f064acb84e3d52c4a4 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Thu, 15 Aug 2019 10:20:22 +0200 +Subject: Fix path to the myspell dictionaries + + +diff --git a/config.cc b/config.cc +index 318ac9c..a9d047c 100644 +--- a/config.cc ++++ b/config.cc +@@ -346,6 +346,11 @@ Class load() throw( exError ) + if ( QDir( "/usr/share/myspell/dicts" ).exists() ) + c.hunspell.dictionariesPath = "/usr/share/myspell/dicts"; + ++ #elif defined(Q_OS_HAIKU) ++ ++ if ( QDir( "/system/data/hunspell" ).exists() ) ++ c.hunspell.dictionariesPath = "/system/data/hunspell"; ++ + #endif + + #ifdef Q_OS_WIN32 +-- +2.21.0