diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-08-20 17:20:13 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-08-20 17:20:13 +0000 |
| commit | 4cd1066819b348756bb1216e043751f0216b8248 (patch) | |
| tree | fc886bb084e394edb6f793e52da2a6b5d4218201 /net-dns | |
| parent | Remove commented out dosym. (diff) | |
| download | gentoo-2-4cd1066819b348756bb1216e043751f0216b8248.tar.gz gentoo-2-4cd1066819b348756bb1216e043751f0216b8248.tar.bz2 gentoo-2-4cd1066819b348756bb1216e043751f0216b8248.zip | |
Fix bug #501664
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'net-dns')
| -rw-r--r-- | net-dns/avahi/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dns/avahi/avahi-0.6.31-r5.ebuild | 5 | ||||
| -rw-r--r-- | net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch | 22 |
3 files changed, 31 insertions, 2 deletions
diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog index 706eb0f5ab80..62ac19770133 100644 --- a/net-dns/avahi/ChangeLog +++ b/net-dns/avahi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dns/avahi # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.266 2014/08/03 17:45:35 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.267 2014/08/20 17:20:13 blueness Exp $ + + 20 Aug 2014; Anthony G. Basile <blueness@gentoo.org> + +files/avahi-0.6.31-fix-locale-build.patch, avahi-0.6.31-r5.ebuild: + Fix bug #501664 03 Aug 2014; <tgall@gentoo.org> avahi-0.6.31-r2.ebuild, avahi-0.6.31-r5.ebuild: diff --git a/net-dns/avahi/avahi-0.6.31-r5.ebuild b/net-dns/avahi/avahi-0.6.31-r5.ebuild index 75f7e368d7a1..0f407d09a7eb 100644 --- a/net-dns/avahi/avahi-0.6.31-r5.ebuild +++ b/net-dns/avahi/avahi-0.6.31-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r5.ebuild,v 1.5 2014/08/03 17:45:35 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r5.ebuild,v 1.6 2014/08/20 17:20:13 blueness Exp $ EAPI="5" @@ -123,6 +123,9 @@ src_prepare() { # allow building client without the daemon epatch "${FILESDIR}"/${P}-build-client-without-daemon.patch + # Fix build under various locales, bug #501664 + epatch "${FILESDIR}"/${P}-fix-locale-build.patch + # Drop DEPRECATED flags, bug #384743 sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die diff --git a/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch b/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch new file mode 100644 index 000000000000..f3ae58807405 --- /dev/null +++ b/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch @@ -0,0 +1,22 @@ +avahi-gobject fails to build under et_EE and possibly other locales. + +The regex for a sed in avahi-gobject/Makefile fails under various locales. +Forcing LANG=C fixes the issue. + +Patch-by: Rafał Mużyło <galtgendo@o2.pl> + +X-Gentoo-Bug: 501664 +X-Gentoo-Bug-URL: https://bugs.gentoo.org/501664 + +diff -Naur avahi-0.6.31.orig/avahi-gobject/Makefile.in avahi-0.6.31/avahi-gobject/Makefile.in +--- avahi-0.6.31.orig/avahi-gobject/Makefile.in 2014-08-20 13:10:02.914432590 -0400 ++++ avahi-0.6.31/avahi-gobject/Makefile.in 2014-08-20 13:12:09.024436983 -0400 +@@ -992,7 +992,7 @@ + + @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@signals-marshal.list: $(CORE_SOURCES) Makefile.am + @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ $(AM_V_GEN)( cd $(srcdir) && \ +-@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \ ++@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ LANG=C sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \ + @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ $(CORE_SOURCES) ) \ + @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp && \ + @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ if cmp -s $@.tmp $@; then \ |