pool/ibus
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 1268912 from M17N

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1268912
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus?expand=0&rev=129
This commit is contained in:
Ana Guerrero
2025-04-15 14:44:50 +00:00
committed by Git OBS Bridge
parent 6091ee183d cb981c217d
commit 0c126228ba
4 changed files with 171 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ibus-gcc15-1.patch Normal file
View File

@@ -0,0 +1,50 @@
github.com/ibus/ibus/commit/aac5446
From aac5446e8c98db934912b9b15a1ef92c3b7e4c8c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 24 Jan 2025 09:40:31 +0900
Subject: [PATCH] src: Fix declaration errors with GCC 15
BUG=rhbz#2340629
---
src/ibuscomposetable.c | 2 +-
src/ibusenginesimple.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index abf51244c..cf865c371 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -1362,7 +1362,7 @@ ibus_compose_table_new_with_list (GList *compose_list,
gsize s_size_total, s_size_16bit, v_size_32bit, v_index_32bit;
guint n = 0, m = 0;
int i, j;
- gpointer rawdata;
+ gpointer rawdata = NULL;
guint16 *ibus_compose_seqs = NULL;
guint16 *ibus_compose_seqs_32bit_first = NULL;
guint32 *ibus_compose_seqs_32bit_second = NULL;
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index a2715ab60..ec4a70ac6 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -501,7 +501,7 @@ check_hex (IBusEngineSimple *simple,
}
static IBusEngineDict *
-load_emoji_dict ()
+load_emoji_dict (void)
{
IBusEngineDict *emoji_dict;
GList *keys;
@@ -544,7 +544,7 @@ check_emoji_table (IBusEngineSimple *simple,
g_object_ref_sink (priv->lookup_table);
}
if (emoji_dict == NULL)
- emoji_dict = priv->emoji_dict = load_emoji_dict (simple);
+ emoji_dict = priv->emoji_dict = load_emoji_dict ();
if (emoji_dict == NULL || emoji_dict->dict == NULL)
return FALSE;

109
ibus-gcc15-2.patch Normal file
View File

@@ -0,0 +1,109 @@
github.com/ibus/ibus/commit/d039b95
From d039b95b1af14fd34167a4ca038938cef2ea41ca Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 24 Jan 2025 10:01:11 +0900
Subject: [PATCH] util/IMdkit: Fix incompatible-pointer-types in
TransportSW.checkAddr
BUG=rhbz#2340629
---
util/IMdkit/Xi18n.h | 18 ++++++++++--------
util/IMdkit/i18nMethod.c | 3 ++-
util/IMdkit/i18nOffsetCache.c | 10 ++++++----
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/util/IMdkit/Xi18n.h b/util/IMdkit/Xi18n.h
index 79dd9619a..09097bb61 100644
--- a/util/IMdkit/Xi18n.h
+++ b/util/IMdkit/Xi18n.h
@@ -3,7 +3,7 @@
Copyright (C) 1994-1995 Sun Microsystems, Inc.
Copyright (C) 1993-1994 Hewlett-Packard Company
Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
- Copyright (C) 2014 Red Hat, Inc.
+ Copyright (C) 2014-2025 Red Hat, Inc.
Permission to use, copy, modify, distribute, and sell this software
and its documentation for any purpose is hereby granted without fee,
@@ -71,13 +71,6 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define I18N_SET 1
#define I18N_GET 2
-typedef struct
-{
- char *transportname;
- int namelen;
- Bool (*checkAddr) ();
-} TransportSW;
-
typedef struct _XIMPending
{
unsigned char *p;
@@ -172,6 +165,15 @@ typedef struct _Xi18nClient
typedef struct _Xi18nCore *Xi18n;
+typedef struct _TransportSW TransportSW;
+
+struct _TransportSW
+{
+ char *transportname;
+ int namelen;
+ Bool (*checkAddr) (Xi18n, TransportSW *, char *);
+};
+
/*
* Callback Struct for XIM Protocol
*/
diff --git a/util/IMdkit/i18nMethod.c b/util/IMdkit/i18nMethod.c
index 9c44e7feb..7f343d875 100644
--- a/util/IMdkit/i18nMethod.c
+++ b/util/IMdkit/i18nMethod.c
@@ -2,6 +2,7 @@
Copyright 1994, 1995 by Sun Microsystems, Inc.
Copyright 1993, 1994 by Hewlett-Packard Company
+ Copyright (C) 2014-2025 Red Hat, Inc.
Permission to use, copy, modify, distribute, and sell this software
and its documentation for any purpose is hereby granted without fee,
@@ -89,7 +90,7 @@ TransportSW _TransR[] =
#ifdef DNETCONN
{"decnet", 6, _Xi18nCheckTransAddress},
#endif
- {(char *) NULL, 0, (Bool (*) ()) NULL}
+ {(char *) NULL, 0, (Bool (*) (Xi18n, TransportSW *, char *))NULL}
};
static Bool GetInputStyles (Xi18n i18n_core, XIMStyles **p_style)
diff --git a/util/IMdkit/i18nOffsetCache.c b/util/IMdkit/i18nOffsetCache.c
index e2fe8c6b3..cab974c74 100644
--- a/util/IMdkit/i18nOffsetCache.c
+++ b/util/IMdkit/i18nOffsetCache.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2014 Red Hat, Inc.
+ * Copyright (C) 2014-2025 Red Hat, Inc.
*
* Permission to use, copy, modify, distribute, and sell this
* software and its documentation for any purpose is hereby granted
@@ -83,10 +83,12 @@ void _Xi18nSetPropertyOffset (Xi18nOffsetCache *offset_cache, Atom key,
}
if (++offset_cache->size > offset_cache->capacity) {
- offset_cache->capacity *= OFFSET_CACHE_GROWTH_FACTOR;
- offset_cache->data = (Xi18nAtomOffsetPair *) realloc (data,
+ Xi18nAtomOffsetPair *pair = (Xi18nAtomOffsetPair *) realloc (data,
offset_cache->capacity * sizeof (Xi18nAtomOffsetPair));
- if (offset_cache->data == NULL) {
+ offset_cache->capacity *= OFFSET_CACHE_GROWTH_FACTOR;
+ if (pair) {
+ offset_cache->data = pair;
+ } else {
offset_cache->data = data;
--offset_cache->size;
}

6
ibus.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Apr 12 14:22:05 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
- Add ibus-gcc15-1.patch and ibus-gcc15-2.patch from upstream to
fix gcc15 compile time errors
-------------------------------------------------------------------
Fri Nov 8 13:27:39 UTC 2024 - Cliff Zhao <qzhao@suse.com>

6
ibus.spec
View File

@@ -76,6 +76,10 @@ Patch15: ibus-socket-name-compatibility.patch
# PATCH-FIX-UPSTREAM ibus-ui-gtk3-restart-via-systemd.patch
# Allow ibus-ui-gtk3 to restart ibus-daemon when it is launched by systemd
Patch16: ibus-ui-gtk3-restart-via-systemd.patch
# PATCH-FIX-UPSTREAM ibus-gcc15.patch
Patch17: ibus-gcc15-1.patch
# PATCH-FIX-UPSTREAM ibus-gcc15-2.patch
Patch18: ibus-gcc15-2.patch
BuildRequires: pkgconfig(dbusmenu-glib-0.4)
BuildRequires: pkgconfig(dbusmenu-gtk3-0.4)
BuildRequires: pkgconfig(gtk+-3.0)
@@ -237,6 +241,8 @@ cp -r %{SOURCE11} .
%patch -P 15 -p1
%endif
%patch -P 16 -p1
%patch -P 17 -p1
%patch -P 18 -p1
%build
%configure --disable-static \