diff options
| -rw-r--r-- | package/avahi/Makefile | 8 | ||||
| -rw-r--r-- | package/avahi/patches/patch-Makefile_am | 12 | ||||
| -rw-r--r-- | package/avahi/patches/patch-avahi-ui_Makefile_am | 19 | ||||
| -rw-r--r-- | package/avahi/patches/patch-configure_ac | 14 |
4 files changed, 4 insertions, 49 deletions
diff --git a/package/avahi/Makefile b/package/avahi/Makefile index a5b7cd081..94b894c5b 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= avahi -PKG_VERSION:= 0.6.32 +PKG_VERSION:= 0.8 PKG_RELEASE:= 1 -PKG_HASH:= d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454 +PKG_HASH:= 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda PKG_DESCR:= multicast dns daemon and dns-sd server PKG_SECTION:= net/dns -PKG_BUILDDEP:= libdaemon expat gdbm glib +PKG_BUILDDEP:= libdaemon expat gdbm glib libevent PKG_NEEDS:= c++ intl PKG_URL:= http://avahi.org/ PKG_SITES:= https://github.com/lathiat/avahi/releases/download/v$(PKG_VERSION)/ @@ -31,12 +31,12 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AVAHI,avahi,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_AVAHI),$(PKG_DESCR),$(PKG_SECTION))) $(eval $(call PKG_template,LIBAVAHI,libavahi,$(PKG_VERSION)-$(PKG_RELEASE),,$(PKGSD_LIBAVAHI),$(PKGSC_LIBAVAHI),$(PKG_OPTS))) -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --enable-glib \ --enable-libdaemon \ --enable-dbus \ --disable-qt3 \ --disable-qt4 \ + --disable-qt5 \ --disable-gtk \ --disable-gtk3 \ --disable-python \ diff --git a/package/avahi/patches/patch-Makefile_am b/package/avahi/patches/patch-Makefile_am deleted file mode 100644 index ff5160336..000000000 --- a/package/avahi/patches/patch-Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ ---- avahi-0.6.31.orig/Makefile.am 2011-12-30 22:26:44.000000000 +0100 -+++ avahi-0.6.31/Makefile.am 2014-03-04 09:57:29.000000000 +0100 -@@ -75,8 +75,7 @@ SUBDIRS = \ - avahi-compat-howl \ - avahi-autoipd \ - avahi-ui \ -- avahi-ui-sharp \ -- po -+ avahi-ui-sharp - - DX_INPUT = \ - $(srcdir)/avahi-common/address.h \ diff --git a/package/avahi/patches/patch-avahi-ui_Makefile_am b/package/avahi/patches/patch-avahi-ui_Makefile_am deleted file mode 100644 index c1744d9d0..000000000 --- a/package/avahi/patches/patch-avahi-ui_Makefile_am +++ /dev/null @@ -1,19 +0,0 @@ ---- avahi-0.6.31.orig/avahi-ui/Makefile.am 2012-02-14 23:22:16.000000000 +0100 -+++ avahi-0.6.31/avahi-ui/Makefile.am 2014-03-04 09:45:16.000000000 +0100 -@@ -79,9 +79,6 @@ libavahi_ui_gtk3_la_CFLAGS += -DDATABASE - endif - - bin_PROGRAMS = bssh --desktop_DATA += bssh.desktop bvnc.desktop --@INTLTOOL_DESKTOP_RULE@ -- - bssh_SOURCES = bssh.c - - if HAVE_GTK3 -@@ -108,6 +105,4 @@ endif # HAVE_GLIB - endif - endif - --@INTLTOOL_DESKTOP_RULE@ -- - CLEANFILES = $(desktop_DATA) $(desktop_DATA_in) diff --git a/package/avahi/patches/patch-configure_ac b/package/avahi/patches/patch-configure_ac deleted file mode 100644 index 53f1aea23..000000000 --- a/package/avahi/patches/patch-configure_ac +++ /dev/null @@ -1,14 +0,0 @@ ---- avahi-0.6.31.orig/configure.ac 2012-02-14 22:44:25.484742099 +0100 -+++ avahi-0.6.31/configure.ac 2014-06-15 20:50:12.072045207 +0200 -@@ -412,11 +412,9 @@ if test "x$have_kqueue" = "xyes" ; then - AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage]) - fi - --IT_PROG_INTLTOOL([0.35.0]) - GETTEXT_PACKAGE=avahi - AC_SUBST([GETTEXT_PACKAGE]) - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) --AM_GLIB_GNU_GETTEXT - - avahilocaledir='${prefix}/${DATADIRNAME}/locale' - AC_SUBST(avahilocaledir) |