diff options
| -rw-r--r-- | net-dns/avahi/avahi-0.8-r2.ebuild | 14 | ||||
| -rw-r--r-- | net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch | 57 |
2 files changed, 63 insertions, 8 deletions
diff --git a/net-dns/avahi/avahi-0.8-r2.ebuild b/net-dns/avahi/avahi-0.8-r2.ebuild index 71213619..574cb8a6 100644 --- a/net-dns/avahi/avahi-0.8-r2.ebuild +++ b/net-dns/avahi/avahi-0.8-r2.ebuild @@ -3,12 +3,12 @@ EAPI="7" -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE="gdbm" inherit autotools flag-o-matic multilib-minimal mono-env python-r1 systemd DESCRIPTION="System which facilitates service discovery on a local network" -HOMEPAGE="http://avahi.org/" +HOMEPAGE="https://avahi.org/" SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" @@ -39,10 +39,7 @@ DEPEND=" dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) - mono? ( - dev-lang/mono - gtk2? ( dev-dotnet/gtk-sharp:2 ) - ) + mono? ( dev-lang/mono ) python? ( ${PYTHON_DEPS} dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) @@ -77,16 +74,17 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h ) +PATCHES=( + "${FILESDIR}/${P}-disable-avahi-ui-sharp.patch" # bug 769062 # These patches do not apply cleanly but may need to be re-instated. # I'll leave them commented out for now. -#PATCHES=( # "${FILESDIR}/${PN}-0.7-qt5.patch" # "${FILESDIR}/${PN}-0.7-CVE-2017-6519.patch" # "${FILESDIR}/${PN}-0.7-remove-empty-avahi_discover.patch" # "${FILESDIR}/${PN}-0.7-python3.patch" # "${FILESDIR}/${PN}-0.7-python3-unittest.patch" # "${FILESDIR}/${PN}-0.7-python3-gdbm.patch" -#) +) pkg_setup() { use mono && mono-env_pkg_setup diff --git a/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch b/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch new file mode 100644 index 00000000..31b361d4 --- /dev/null +++ b/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch @@ -0,0 +1,57 @@ +From ebd2a01a7b5e88f3be35b2f803d5adbd36ae6593 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 27 Mar 2021 22:49:08 +0100 +Subject: [PATCH] Disable avahi-ui-sharp + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + Makefile.am | 6 ++---- + configure.ac | 1 - + 2 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 33c51f5..0e12120 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -46,7 +46,6 @@ EXTRA_DIST = \ + avahi-qt4.pc.in \ + avahi-qt5.pc.in \ + avahi-sharp.pc.in \ +- avahi-ui-sharp.pc.in \ + avahi-compat-libdns_sd.pc.in \ + avahi-compat-howl.pc.in \ + avahi-ui.pc.in \ +@@ -77,7 +76,6 @@ SUBDIRS = \ + avahi-compat-howl \ + avahi-autoipd \ + avahi-ui \ +- avahi-ui-sharp \ + avahi-libevent \ + po + +@@ -188,8 +186,8 @@ CLEANFILES += avahi-compat-libdns_sd.pc + endif + + if HAVE_MONO +-pkgconfig_DATA += avahi-sharp.pc avahi-ui-sharp.pc +-CLEANFILES += avahi-sharp.pc avahi-ui-sharp.pc ++pkgconfig_DATA += avahi-sharp.pc ++CLEANFILES += avahi-sharp.pc + endif + + endif +diff --git a/configure.ac b/configure.ac +index 58db8c7..844360f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1166,7 +1166,6 @@ man/Makefile + tests/Makefile + service-type-database/Makefile + avahi-sharp/Makefile +-avahi-ui-sharp/Makefile + avahi-compat-libdns_sd/Makefile + avahi-compat-howl/Makefile + avahi-compat-howl/samples/Makefile +-- +2.31.1 + |