cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to ibus-1.5.24.

Browse Source
This commit is contained in:
ajacoutot 2021-03-07 17:28:12 +00:00
parent c7efe3c7b9
commit 6834ff13c2
6 changed files with 16 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inputmethods/ibus/Makefile
View File

@ -1,12 +1,14 @@
# $OpenBSD: Makefile,v 1.68 2021/02/23 19:39:27 sthen Exp $
# $OpenBSD: Makefile,v 1.69 2021/03/07 17:28:12 ajacoutot Exp $
# when gtk+4 support is added, split into multi packages (gtk+{2,3,4})
COMMENT = intelligent input bus framework
GH_PROJECT = ibus
GH_ACCOUNT = ibus
GH_TAGNAME = 1.5.23
GH_TAGNAME = 1.5.24
SHARED_LIBS += ibus-1.0 4.2 # 5.523
SHARED_LIBS += ibus-1.0 4.2 # 5.524
CATEGORIES = inputmethods chinese japanese korean

4
inputmethods/ibus/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ibus-1.5.23.tar.gz) = 6JeLSR7Fb3hVLCPPTn/mJ5rt4nDm7630PAOV8Iy0CQY=
SIZE (ibus-1.5.23.tar.gz) = 1371387
SHA256 (ibus-1.5.24.tar.gz) = ADqEowqMbKkC1Em3gsguwq401Xb8vQtgNvRv4ZXVh6k=
SIZE (ibus-1.5.24.tar.gz) = 1390778

14
inputmethods/ibus/patches/patch-client_gtk2_ibusimcontext_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-client_gtk2_ibusimcontext_c,v 1.3 2020/04/20 10:15:16 ajacoutot Exp $
$OpenBSD: patch-client_gtk2_ibusimcontext_c,v 1.4 2021/03/07 17:28:12 ajacoutot Exp $
Index: client/gtk2/ibusimcontext.c
--- client/gtk2/ibusimcontext.c.orig
+++ client/gtk2/ibusimcontext.c
@@ -688,10 +688,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
@@ -815,10 +815,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
#if !GTK_CHECK_VERSION (3, 98, 4)
/* always install snooper */
if (_key_snooper_id == 0) {
-#pragma GCC diagnostic push
@ -12,10 +12,10 @@ Index: client/gtk2/ibusimcontext.c
_key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
-#pragma GCC diagnostic pop
}
#endif
_daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
@@ -708,10 +705,7 @@ ibus_im_context_class_fini (IBusIMContextClass *class)
{
@@ -837,10 +834,7 @@ ibus_im_context_class_fini (IBusIMContextClass *class)
#if !GTK_CHECK_VERSION (3, 98, 4)
if (_key_snooper_id != 0) {
IDEBUG ("snooper is terminated.");
-#pragma GCC diagnostic push
@ -24,4 +24,4 @@ Index: client/gtk2/ibusimcontext.c
-#pragma GCC diagnostic pop
_key_snooper_id = 0;
}
#endif

49
inputmethods/ibus/patches/patch-ui_gtk3_application_vala
View File

@ -1,49 +0,0 @@
$OpenBSD: patch-ui_gtk3_application_vala,v 1.1 2020/11/02 06:22:08 jasper Exp $
https://github.com/ibus/ibus/commit/dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40
Index: ui/gtk3/application.vala
--- ui/gtk3/application.vala.orig
+++ 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()

49
inputmethods/ibus/patches/patch-ui_gtk3_extension_vala
View File

@ -1,49 +0,0 @@
$OpenBSD: patch-ui_gtk3_extension_vala,v 1.1 2020/11/02 06:22:08 jasper Exp $
https://github.com/ibus/ibus/commit/dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40
Index: ui/gtk3/extension.vala
--- ui/gtk3/extension.vala.orig
+++ 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()

4
inputmethods/ibus/pkg/DESCR
View File

@ -1,2 +1,2 @@
IBus means Intelligent Input Bus. It is an open source input framework
for Linux/Unix OS.
IBus means Intelligent Input Bus.
It is an open source input framework for Linux/Unix OS.