From 4b89b62cad185a8ca91965d18431876f22d5bc4b Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 10 Apr 2018 14:49:39 +0200 Subject: [PATCH] Fix the build on F28+ with new glib2 --- incompatible_pointer_build_fix.patch | 12 ++++++++++++ libappindicator.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 incompatible_pointer_build_fix.patch diff --git a/incompatible_pointer_build_fix.patch b/incompatible_pointer_build_fix.patch new file mode 100644 index 0000000..50678be --- /dev/null +++ b/incompatible_pointer_build_fix.patch @@ -0,0 +1,12 @@ +diff -up libappindicator-12.10.0/src/app-indicator.c.build_fix libappindicator-12.10.0/src/app-indicator.c +--- libappindicator-12.10.0/src/app-indicator.c.build_fix 2018-04-10 14:43:57.134400594 +0200 ++++ libappindicator-12.10.0/src/app-indicator.c 2018-04-10 14:45:34.655448722 +0200 +@@ -2196,7 +2196,7 @@ app_indicator_set_secondary_activate_tar + + g_return_if_fail (GTK_IS_WIDGET (menuitem)); + +- priv->sec_activate_target = g_object_ref(G_OBJECT(menuitem)); ++ priv->sec_activate_target = g_object_ref(menuitem); + priv->sec_activate_enabled = widget_is_menu_child(self, menuitem); + g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self); + } diff --git a/libappindicator.spec b/libappindicator.spec index f68b304..c40209f 100644 --- a/libappindicator.spec +++ b/libappindicator.spec @@ -1,6 +1,6 @@ Name: libappindicator Version: 12.10.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Application indicators library Group: System Environment/Libraries @@ -8,6 +8,8 @@ License: LGPLv2 and LGPLv3 URL: https://launchpad.net/libappindicator Source0: https://launchpad.net/libappindicator/12.10/%{version}/+download/%{name}-%{version}.tar.gz Patch0: 0001_Fix_mono_dir.patch +# https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.16.10/revision/285 +Patch1: incompatible_pointer_build_fix.patch BuildRequires: autoconf BuildRequires: automake @@ -122,6 +124,7 @@ This package contains the development files for the appindicator-sharp library. %prep %setup -q %patch0 -p1 -b .monodir +%patch1 -p1 -b .incompatible_pointer_build_fix sed -i "s#gmcs#mcs#g" configure.ac # fix for gtk-doc 1.26 @@ -243,6 +246,9 @@ find %{buildroot} -type f -name '*.la' -delete %endif %changelog +* Tue Apr 10 2018 Tomas Popela - 12.10.0-20 +- Fix the build on F28+ with new glib2 + * Wed Feb 07 2018 Fedora Release Engineering - 12.10.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild