Hello community, here is the log from the commit of package gjiten for openSUSE:Factory checked in at 2019-08-09 16:54:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gjiten (Old) and /work/SRC/openSUSE:Factory/.gjiten.new.9556 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gjiten" Fri Aug 9 16:54:36 2019 rev:3 rq:721962 version:2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/gjiten/gjiten.changes 2018-11-27 10:42:25.196195833 +0100 +++ /work/SRC/openSUSE:Factory/.gjiten.new.9556/gjiten.changes 2019-08-09 16:54:40.385450162 +0200 @@ -1,0 +2,20 @@ +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. + +------------------------------------------------------------------- Old: ---- configure.patch schemas.patch New: ---- configure-set-foreign.patch port-to-GSettings.patch stop-using-gnome-common.patch stop-using-libgnome-ui.patch switch-to-GtkBuilder.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gjiten.spec ++++++ --- /var/tmp/diff_new_pack.sttJbO/_old 2019-08-09 16:54:41.009450013 +0200 +++ /var/tmp/diff_new_pack.sttJbO/_new 2019-08-09 16:54:41.013450012 +0200 @@ -1,7 +1,7 @@ # # spec file for package gjiten # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,44 +23,38 @@ License: GPL-2.0-or-later Group: Productivity/Office/Dictionary URL: http://gjiten.sourceforge.net/ + # CVS version is here: # cvs -d:pserver:anonymous@gjiten.cvs.sourceforge.net:/cvsroot/gjiten login # (empty password) # cvs -d:pserver:anonymous@gjiten.cvs.sourceforge.net:/cvsroot/gjiten checkout gjiten -Source: http://gjiten.sourceforge.net/gjiten-%version.tar.gz -Patch0: gjiten.patch -Patch1: %name-desktop.patch -Patch3: configure.patch -Patch4: schemas.patch -Patch5: skip-validation.patch -Patch348100: bugzilla-348100-empty-radicals-window.patch -Patch6: gjiten-automake-fix.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define gnome_prefix %(pkg-config --variable=prefix libgnomeui-2.0) -%if "%gnome_prefix" == "/usr" -%define gnome_etc /etc -%gconf_schemas_prereq -%else -%define gnome_etc /etc%gnome_prefix -Requires(pre): gconf2 -%endif +Source: %{url}/%{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 + +BuildRequires: autoconf-archive BuildRequires: edict BuildRequires: intltool -BuildRequires: libglade2-devel -BuildRequires: libgnomeui-devel BuildRequires: libtool BuildRequires: libxslt BuildRequires: perl-XML-Parser -BuildRequires: scrollkeeper +BuildRequires: pkgconfig BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: w3m BuildRequires: xmlto -%if 0%{?suse_version} >= 1130 -BuildRequires: libgnome-keyring-devel -%else -BuildRequires: gnome-keyring-devel -%endif +BuildRequires: pkgconfig(gmodule-export-2.0) +BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(gtk+-2.0) >= 2.14 Requires: edict Provides: locale(libgnome:ja) @@ -72,66 +66,34 @@ method (such as ibus) for Japanese input. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch348100 -p1 -%patch6 -p1 +%autosetup -p1 %build -export CFLAGS="%optflags" -./autogen.sh --prefix=%{gnome_prefix} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --with-gnome=%{gnome_prefix} \ - --with-gconf-schema-file-dir=%{gnome_etc}/gconf/schemas \ - %{_target_cpu}-suse-linux -make %{?_smp_mflags} +NOCONFIGURE=1 ./autogen.sh +%configure +%make_build %install %make_install -ln -fsv "%_datadir/edict/radkfile" "%buildroot/%_datadir/gjiten/radkfile.utf8" -mkdir -p -m 755 %buildroot/%{_defaultdocdir}/%{name} -cp AUTHORS BUGS COPYING ChangeLog* INSTALL* NEWS* README* TODO \ - %buildroot/%{gnome_prefix}/share/doc/gjiten/gjiten-doc.ja.html \ - %buildroot/%{_defaultdocdir}/%{name} -pushd %buildroot/%{_defaultdocdir}/%{name} - for i in %buildroot/%{gnome_prefix}/share/gnome/help/gjiten/* - do - ln -sfv $(echo "$i" | sed "s%%^%buildroot/%%%%g") . - done -popd -%find_lang gjiten -%find_gconf_schemas -cat %{name}.lang %{name}.schemas_list >%{name}.lst -%suse_update_desktop_file %name Office Dictionary - -%pre -f %{name}.schemas_pre - -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun - -%files -f %{name}.lst -%defattr(-, root, root) -%doc %{_defaultdocdir}/%{name}/ -%{gnome_prefix}/bin/* -%dir %{gnome_prefix}/share/application-registry +ln -fsv "%{_datadir}/edict/radkfile" "%{buildroot}/%{_datadir}/%{name}/radkfile.utf8" +%find_lang %{name} +%suse_update_desktop_file %{name} Office Dictionary + +%files -f %{name}.lang +%{_bindir}/%{name} +%dir %{_datadir}/application-registry +%{_datadir}/application-registry/%{name}.desktop +%{_datadir}/applications/%{name}.desktop +%dir %{_datadir}/doc/%{name} +%{_datadir}/doc/%{name}/%{name}-doc.ja.html +%{_datadir}/GConf/gsettings/%{name}.convert +%{_datadir}/glib-2.0/schemas/net.sf.%{name}.gschema.xml +%dir %{_datadir}/%{name} +%{_datadir}/%{name} +%{_datadir}/pixmaps/* +%dir %{_datadir}/gnome +%dir %{_datadir}/gnome/help %dir %{_datadir}/omf -%{gnome_prefix}/share/application-registry/gjiten.desktop -%{gnome_prefix}/share/applications/gjiten.desktop -%{gnome_prefix}/share/gjiten -%{gnome_prefix}/share/gnome/help/gjiten -%{gnome_prefix}/share/locale/*/LC_MESSAGES/gjiten.mo -%{gnome_prefix}/share/omf/gjiten -%{gnome_prefix}/share/pixmaps/* -%exclude %{gnome_prefix}/share/doc/gjiten/gjiten-doc.ja.html -%if %suse_version <= 1020 -%{gnome_etc}/gconf/schemas/* -%endif -%{_mandir}/man1/* +%{_mandir}/man1/%{name}.1%{ext_man} %changelog ++++++ bugzilla-348100-empty-radicals-window.patch ++++++ --- /var/tmp/diff_new_pack.sttJbO/_old 2019-08-09 16:54:41.025450009 +0200 +++ /var/tmp/diff_new_pack.sttJbO/_new 2019-08-09 16:54:41.029450008 +0200 @@ -1,6 +1,8 @@ ---- gjiten-2.6/src/kanjidic.c 2006/10/29 18:52:29 1.19 -+++ gjiten-2.6/src/kanjidic.c 2007/10/23 21:03:36 1.20 -@@ -55,6 +55,7 @@ +Index: gjiten-2.6/src/kanjidic.c +=================================================================== +--- gjiten-2.6.orig/src/kanjidic.c ++++ gjiten-2.6/src/kanjidic.c +@@ -55,6 +55,7 @@ gchar *kdic_line = NULL; /*size = KCFGN gchar kanjiselected[2]; gchar *radkfile = NULL; guint32 radkfile_size; @@ -8,7 +10,7 @@ extern guint32 srchpos; GList *klinklist = NULL, *tmpklinklist = NULL; -@@ -775,7 +776,6 @@ +@@ -729,7 +730,6 @@ void load_radkfile() { gchar *radkfile_name = RADKFILE_NAME; gchar *radkfile_ptr; gchar *radkfile_end; @@ -16,7 +18,7 @@ RadInfo *rad_info = NULL; KanjiInfo *kanji_info; gunichar kanji; -@@ -789,13 +789,17 @@ +@@ -743,13 +743,17 @@ void load_radkfile() { error = TRUE; } radkfile_size = radk_stat.st_size; @@ -37,7 +39,7 @@ if (error == TRUE) { gjiten_print_error(_("Error opening %s.\n "\ -@@ -945,6 +949,13 @@ +@@ -899,6 +903,13 @@ static void kanjidic_close() { if (kanjiDic != NULL) { KanjiDic *tmp; radical_window_close(); ++++++ configure-set-foreign.patch ++++++ From: Yavor Doganov <yavor@gnu.org> Date: Wed, 10 Oct 2018 18:26:12 +0300 Subject: configure: set foreign GNU expects a README but we don't have one. So by setting the foreign flag, we fix autoreconf Bug-Debian: https://bugs.debian.org/765214 --- configure.in | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.in b/configure.in index aec96d4..fde3865 100644 --- a/configure.in +++ b/configure.in @@ -5,6 +5,7 @@ GJITEN_VERSION=2.6 AC_INIT(gjiten, 2.6) AC_CONFIG_SRCDIR(src/gjiten.c) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) +AM_INIT_AUTOMAKE([foreign]) dnl AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) ++++++ port-to-GSettings.patch ++++++ ++++ 1002 lines (skipped) ++++++ stop-using-gnome-common.patch ++++++ 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.in | 4 ++-- src/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 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/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) ++++++ stop-using-libgnome-ui.patch ++++++ ++++ 1144 lines (skipped) ++++++ switch-to-GtkBuilder.patch ++++++ ++++ 2716 lines (skipped)