From 94cbdb5e875e0906ee69c92254147d8fade4e0fe5f4e8baae239098a5e982d49 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 6 Aug 2013 09:46:54 +0000
Subject: [PATCH] Accepting request 185992 from
 home:dimstar:branches:GNOME:Factory

- Remove -DGTK_DISABLE_DEPRECATED=1 from avahi-ui/Makefile.am in
  order to allow building against GTK+ 3.9.10, which has GtkStock
  deprecated.

OBS-URL: https://build.opensuse.org/request/show/185992
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=98
---
 avahi-glib2.changes | 7 +++++++
 avahi-glib2.spec    | 2 ++
 avahi-mono.spec     | 2 ++
 avahi-qt4.spec      | 2 ++
 avahi.spec          | 2 ++
 5 files changed, 15 insertions(+)

diff --git a/avahi-glib2.changes b/avahi-glib2.changes
index 251c37b..1ff8a84 100644
--- a/avahi-glib2.changes
+++ b/avahi-glib2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug  5 21:31:42 UTC 2013 - dimstar@opensuse.org
+
+- Remove -DGTK_DISABLE_DEPRECATED=1 from avahi-ui/Makefile.am in
+  order to allow building against GTK+ 3.9.10, which has GtkStock
+  deprecated. 
+
 -------------------------------------------------------------------
 Mon Feb  4 16:59:54 CET 2013 - sbrabec@suse.cz
 
diff --git a/avahi-glib2.spec b/avahi-glib2.spec
index b6bfd2a..d7bfa32 100644
--- a/avahi-glib2.spec
+++ b/avahi-glib2.spec
@@ -30,6 +30,7 @@ Name:           avahi-glib2
 %define         build_qt4 0
 Version:        0.6.31
 Release:        0
+# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -781,6 +782,7 @@ if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
 fi
 # FIXME: We do not have xmltoman, use original doc, just fix paths.
 sed -i s:/home/lennart/tmp/avahi:: man/*.[0-9]
+sed -i "s:-DGTK_DISABLE_DEPRECATED=1::" avahi-ui/Makefile.am
 
 %build
 autoreconf -f -i
diff --git a/avahi-mono.spec b/avahi-mono.spec
index 4ef168d..87b042f 100644
--- a/avahi-mono.spec
+++ b/avahi-mono.spec
@@ -30,6 +30,7 @@ Name:           avahi-mono
 %define         build_qt4 0
 Version:        0.6.31
 Release:        0
+# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -780,6 +781,7 @@ if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
 fi
 # FIXME: We do not have xmltoman, use original doc, just fix paths.
 sed -i s:/home/lennart/tmp/avahi:: man/*.[0-9]
+sed -i "s:-DGTK_DISABLE_DEPRECATED=1::" avahi-ui/Makefile.am
 
 %build
 autoreconf -f -i
diff --git a/avahi-qt4.spec b/avahi-qt4.spec
index 75ecfc9..6029262 100644
--- a/avahi-qt4.spec
+++ b/avahi-qt4.spec
@@ -30,6 +30,7 @@ Name:           avahi-qt4
 %define         build_qt4 1
 Version:        0.6.31
 Release:        0
+# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -783,6 +784,7 @@ if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
 fi
 # FIXME: We do not have xmltoman, use original doc, just fix paths.
 sed -i s:/home/lennart/tmp/avahi:: man/*.[0-9]
+sed -i "s:-DGTK_DISABLE_DEPRECATED=1::" avahi-ui/Makefile.am
 
 %build
 autoreconf -f -i
diff --git a/avahi.spec b/avahi.spec
index c274fea..5e4c33a 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -32,6 +32,7 @@ Name:           avahi
 %define         build_qt4 0
 Version:        0.6.31
 Release:        0
+# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -783,6 +784,7 @@ if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
 fi
 # FIXME: We do not have xmltoman, use original doc, just fix paths.
 sed -i s:/home/lennart/tmp/avahi:: man/*.[0-9]
+sed -i "s:-DGTK_DISABLE_DEPRECATED=1::" avahi-ui/Makefile.am
 
 %build
 autoreconf -f -i