fix compile error
This commit is contained in:
parent
ed6f168b31
commit
3b6edbb999
39
imsetting-fix-compile-error-sinal-multi-defined.patch
Normal file
39
imsetting-fix-compile-error-sinal-multi-defined.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From 2afb5e7516406d6147f5469e7f3482d61b6bb3df Mon Sep 17 00:00:00 2001
|
||||
From: root <root@localhost.localdomain>
|
||||
Date: Fri, 20 Aug 2021 14:43:12 +0800
|
||||
Subject: [PATCH] fix compile error sinal multi defined
|
||||
|
||||
---
|
||||
imsettings-daemon/imsettings-proc.c | 2 +-
|
||||
imsettings-daemon/imsettings-server.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/imsettings-daemon/imsettings-proc.c b/imsettings-daemon/imsettings-proc.c
|
||||
index b78fcff..25c461a 100644
|
||||
--- a/imsettings-daemon/imsettings-proc.c
|
||||
+++ b/imsettings-daemon/imsettings-proc.c
|
||||
@@ -86,7 +86,7 @@ static gboolean _stop_process (IMSettingsProc *proc,
|
||||
|
||||
G_DEFINE_TYPE (IMSettingsProc, imsettings_proc, G_TYPE_OBJECT);
|
||||
|
||||
-guint signals[LAST_SIGNAL] = { 0 };
|
||||
+static guint signals[LAST_SIGNAL] = { 0 };
|
||||
|
||||
/*< private >*/
|
||||
static gboolean
|
||||
diff --git a/imsettings-daemon/imsettings-server.c b/imsettings-daemon/imsettings-server.c
|
||||
index 1b97548..db9df37 100644
|
||||
--- a/imsettings-daemon/imsettings-server.c
|
||||
+++ b/imsettings-daemon/imsettings-server.c
|
||||
@@ -93,7 +93,7 @@ GDBusInterfaceVTable __iface_vtable = {
|
||||
NULL,
|
||||
NULL,
|
||||
};
|
||||
-guint signals[LAST_SIGNAL];
|
||||
+static guint signals[LAST_SIGNAL];
|
||||
|
||||
G_DEFINE_TYPE (IMSettingsServer, imsettings_server, G_TYPE_OBJECT);
|
||||
G_LOCK_DEFINE_STATIC (logger);
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: imsettings
|
||||
Version: 1.7.3
|
||||
Release: 8
|
||||
Release: 9
|
||||
License: LGPLv2.1
|
||||
Summary: Delivery framework for general Input Method configuration
|
||||
URL: https://bitbucket.org/tagoh/imsettings/src/master/
|
||||
@ -11,6 +11,7 @@ Patch0002: imsettings-xinput-xcompose.patch
|
||||
Patch0003: imsettings-force-enable-for-cinnamon.patch
|
||||
Patch0004: imsettings-fix-unbound-var.patch
|
||||
Patch0005: Fix-can-not-input-chinese-in-en-environment.patch
|
||||
Patch0006: imsetting-fix-compile-error-sinal-multi-defined.patch
|
||||
BuildRequires: desktop-file-utils intltool gettext libtool automake autoconf glib2 >= 2.32.0 gobject-introspection-devel
|
||||
BuildRequires: libnotify-devel libX11-devel libgxim-devel >= 0.5.0 gtk3-devel >= 3.3.3
|
||||
Requires: xorg-x11-xinit >= 1.0.2-22
|
||||
@ -143,6 +144,9 @@ fi
|
||||
%{_libdir}/imsettings/libimsettings-qt.so
|
||||
|
||||
%changelog
|
||||
* Fri Aug 20 2021 tanyulong <tanyulong@kylinos.cn> - 1.7.3-9
|
||||
- fix compile error sinal multi defined
|
||||
|
||||
* Fri Mar 12 2021 weidong <weidong@uniontech.com> - 1.7.3-8
|
||||
- fix can't input chinese in en environment
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user