diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..5812993 --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1761605875 +commit: b7b12fcf2ea05d38babe72564bb3f49677f94ac1aa6140858e3d7be92529cb45 +url: https://src.opensuse.org/jengelh/gjiten +revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..d0a19c9 --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:baf3ea77901aee3b993970d410392b3932a0584921782afe51adfc16ef2bd398 +size 256 diff --git a/gjiten-3.1.tar.gz b/gjiten-3.1.tar.gz deleted file mode 100644 index 04243aa..0000000 --- a/gjiten-3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e2d2dff4a42e700086cec1ea6d295746df13d019fff02f12a5f1b6b9e6d1e98 -size 922726 diff --git a/gjiten.changes b/gjiten.changes index eb3efaa..2bf967f 100644 --- a/gjiten.changes +++ b/gjiten.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sat Nov 22 21:41:18 CET 2025 - Stanislav Brabec + +- Remove unused BuildRequires: update-desktop-files. + +------------------------------------------------------------------- +Mon Oct 27 22:33:11 UTC 2025 - Jan Engelhardt + +- Update to release 3.2.1 + * Build system updates (C23; gnome-common) +- Delete c23.patch (merged/obsolete), + stop-using-gnome-common.patch (obsolete) + +------------------------------------------------------------------- +Tue Jun 17 10:57:35 UTC 2025 - Jan Engelhardt + +- Add c23.patch + ------------------------------------------------------------------- Sun Aug 28 22:06:52 UTC 2022 - Jan Engelhardt diff --git a/gjiten.spec b/gjiten.spec index f1eb60b..5f00dcc 100644 --- a/gjiten.spec +++ b/gjiten.spec @@ -1,7 +1,7 @@ # # spec file for package gjiten # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,25 +17,21 @@ Name: gjiten -Version: 3.1 +Version: 3.2.1 Release: 0 Summary: Japanese Dictionary Browser for GNOME/GTK+ License: GPL-2.0-or-later Group: Productivity/Office/Dictionary URL: https://github.com/DarkTrick/gjiten -Source: https://github.com/DarkTrick/gjiten/archive/refs/tags/%name-%version.tar.gz +Source: https://github.com/DarkTrick/gjiten/archive/refs/tags/v%version.tar.gz Patch0: %name.patch Patch1: %name-desktop.patch -Patch2: stop-using-gnome-common.patch -BuildRequires: autoconf-archive BuildRequires: edict -BuildRequires: intltool -BuildRequires: libtool BuildRequires: libxslt +BuildRequires: meson BuildRequires: perl-XML-Parser -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: sgml-skel -BuildRequires: update-desktop-files BuildRequires: w3m BuildRequires: xmlto BuildRequires: pkgconfig(gmodule-export-2.0) @@ -52,25 +48,24 @@ key can be used for Kanji lookups. It requires a working X input method (such as ibus) for Japanese input. %prep -%autosetup -p1 -n %name-%name-%version +%autosetup -p1 %build -NOCONFIGURE=1 ./autogen.sh -%configure -%make_build +%meson +# https://github.com/DarkTrick/gjiten/issues/10 +perl -i -lpe 's{define GJITEN_DATADIR .*}{define GJITEN_DATADIR "%_datadir/%name"}g' */config.h +grep GJITEN_DATADIR */config.h +%meson_build %install -%make_install +%meson_install b="%buildroot" +mkdir -pv "$b/%_datadir/%name/dics" ln -fsv "%_datadir/edict/radkfile" "$b/%_datadir/%name/radkfile.utf8" -mkdir "$b/%_datadir/%name/dics" for i in %_datadir/edict/*; do - ln -s "$i" "$b/%_datadir/%name/dics/" + ln -sv "$i" "$b/%_datadir/%name/dics/" done -# Drop legacy GNOME 1 content -rm -rf %{buildroot}%_datadir/application-registry/ %find_lang %name -%suse_update_desktop_file %name Office Dictionary %files -f %name.lang %_bindir/%name diff --git a/stop-using-gnome-common.patch b/stop-using-gnome-common.patch deleted file mode 100644 index d14b8d8..0000000 --- a/stop-using-gnome-common.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Yavor Doganov -Date: Sat, 13 Oct 2018 12:20:53 +0300 -Subject: stop using gnome-common - -Use autoconf-archive instead of deprecated gnome-common - -Bug-Debian: https://bugs.debian.org/829781 ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -Index: gjiten-gjiten-3.1/configure.ac -=================================================================== ---- gjiten-gjiten-3.1.orig/configure.ac -+++ gjiten-gjiten-3.1/configure.ac -@@ -36,7 +36,8 @@ AC_FUNC_MMAP - AC_FUNC_STAT - AC_CHECK_FUNCS([getcwd putenv setlocale strerror strrchr strstr munmap]) - --GNOME_COMPILE_WARNINGS(maximum) -+AX_IS_RELEASE([always]) -+AX_COMPILER_FLAGS - - # Gettext stuff - GETTEXT_PACKAGE=gjiten diff --git a/v3.2.1.tar.gz b/v3.2.1.tar.gz new file mode 100644 index 0000000..b9fa929 --- /dev/null +++ b/v3.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e79476041c65cdaeca2b5db6cb306d4e002ab01f9e1abf6d53d74d2052c4ac8 +size 870192