Accepting request 1313946 from Education

- Update to release 3.2.1

OBS-URL: https://build.opensuse.org/request/show/1313946
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gjiten?expand=0&rev=9

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1761605875
+commit: b7b12fcf2ea05d38babe72564bb3f49677f94ac1aa6140858e3d7be92529cb45
+url: https://src.opensuse.org/jengelh/gjiten
+revision: master

build.specials.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:baf3ea77901aee3b993970d410392b3932a0584921782afe51adfc16ef2bd398
+size 256

gjiten-3.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e2d2dff4a42e700086cec1ea6d295746df13d019fff02f12a5f1b6b9e6d1e98
-size 922726

gjiten.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Oct 27 22:33:11 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- 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 <jengelh@inai.de>
+
+- Add c23.patch
+
 -------------------------------------------------------------------
 Sun Aug 28 22:06:52 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
 

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,23 +17,20 @@
 
 
 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
@@ -52,25 +49,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

stop-using-gnome-common.patch

@@ -1,25 +0,0 @@
-From: Yavor Doganov <yavor@gnu.org>
-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