From 887e873c0f5f71b45b93af25b1e63168b6474f84b4257f22112e73b797b8f5f6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 17 Jun 2025 10:57:15 +0000 Subject: [PATCH 1/4] [info=09498d83629a08dc61dd52ecd5eb94a1aa515da0cf1684ba497f2378dee76a49] OBS-URL: https://build.opensuse.org/package/show/Education/gjiten?expand=0&rev=15 --- .gitattributes | 23 +++ .gitignore | 1 + _scmsync.obsinfo | 4 + build.specials.obscpio | 3 + gjiten-3.1.tar.gz | 3 + gjiten-desktop.patch | 12 ++ gjiten.changes | 312 ++++++++++++++++++++++++++++++++++ gjiten.patch | 19 +++ gjiten.spec | 81 +++++++++ stop-using-gnome-common.patch | 25 +++ 10 files changed, 483 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _scmsync.obsinfo create mode 100644 build.specials.obscpio create mode 100644 gjiten-3.1.tar.gz create mode 100644 gjiten-desktop.patch create mode 100644 gjiten.changes create mode 100644 gjiten.patch create mode 100644 gjiten.spec create mode 100644 stop-using-gnome-common.patch diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..4f5750a --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1661863749 +commit: 09498d83629a08dc61dd52ecd5eb94a1aa515da0cf1684ba497f2378dee76a49 +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..d08c49d --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c13373345786e0f56ed53250be1792c15ccd2094aebccf8fb3ef6c40f2db660c +size 256 diff --git a/gjiten-3.1.tar.gz b/gjiten-3.1.tar.gz new file mode 100644 index 0000000..04243aa --- /dev/null +++ b/gjiten-3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e2d2dff4a42e700086cec1ea6d295746df13d019fff02f12a5f1b6b9e6d1e98 +size 922726 diff --git a/gjiten-desktop.patch b/gjiten-desktop.patch new file mode 100644 index 0000000..862c5ce --- /dev/null +++ b/gjiten-desktop.patch @@ -0,0 +1,12 @@ +diff -ru gjiten-2.6.orig/gnome/gjiten.desktop.in gjiten-2.6/gnome/gjiten.desktop.in +--- gjiten-2.6.orig/gnome/gjiten.desktop.in 2006-10-29 18:17:36.000000000 +0100 ++++ gjiten-2.6/gnome/gjiten.desktop.in 2007-05-21 18:15:41.000000000 +0200 +@@ -3,7 +3,7 @@ + _Name=Gjiten + _Comment=Japanese dictionary + Exec=gjiten +-Icon=jiten.png ++Icon=jiten + StartupNotify=true + Terminal=false + Type=Application diff --git a/gjiten.changes b/gjiten.changes new file mode 100644 index 0000000..eb3efaa --- /dev/null +++ b/gjiten.changes @@ -0,0 +1,312 @@ +------------------------------------------------------------------- +Sun Aug 28 22:06:52 UTC 2022 - Jan Engelhardt + +- Update to release 3.1 +- Delete skip-validation.patch (obsolete), + gjiten-automake-fix.diff (duplicate of configure-set-foreign.patch), + stop-using-libgnome-ui.patch (obsolete/inapplicable), + switch-to-GtkBuilder.patch (obsolete/inapplicable), + port-to-GSettings.patch (obsolete), + bugzilla-348100-empty-radicals-window.patch (obsolete/inapplicable) +- Delete configure-set-foreign.patch (not needed) + +------------------------------------------------------------------- +Sat Dec 11 20:14:46 UTC 2021 - Jan Engelhardt + +- Fix broken configure-set-foreign.patch introduced on 2019-08-08. + (Can't have AM_INIT_AUTOMAKE twice!) + +------------------------------------------------------------------- +Thu Jun 18 08:49:08 UTC 2020 - Dominique Leuenberger + +- No longer package /usr/share/application-registry: GNOME 1 is + long gone and this is only dead bytes (boo#1062631). + +------------------------------------------------------------------- +Wed Aug 21 12:51:47 UTC 2019 - Jan Engelhardt + +- As a result of port-to-GSettings.patch(?), gjiten no longer found + its dictionaries. Add more symlinks from /usr/share/gjiten to + /usr/share/edict and drop the GJITEN_DICDIR change from + gjiten-dirs.patch. + +------------------------------------------------------------------- +Thu Aug 8 15:04:14 UTC 2019 - bjorn.lie@gmail.com + +- Add patches from debian porting gjiten to a more modern build. + * configure-set-foreign.patch + * stop-using-gnome-common.patch + * stop-using-libgnome-ui.patch + * switch-to-GtkBuilder.patch + * port-to-GSettings.patch +- Drop configure.patch and schemas.patch, part of debian patch set. +- Following above patch set: + * Drop libglade2-devel, libgnomeui-devel, scrollkeeper, + libgnome-keyring-devel and gnome-keyring-devel BuildRequires: + No longer needed. + * Add autoconf-archive, pkgconfig, pkgconfig(gmodule-export-2.0), + pkgconfig(gsettings-desktop-schemas) and pkgconfig(gtk+-2.0) + BuildRequires: New dependencies. + * Drop all old workarounds for various versions of openSUSE. +- Use modern macros. + +------------------------------------------------------------------- +Mon Nov 26 02:56:53 UTC 2018 - Jan Engelhardt + +- Unbundle radkfile and symlink to edict instead. +- Replace old $RPM_* shell vars. Remove redundant %clean section. +- Drop spec code for openSUSE < 10.2. + +------------------------------------------------------------------- +Sun Jul 27 14:00:27 CST 2014 - hillwood@linuxfans.org + +- Fix build for openSUSE 13.2 + +------------------------------------------------------------------- +Wed Feb 15 17:27:13 CET 2012 - tiwai@suse.de + +- clean up spec file: fix Makefile.am to build properly, remove + obsoleted suse macro +- Enable parallel builds + +------------------------------------------------------------------- +Sat Oct 15 04:47:02 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to make the spec file more reliable + +------------------------------------------------------------------- +Mon Jan 4 13:09:34 CET 2010 - vuntz@opensuse.org + +- Change gnome-keyring-devel BuildRequires to + libgnome-keyring-devel on 11.3 and later, following the module + split upstream. + +------------------------------------------------------------------- +Tue Dec 18 19:29:02 CET 2007 - mfabian@suse.de + +- Bugzilla #348100: sometimes the radicals window in gjiten + was empty. Fix from upstream CVS. + +------------------------------------------------------------------- +Thu Oct 11 13:07:20 CEST 2007 - sbrabec@suse.cz + +- Removed false dependency on avahi. + +------------------------------------------------------------------- +Mon May 21 18:16:32 CEST 2007 - mfabian@suse.de + +- fix build on STABLE (remove X-SuSE-translate=true from .desktop + file). + +------------------------------------------------------------------- +Mon Mar 12 15:57:34 CET 2007 - mfabian@suse.de + +- fix build on STABLE: adapt installtion of schemas for + openSUSE > 10.2. + +------------------------------------------------------------------- +Wed Jan 24 19:23:32 CET 2007 - mfabian@suse.de + +- make it build in older distributions in the openSUSE build + service. + +------------------------------------------------------------------- +Wed Jan 24 16:42:52 CET 2007 - mfabian@suse.de + +- update to 2.6: + • DTD location changed in docbook doc (John Thacker). + • Don't look up kanji if there is a selection. + • Configurable toolbar/menubar was causing problems, removed. + • Add de_CH translation and close debian bug #314089. + • Japanese translation update (Daichi Kawahata). + • Shade unavailable radicals in radical window + • radkfile update. +- make it build on older openSUSE releases by determining + gnome_prefix automatically. +- use find_lang macro. + +------------------------------------------------------------------- +Mon Jan 22 22:44:16 CET 2007 - aj@suse.de + +- Move to /usr + +------------------------------------------------------------------- +Sat Oct 7 12:48:02 CEST 2006 - aj@suse.de + +- Cleanup BuildRequires. + +------------------------------------------------------------------- +Thu Sep 07 17:28:14 CEST 2006 - mfabian@suse.de + +- update to CVS version 2.5.20060907 to fix the problem that the + radicals are not displayed in the result field when using + the kanji dictionary. + +------------------------------------------------------------------- +Thu Sep 07 15:45:59 CEST 2006 - mfabian@suse.de + +- update to 2.5. + • Kanji can be clicked in WordDic for KanjiDic lookup. + (Mboso Sampson) + • Regenerated autoconf scripts for kfreebsd support. + • Fixed possible buffer overflows. + • Fixed stroke count search when irrelevant results showed up. + • History buffer overrun fixed (John Thacker). + • Updated spec for FC3 + • Fixed segfault with invalid dicfile in the schema. +- remove schemasdir.patch (included upstream). + +------------------------------------------------------------------- +Fri Jun 16 12:07:44 CEST 2006 - schwab@suse.de + +- Fix syntax error in configure script. + +------------------------------------------------------------------- +Wed Mar 01 12:24:18 CET 2006 - mfabian@suse.de + +- add "Provides: locale(libgnome:ja)". + +------------------------------------------------------------------- +Wed Jan 25 21:36:11 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Tue Jun 21 16:15:15 CEST 2005 - mfabian@suse.de + +- set correct default dictionary paths and other default values + in schemas.in. + +------------------------------------------------------------------- +Fri Jun 10 18:53:36 CEST 2005 - mfabian@suse.de + +- update to 2.4. +- Gettext fix for kanji info pref dialog. (Daichi Kawahata) +- KanjiDic segv on CTRL-Q fixed. (Alexis S. L. Carvalho) +- Japanese translation fixes and desktop file i18n. + (Daichi Kawahata) +- Dicfile match colorization fix for gettext translation. +- KanjiDic history width problem fixed. +- Added support for the Chinese CEDICT dictionary. +- German translation update. (Gregor Riepl) +- Optional unicode radicals in KanjiDic. +- Don't limit if result limit is < 1. +- Perl script for automated dictionary setup + (system-wide or user-only). +- Gconf schema for system-wide settings. +- Fixed help menu. + +------------------------------------------------------------------- +Tue Jan 25 18:26:19 CET 2005 - uli@suse.de + +- update -> 2.3 (search hiragana on katakana input and vice versa, + code cleanup, fixes 'whole expression' matching with newer edict + files, unlimited number of dictionary files, radkfile updated, + bugfixes, minor enhancements) + +------------------------------------------------------------------- +Tue Dec 14 22:20:31 CET 2004 - hvogel@suse.de + +- fix desktop file + +------------------------------------------------------------------- +Wed May 26 16:13:50 CEST 2004 - ro@suse.de + +- do not define GTK_DISABLE_DEPRECATED + +------------------------------------------------------------------- +Sat Jan 10 20:20:27 CET 2004 - adrian@suse.de + +- build as user + +------------------------------------------------------------------- +Sun Aug 24 14:15:54 CEST 2003 - mfabian@suse.de + +- update to 2.1 (Gnome2 version). + The EDICT dictionaries MUST be UTF-8 encoded now! + +------------------------------------------------------------------- +Sat Jun 14 00:55:35 CEST 2003 - mfabian@suse.de + +- fix "directory not owned by any package". + +------------------------------------------------------------------- +Fri Sep 27 14:36:04 CEST 2002 - ro@suse.de + +- Added alsa alsa-devel to neededforbuild (esound) + +------------------------------------------------------------------- +Sat Jan 19 20:03:12 CET 2002 - mfabian@suse.de + +- update to gjiten-1.0 + New stuff and fixes in v1.0 according to the author + Botond Botyanszki : + - "Reply overrun" crashes with the JP-German GDICT fixed. + - Search options are saved on exit. + - Limit search results in word dictionary. + - Kanji info window moved to the main KanjiDic window. + - KanjiDic kanji-info history. + - Automatic vertical scrollbars. + - Bigger fonts for KanjiDic. + - Word dictionary fonts also customizable in preferences. + +------------------------------------------------------------------- +Sat Nov 3 14:36:04 CET 2001 - mfabian@suse.de + +- update to gjiten-0.9 +- remove gjiten-0.8-fix-for-crash-with-fvwm2.patch + (included upstream) +- remove gjiten-0.8-fix-for-64bit.patch (included upstream) + New stuff and fixes in v0.9 according to the author + Botond Botyanszki : + - History saving (up to 50 entries) on exit. + - Auto adjust search options if no match is found. + - Now starts up properly with gnome/gtk specific cmd line options. + - Updated for the IA64 architecture. + - Shouldn't crash with Fvwm2 anymore. + - dpkg-buildpackage should work under debian potato from now. + - Dicfile limit raised to 40. + - Added Back/Forward buttons to the toolbar. + - Radkfile updated. + - Fixed history behaviour (garbage, whitespace, case sensitivity) + - Segfault on unconfigured exit fixed. + - Numerous small bugfixes. + +------------------------------------------------------------------- +Sun Sep 16 14:46:27 CEST 2001 - mfabian@suse.de + +- make it work on ia64 +- fix for crash when using gjiten with fvwm 2.4.0 + +------------------------------------------------------------------- +Tue Sep 4 16:25:13 CEST 2001 - schwab@suse.de + +- Fix portability. + +------------------------------------------------------------------- +Tue Sep 4 13:11:24 CEST 2001 - mfabian@suse.de + +- upgrade to gjiten-0.8 +- remove gjiten-0.7-setlocale.patch, now included upstream +- share same data with xjdic and + make gjiten require xjdic-data and xjdic-indices instead of + including the same data in gjiten as well +- default dictionary location changed to /usr/share/edict + +------------------------------------------------------------------- +Tue Mar 20 18:57:15 CET 2001 - uli@suse.de + +- added esound* to neededforbuild + +------------------------------------------------------------------- +Tue Jan 2 19:01:39 CET 2001 - mfabian@suse.de + +- corrected problem with setlocale(): + setlocale() must be called before bindtextdomain() and + textdomain() + +------------------------------------------------------------------- +Thu Nov 9 20:38:00 CET 2000 - Mike Fabian + +- new package: gjiten-0.7 + diff --git a/gjiten.patch b/gjiten.patch new file mode 100644 index 0000000..5ea1c7d --- /dev/null +++ b/gjiten.patch @@ -0,0 +1,19 @@ +--- + src/constants.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: gjiten-gjiten-3.1/src/constants.h +=================================================================== +--- gjiten-gjiten-3.1.orig/src/constants.h ++++ gjiten-gjiten-3.1/src/constants.h +@@ -3,8 +3,8 @@ + + #include + +-#define DEFWORDFONTNAME "-*-fixed-medium-r-normal-*-14-*-*-*-*-*-jisx0208.1983-0" +-#define DEFBIGFONTNAME "-*-fixed-medium-r-normal-*-24-*-*-*-*-*-jisx0208.1983-0"; ++#define DEFWORDFONTNAME "-*-fixed-medium-r-normal-*-16-*-*-*-*-*-jisx0208.1983-0" ++#define DEFBIGFONTNAME "-*-fixed-medium-r-normal-*-24-*-*-*-*-*-jisx0208.1983-0" + #define DEFMAXWORDMATCHES 100 + #define MAXDICFILES 100 + diff --git a/gjiten.spec b/gjiten.spec new file mode 100644 index 0000000..f1eb60b --- /dev/null +++ b/gjiten.spec @@ -0,0 +1,81 @@ +# +# spec file for package gjiten +# +# Copyright (c) 2022 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: gjiten +Version: 3.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 +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: perl-XML-Parser +BuildRequires: pkgconfig +BuildRequires: sgml-skel +BuildRequires: update-desktop-files +BuildRequires: w3m +BuildRequires: xmlto +BuildRequires: pkgconfig(gmodule-export-2.0) +BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22 +Requires: edict +Provides: locale(libgnome:ja) + +%description +Gjiten is a GNOME-based Japanese dictionary program. It uses the +JMdict/edict word dictionary, KANJIDIC kanji dictionary, and some of +the xjdic code. Any combination of stroke count, radicals, and search +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 + +%build +NOCONFIGURE=1 ./autogen.sh +%configure +%make_build + +%install +%make_install +b="%buildroot" +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/" +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 +%_datadir/applications/* +%_datadir/%name/ +%_datadir/pixmaps/* + +%changelog diff --git a/stop-using-gnome-common.patch b/stop-using-gnome-common.patch new file mode 100644 index 0000000..d14b8d8 --- /dev/null +++ b/stop-using-gnome-common.patch @@ -0,0 +1,25 @@ +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 -- 2.51.1 From 879601e9811e7301c4519a1e5e1856de0ac78fbdd884e05f3a49907efefa1f83 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 17 Jun 2025 10:59:48 +0000 Subject: [PATCH 2/4] [info=bb7eb6de17084400f8e3cb820ff3accf26b1032c2df0ab6a9bbc1b4a53fe8865] OBS-URL: https://build.opensuse.org/package/show/Education/gjiten?expand=0&rev=16 --- _scmsync.obsinfo | 4 +- build.specials.obscpio | 2 +- c23.patch | 217 +++++++++++++++++++++++++++++++++++++++++ gjiten.changes | 5 + gjiten.spec | 3 +- 5 files changed, 227 insertions(+), 4 deletions(-) create mode 100644 c23.patch diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 4f5750a..8938d43 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1661863749 -commit: 09498d83629a08dc61dd52ecd5eb94a1aa515da0cf1684ba497f2378dee76a49 +mtime: 1750157977 +commit: bb7eb6de17084400f8e3cb820ff3accf26b1032c2df0ab6a9bbc1b4a53fe8865 url: https://src.opensuse.org/jengelh/gjiten revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index d08c49d..15f166c 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c13373345786e0f56ed53250be1792c15ccd2094aebccf8fb3ef6c40f2db660c +oid sha256:fd9a08f7eeb8f5c5ea28a878d2585e7745b199ebcff6c57e9aaf6fcb96aade32 size 256 diff --git a/c23.patch b/c23.patch new file mode 100644 index 0000000..767f88d --- /dev/null +++ b/c23.patch @@ -0,0 +1,217 @@ +From 9e0d6f0c35fd31ccc787c0d301b94a62ee9abd8d Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 17 Jun 2025 12:21:28 +0200 +Subject: [PATCH] Fix mismatch between function heads/prototypes/pointer types +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +References: https://github.com/DarkTrick/gjiten/pull/9 + +Support GCC 15. + +``` +gjiten.c: In function ‘_action_start_kanjipad’: +gjiten.c:356:3: error: too many arguments to function ‘gjiten_start_kanjidic’; expected 0, have 1 + 356 | gjiten_start_kanjidic (GTK_APPLICATION (gtk_application)); +In file included from gjiten.c:45: +gjiten.h:43:6: note: declared here + 43 | void gjiten_start_kanjidic(); +gjiten.c: In function ‘_action_start_worddic’: +gjiten.c:366:3: error: too many arguments to function ‘gjiten_start_worddic’; expected 0, have 1 + 366 | gjiten_start_worddic (GTK_APPLICATION (gtk_application)); +gjiten.h:42:6: note: declared here + 42 | void gjiten_start_worddic(); +gjiten.c: In function ‘_gjiten_create_menu’: +gjiten.c:449:43: error: initialization of ‘void (*)(GSimpleAction *, GVariant *, void *)’ {aka ‘void (*)(struct _GSimpleAction *, struct _GVariant *, void *)’} from incompatible pointer type ‘void (*)(void)’ [-Wincompatible-pointer-types] + 449 | {.name="quit", .activate=gjiten_quit }, +gjiten.c:449:43: note: (near initialization for ‘actions[0].activate’) +gjiten.c:170:1: note: ‘gjiten_quit’ declared here + 170 | gjiten_quit() +gjiten.c:450:43: error: initialization of ‘void (*)(GSimpleAction *, GVariant *, void *)’ {aka ‘void (*)(struct _GSimpleAction *, struct _GVariant *, void *)’} from incompatible pointer type ‘void (*)(void)’ [-Wincompatible-pointer-types] + 450 | {.name="preferences", .activate=create_dialog_preferences }, +gjiten.c:450:43: note: (near initialization for ‘actions[1].activate’) +In file included from gjiten.c:44: +pref.h:27:6: note: ‘create_dialog_preferences’ declared here + 27 | void create_dialog_preferences(); +gjiten.c:451:43: error: initialization of ‘void (*)(GSimpleAction *, GVariant *, void *)’ {aka ‘void (*)(struct _GSimpleAction *, struct _GVariant *, void *)’} from incompatible pointer type ‘void (*)(void)’ [-Wincompatible-pointer-types] + 451 | {.name="startKanjipad", .activate=gjiten_start_kanjipad }, +gjiten.c:451:43: note: (near initialization for ‘actions[2].activate’) +gjiten.c:181:1: note: ‘gjiten_start_kanjipad’ declared here + 181 | gjiten_start_kanjipad() +gjiten.c:452:46: error: initialization of ‘void (*)(GSimpleAction *, GVariant *, void *)’ {aka ‘void (*)(struct _GSimpleAction *, struct _GVariant *, void *)’} from incompatible pointer type ‘void (*)(void)’ [-Wincompatible-pointer-types] + 452 | {.name="showWhatsNew", .activate=gjiten_show_whatsnew }, +gjiten.c:452:46: note: (near initialization for ‘actions[3].activate’) +gjiten.c:243:1: note: ‘gjiten_show_whatsnew’ declared here + 243 | gjiten_show_whatsnew() +gjiten.c:453:43: error: initialization of ‘void (*)(GSimpleAction *, GVariant *, void *)’ {aka ‘void (*)(struct _GSimpleAction *, struct _GVariant *, void *)’} from incompatible pointer type ‘void (*)(void)’ [-Wincompatible-pointer-types] + 453 | {.name="showAbout", .activate=gjiten_create_about }, +gjiten.c:453:43: note: (near initialization for ‘actions[4].activate’) +gjiten.c:302:1: note: ‘gjiten_create_about’ declared here + 302 | gjiten_create_about() +gjiten.c: At top level: +gjiten.c:480:1: error: conflicting types for ‘gjiten_start_worddic’; have ‘void(GtkApplication *)’ {aka ‘void(struct _GtkApplication *)’} + 480 | gjiten_start_worddic(GtkApplication *app){ +gjiten.h:42:6: note: previous declaration of ‘gjiten_start_worddic’ with type ‘void(void)’ + 42 | void gjiten_start_worddic(); +gjiten.c: In function ‘gjiten_start_worddic’: +gjiten.c:486:29: error: too many arguments to function ‘worddic_create’; expected 0, have 1 + 486 | GjWorddicWindow *window = worddic_create (app); +In file included from gjiten.c:42: +worddic.h:54:18: note: declared here + 54 | GjWorddicWindow* worddic_create(); +gjiten.c: At top level: +gjiten.c:494:1: error: conflicting types for ‘gjiten_start_kanjidic’; have ‘void(GtkApplication *)’ {aka ‘void(struct _GtkApplication *)’} + 494 | gjiten_start_kanjidic(GtkApplication *app) +gjiten.h:43:6: note: previous declaration of ‘gjiten_start_kanjidic’ with type ‘void(void)’ + 43 | void gjiten_start_kanjidic(); +gjiten.c: In function ‘gjiten_start_kanjidic’: +gjiten.c:500:30: error: too many arguments to function ‘kanjidic_create’; expected 0, have 1 + 500 | GjKanjidicWindow *window = kanjidic_create (app); +In file included from gjiten.c:43: +kanjidic.h:59:19: note: declared here + 59 | GjKanjidicWindow *kanjidic_create(); +``` +--- + src/gjiten.c | 16 ++++++++-------- + src/gjiten.h | 6 +++--- + src/migration2-6_3-0.c | 2 +- + src/migration2-6_3-0.h | 2 +- + src/pref.c | 2 +- + src/pref.h | 2 +- + 6 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/src/gjiten.c b/src/gjiten.c +index 3f8ef6c..f6fb5d7 100755 +--- a/src/gjiten.c ++++ b/src/gjiten.c +@@ -167,7 +167,7 @@ gjiten_quit_if_all_windows_closed() + * Cleanly close gjiten from anywhere in the code + **/ + void +-gjiten_quit() ++gjiten_quit(GSimpleAction *xa, GVariant *xb, void *xc) + { + // Close all windows + // (gjiten_quit_if_all_windows_closed () will be called inside there) +@@ -178,7 +178,7 @@ gjiten_quit() + + + void +-gjiten_start_kanjipad() ++gjiten_start_kanjipad(GSimpleAction *xa, GVariant *xb, void *xc) + { + FILE *kanjipad_binary; + char *kpad_cmd; +@@ -239,8 +239,8 @@ gjiten_display_manual(GtkWidget *parent_window_nullable, + + + +-void +-gjiten_show_whatsnew() ++static void ++gjiten_show_whatsnew(GSimpleAction *xa, GVariant *xb, void *xc) + { + GtkTextBuffer *textbuffer = gtk_text_buffer_new (NULL); + +@@ -298,8 +298,8 @@ gjiten_show_whatsnew() + + + +-void +-gjiten_create_about() ++static void ++gjiten_create_about(GSimpleAction *, GVariant *, void *) + { + const gchar *authors[] = { "Botond Botyanszki , DarkTrick", NULL }; + const gchar *documenters[] = { NULL }; +@@ -483,7 +483,7 @@ gjiten_start_worddic(GtkApplication *app){ + gtk_window_present (GTK_WINDOW (gjitenApp->worddic)); + } + +- GjWorddicWindow *window = worddic_create (app); ++ GjWorddicWindow *window = worddic_create (); + gjitenApp->worddic = window; + _start_window (GTK_WINDOW (window)); + } +@@ -497,7 +497,7 @@ gjiten_start_kanjidic(GtkApplication *app) + gtk_window_present (GTK_WINDOW (gjitenApp->kanjidic)); + } + +- GjKanjidicWindow *window = kanjidic_create (app); ++ GjKanjidicWindow *window = kanjidic_create (); + gjitenApp->kanjidic = window; + _start_window (GTK_WINDOW (window)); + } +diff --git a/src/gjiten.h b/src/gjiten.h +index 1f3e10c..ca30890 100755 +--- a/src/gjiten.h ++++ b/src/gjiten.h +@@ -38,9 +38,9 @@ struct _GjitenApp { + + GtkApplication * gjiten_new(); + +-void gjiten_start_kanjipad(); +-void gjiten_start_worddic(); +-void gjiten_start_kanjidic(); ++void gjiten_start_kanjipad(GSimpleAction *, GVariant *, void *); ++void gjiten_start_worddic(GtkApplication *); ++void gjiten_start_kanjidic(GtkApplication *); + void gjiten_start_kanjidic_with_search(gunichar kanji); + + void gjiten_apply_fonts(GjitenApp * gjitenApp); +diff --git a/src/migration2-6_3-0.c b/src/migration2-6_3-0.c +index 36d9644..209ccac 100644 +--- a/src/migration2-6_3-0.c ++++ b/src/migration2-6_3-0.c +@@ -384,7 +384,7 @@ migrate_2_6_to_3_0(const gchar *new_storage_dir, + if (_store_available_gsettings()) + succ = _migrate_gsettings (&self, new_storage_dir, new_storage_file); + else +- if (_store_available_gconf (&self)) ++ if (_store_available_gconf ()) + succ = _migrate_gconf (&self, new_storage_dir, new_storage_file); + } + +diff --git a/src/migration2-6_3-0.h b/src/migration2-6_3-0.h +index f5d363e..0150619 100644 +--- a/src/migration2-6_3-0.h ++++ b/src/migration2-6_3-0.h +@@ -4,7 +4,7 @@ + #define __MIGRATION2_6_3_0_H__ + + gboolean migration_possible_2_6_to_3_0(); +-gboolean migrate_2_6_to_3_0 (); ++gboolean migrate_2_6_to_3_0 (const gchar *, const gchar *); + + + #endif +\ No newline at end of file +diff --git a/src/pref.c b/src/pref.c +index 7c5f0eb..d888d82 100755 +--- a/src/pref.c ++++ b/src/pref.c +@@ -459,7 +459,7 @@ checkbutton_envvar_cb(GtkWidget *button) + + + void +-create_dialog_preferences() ++create_dialog_preferences(GSimpleAction *xa, GVariant *xb, void *xc) + { + GtkWidget *button; + GtkWidget *tmpwidget; +diff --git a/src/pref.h b/src/pref.h +index ef36d69..8ad49d5 100644 +--- a/src/pref.h ++++ b/src/pref.h +@@ -24,7 +24,7 @@ + #ifndef __PREF_H__ + #define __PREF_H__ + +-void create_dialog_preferences(); ++void create_dialog_preferences(GSimpleAction *, GVariant *, void *); + + + #endif +-- +2.49.0 + diff --git a/gjiten.changes b/gjiten.changes index eb3efaa..716bbad 100644 --- a/gjiten.changes +++ b/gjiten.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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..06e509c 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 # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,7 @@ Source: https://github.com/DarkTrick/gjiten/archive/refs/tags/%name-%ver Patch0: %name.patch Patch1: %name-desktop.patch Patch2: stop-using-gnome-common.patch +Patch3: c23.patch BuildRequires: autoconf-archive BuildRequires: edict BuildRequires: intltool -- 2.51.1 From d82d200c7dea6d020faa2ca491ecc5f3fc106f10d11e2db30681da03038041dc Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Tue, 28 Oct 2025 13:47:36 +0000 Subject: [PATCH 3/4] 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 | 4 +- build.specials.obscpio | 2 +- c23.patch | 217 ---------------------------------- gjiten-3.1.tar.gz | 3 - gjiten.changes | 8 ++ gjiten.spec | 33 +++--- stop-using-gnome-common.patch | 25 ---- v3.2.1.tar.gz | 3 + 8 files changed, 28 insertions(+), 267 deletions(-) delete mode 100644 c23.patch delete mode 100644 gjiten-3.1.tar.gz delete mode 100644 stop-using-gnome-common.patch create mode 100644 v3.2.1.tar.gz diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 8938d43..5812993 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1750157977 -commit: bb7eb6de17084400f8e3cb820ff3accf26b1032c2df0ab6a9bbc1b4a53fe8865 +mtime: 1761605875 +commit: b7b12fcf2ea05d38babe72564bb3f49677f94ac1aa6140858e3d7be92529cb45 url: https://src.opensuse.org/jengelh/gjiten revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 15f166c..d0a19c9 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd9a08f7eeb8f5c5ea28a878d2585e7745b199ebcff6c57e9aaf6fcb96aade32 +oid sha256:baf3ea77901aee3b993970d410392b3932a0584921782afe51adfc16ef2bd398 size 256 diff --git a/c23.patch b/c23.patch deleted file mode 100644 index 767f88d..0000000 --- a/c23.patch +++ /dev/null @@ -1,217 +0,0 @@ -From 9e0d6f0c35fd31ccc787c0d301b94a62ee9abd8d Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Tue, 17 Jun 2025 12:21:28 +0200 -Subject: [PATCH] Fix mismatch between function heads/prototypes/pointer types -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -References: https://github.com/DarkTrick/gjiten/pull/9 - -Support GCC 15. - -``` -gjiten.c: In function ‘_action_start_kanjipad’: -gjiten.c:356:3: error: too many arguments to function ‘gjiten_start_kanjidic’; expected 0, have 1 - 356 | gjiten_start_kanjidic (GTK_APPLICATION (gtk_application)); -In file included from gjiten.c:45: -gjiten.h:43:6: note: declared here - 43 | void gjiten_start_kanjidic(); -gjiten.c: In function ‘_action_start_worddic’: -gjiten.c:366:3: error: too many arguments to function ‘gjiten_start_worddic’; expected 0, have 1 - 366 | gjiten_start_worddic (GTK_APPLICATION (gtk_application)); -gjiten.h:42:6: note: declared here - 42 | void gjiten_start_worddic(); -gjiten.c: In function ‘_gjiten_create_menu’: -gjiten.c:449:43: error: initialization of ‘void (*)(GSimpleAction *, GVariant *, void *)’ {aka ‘void (*)(struct _GSimpleAction *, struct _GVariant *, void *)’} from incompatible pointer type ‘void (*)(void)’ [-Wincompatible-pointer-types] - 449 | {.name="quit", .activate=gjiten_quit }, -gjiten.c:449:43: note: (near initialization for ‘actions[0].activate’) -gjiten.c:170:1: note: ‘gjiten_quit’ declared here - 170 | gjiten_quit() -gjiten.c:450:43: error: initialization of ‘void (*)(GSimpleAction *, GVariant *, void *)’ {aka ‘void (*)(struct _GSimpleAction *, struct _GVariant *, void *)’} from incompatible pointer type ‘void (*)(void)’ [-Wincompatible-pointer-types] - 450 | {.name="preferences", .activate=create_dialog_preferences }, -gjiten.c:450:43: note: (near initialization for ‘actions[1].activate’) -In file included from gjiten.c:44: -pref.h:27:6: note: ‘create_dialog_preferences’ declared here - 27 | void create_dialog_preferences(); -gjiten.c:451:43: error: initialization of ‘void (*)(GSimpleAction *, GVariant *, void *)’ {aka ‘void (*)(struct _GSimpleAction *, struct _GVariant *, void *)’} from incompatible pointer type ‘void (*)(void)’ [-Wincompatible-pointer-types] - 451 | {.name="startKanjipad", .activate=gjiten_start_kanjipad }, -gjiten.c:451:43: note: (near initialization for ‘actions[2].activate’) -gjiten.c:181:1: note: ‘gjiten_start_kanjipad’ declared here - 181 | gjiten_start_kanjipad() -gjiten.c:452:46: error: initialization of ‘void (*)(GSimpleAction *, GVariant *, void *)’ {aka ‘void (*)(struct _GSimpleAction *, struct _GVariant *, void *)’} from incompatible pointer type ‘void (*)(void)’ [-Wincompatible-pointer-types] - 452 | {.name="showWhatsNew", .activate=gjiten_show_whatsnew }, -gjiten.c:452:46: note: (near initialization for ‘actions[3].activate’) -gjiten.c:243:1: note: ‘gjiten_show_whatsnew’ declared here - 243 | gjiten_show_whatsnew() -gjiten.c:453:43: error: initialization of ‘void (*)(GSimpleAction *, GVariant *, void *)’ {aka ‘void (*)(struct _GSimpleAction *, struct _GVariant *, void *)’} from incompatible pointer type ‘void (*)(void)’ [-Wincompatible-pointer-types] - 453 | {.name="showAbout", .activate=gjiten_create_about }, -gjiten.c:453:43: note: (near initialization for ‘actions[4].activate’) -gjiten.c:302:1: note: ‘gjiten_create_about’ declared here - 302 | gjiten_create_about() -gjiten.c: At top level: -gjiten.c:480:1: error: conflicting types for ‘gjiten_start_worddic’; have ‘void(GtkApplication *)’ {aka ‘void(struct _GtkApplication *)’} - 480 | gjiten_start_worddic(GtkApplication *app){ -gjiten.h:42:6: note: previous declaration of ‘gjiten_start_worddic’ with type ‘void(void)’ - 42 | void gjiten_start_worddic(); -gjiten.c: In function ‘gjiten_start_worddic’: -gjiten.c:486:29: error: too many arguments to function ‘worddic_create’; expected 0, have 1 - 486 | GjWorddicWindow *window = worddic_create (app); -In file included from gjiten.c:42: -worddic.h:54:18: note: declared here - 54 | GjWorddicWindow* worddic_create(); -gjiten.c: At top level: -gjiten.c:494:1: error: conflicting types for ‘gjiten_start_kanjidic’; have ‘void(GtkApplication *)’ {aka ‘void(struct _GtkApplication *)’} - 494 | gjiten_start_kanjidic(GtkApplication *app) -gjiten.h:43:6: note: previous declaration of ‘gjiten_start_kanjidic’ with type ‘void(void)’ - 43 | void gjiten_start_kanjidic(); -gjiten.c: In function ‘gjiten_start_kanjidic’: -gjiten.c:500:30: error: too many arguments to function ‘kanjidic_create’; expected 0, have 1 - 500 | GjKanjidicWindow *window = kanjidic_create (app); -In file included from gjiten.c:43: -kanjidic.h:59:19: note: declared here - 59 | GjKanjidicWindow *kanjidic_create(); -``` ---- - src/gjiten.c | 16 ++++++++-------- - src/gjiten.h | 6 +++--- - src/migration2-6_3-0.c | 2 +- - src/migration2-6_3-0.h | 2 +- - src/pref.c | 2 +- - src/pref.h | 2 +- - 6 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/src/gjiten.c b/src/gjiten.c -index 3f8ef6c..f6fb5d7 100755 ---- a/src/gjiten.c -+++ b/src/gjiten.c -@@ -167,7 +167,7 @@ gjiten_quit_if_all_windows_closed() - * Cleanly close gjiten from anywhere in the code - **/ - void --gjiten_quit() -+gjiten_quit(GSimpleAction *xa, GVariant *xb, void *xc) - { - // Close all windows - // (gjiten_quit_if_all_windows_closed () will be called inside there) -@@ -178,7 +178,7 @@ gjiten_quit() - - - void --gjiten_start_kanjipad() -+gjiten_start_kanjipad(GSimpleAction *xa, GVariant *xb, void *xc) - { - FILE *kanjipad_binary; - char *kpad_cmd; -@@ -239,8 +239,8 @@ gjiten_display_manual(GtkWidget *parent_window_nullable, - - - --void --gjiten_show_whatsnew() -+static void -+gjiten_show_whatsnew(GSimpleAction *xa, GVariant *xb, void *xc) - { - GtkTextBuffer *textbuffer = gtk_text_buffer_new (NULL); - -@@ -298,8 +298,8 @@ gjiten_show_whatsnew() - - - --void --gjiten_create_about() -+static void -+gjiten_create_about(GSimpleAction *, GVariant *, void *) - { - const gchar *authors[] = { "Botond Botyanszki , DarkTrick", NULL }; - const gchar *documenters[] = { NULL }; -@@ -483,7 +483,7 @@ gjiten_start_worddic(GtkApplication *app){ - gtk_window_present (GTK_WINDOW (gjitenApp->worddic)); - } - -- GjWorddicWindow *window = worddic_create (app); -+ GjWorddicWindow *window = worddic_create (); - gjitenApp->worddic = window; - _start_window (GTK_WINDOW (window)); - } -@@ -497,7 +497,7 @@ gjiten_start_kanjidic(GtkApplication *app) - gtk_window_present (GTK_WINDOW (gjitenApp->kanjidic)); - } - -- GjKanjidicWindow *window = kanjidic_create (app); -+ GjKanjidicWindow *window = kanjidic_create (); - gjitenApp->kanjidic = window; - _start_window (GTK_WINDOW (window)); - } -diff --git a/src/gjiten.h b/src/gjiten.h -index 1f3e10c..ca30890 100755 ---- a/src/gjiten.h -+++ b/src/gjiten.h -@@ -38,9 +38,9 @@ struct _GjitenApp { - - GtkApplication * gjiten_new(); - --void gjiten_start_kanjipad(); --void gjiten_start_worddic(); --void gjiten_start_kanjidic(); -+void gjiten_start_kanjipad(GSimpleAction *, GVariant *, void *); -+void gjiten_start_worddic(GtkApplication *); -+void gjiten_start_kanjidic(GtkApplication *); - void gjiten_start_kanjidic_with_search(gunichar kanji); - - void gjiten_apply_fonts(GjitenApp * gjitenApp); -diff --git a/src/migration2-6_3-0.c b/src/migration2-6_3-0.c -index 36d9644..209ccac 100644 ---- a/src/migration2-6_3-0.c -+++ b/src/migration2-6_3-0.c -@@ -384,7 +384,7 @@ migrate_2_6_to_3_0(const gchar *new_storage_dir, - if (_store_available_gsettings()) - succ = _migrate_gsettings (&self, new_storage_dir, new_storage_file); - else -- if (_store_available_gconf (&self)) -+ if (_store_available_gconf ()) - succ = _migrate_gconf (&self, new_storage_dir, new_storage_file); - } - -diff --git a/src/migration2-6_3-0.h b/src/migration2-6_3-0.h -index f5d363e..0150619 100644 ---- a/src/migration2-6_3-0.h -+++ b/src/migration2-6_3-0.h -@@ -4,7 +4,7 @@ - #define __MIGRATION2_6_3_0_H__ - - gboolean migration_possible_2_6_to_3_0(); --gboolean migrate_2_6_to_3_0 (); -+gboolean migrate_2_6_to_3_0 (const gchar *, const gchar *); - - - #endif -\ No newline at end of file -diff --git a/src/pref.c b/src/pref.c -index 7c5f0eb..d888d82 100755 ---- a/src/pref.c -+++ b/src/pref.c -@@ -459,7 +459,7 @@ checkbutton_envvar_cb(GtkWidget *button) - - - void --create_dialog_preferences() -+create_dialog_preferences(GSimpleAction *xa, GVariant *xb, void *xc) - { - GtkWidget *button; - GtkWidget *tmpwidget; -diff --git a/src/pref.h b/src/pref.h -index ef36d69..8ad49d5 100644 ---- a/src/pref.h -+++ b/src/pref.h -@@ -24,7 +24,7 @@ - #ifndef __PREF_H__ - #define __PREF_H__ - --void create_dialog_preferences(); -+void create_dialog_preferences(GSimpleAction *, GVariant *, void *); - - - #endif --- -2.49.0 - 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 716bbad..217747c 100644 --- a/gjiten.changes +++ b/gjiten.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/gjiten.spec b/gjiten.spec index 06e509c..386bd64 100644 --- a/gjiten.spec +++ b/gjiten.spec @@ -1,7 +1,7 @@ # # spec file for package gjiten # -# Copyright (c) 2025 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,24 +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 -Patch3: c23.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 @@ -53,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 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 -- 2.51.1 From 31f326ea63cf54ac9b1a0f6a096ec51b8d9bec6bbd2414d5d4ef21f2850fac48 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sat, 22 Nov 2025 23:05:08 +0100 Subject: [PATCH 4/4] Remove unused BuildRequires: update-desktop-files. --- gjiten.changes | 5 +++++ gjiten.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gjiten.changes b/gjiten.changes index 217747c..2bf967f 100644 --- a/gjiten.changes +++ b/gjiten.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/gjiten.spec b/gjiten.spec index 386bd64..5f00dcc 100644 --- a/gjiten.spec +++ b/gjiten.spec @@ -32,7 +32,6 @@ BuildRequires: meson BuildRequires: perl-XML-Parser BuildRequires: pkg-config BuildRequires: sgml-skel -BuildRequires: update-desktop-files BuildRequires: w3m BuildRequires: xmlto BuildRequires: pkgconfig(gmodule-export-2.0) -- 2.51.1