Hello community, here is the log from the commit of package uim for openSUSE:Factory checked in at 2020-08-21 19:19:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uim (Old) and /work/SRC/openSUSE:Factory/.uim.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "uim" Fri Aug 21 19:19:33 2020 rev:49 rq:828513 version:1.8.8 Changes: -------- --- /work/SRC/openSUSE:Factory/uim/uim.changes 2019-04-30 13:05:34.581925035 +0200 +++ /work/SRC/openSUSE:Factory/.uim.new.3399/uim.changes 2020-08-21 19:20:20.872921688 +0200 @@ -1,0 +2,13 @@ +Tue Aug 18 12:37:11 UTC 2020 - Dr. Werner Fink <wer...@suse.de> + +- Add patch uim-fix-multiple_declaration.diff to avoid multiple + declaration of GCROOTS_jmp_buf + +------------------------------------------------------------------- +Tue Aug 18 11:19:51 UTC 2020 - Dr. Werner Fink <wer...@suse.de> + +- Add patch bugzilla-1175274-emacs-27.1.patch + There is no (process-kill-without-query) anymore, use + (set-process-query-on-exit-flag) instead (boo#1175274). + +------------------------------------------------------------------- New: ---- bugzilla-1175274-emacs-27.1.patch uim-fix-multiple_declaration.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uim.spec ++++++ --- /var/tmp/diff_new_pack.hPo8uz/_old 2020-08-21 19:20:24.628923686 +0200 +++ /var/tmp/diff_new_pack.hPo8uz/_new 2020-08-21 19:20:24.628923686 +0200 @@ -1,7 +1,7 @@ # # spec file for package uim # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,13 +22,15 @@ Summary: A multilingual input method framework License: BSD-3-Clause AND LGPL-2.1-or-later AND (BSD-3-Clause OR LGPL-2.0-only) Group: System/I18n/Japanese -Url: https://github.com/uim/uim +URL: https://github.com/uim/uim Source0: https://github.com/uim/uim/releases/download/%{version}/%{name}-%{version}.tar.gz Source1: suse-start-uim.el Source2: xemacs-auto-autoloads.el Source3: etc-x11-xim.d-uim Source4: baselibs.conf Patch2: uim-fix-crash-in-firefox.diff +Patch3: bugzilla-1175274-emacs-27.1.patch +Patch4: uim-fix-multiple_declaration.diff BuildRequires: canna-devel BuildRequires: emacs-x11 BuildRequires: fdupes @@ -105,6 +107,8 @@ %prep %setup -q %patch2 -p1 +%patch3 -p0 +%patch4 -p0 cp emacs/README README.emacs iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs ++++++ bugzilla-1175274-emacs-27.1.patch ++++++ There is no (process-kill-without-query) anymore, use (set-process-query-on-exit-flag) instead. --- emacs/uim-helper.el | 2 +- emacs/uim.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- emacs/uim-helper.el +++ emacs/uim-helper.el 2020-08-18 11:46:01.236192703 +0000 @@ -106,7 +106,7 @@ (if (not proc) (error "uim.el: Couldn't invoke uim-el-helper-agent.")) - (process-kill-without-query proc) + (set-process-query-on-exit-flag proc nil) ;; wait "OK" (let ((patience uim-startup-timeout) (ok nil)) --- emacs/uim.el +++ emacs/uim.el 2020-08-18 11:45:51.828359337 +0000 @@ -488,7 +488,7 @@ (error "uim.el: Couldn't invoke uim-el-agent.")) ;; don't ask kill - (process-kill-without-query proc) + (set-process-query-on-exit-flag proc nil) ;; wait "OK" (let ((patience uim-startup-timeout) (ok nil)) ++++++ uim-fix-multiple_declaration.diff ++++++ --- sigscheme/libgcroots/gcroots.c | 2 ++ sigscheme/libgcroots/include/private/gc_priv.h | 4 ++++ 2 files changed, 6 insertions(+) --- sigscheme/libgcroots/gcroots.c +++ sigscheme/libgcroots/gcroots.c 2020-08-18 12:34:48.712190602 +0000 @@ -16,7 +16,9 @@ #include "gcroots.h" #include "private/gcroots_priv.h" +#define DECLARE_JMP #include "private/gc_priv.h" +#undef DECLARE_JMP #if ((defined(__MWERKS__) && !defined(POWERPC)) \ || (!defined(USE_ASM_PUSH_REGS) && defined(M68K)) \ --- sigscheme/libgcroots/include/private/gc_priv.h +++ sigscheme/libgcroots/include/private/gc_priv.h 2020-08-18 12:35:41.103258717 +0000 @@ -2026,7 +2026,11 @@ void GC_err_puts(const char *s); # if defined(NEED_FIND_LIMIT) || \ defined(USE_PROC_FOR_LIBRARIES) && defined(THREADS) +# ifndef DECLARE_JMP +extern JMP_BUF GC_jmp_buf; +# else JMP_BUF GC_jmp_buf; +# endif /* Set up a handler for address faults which will longjmp to */ /* GC_jmp_buf; */
