Fix the build on F28+ with new glib2

epel9
Tomas Popela 7 years ago
parent a08f19ecdb
commit 4b89b62cad

@ -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);
}

@ -1,6 +1,6 @@
Name: libappindicator Name: libappindicator
Version: 12.10.0 Version: 12.10.0
Release: 19%{?dist} Release: 20%{?dist}
Summary: Application indicators library Summary: Application indicators library
Group: System Environment/Libraries Group: System Environment/Libraries
@ -8,6 +8,8 @@ License: LGPLv2 and LGPLv3
URL: https://launchpad.net/libappindicator URL: https://launchpad.net/libappindicator
Source0: https://launchpad.net/libappindicator/12.10/%{version}/+download/%{name}-%{version}.tar.gz Source0: https://launchpad.net/libappindicator/12.10/%{version}/+download/%{name}-%{version}.tar.gz
Patch0: 0001_Fix_mono_dir.patch 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: autoconf
BuildRequires: automake BuildRequires: automake
@ -122,6 +124,7 @@ This package contains the development files for the appindicator-sharp library.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .monodir %patch0 -p1 -b .monodir
%patch1 -p1 -b .incompatible_pointer_build_fix
sed -i "s#gmcs#mcs#g" configure.ac sed -i "s#gmcs#mcs#g" configure.ac
# fix for gtk-doc 1.26 # fix for gtk-doc 1.26
@ -243,6 +246,9 @@ find %{buildroot} -type f -name '*.la' -delete
%endif %endif
%changelog %changelog
* Tue Apr 10 2018 Tomas Popela <tpopela@redhat.com> - 12.10.0-20
- Fix the build on F28+ with new glib2
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.0-19 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.0-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Loading…
Cancel
Save