pool/ibus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 874320 from home:ftake:branches:M17N

Browse Source 
- Upstream update to 1.5.24
  * Add GTK4 IM module (currently disabled for openSUSE)
  * Search engine name directly
  * Update IBusInputPurpose and IBusInputHints in ibustypes.h
  * Warn deprecated IBus XKB engines /w dialog
    - Workaround for boo#1177545
  * Update simple.xml
  * Fix arguments in GLib.DBusSignalCallback for Vala 0.50
  * Fix to build emoji-*.dict in CLDR 38
  * Fix build environments
  * Hide IBus Preferences from AppStream
- Drop vala-0.50.patch, merged by upstream
- Remove old "Obsoletes" for ibus-gnome-shell and libibus-1_0-0

OBS-URL: https://build.opensuse.org/request/show/874320
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=251
This commit is contained in:
Hillwood Yang 2021-02-23 01:39:03 +00:00 committed by Git OBS Bridge
parent eb5358a740
commit e02aab6ed9
5 changed files with 21 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ibus-1.5.23.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b7e8d5bdb7d71a5ba4ee43cdf374675f77121a71c1679c9b9e7e02875bd0e150
size 3557661

3
ibus-1.5.24.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:abf33a965063629d3bbdab8a5948736ce3a9523cc3d6331e5ea0ec5e8ea7421f
size 3614372

17
ibus.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Feb 22 01:50:38 UTC 2021 - Fuminobu Takeyama <ftake@geeko.jp> - 1.5.24
- Upstream update to 1.5.24
* Add GTK4 IM module (currently disabled for openSUSE)
* Search engine name directly
* Update IBusInputPurpose and IBusInputHints in ibustypes.h
* Warn deprecated IBus XKB engines /w dialog
- Workaround for boo#1177545
* Update simple.xml
* Fix arguments in GLib.DBusSignalCallback for Vala 0.50
* Fix to build emoji-*.dict in CLDR 38
* Fix build environments
* Hide IBus Preferences from AppStream
- Drop vala-0.50.patch, merged by upstream
- Remove old "Obsoletes" for ibus-gnome-shell and libibus-1_0-0
-------------------------------------------------------------------
Mon Feb 8 14:37:27 UTC 2021 - Fuminobu Takeyama <ftake@geeko.jp>

7
ibus.spec
View File

@ -25,7 +25,7 @@
%endif
Name: ibus
Version: 1.5.23
Version: 1.5.24
Release: 0
Summary: The "Intelligent Input Bus" input method
License: LGPL-2.1-or-later
@ -59,8 +59,6 @@ Patch11: setup-switch-im.patch
# PATCH-FIX-SLE ibus-disable-engines-preload-in-GNOME.patch bnc#1036729 qzhao@suse.com
# Disable ibus engines preload in GNOME for These works are handled by gnome-shell.
Patch12: ibus-disable-engines-preload-in-GNOME.patch
# PATCH-FIX-UPSTREAM Fix build with vala 0.50 - gh#ibus/ibus#2265
Patch13: vala-0.50.patch
BuildRequires: fdupes
BuildRequires: gettext-devel
BuildRequires: gobject-introspection-devel >= 0.9.6
@ -99,7 +97,6 @@ Requires: python3-gobject-Gdk
# versions to 3.0 only.
Requires: typelib-1_0-Gtk-3_0
Provides: locale(ja;ko;zh)
Obsoletes: ibus-gnome-shell
%if %{with_wayland}
BuildRequires: pkgconfig(wayland-client) >= 1.2.0
%endif
@ -117,7 +114,6 @@ the text cursor.
%package -n libibus-1_0-5
Summary: IBus libraries
Group: System/Libraries
Obsoletes: libibus-1_0-0
%description -n libibus-1_0-5
This package contains the libraries for IBus
@ -197,7 +193,6 @@ cp -r %{SOURCE11} .
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%build
autoreconf -fi

104
vala-0.50.patch
View File

@ -1,104 +0,0 @@
From dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 30 Sep 2020 20:35:23 +0900
Subject: [PATCH] ui/gtk3: Fix arguments in GLib.DBusSignalCallback for Vala
0.50
BUG=https://github.com/ibus/ibus/issues/2265
---
ui/gtk3/application.vala | 22 +++++++++++-----------
ui/gtk3/extension.vala | 22 +++++++++++-----------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
index cc9ee54c9..da65301b4 100644
--- a/ui/gtk3/application.vala
+++ b/ui/gtk3/application.vala
@@ -3,7 +3,7 @@
* ibus - The Input Bus
*
* Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2017-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -69,22 +69,22 @@ class Application {
}
private void bus_name_acquired_cb(DBusConnection connection,
- string sender_name,
- string object_path,
- string interface_name,
- string signal_name,
- Variant parameters) {
+ string? sender_name,
+ string object_path,
+ string interface_name,
+ string signal_name,
+ Variant parameters) {
debug("signal_name = %s", signal_name);
m_panel = new Panel(m_bus);
m_panel.load_settings();
}
private void bus_name_lost_cb(DBusConnection connection,
- string sender_name,
- string object_path,
- string interface_name,
- string signal_name,
- Variant parameters) {
+ string? sender_name,
+ string object_path,
+ string interface_name,
+ string signal_name,
+ Variant parameters) {
// "Destroy" dbus method was called before this callback is called.
// "Destroy" dbus method -> ibus_service_destroy()
// -> g_dbus_connection_unregister_object()
diff --git a/ui/gtk3/extension.vala b/ui/gtk3/extension.vala
index ea3cd4647..a6f2e8e6a 100644
--- a/ui/gtk3/extension.vala
+++ b/ui/gtk3/extension.vala
@@ -3,7 +3,7 @@
* ibus - The Input Bus
*
* Copyright(c) 2018 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2018-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -67,22 +67,22 @@ class ExtensionGtk : Gtk.Application {
private void bus_name_acquired_cb(DBusConnection connection,
- string sender_name,
- string object_path,
- string interface_name,
- string signal_name,
- Variant parameters) {
+ string? sender_name,
+ string object_path,
+ string interface_name,
+ string signal_name,
+ Variant parameters) {
debug("signal_name = %s", signal_name);
m_panel = new PanelBinding(m_bus, this);
m_panel.load_settings();
}
private void bus_name_lost_cb(DBusConnection connection,
- string sender_name,
- string object_path,
- string interface_name,
- string signal_name,
- Variant parameters) {
+ string? sender_name,
+ string object_path,
+ string interface_name,
+ string signal_name,
+ Variant parameters) {
// "Destroy" dbus method was called before this callback is called.
// "Destroy" dbus method -> ibus_service_destroy()
// -> g_dbus_connection_unregister_object()