diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-03-02 21:25:00 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-03-02 21:25:00 +0100 |
| commit | 28cd1ed30aa4959c744ee37a6070cf22a66fb31f (patch) | |
| tree | fe08f3fdff6fe458a3a21cf814f12ed6c7ba54e4 /package/avahi | |
| parent | 13222c07293becaefc69c46c8f90b04ddc7023d9 (diff) | |
| parent | 2dfabd10d1e484d84c0e6b5a58ab43d131ca3230 (diff) | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/avahi')
| -rw-r--r-- | package/avahi/0004-no-gtk-deprecations.patch | 30 | ||||
| -rw-r--r-- | package/avahi/avahi.hash | 2 | ||||
| -rw-r--r-- | package/avahi/avahi.mk | 6 |
3 files changed, 4 insertions, 34 deletions
diff --git a/package/avahi/0004-no-gtk-deprecations.patch b/package/avahi/0004-no-gtk-deprecations.patch deleted file mode 100644 index d187053cf..000000000 --- a/package/avahi/0004-no-gtk-deprecations.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 - -[Peter: patch Makefile.in so we don't need autoreconf] -Signed-off-by: Peter Korsgaard <peter@korsgaard.com> ---- - avahi-ui/Makefile.am | 2 +- - avahi-ui/Makefile.in | 3 +-- - configure.ac | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -Index: avahi-0.6.31/avahi-ui/Makefile.in -=================================================================== ---- avahi-0.6.31.orig/avahi-ui/Makefile.in -+++ avahi-0.6.31/avahi-ui/Makefile.in -@@ -464,8 +464,7 @@ - top_srcdir = @top_srcdir@ - - # This cool debug trap works on i386/gcc only --AM_CFLAGS = -I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 \ -- -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1 \ -+AM_CFLAGS = -I$(top_srcdir) \ - '-DDEBUG_TRAP=__asm__("int $$3")' $(am__append_1) - pkglibdatadir = $(libdir)/avahi - desktopdir = $(datadir)/applications diff --git a/package/avahi/avahi.hash b/package/avahi/avahi.hash index 99bbd513c..09c5d4243 100644 --- a/package/avahi/avahi.hash +++ b/package/avahi/avahi.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 avahi-0.6.31.tar.gz +sha256 d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454 avahi-0.6.32.tar.gz diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index b7ad81dc3..069b45a96 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -11,8 +11,8 @@ # either version 2.1 of the License, or (at your option) any # later version. -AVAHI_VERSION = 0.6.31 -AVAHI_SITE = http://www.avahi.org/download +AVAHI_VERSION = 0.6.32 +AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION) AVAHI_LICENSE = LGPLv2.1+ AVAHI_LICENSE_FILES = LICENSE AVAHI_INSTALL_STAGING = YES @@ -220,13 +220,13 @@ define AVAHI_INSTALL_INIT_SYSV $(AVAHI_INSTALL_DAEMON_INIT_SYSV) endef +ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y) # applications expects to be able to #include <dns_sd.h> define AVAHI_STAGING_INSTALL_LIBDNSSD_LINK ln -sf avahi-compat-libdns_sd/dns_sd.h \ $(STAGING_DIR)/usr/include/dns_sd.h endef -ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y) AVAHI_POST_INSTALL_STAGING_HOOKS += AVAHI_STAGING_INSTALL_LIBDNSSD_LINK endif |