Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ibus-hangul for openSUSE:Factory checked in at 2021-01-21 21:57:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-hangul (Old) and /work/SRC/openSUSE:Factory/.ibus-hangul.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-hangul" Thu Jan 21 21:57:13 2021 rev:27 rq:865348 version:1.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-hangul/ibus-hangul.changes 2020-10-10 00:29:16.565150775 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-hangul.new.28504/ibus-hangul.changes 2021-01-21 21:57:15.397854796 +0100 @@ -1,0 +2,7 @@ +Thu Jan 21 03:04:06 UTC 2021 - Wang Jun <[email protected]> + +- Update to version 1.5.4 + * Fix issue #93 + * Merge Pull Request #99, #96 + +------------------------------------------------------------------- Old: ---- ibus-hangul-1.5.3.tar.gz New: ---- ibus-hangul-1.5.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-hangul.spec ++++++ --- /var/tmp/diff_new_pack.PG7eAO/_old 2021-01-21 21:57:15.993855000 +0100 +++ /var/tmp/diff_new_pack.PG7eAO/_new 2021-01-21 21:57:15.997855001 +0100 @@ -1,7 +1,7 @@ # # spec file for package ibus-hangul # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,20 @@ Name: ibus-hangul -Version: 1.5.3 +Version: 1.5.4 Release: 0 Summary: The Hangul engine for IBus input platform License: GPL-2.0-or-later Group: System/I18n/Korean URL: https://github.com/libhangul/ibus-hangul -Source: https://github.com/libhangul/ibus-hangul/archive/1.5.3/%{name}-%{version}.tar.gz +Source: https://github.com/libhangul/ibus-hangul/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: fdupes BuildRequires: gettext BuildRequires: gnome-common BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig BuildRequires: update-desktop-files +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(ibus-1.0) BuildRequires: pkgconfig(libhangul) BuildRequires: pkgconfig(python3) ++++++ ibus-hangul-1.5.3.tar.gz -> ibus-hangul-1.5.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.5.3/Makefile.am new/ibus-hangul-1.5.4/Makefile.am --- old/ibus-hangul-1.5.3/Makefile.am 2019-11-30 08:08:59.000000000 +0100 +++ new/ibus-hangul-1.5.4/Makefile.am 2020-08-23 08:43:37.000000000 +0200 @@ -20,6 +20,7 @@ SUBDIRS = \ src \ + tests \ setup \ icons \ data \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.5.3/configure.ac new/ibus-hangul-1.5.4/configure.ac --- old/ibus-hangul-1.5.3/configure.ac 2019-11-30 08:08:59.000000000 +0100 +++ new/ibus-hangul-1.5.4/configure.ac 2020-08-23 08:43:37.000000000 +0200 @@ -22,7 +22,7 @@ m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [5]) -m4_define([ibus_micro_version], [3]) +m4_define([ibus_micro_version], [4]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) @@ -64,6 +64,11 @@ libhangul >= 0.1.0 ]) +# check gtk +PKG_CHECK_MODULES(GTK, [ + gtk+-3.0 >= 3.0.0 +]) + # check env AC_PATH_PROG(ENV_PROG, env) AC_SUBST(ENV_PROG) @@ -84,6 +89,18 @@ [Define to the read-only architecture-independent data directory.] ) +# --enable-installed-tests +AC_ARG_ENABLE(installed-tests, + AS_HELP_STRING([--enable-installed-tests], + [Enable to installed tests]), + [enable_installed_tests=$enableval], + [enable_installed_tests=no] +) +AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], [test x"$enable_installed_tests" = x"yes"]) +if test x"$enable_installed_tests" = x"no"; then + enable_installed_tests="no (disabled, use --enable-installed-tests to enable)" +fi + # OUTPUT files AC_CONFIG_FILES([ po/Makefile.in @@ -91,6 +108,7 @@ ibus-hangul.spec src/Makefile src/hangul.xml.in +tests/Makefile setup/Makefile icons/Makefile data/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.5.3/ibus-hangul.spec.in new/ibus-hangul-1.5.4/ibus-hangul.spec.in --- old/ibus-hangul-1.5.3/ibus-hangul.spec.in 2019-11-30 08:08:59.000000000 +0100 +++ new/ibus-hangul-1.5.4/ibus-hangul.spec.in 2020-08-23 08:43:37.000000000 +0200 @@ -36,6 +36,9 @@ %find_lang %{name} +%check +make check DISABLE_GUI_TESTS=ibus-hangul + %clean rm -rf $RPM_BUILD_ROOT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.5.3/setup/main.py new/ibus-hangul-1.5.4/setup/main.py --- old/ibus-hangul-1.5.3/setup/main.py 2019-11-30 08:08:59.000000000 +0100 +++ new/ibus-hangul-1.5.4/setup/main.py 2020-08-23 08:43:37.000000000 +0200 @@ -295,7 +295,6 @@ if __name__ == "__main__": locale.bindtextdomain(config.gettext_package, config.localedir) - gettext.bind_textdomain_codeset(config.gettext_package, "UTF-8") GLib.set_prgname("ibus-setup-hangul") GLib.set_application_name(_("IBusHangul Setup")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.5.3/src/Makefile.am new/ibus-hangul-1.5.4/src/Makefile.am --- old/ibus-hangul-1.5.3/src/Makefile.am 2019-11-30 08:08:59.000000000 +0100 +++ new/ibus-hangul-1.5.4/src/Makefile.am 2020-08-23 08:43:37.000000000 +0200 @@ -28,6 +28,27 @@ @HANGUL_LIBS@ \ $(NULL) +noinst_LIBRARIES = \ + libinternal.a + $(NULL) + +libinternal_a_SOURCES = \ + engine.c \ + engine.h \ + ustring.c \ + ustring.h \ + i18n.h \ + $(NULL) + +libinternal_a_CFLAGS = \ + @IBUS_CFLAGS@ \ + @HANGUL_CFLAGS@ \ + -DPKGDATADIR=\"$(pkgdatadir)\" \ + -DLOCALEDIR=\"$(localedir)\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -DIBUSHANGUL_DATADIR=\"$(datadir)/ibus-hangul\" \ + $(NULL) + check_PROGRAMS = \ test-ustring $(NULL) @@ -40,11 +61,6 @@ ibus_engine_hangul_SOURCES = \ main.c \ - engine.c \ - engine.h \ - ustring.c \ - ustring.h \ - i18n.h \ $(NULL) ibus_engine_hangul_CFLAGS = \ @@ -57,6 +73,7 @@ $(NULL) ibus_engine_hangul_LDADD = \ + libinternal.a \ @IBUS_LIBS@ \ @HANGUL_LIBS@ \ $(NULL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.5.3/src/hangul.xml.in.in new/ibus-hangul-1.5.4/src/hangul.xml.in.in --- old/ibus-hangul-1.5.3/src/hangul.xml.in.in 2019-11-30 08:08:59.000000000 +0100 +++ new/ibus-hangul-1.5.4/src/hangul.xml.in.in 2020-08-23 08:43:37.000000000 +0200 @@ -23,6 +23,7 @@ <description>Korean Input Method</description> <rank>99</rank> <symbol>한</symbol> + <setup>${libexecdir}/ibus-setup-hangul</setup> </engine> </engines> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.5.3/tests/Makefile.am new/ibus-hangul-1.5.4/tests/Makefile.am --- old/ibus-hangul-1.5.3/tests/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-hangul-1.5.4/tests/Makefile.am 2020-08-23 08:43:37.000000000 +0200 @@ -0,0 +1,77 @@ +# vim:set noet ts=4: +# +# ibus-hangul - The Hangul engine for IBus +# +# Copyright (c) 2019 Peng Wu <[email protected]> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +TESTS = \ + ibus-hangul \ + $(NULL) + +CLEANFILES = $(test_metas) + +EXTRA_DIST = $(test_metas_in) runtest + +noinst_PROGRAMS = $(TESTS) + +TESTS_ENVIRONMENT = \ + top_builddir=$(top_builddir) \ + top_srcdir=$(top_srcdir) \ + builddir=$(builddir) \ + srcdir=$(srcdir) \ + LD_LIBRARY_PATH="$(top_builddir)/src/.libs:$(top_builddir)/src" \ + DISABLE_GUI_TESTS="$(DISABLE_GUI_TESTS)" \ + $(NULL) + +LOG_COMPILER = $(srcdir)/runtest +test_metas_in = meta.test.in + +if ENABLE_INSTALLED_TESTS +test_execs = ibus-hangul +test_metas = $(addsuffix .test, $(test_execs)) +test_sources_DATA = $(test_metas) +test_sourcesdir = $(datadir)/installed-tests/ibus-hangul +test_execs_PROGRAMS = $(TESTS) +test_execsdir = $(libexecdir)/installed-tests/ibus-hangul +endif + +ibus_hangul_SOURCES = ibus-hangul.c +ibus_hangul_CFLAGS = \ + @IBUS_CFLAGS@ \ + @HANGUL_CFLAGS@ \ + @GTK_CFLAGS@ \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + -DPKGDATADIR=\"$(pkgdatadir)\" \ + -DLOCALEDIR=\"$(localedir)\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -DIBUSHANGUL_DATADIR=\"$(datadir)/ibus-hangul\" \ + $(NULL) + +ibus_hangul_LDADD = \ + ../src/libinternal.a \ + @IBUS_LIBS@ \ + @HANGUL_LIBS@ \ + @GTK_LIBS@ \ + $(NULL) + +$(test_metas): $(test_metas_in) $(test_programs) + f=`echo $@ | sed -e 's/\.test//'`; \ + TEST_EXEC=$(test_execsdir)/$$f; \ + sed -e "s|@TEST_EXEC[@]|$$TEST_EXEC|g" $(test_metas_in) > [email protected]; \ + mv [email protected] $@; \ + $(NULL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.5.3/tests/ibus-hangul.c new/ibus-hangul-1.5.4/tests/ibus-hangul.c --- old/ibus-hangul-1.5.3/tests/ibus-hangul.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-hangul-1.5.4/tests/ibus-hangul.c 2020-08-23 08:43:37.000000000 +0200 @@ -0,0 +1,322 @@ +#include <unistd.h> +#include <gtk/gtk.h> +#include "ibus.h" +#include "engine.h" + +#define GREEN "\033[0;32m" +#define RED "\033[0;31m" +#define NC "\033[0m" + +typedef struct { + const gchar * input; + const gchar * output; +}TestCase; + +IBusBus *m_bus; +IBusEngine *m_engine; +gchar *m_srcdir; + +IBusKeymap *keymap = NULL; + +const guint m_switch_hangul[3] = {IBUS_Hangul, 122, 0}; + +const TestCase m_test_cases[] = +{ + {"rk ", "???"} +}; + +static gboolean window_focus_in_event_cb (GtkWidget *entry, + GdkEventFocus *event, + gpointer data); + +static guint16 guess_keycode (IBusKeymap *keymap, + guint keyval, + guint32 modifiers) +{ + /* The IBusKeymap only have 256 entries here, + Use Brute Force method to get keycode from keyval. */ + guint16 keycode = 0; + for (; keycode < 256; ++keycode) { + if (keyval == ibus_keymap_lookup_keysym (keymap, keycode, modifiers)) + return keycode; + } + return 0; +} + +static IBusEngine * +create_engine_cb (IBusFactory *factory, + const gchar *name, + gpointer data) +{ + static int i = 1; + gchar *engine_path = + g_strdup_printf ("/org/freedesktop/IBus/engine/hangultest/%d", + i++); + + m_engine = ibus_engine_new_with_type (IBUS_TYPE_HANGUL_ENGINE, + name, + engine_path, + ibus_bus_get_connection (m_bus)); + g_free (engine_path); + + return m_engine; +} + +static gboolean +register_ibus_engine () +{ + IBusFactory *factory; + IBusComponent *component; + IBusEngineDesc *desc; + + m_bus = ibus_bus_new (); + if (!ibus_bus_is_connected (m_bus)) { + g_critical ("ibus-daemon is not running."); + return FALSE; + } + factory = ibus_factory_new (ibus_bus_get_connection (m_bus)); + g_signal_connect (factory, "create-engine", + G_CALLBACK (create_engine_cb), NULL); + + component = ibus_component_new ( + "org.freedesktop.IBus.HangulTest", + "Hangul Engine Test", + "1.5.1", + "GPL", + "Peng Huang <[email protected]>", + "https://github.com/ibus/ibus/wiki";, + "", + "ibus-hangul"); + desc = ibus_engine_desc_new ( + "hangultest", + "Hangul Test", + "Hangul Test", + "en", + "GPL", + "Peng Huang <[email protected]>", + "ibus-hangul", + "us"); + ibus_component_add_engine (component, desc); + ibus_bus_register_component (m_bus, component); + + return TRUE; +} + +static gboolean +finit (gpointer data) +{ + g_test_incomplete ("time out"); + gtk_main_quit (); + return FALSE; +} + +static void +set_engine_cb (GObject *object, GAsyncResult *res, gpointer data) +{ + IBusBus *bus = IBUS_BUS (object); + GtkWidget *entry = GTK_WIDGET (data); + GError *error = NULL; + gint i; + const gchar *p = NULL; + + if (!ibus_bus_set_global_engine_async_finish (bus, res, &error)) { + gchar *msg = g_strdup_printf ("set engine failed: %s", error->message); + g_test_incomplete (msg); + g_free (msg); + g_error_free (error); + return; + } + + { + /* Switch hangul mode. */ + guint keyval = m_switch_hangul[0]; + guint keycode = m_switch_hangul[1]; + guint modifiers = m_switch_hangul[2]; + gboolean retval; + + if (keyval == 0) { + g_test_incomplete ("ibus-hangul switch key is not set correctly."); + return; + } + g_signal_emit_by_name (m_engine, "process-key-event", + keyval, keycode, modifiers, &retval); + modifiers |= IBUS_RELEASE_MASK; + sleep(1); + g_signal_emit_by_name (m_engine, "process-key-event", + keyval, keycode, modifiers, &retval); + } + + { + /* Run test cases */ + for (i = 0; + i < G_N_ELEMENTS(m_test_cases); + i++) { + for (p = m_test_cases[i].input; *p; p++) { + gboolean retval; + guint keyval = *p; + guint modifiers = 0; + guint keycode = guess_keycode (keymap, keyval, modifiers); + + if (keyval == 0) + break; + g_signal_emit_by_name (m_engine, "process-key-event", + keyval, keycode, modifiers, &retval); + modifiers |= IBUS_RELEASE_MASK; + sleep(1); + g_signal_emit_by_name (m_engine, "process-key-event", + keyval, keycode, modifiers, &retval); + } + } + } + + g_signal_handlers_disconnect_by_func (entry, + G_CALLBACK (window_focus_in_event_cb), + NULL); + g_timeout_add_seconds (10, finit, NULL); +} + +static gboolean +window_focus_in_event_cb (GtkWidget *entry, GdkEventFocus *event, gpointer data) +{ + g_assert (m_bus != NULL); + ibus_bus_set_global_engine_async (m_bus, + "hangultest", + -1, + NULL, + set_engine_cb, + entry); + return FALSE; +} + +static void +window_inserted_text_cb (GtkEntryBuffer *buffer, + guint position, + const gchar *chars, + guint nchars, + gpointer data) +{ +/* https://gitlab.gnome.org/GNOME/gtk/commit/9981f46e0b + * The latest GTK does not emit "inserted-text" when the text is "". + */ +#if !GTK_CHECK_VERSION (3, 22, 16) + static int n_loop = 0; +#endif + static guint index = 0; + gunichar code = g_utf8_get_char (chars); + const gchar *test; + GtkEntry *entry = GTK_ENTRY (data); + +#if !GTK_CHECK_VERSION (3, 22, 16) + if (n_loop % 2 == 1) { + n_loop = 0; + return; + } +#endif + + { + /* Run test case */ + const gchar *p = chars; + const gchar *output = m_test_cases[index].output; + guint j = 0; + gboolean valid_output = TRUE; + + if (0 != g_strcmp0 (p, output)) + valid_output = FALSE; + index++; + + if (valid_output) { + test = GREEN "PASS" NC; + } else { + test = RED "FAIL" NC; + g_test_fail (); + } + g_print ("%05d %s expected: %s typed: %s\n", + index, test, output, p); + } + + if (index == G_N_ELEMENTS(m_test_cases)) { + gtk_main_quit (); + return; + } + +#if !GTK_CHECK_VERSION (3, 22, 16) + n_loop++; +#endif + gtk_entry_set_text (entry, ""); +} + +static void +create_window () +{ + GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + GtkWidget *entry = gtk_entry_new (); + GtkEntryBuffer *buffer; + + g_signal_connect (window, "destroy", + G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (entry, "focus-in-event", + G_CALLBACK (window_focus_in_event_cb), NULL); + buffer = gtk_entry_get_buffer (GTK_ENTRY (entry)); + g_signal_connect (buffer, "inserted-text", + G_CALLBACK (window_inserted_text_cb), entry); + gtk_container_add (GTK_CONTAINER (window), entry); + gtk_widget_show_all (window); +} + +static void +test_hangul (void) +{ + GLogLevelFlags flags; + if (!register_ibus_engine ()) { + g_test_fail (); + return; + } + + ibus_hangul_init (m_bus); + + create_window (); + /* FIXME: + * IBusIMContext opens GtkIMContextSimple as the slave and + * GtkIMContextSimple opens the compose table on el_GR.UTF-8, and the + * multiple outputs in el_GR's compose causes a warning in gtkcomposetable + * and the warning always causes a fatal in GTest: + " "GTK+ supports to output one char only: " + */ + flags = g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); + gtk_main (); + g_log_set_always_fatal (flags); +} + +int +main (int argc, char *argv[]) +{ + const gchar *test_name; + gchar *test_path; + + /* Run test cases with X Window. */ + g_setenv ("GDK_BACKEND", "x11", TRUE); + + ibus_init (); + /* Avoid a warning of "AT-SPI: Could not obtain desktop path or name" + * with gtk_main(). + */ + g_setenv ("NO_AT_BRIDGE", "1", TRUE); + g_test_init (&argc, &argv, NULL); + gtk_init (&argc, &argv); + + m_srcdir = argc > 1 ? g_strdup (argv[1]) : g_strdup ("."); + +#if GLIB_CHECK_VERSION (2, 58, 0) + test_name = g_get_language_names_with_category ("LC_CTYPE")[0]; +#else + test_name = g_getenv ("LANG"); +#endif + + test_path = g_build_filename ("/ibus-hangul", test_name, NULL); + g_test_add_func (test_path, test_hangul); + g_free (test_path); + + keymap = ibus_keymap_get("us"); + + return g_test_run (); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.5.3/tests/meta.test.in new/ibus-hangul-1.5.4/tests/meta.test.in --- old/ibus-hangul-1.5.3/tests/meta.test.in 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-hangul-1.5.4/tests/meta.test.in 2020-08-23 08:43:37.000000000 +0200 @@ -0,0 +1,4 @@ +[Test] +Type=session +Exec=@TEST_EXEC@ --tap +Output=TAP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.5.3/tests/runtest new/ibus-hangul-1.5.4/tests/runtest --- old/ibus-hangul-1.5.3/tests/runtest 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-hangul-1.5.4/tests/runtest 2020-08-23 08:43:37.000000000 +0200 @@ -0,0 +1,25 @@ +#!/bin/bash + +: ${top_builddir:=../..} +: ${top_srcdir:=../..} +: ${builddir:=.} +: ${srcdir:=.} +: ${DISABLE_GUI_TESTS:=''} + +ibus-daemon --xim --panel disable --config disable & +sleep 30 + +tst=$1 + +for t in $DISABLE_GUI_TESTS; do + if test $t = `basename $tst`; then + exit 77 + fi +done + +$builddir/$tst +retval=$? + +ibus exit + +exit $retval
