From 37d818146a4e7b2f5a6e961c5c00f312220a5f78 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Mon, 15 Aug 2022 14:31:33 +0200 Subject: [PATCH] Rebased to 1064880 snapshot with different bugfixes. --- .gitignore | 1 + goldendict-gcc11.patch | 12 ----- goldendict.spec | 99 ++++++++++++++++++++++-------------------- sources | 2 +- 4 files changed, 53 insertions(+), 61 deletions(-) delete mode 100644 goldendict-gcc11.patch diff --git a/.gitignore b/.gitignore index 3c4f6b6..6ef2804 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ goldendict-415f35e.tar.gz /goldendict-a1c7c5b3762c292c2620af41428c3c6c3f758f04.tar.gz /goldendict-6ca112b797e70774d252b3635d41b4c5d38ea9dd.tar.gz /goldendict-dda311cf9c44ffce7eadf489bfbf7f02d61fa0d4.tar.gz +/goldendict-1064880.tar.gz diff --git a/goldendict-gcc11.patch b/goldendict-gcc11.patch deleted file mode 100644 index d9fb009..0000000 --- a/goldendict-gcc11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/ripemd.cc b/ripemd.cc -index 14dd491..044535f 100644 ---- a/ripemd.cc -+++ b/ripemd.cc -@@ -18,6 +18,7 @@ - - #include "ripemd.hh" - -+#include - #include - #include - diff --git a/goldendict.spec b/goldendict.spec index c3a7446..157c9ab 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,55 +1,55 @@ -%global owner goldendict -%global commit dda311cf9c44ffce7eadf489bfbf7f02d61fa0d4 +%global commit 1064880450a648696dfabdf698fdbeec095604e1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Name: goldendict -Version: 1.5 -Release: 0.34.RC2%{?dist} -Summary: A feature-rich dictionary lookup program -License: GPLv3+ -URL: http://goldendict.org -Source0: https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz -Patch0: goldendict-gcc11.patch - -BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: cmake(Qt5XmlPatterns) -BuildRequires: cmake(Qt5Multimedia) -BuildRequires: cmake(Qt5X11Extras) -BuildRequires: cmake(Qt5Network) -BuildRequires: cmake(Qt5WebKit) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Help) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Xml) - -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: make -BuildRequires: libXtst-devel -BuildRequires: hunspell-devel -BuildRequires: libvorbis-devel -BuildRequires: desktop-file-utils -BuildRequires: phonon-qt5-devel -BuildRequires: bzip2-devel -BuildRequires: lzo-devel -BuildRequires: libtiff-devel -BuildRequires: eb-devel -BuildRequires: qtsingleapplication-qt5-devel -BuildRequires: libappstream-glib -BuildRequires: libzstd-devel - -Requires: qt5-qtsvg%{?_isa} -Recommends: %{name}-docs = %{?epoch:%{epoch}:}%{version}-%{release} +Name: goldendict +Version: 1.5 +Release: 0.35.RC2%{?dist} + +License: GPLv3+ +Summary: A feature-rich dictionary lookup program +URL: http://goldendict.org +Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz + +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Help) +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5Multimedia) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5WebKit) +BuildRequires: cmake(Qt5X11Extras) +BuildRequires: cmake(Qt5Xml) +BuildRequires: cmake(Qt5XmlPatterns) + +BuildRequires: bzip2-devel +BuildRequires: eb-devel +BuildRequires: hunspell-devel +BuildRequires: libXtst-devel +BuildRequires: libtiff-devel +BuildRequires: libvorbis-devel +BuildRequires: libzstd-devel +BuildRequires: lzo-devel +BuildRequires: phonon-qt5-devel +BuildRequires: qtsingleapplication-qt5-devel + +BuildRequires: desktop-file-utils +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libappstream-glib +BuildRequires: make + +Requires: qt5-qtsvg%{?_isa} + +Recommends: %{name}-docs = %{?epoch:%{epoch}:}%{version}-%{release} %description -Goldendict is a feature-rich dictionary lookup program. -The latest release has the following features: -Use of WebKit for an accurate articles' representation; -Support of multiple dictionary file formats; -Support MediaWiki-based sites to perform search; -Scan popup functionality. +GoldenDict is a feature-rich dictionary lookup program, supporting multiple +dictionary formats (StarDict/Babylon/Lingvo/Dictd/AARD/MDict/SDict) and +online dictionaries, featuring perfect article rendering with the complete +markup, illustrations and other content retained, and allowing you to type +in words without any accents or correct case. %package docs Summary: Documentation for %{name} @@ -91,6 +91,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Mon Aug 15 2022 Vitaly Zaitsev - 1.5-0.35.RC2 +- Rebased to 1064880 snapshot with different bugfixes. + * Thu Jul 21 2022 Fedora Release Engineering - 1.5-0.34.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 9171c11..05c8d4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goldendict-dda311cf9c44ffce7eadf489bfbf7f02d61fa0d4.tar.gz) = d583fda2b98a927761d1a6462d193743b696536f10032a48554653f2a72e6f75c1358236cd512ee043efab4faf74cec4c07775bb117c380819369eebc9971ed3 +SHA512 (goldendict-1064880.tar.gz) = 1204f18d82a5933d7b8b0a66df94ded77cecff88eac0d97cf38d229c831d755c028d1be3ce5f186dd3432a65a7b55e652beb6318ee11d230004d3f8f76d68293