Compare commits
10 Commits
b687d69f9c
...
545d5f3d4b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
545d5f3d4b | ||
|
|
cb4b70230e | ||
|
|
88c29d6acf | ||
|
|
84d51cc00a | ||
|
|
d18d82834c | ||
|
|
85d875f652 | ||
|
|
f7c44fa6a0 | ||
|
|
b43fab3917 | ||
|
|
62d5db1c92 | ||
|
|
1c6526eb3c |
52
Fix-test-dependencies-with-Meson-0.57.patch
Normal file
52
Fix-test-dependencies-with-Meson-0.57.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
From 87c026cfe4acbcfc62d15950f88a71d8d9678c7e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Emmanuele Bassi <ebassi@gnome.org>
|
||||||
|
Date: Thu, 22 Apr 2021 15:11:59 +0100
|
||||||
|
Subject: [PATCH] build: Fix test dependencies with Meson 0.57
|
||||||
|
|
||||||
|
We need to explicitly depend on the generated files.
|
||||||
|
---
|
||||||
|
data/appdata/meson.build | 3 ++-
|
||||||
|
data/meson.build | 3 ++-
|
||||||
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
|
||||||
|
index 1dc4ed7..ef95c85 100644
|
||||||
|
--- a/data/appdata/meson.build
|
||||||
|
+++ b/data/appdata/meson.build
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
appdata_conf = configuration_data()
|
||||||
|
appdata_conf.set('application_id', application_id)
|
||||||
|
-i18n.merge_file('appdata',
|
||||||
|
+appdata_file = i18n.merge_file('appdata',
|
||||||
|
input: configure_file(
|
||||||
|
input: 'org.gnome.Dictionary.appdata.xml.in.in',
|
||||||
|
output: 'org.gnome.Dictionary.appdata.xml.in',
|
||||||
|
@@ -18,6 +18,7 @@ if appstream_util.found()
|
||||||
|
appstream_util,
|
||||||
|
args: [ 'validate', '--nonet', application_id + '.appdata.xml' ],
|
||||||
|
workdir: meson.current_build_dir(),
|
||||||
|
+ depends: appdata_file,
|
||||||
|
)
|
||||||
|
endif
|
||||||
|
|
||||||
|
diff --git a/data/meson.build b/data/meson.build
|
||||||
|
index 660e6b8..1723c8f 100644
|
||||||
|
--- a/data/meson.build
|
||||||
|
+++ b/data/meson.build
|
||||||
|
@@ -3,7 +3,7 @@ subdir('appdata')
|
||||||
|
desktop_conf = configuration_data()
|
||||||
|
desktop_conf.set('icon', application_id)
|
||||||
|
desktop_conf.set('application_id', application_id)
|
||||||
|
-i18n.merge_file('desktop',
|
||||||
|
+desktop_file = i18n.merge_file('desktop',
|
||||||
|
input: configure_file(
|
||||||
|
input: 'org.gnome.Dictionary.desktop.in.in',
|
||||||
|
output: 'org.gnome.Dictionary.desktop.in',
|
||||||
|
@@ -22,6 +22,7 @@ if desktop_file_validate.found()
|
||||||
|
desktop_file_validate,
|
||||||
|
args: application_id + '.desktop',
|
||||||
|
workdir: meson.current_build_dir(),
|
||||||
|
+ depends: desktop_file,
|
||||||
|
)
|
||||||
|
endif
|
||||||
|
|
||||||
49
drop-unused-argument-for-i18n.merge_file.patch
Normal file
49
drop-unused-argument-for-i18n.merge_file.patch
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
From cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jan Beich <jbeich@FreeBSD.org>
|
||||||
|
Date: Mon, 24 Jan 2022 11:13:54 +0000
|
||||||
|
Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
|
||||||
|
|
||||||
|
Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
|
||||||
|
|
||||||
|
data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments.
|
||||||
|
data/meson.build:6:5: ERROR: Function does not take positional arguments.
|
||||||
|
data/meson.build:49:5: ERROR: Function does not take positional arguments.
|
||||||
|
---
|
||||||
|
data/appdata/meson.build | 2 +-
|
||||||
|
data/meson.build | 4 ++--
|
||||||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
|
||||||
|
index ef95c85..65a044f 100644
|
||||||
|
--- a/data/appdata/meson.build
|
||||||
|
+++ b/data/appdata/meson.build
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
appdata_conf = configuration_data()
|
||||||
|
appdata_conf.set('application_id', application_id)
|
||||||
|
-appdata_file = i18n.merge_file('appdata',
|
||||||
|
+appdata_file = i18n.merge_file(
|
||||||
|
input: configure_file(
|
||||||
|
input: 'org.gnome.Dictionary.appdata.xml.in.in',
|
||||||
|
output: 'org.gnome.Dictionary.appdata.xml.in',
|
||||||
|
diff --git a/data/meson.build b/data/meson.build
|
||||||
|
index 1723c8f..4db85ee 100644
|
||||||
|
--- a/data/meson.build
|
||||||
|
+++ b/data/meson.build
|
||||||
|
@@ -3,7 +3,7 @@ subdir('appdata')
|
||||||
|
desktop_conf = configuration_data()
|
||||||
|
desktop_conf.set('icon', application_id)
|
||||||
|
desktop_conf.set('application_id', application_id)
|
||||||
|
-desktop_file = i18n.merge_file('desktop',
|
||||||
|
+desktop_file = i18n.merge_file(
|
||||||
|
input: configure_file(
|
||||||
|
input: 'org.gnome.Dictionary.desktop.in.in',
|
||||||
|
output: 'org.gnome.Dictionary.desktop.in',
|
||||||
|
@@ -46,7 +46,7 @@ sources = [
|
||||||
|
]
|
||||||
|
|
||||||
|
foreach s: sources
|
||||||
|
- i18n.merge_file('sources',
|
||||||
|
+ i18n.merge_file(
|
||||||
|
input: '@0@.in'.format(s),
|
||||||
|
output: s,
|
||||||
|
install: true,
|
||||||
BIN
gnome-dictionary-40.0.tar.xz
Normal file
BIN
gnome-dictionary-40.0.tar.xz
Normal file
Binary file not shown.
69
gnome-dictionary.spec
Normal file
69
gnome-dictionary.spec
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
Name: gnome-dictionary
|
||||||
|
Version: 40.0
|
||||||
|
Release: 2
|
||||||
|
Summary: A dictionary application for GNOME
|
||||||
|
License: GPL-3.0-or-later and LGPL-2.0-or-later and GFDL-1.1-only
|
||||||
|
URL: https://wiki.gnome.org/Apps/Dictionary
|
||||||
|
Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{version}.tar.xz
|
||||||
|
#https://github.com/GNOME/gnome-dictionary/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e
|
||||||
|
Patch0: Fix-test-dependencies-with-Meson-0.57.patch
|
||||||
|
#https://github.com/GNOME/gnome-dictionary/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68
|
||||||
|
Patch1: drop-unused-argument-for-i18n.merge_file.patch
|
||||||
|
|
||||||
|
BuildRequires: desktop-file-utils docbook-style-xsl gettext itstool libappstream-glib libxslt
|
||||||
|
BuildRequires: meson pkgconfig(gobject-introspection-1.0) pkgconfig(gtk+-3.0)
|
||||||
|
Obsoletes: gnome-utils <= 1:3.3 gnome-utils-libs <= 1:3.3 gnome-utils-devel <= 1:3.3
|
||||||
|
Obsoletes: gnome-dictionary-devel < 3.26.0 gnome-dictionary-libs < 3.26.0
|
||||||
|
|
||||||
|
%description
|
||||||
|
GNOME Dictionary is a simple, clean, elegant application to look up words in
|
||||||
|
online dictionaries using the DICT protocol.
|
||||||
|
|
||||||
|
%package help
|
||||||
|
Summary: Help package for gnome-dictionary
|
||||||
|
|
||||||
|
%description help
|
||||||
|
This package contains some man help files for gnome-dictionary.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -n %{name}-%{version} -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
%meson
|
||||||
|
%meson_build
|
||||||
|
|
||||||
|
%install
|
||||||
|
%meson_install
|
||||||
|
%find_lang %{name} --with-gnome
|
||||||
|
|
||||||
|
%check
|
||||||
|
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
|
||||||
|
desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
|
||||||
|
|
||||||
|
%postun
|
||||||
|
if [ $1 -eq 0 ]; then
|
||||||
|
glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
|
||||||
|
fi
|
||||||
|
|
||||||
|
%posttrans
|
||||||
|
glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
|
||||||
|
|
||||||
|
%files -f %{name}.lang
|
||||||
|
%doc NEWS README.md
|
||||||
|
%license COPYING COPYING.docs COPYING.libs
|
||||||
|
%{_bindir}/gnome-dictionary
|
||||||
|
%{_datadir}/*
|
||||||
|
%exclude %{_datadir}/man*
|
||||||
|
|
||||||
|
%files help
|
||||||
|
%{_mandir}/man1/gnome-dictionary.1*
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Tue Jul 26 2022 yaoxin <yaoxin30@h-partners.com> - 40.0-2
|
||||||
|
- License compliance rectification
|
||||||
|
|
||||||
|
* Mon Jun 20 2022 yaoxin <yaoxin30@h-partners.com> - 40.0-1
|
||||||
|
- Update to 40.0
|
||||||
|
|
||||||
|
* Wed Dec 11 2019 lingsheng <lingsheng@huawei.com> - 3.26.1-4
|
||||||
|
- Package init
|
||||||
4
gnome-dictionary.yaml
Normal file
4
gnome-dictionary.yaml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version_control: gitlab.gnome
|
||||||
|
src_repo: gnome-dictionary
|
||||||
|
tag_prefix: ^
|
||||||
|
seperator: .
|
||||||
Loading…
x
Reference in New Issue
Block a user