From 206f4f7db80bd5d698f6bbf98de73e21242491e32ec98a79d275a2f4783e32fc Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 16 Sep 2020 21:51:41 +0000 Subject: [PATCH] Accepting request 835012 from home:cgiboudeaux:branches:X11:Unity - Add upstream patch to fix build: * 0001-gtk_widget_get_state-is-deprecated.patch OBS-URL: https://build.opensuse.org/request/show/835012 OBS-URL: https://build.opensuse.org/package/show/X11:Unity/ayatana-ido?expand=0&rev=10 --- 0001-gtk_widget_get_state-is-deprecated.patch | 26 +++++++++++++++++++ ayatana-ido.changes | 6 +++++ ayatana-ido.spec | 9 ++++--- 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 0001-gtk_widget_get_state-is-deprecated.patch diff --git a/0001-gtk_widget_get_state-is-deprecated.patch b/0001-gtk_widget_get_state-is-deprecated.patch new file mode 100644 index 0000000..820e0d4 --- /dev/null +++ b/0001-gtk_widget_get_state-is-deprecated.patch @@ -0,0 +1,26 @@ +From cbe2eb7890c635cf1b1ae3b6559a5373f9879a34 Mon Sep 17 00:00:00 2001 +From: Sylvain POULAIN +Date: Tue, 7 Jul 2020 09:18:43 +0400 +Subject: [PATCH] gtk_widget_get_state is deprecated + +gtk_widget_get_state is even deprecated, and has to be replaced with gtk_widget_get_state_flags. It worked. +--- + src/idomediaplayermenuitem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/idomediaplayermenuitem.c b/src/idomediaplayermenuitem.c +index 7ed9d6d..232ad0e 100644 +--- a/src/idomediaplayermenuitem.c ++++ b/src/idomediaplayermenuitem.c +@@ -81,7 +81,7 @@ ido_media_player_menu_item_draw (GtkWidget *widget, + int y; + + gtk_style_context_get_color (gtk_widget_get_style_context (widget), +- gtk_widget_get_state (widget), ++ gtk_widget_get_state_flags (widget), + &color); + + gtk_widget_get_allocation (widget, &allocation); +-- +2.28.0 + diff --git a/ayatana-ido.changes b/ayatana-ido.changes index 318d80b..feca87f 100644 --- a/ayatana-ido.changes +++ b/ayatana-ido.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 16 21:19:35 UTC 2020 - Christophe Giboudeaux + +- Add upstream patch to fix build: + * 0001-gtk_widget_get_state-is-deprecated.patch + ------------------------------------------------------------------- Fri Nov 8 03:40:02 UTC 2019 - Marguerite Su diff --git a/ayatana-ido.spec b/ayatana-ido.spec index c7efd3f..792d18f 100644 --- a/ayatana-ido.spec +++ b/ayatana-ido.spec @@ -1,7 +1,7 @@ # # spec file for package ayatana-ido # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,9 @@ URL: https://github.com/AyatanaIndicators/ayatana-ido Source: https://github.com/AyatanaIndicators/ayatana-ido/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: baselibs.conf #PATCH-FIX-UPSTREAM ayatana-ido-glib-2.58.patch g_type_class_add_private was deprecated since glib 2.58 -Patch: ayatana-ido-glib-2.58.patch +Patch0: ayatana-ido-glib-2.58.patch +# PATCH-FIX-UPSTREAM 0001-gtk_widget_get_state-is-deprecated.patch -- gtk_widget_get_state is deprecated +Patch1: 0001-gtk_widget_get_state-is-deprecated.patch BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: mate-common @@ -84,14 +86,13 @@ This package contains the development files for Ido. %build NOCONFIGURE=1 mate-autogen %configure -make %{?_smp_mflags} V=1 +%make_build %install %make_install find %{buildroot} -type f -name "*.la" -delete -print %post -n %{lname} -p /sbin/ldconfig - %postun -n %{lname} -p /sbin/ldconfig %files -n %{lname}