Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gjiten for openSUSE:Factory checked in at 2022-08-30 14:49:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gjiten (Old) and /work/SRC/openSUSE:Factory/.gjiten.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gjiten" Tue Aug 30 14:49:09 2022 rev:7 rq:999987 version:3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gjiten/gjiten.changes 2021-12-12 00:58:11.918608649 +0100 +++ /work/SRC/openSUSE:Factory/.gjiten.new.2083/gjiten.changes 2022-08-30 14:49:40.644150645 +0200 @@ -1,0 +2,12 @@ +Sun Aug 28 22:06:52 UTC 2022 - Jan Engelhardt <[email protected]> + +- 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) + +------------------------------------------------------------------- Old: ---- bugzilla-348100-empty-radicals-window.patch configure-set-foreign.patch gjiten-2.6.tar.gz gjiten-automake-fix.diff port-to-GSettings.patch skip-validation.patch stop-using-libgnome-ui.patch switch-to-GtkBuilder.patch New: ---- gjiten-3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gjiten.spec ++++++ --- /var/tmp/diff_new_pack.E4YHq0/_old 2022-08-30 14:49:41.284152278 +0200 +++ /var/tmp/diff_new_pack.E4YHq0/_new 2022-08-30 14:49:41.292152298 +0200 @@ -1,7 +1,7 @@ # # spec file for package gjiten # -# Copyright (c) 2021 SUSE LLC +# 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 @@ -17,30 +17,16 @@ Name: gjiten -Version: 2.6 +Version: 3.1 Release: 0 Summary: Japanese Dictionary Browser for GNOME/GTK+ License: GPL-2.0-or-later Group: Productivity/Office/Dictionary -URL: http://gjiten.sourceforge.net/ - -# CVS version is here: -# cvs -d:pserver:[email protected]:/cvsroot/gjiten login -# (empty password) -# cvs -d:pserver:[email protected]:/cvsroot/gjiten checkout gjiten -Source: %url/%name-%version.tar.gz - +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: configure-set-foreign.patch -Patch3: stop-using-gnome-common.patch -Patch4: skip-validation.patch -Patch5: gjiten-automake-fix.diff -Patch6: stop-using-libgnome-ui.patch -Patch7: switch-to-GtkBuilder.patch -Patch8: port-to-GSettings.patch -Patch9: bugzilla-348100-empty-radicals-window.patch - +Patch2: stop-using-gnome-common.patch BuildRequires: autoconf-archive BuildRequires: edict BuildRequires: intltool @@ -54,7 +40,7 @@ BuildRequires: xmlto BuildRequires: pkgconfig(gmodule-export-2.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) -BuildRequires: pkgconfig(gtk+-2.0) >= 2.14 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22 Requires: edict Provides: locale(libgnome:ja) @@ -66,7 +52,7 @@ method (such as ibus) for Japanese input. %prep -%autosetup -p1 +%autosetup -p1 -n %name-%name-%version %build NOCONFIGURE=1 ./autogen.sh @@ -89,13 +75,7 @@ %files -f %name.lang %_bindir/%name %_datadir/applications/* -%_datadir/doc/* -%_datadir/GConf/ -%_datadir/glib-2.0/ -%_datadir/omf/ %_datadir/%name/ %_datadir/pixmaps/* -%_datadir/gnome/ -%_mandir/man1/*.1* %changelog ++++++ gjiten-2.6.tar.gz -> gjiten-3.1.tar.gz ++++++ ++++ 111346 lines of diff (skipped) ++++++ gjiten.patch ++++++ --- /var/tmp/diff_new_pack.E4YHq0/_old 2022-08-30 14:49:41.540152931 +0200 +++ /var/tmp/diff_new_pack.E4YHq0/_new 2022-08-30 14:49:41.544152942 +0200 @@ -1,65 +1,14 @@ --- - po/de.po | 6 ++---- - po/ja.po | 4 ++-- - src/conf.c | 4 ++-- src/constants.h | 4 ++-- - 4 files changed, 8 insertions(+), 10 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) -Index: gjiten-2.6/po/de.po +Index: gjiten-gjiten-3.1/src/constants.h =================================================================== ---- gjiten-2.6.orig/po/de.po -+++ gjiten-2.6/po/de.po -@@ -132,10 +132,8 @@ msgid "WordDic" - msgstr "W??rterbuch" +--- gjiten-gjiten-3.1.orig/src/constants.h ++++ gjiten-gjiten-3.1/src/constants.h +@@ -3,8 +3,8 @@ - #: ../data/gjiten-settings.glade.h:28 --msgid "_Antialiasing [GDK__USE__XFT=1] (might not work with Japanese)" --msgstr "" --"_Anti-Aliasing [GDK__USE__XFT=1](funktioniert m??glicherweise nicht mit " --"japanischen Schriften)" -+msgid "_Antialiasing [GDK__USE__XFT=1]" -+msgstr "_Anti-Aliasing [GDK__USE__XFT=1]" - - #: ../data/gjiten-settings.glade.h:29 - msgid "_English interface [LANGUAGE=C]" -Index: gjiten-2.6/po/ja.po -=================================================================== ---- gjiten-2.6.orig/po/ja.po -+++ gjiten-2.6/po/ja.po -@@ -137,9 +137,9 @@ msgid "WordDic" - msgstr "????????????" - - #: ../data/gjiten-settings.glade.h:28 --msgid "_Antialiasing [GDK__USE__XFT=1] (might not work with Japanese)" -+msgid "_Antialiasing [GDK__USE__XFT=1]" - msgstr "" --"????????????????????????????????????(_A) [GDK__USE__XFT=1] (???????????????????????????????????????)" -+"????????????????????????????????????(_A) [GDK__USE__XFT=1]" - - #: ../data/gjiten-settings.glade.h:29 - msgid "_English interface [LANGUAGE=C]" -Index: gjiten-2.6/src/conf.c -=================================================================== ---- gjiten-2.6.orig/src/conf.c -+++ gjiten-2.6/src/conf.c -@@ -64,8 +64,8 @@ GjitenConfig *conf_load() { - conf->kdiccfg[CREF] = TRUE; - conf->toolbar = TRUE; - conf->menubar = TRUE; -- conf->force_ja_JP = TRUE; -- conf->force_language_c = TRUE; -+ conf->force_ja_JP = FALSE; -+ conf->force_language_c = FALSE; - if (conf->kanjidic == NULL) conf->kanjidic = g_new0(GjitenDicfile, 1); - conf->kanjidic->path = GJITEN_DICDIR"/kanjidic"; - conf->dictpath = GJITEN_DICDIR; -Index: gjiten-2.6/src/constants.h -=================================================================== ---- gjiten-2.6.orig/src/constants.h -+++ gjiten-2.6/src/constants.h -@@ -1,8 +1,8 @@ - #ifndef __CONSTANTS_H__ - #define __CONSTANTS_H__ + #include <config.h> -#define DEFWORDFONTNAME "-*-fixed-medium-r-normal-*-14-*-*-*-*-*-jisx0208.1983-0" -#define DEFBIGFONTNAME "-*-fixed-medium-r-normal-*-24-*-*-*-*-*-jisx0208.1983-0"; ++++++ stop-using-gnome-common.patch ++++++ --- /var/tmp/diff_new_pack.E4YHq0/_old 2022-08-30 14:49:41.556152972 +0200 +++ /var/tmp/diff_new_pack.E4YHq0/_new 2022-08-30 14:49:41.560152982 +0200 @@ -6,23 +6,14 @@ Bug-Debian: https://bugs.debian.org/829781 --- - configure.in | 4 ++-- - src/Makefile.am | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index fde3865..f56afdb 100644 ---- a/configure.in -+++ b/configure.in -@@ -19,7 +19,6 @@ AC_PROG_MAKE_SET - AC_PROG_INTLTOOL([0.22]) - AC_PATH_PROG([GCONFTOOL], [gconftool-2]) - --GNOME_COMMON_INIT - dnl GNOME_PLATFORM_GNOME_2(yes, force) - PKG_CHECK_MODULES(GJITEN, libgnome-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libglade-2.0 gconf-2.0) - AM_GCONF_SOURCE_2 -@@ -37,7 +36,8 @@ AC_FUNC_MMAP +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]) @@ -32,16 +23,4 @@ # Gettext stuff GETTEXT_PACKAGE=gjiten -diff --git a/src/Makefile.am b/src/Makefile.am -index ddb2df6..4773f90 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -20,5 +20,5 @@ radical_convtable: radical-convtable.txt - - EXTRA_DIST = convtable.pl radical-convtable.txt - --gjiten_CFLAGS = $(GJITEN_CFLAGS) -Wall -Wunused @DEBUG_FLAGS@ -+gjiten_CFLAGS = $(GJITEN_CFLAGS) -Wall -Wunused @DEBUG_FLAGS@ @WARN_CFLAGS@ - gjiten_LDADD = $(GJITEN_LIBS) -
