diff --git a/goldendict-ng.changes b/goldendict-ng.changes index d8c5ed1..9878738 100644 --- a/goldendict-ng.changes +++ b/goldendict-ng.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jun 6 15:03:42 UTC 2023 - slb + +- Drop the version.txt patch + +------------------------------------------------------------------- +Mon Jun 5 12:31:28 UTC 2023 - shenlebantongying + +- Build against Qt5 to avoid various regressions + ------------------------------------------------------------------- Sun Jun 4 00:21:23 UTC 2023 - shenlebantongying diff --git a/goldendict-ng.spec b/goldendict-ng.spec index 1ed24ae..cc2e5ca 100644 --- a/goldendict-ng.spec +++ b/goldendict-ng.spec @@ -16,6 +16,7 @@ # +%define qt_version 5 Name: goldendict-ng Version: 23.05.03 Release: 0 @@ -23,7 +24,7 @@ Summary: Dictionary Lookup Program License: GPL-3.0-or-later Group: Productivity/Office/Dictionary URL: https://xiaoyifang.github.io/goldendict-ng/ -Source0: goldendict-ng-%{version}.tar.xz +Source0: %{name}-%{version}.tar.xz BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: git @@ -38,29 +39,36 @@ BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xapian-core) BuildRequires: pkgconfig(xtst) -# /Section Qt 6 -BuildRequires: pkgconfig(Qt6Concurrent) -BuildRequires: pkgconfig(Qt6Core) -BuildRequires: pkgconfig(Qt6Core5Compat) -BuildRequires: pkgconfig(Qt6Gui) -BuildRequires: pkgconfig(Qt6Multimedia) -BuildRequires: pkgconfig(Qt6Svg) -BuildRequires: pkgconfig(Qt6TextToSpeech) -BuildRequires: pkgconfig(Qt6WebEngineWidgets) -BuildRequires: pkgconfig(Qt6Widgets) -BuildRequires: pkgconfig(Qt6Xml) +# /Section Qt +BuildRequires: pkgconfig(Qt%{qt_version}Concurrent) +BuildRequires: pkgconfig(Qt%{qt_version}Core) +BuildRequires: pkgconfig(Qt%{qt_version}Gui) +BuildRequires: pkgconfig(Qt%{qt_version}Multimedia) +BuildRequires: pkgconfig(Qt%{qt_version}Svg) +BuildRequires: pkgconfig(Qt%{qt_version}TextToSpeech) +BuildRequires: pkgconfig(Qt%{qt_version}WebEngineWidgets) +BuildRequires: pkgconfig(Qt%{qt_version}Widgets) +BuildRequires: pkgconfig(Qt%{qt_version}Xml) +%if %{qt_version} >= 6 BuildRequires: qt6-tools-linguist +BuildRequires: pkgconfig(Qt6Core5Compat) +%else +BuildRequires: libqt5-linguist +BuildRequires: pkgconfig(Qt5X11Extras) +%endif # /Section compresion libraries BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(libzip) BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(lzo2) -BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(zlib) # /Section ffmpeg 6 BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) +%if %{qt_version} >= 6 Requires: qt6-multimedia +%endif Provides: goldendict = %{version} Obsoletes: goldendict < 1.5.1 Obsoletes: goldendict-lang < 1.5.1 @@ -71,14 +79,23 @@ The Next Generation GoldenDict: A feature-rich dictionaries lookup program, supp %lang_package %prep -%autosetup -p1 +%autosetup %build +%if %{qt_version} >= 6 %qmake6 PREFIX=%{_prefix} "CONFIG+=use_xapian" "CONFIG+=zim_support" "CONFIG+=chinese_conversion_support" goldendict.pro %qmake6_build +%else +%qmake5 PREFIX=%{_prefix} "CONFIG+=use_xapian" "CONFIG+=zim_support" "CONFIG+=chinese_conversion_support" goldendict.pro +%make_jobs +%endif %install +%if %{qt_version} >= 6 %qmake6_install +%else +%qmake5_install +%endif %suse_update_desktop_file -r org.goldendict.GoldenDict Office Dictionary %files