From b273614079edeeac4ebc76f2e2e4a64700ca6b326f2dae392db1301624e8549f Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Mon, 5 Dec 2016 12:15:31 +0000 Subject: [PATCH 1/2] Accepting request 443755 from home:hillwood:branches:M17N - Update to 1.5.14 * Don't warn if DISPLAY is not set. * Install a DBus service file * configure: don't hardcode pkg-config * conf/gconf: Fix SEGV in ibus_config_gconf_get_values * client/gtk2: Fix SEGV with Wayland display * ui/gtk3: Fix panel CSS format for GTK 3.20 * engine: Implement Emoji typing with XKB engines * engine: Add emoji-list.html * engine: Use annotations/en.xml from unocode.org but not emoji-list.html * Fix typo in configure.ac * tests/ibus-engine-switch: Don't try to remove non-existing GSource * Fix make dist * Fix Croatian language code in simple.xml * Replace deprecated GSimpleAsyncResult with GTask since GLib 2.46 OBS-URL: https://build.opensuse.org/request/show/443755 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=155 --- ibus-1.5.13.tar.gz | 3 --- ibus-1.5.14.tar.gz | 3 +++ ibus.changes | 20 ++++++++++++++++++++ ibus.spec | 11 ++++++++--- 4 files changed, 31 insertions(+), 6 deletions(-) delete mode 100644 ibus-1.5.13.tar.gz create mode 100644 ibus-1.5.14.tar.gz diff --git a/ibus-1.5.13.tar.gz b/ibus-1.5.13.tar.gz deleted file mode 100644 index 89aacaa..0000000 --- a/ibus-1.5.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed73d80542dfdcca190b7958431048cd6830c2ce25c467384630b6a7e957a5f1 -size 2194054 diff --git a/ibus-1.5.14.tar.gz b/ibus-1.5.14.tar.gz new file mode 100644 index 0000000..176466b --- /dev/null +++ b/ibus-1.5.14.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c +size 2214350 diff --git a/ibus.changes b/ibus.changes index 4b6a72a..5be49f3 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Aug 25 02:40:50 UTC 2016 - hillwood@opensuse.org + +- Update to 1.5.14 + * Don't warn if DISPLAY is not set. + * Install a DBus service file + * configure: don't hardcode pkg-config + * conf/gconf: Fix SEGV in ibus_config_gconf_get_values + * client/gtk2: Fix SEGV with Wayland display + * ui/gtk3: Fix panel CSS format for GTK 3.20 + * engine: Implement Emoji typing with XKB engines + * engine: Add emoji-list.html + * engine: Use annotations/en.xml from unocode.org but not + emoji-list.html + * Fix typo in configure.ac + * tests/ibus-engine-switch: Don't try to remove non-existing GSource + * Fix make dist + * Fix Croatian language code in simple.xml + * Replace deprecated GSimpleAsyncResult with GTask since GLib 2.46 + ------------------------------------------------------------------- Mon Apr 18 14:40:35 UTC 2016 - ftake@geeko.jp diff --git a/ibus.spec b/ibus.spec index d8ea91e..774dddb 100644 --- a/ibus.spec +++ b/ibus.spec @@ -18,10 +18,10 @@ %define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0) %if 0%{?suse_version} == 1315 -%define with_python3 0 +%define with_python3 1 %else # temporary disable, 'coz ibus is not python3 ready -%define with_python3 0 +%define with_python3 1 %endif %if 0%{?suse_version} > 1315 %define with_wayland 1 @@ -30,7 +30,7 @@ %endif Name: ibus -Version: 1.5.13 +Version: 1.5.14 Release: 0 Summary: Intelligent Input Bus for Linux OS License: LGPL-2.1+ @@ -87,6 +87,9 @@ BuildRequires: intltool BuildRequires: iso-codes-devel BuildRequires: libnotify-devel >= 0.7 BuildRequires: libtool +BuildRequires: python-devel +BuildRequires: python3-devel +BuildRequires: pkgconfig(json-glib-1.0) # directory ownership { BuildRequires: oxygen-icon-theme BuildRequires: oxygen-icon-theme-scalable @@ -107,6 +110,7 @@ BuildRequires: pkgconfig(vapigen) %if %{with_wayland} BuildRequires: pkgconfig(wayland-client) >= 1.2.0 %endif +BuildRequires: nodejs-emojione BuildRequires: pkgconfig(xkbcommon) # It seems that old vala compiler cannot build with an incompatible # return type error among two overriding functions with @@ -394,6 +398,7 @@ dconf update %{_datadir}/pixmaps/ibus-keyboard.png %{_libdir}/ibus %{_datadir}/bash-completion/completions/ibus.bash +%{_datadir}/dbus-1/services/org.freedesktop.IBus.service # This file is generated by dconf update %ghost %{_sysconfdir}/dconf/db/ibus %dir %{_sysconfdir}/dconf/db/ibus.d From 85c6512d269cf60c1bc717f31f7430a47f0f80bdcb2eda825b8feed4336c606e Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Wed, 28 Dec 2016 15:31:01 +0000 Subject: [PATCH 2/2] Accepting request 448003 from home:hillwood:branches:M17N - Disable emoji dict build. OBS-URL: https://build.opensuse.org/request/show/448003 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=156 --- ibus.changes | 5 +++++ ibus.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ibus.changes b/ibus.changes index 5be49f3..05dd4aa 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 28 15:04:47 UTC 2016 - hillwood@opensuse.org + +- Disable emoji dict build. + ------------------------------------------------------------------- Thu Aug 25 02:40:50 UTC 2016 - hillwood@opensuse.org diff --git a/ibus.spec b/ibus.spec index 774dddb..31329e8 100644 --- a/ibus.spec +++ b/ibus.spec @@ -18,10 +18,10 @@ %define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0) %if 0%{?suse_version} == 1315 -%define with_python3 1 +%define with_python3 0 %else # temporary disable, 'coz ibus is not python3 ready -%define with_python3 1 +%define with_python3 0 %endif %if 0%{?suse_version} > 1315 %define with_wayland 1 @@ -110,7 +110,7 @@ BuildRequires: pkgconfig(vapigen) %if %{with_wayland} BuildRequires: pkgconfig(wayland-client) >= 1.2.0 %endif -BuildRequires: nodejs-emojione +# BuildRequires: nodejs-emojione BuildRequires: pkgconfig(xkbcommon) # It seems that old vala compiler cannot build with an incompatible # return type error among two overriding functions with @@ -272,6 +272,7 @@ intltoolize -f %configure --disable-static \ --enable-gtk3 \ --enable-vala \ + --disable-emoji-dict \ %if %{with_python3} --with-python=python3 \ %endif