Commit e6c04e6d authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

avahi: fix avahi-ui build with libgtk3

parent c7c0ca28
Loading
Loading
Loading
Loading
+31 −0
Original line number Diff line number Diff line
Patch from http://pkgs.fedoraproject.org/cgit/avahi.git/plain/avahi-0.6.31-no-deprecations.patch?id=b3f4de05e331258c5123e3acc144e452595c2112

Don't disable deprecated GTK support, as that breaks builds with modern GTK3
versions.

For more details, see the Fedora bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=1001676

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
--- avahi-0.6.31/avahi-ui/Makefile.am.orig	2013-09-21 16:47:28.677659361 +0200
+++ avahi-0.6.31/avahi-ui/Makefile.am	2013-09-21 16:47:34.852520537 +0200
@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1
+AM_CFLAGS=-I$(top_srcdir)
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
--- avahi-0.6.31/configure.ac.orig	2013-09-21 16:46:43.750669413 +0200
+++ avahi-0.6.31/configure.ac	2013-09-21 16:47:02.566246400 +0200
@@ -92,7 +92,7 @@
     AC_MSG_CHECKING([whether stack-smashing protection is available])
     ssp_old_cflags="$CFLAGS"
     ssp_old_ldflags="$LDFLAGS"
-    CFLAGS="$CFLAGS -Werror -fstack-protector-all -fPIC"
+    CFLAGS="$CFLAGS -fstack-protector-all -fPIC"
     LDFLAGS="$LDFLAGS -Wl,-z,defs"
     cat confdefs.h > conftest.c
     cat >>conftest.c <<_ACEOF
+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ AVAHI_SITE = http://www.avahi.org/download
AVAHI_LICENSE = LGPLv2.1+
AVAHI_LICENSE_FILES = LICENSE
AVAHI_INSTALL_STAGING = YES
AVAHI_AUTORECONF = YES

AVAHI_CONF_ENV = ac_cv_func_strtod=yes \
		ac_fsusage_space=yes \