From c2a3bdd8ff7df2697e0a727035b3fc941cfd2102 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Jan 29 2020 04:35:33 +0000 Subject: Fix the build issue. --- diff --git a/imsettings-gcc10.patch b/imsettings-gcc10.patch new file mode 100644 index 0000000..8844baf --- /dev/null +++ b/imsettings-gcc10.patch @@ -0,0 +1,24 @@ +diff -pruN imsettings-1.8.2.orig/imsettings-daemon/imsettings-proc.c imsettings-1.8.2/imsettings-daemon/imsettings-proc.c +--- imsettings-1.8.2.orig/imsettings-daemon/imsettings-proc.c 2019-01-18 20:52:58.000000000 +0900 ++++ imsettings-1.8.2/imsettings-daemon/imsettings-proc.c 2020-01-29 13:33:07.051676780 +0900 +@@ -84,7 +84,7 @@ static gboolean _stop_process + + G_DEFINE_TYPE_WITH_PRIVATE (IMSettingsProc, imsettings_proc, G_TYPE_OBJECT); + +-guint signals[LAST_SIGNAL] = { 0 }; ++static guint signals[LAST_SIGNAL] = { 0 }; + + /*< private >*/ + static gboolean +diff -pruN imsettings-1.8.2.orig/imsettings-daemon/imsettings-server.c imsettings-1.8.2/imsettings-daemon/imsettings-server.c +--- imsettings-1.8.2.orig/imsettings-daemon/imsettings-server.c 2019-11-14 14:08:03.000000000 +0900 ++++ imsettings-1.8.2/imsettings-daemon/imsettings-server.c 2020-01-29 13:32:50.827832726 +0900 +@@ -91,7 +91,7 @@ GDBusInterfaceVTable __iface_vtable = { + NULL, + NULL, + }; +-guint signals[LAST_SIGNAL]; ++static guint signals[LAST_SIGNAL]; + + G_DEFINE_TYPE_WITH_PRIVATE (IMSettingsServer, imsettings_server, G_TYPE_OBJECT); + G_LOCK_DEFINE_STATIC (logger); diff --git a/imsettings.spec b/imsettings.spec index 2a9016e..70dd0ff 100644 --- a/imsettings.spec +++ b/imsettings.spec @@ -21,6 +21,7 @@ Patch1: %{name}-disable-xim.patch Patch2: %{name}-xinput-xcompose.patch ## Fedora specific: Force enable the IM management on imsettings for Cinnamon Patch3: %{name}-force-enable-for-cinnamon.patch +Patch4: %{name}-gcc10.patch Summary: Delivery framework for general Input Method configuration Requires: xorg-x11-xinit >= 1.0.2-22.fc8 @@ -309,6 +310,9 @@ fi %changelog +* Wed Jan 29 2020 Akira TAGOH - 1.8.2-2 +- Fix the build issue. + * Tue Dec 24 2019 Akira TAGOH - 1.8.2-1 - New upstream release. - Fix a segfault on XFCE. (#1697211)