Accepting request 1090975 from home:slbtongying:branches:Education
I am really sorry for submitting requests consecutively on a single package. There is a major regression due to Qt6. Although it is addressed, I think more testing is needed before shipping the qt6 version. * https://build.opensuse.org/request/show/1087963?notification_id=41012894 * https://bugzilla.suse.com/show_bug.cgi?id=1211986 * And the sudden boom of alternative packages on OBS https://build.opensuse.org/search?search_text=goldendict OBS-URL: https://build.opensuse.org/request/show/1090975 OBS-URL: https://build.opensuse.org/package/show/Education/goldendict-ng?expand=0&rev=7
This commit is contained in:
Git OBS Bridge
parent
297583a5b0
commit
a7aed14e1f
19
goldendict-ng-replace-version-txt-generation.patch
Normal file
19
goldendict-ng-replace-version-txt-generation.patch
Normal file
@ -0,0 +1,19 @@
|
||||
--- ./goldendict.pro 2023-06-05 07:46:03.433741407 -0400
|
||||
+++ ./goldendict.pro.orgi 2023-06-05 08:14:30.474500795 -0400
|
||||
@@ -7,15 +7,9 @@
|
||||
# rebuilt; and doing it here is required too since any other way the RCC
|
||||
# compiler would complain if version.txt wouldn't exist (fresh checkouts).
|
||||
|
||||
-system(git describe --tags --always --dirty): hasGit=1
|
||||
-
|
||||
-!isEmpty(hasGit){
|
||||
- GIT_HASH=$$system(git rev-parse --short=8 HEAD )
|
||||
-}
|
||||
-
|
||||
!exists( version.txt ) {
|
||||
message( "generate version.txt...." )
|
||||
- system(echo $${VERSION}.$${GIT_HASH} on $${_DATE_} > version.txt)
|
||||
+ system(echo "openSUSE" > version.txt)
|
||||
}
|
||||
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 5 12:31:28 UTC 2023 - shenlebantongying <shenlebantongying@gmail.com>
|
||||
|
||||
- Build against Qt5 to avoid various regressions
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 4 00:21:23 UTC 2023 - shenlebantongying <shenlebantongying@gmail.com>
|
||||
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define qt_version 5
|
||||
Name: goldendict-ng
|
||||
Version: 23.05.03
|
||||
Release: 0
|
||||
@ -23,7 +24,8 @@ 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
|
||||
Patch0: %{name}-replace-version-txt-generation.patch
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: git
|
||||
@ -38,29 +40,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 +80,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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user