commit: e8432718a163db9e0c2389815e034678413b247e Author: Rémi Cardona <remi <AT> gentoo <DOT> org> AuthorDate: Sun Nov 30 15:51:35 2014 +0000 Commit: Remi Cardona <remi <AT> gentoo <DOT> org> CommitDate: Sun Nov 30 15:52:17 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e8432718
x11-libs/gtk+: Fix build with dash as /bin/sh See bug #525928. --- x11-libs/gtk+/files/gtk+-non-bash-support.patch | 29 +++++++++++++++++++++++++ x11-libs/gtk+/gtk+-3.14.5.ebuild | 6 ++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch b/x11-libs/gtk+/files/gtk+-non-bash-support.patch new file mode 100644 index 0000000..efd13e6 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-non-bash-support.patch @@ -0,0 +1,29 @@ +From c8ef010024db794e25ca58ef3c02663de685f1bb Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <alexan...@tsoy.me> +Date: Sun, 26 Oct 2014 01:59:33 +0400 +Subject: [PATCH] gtk/Makefile.am: improve portability of ECHO + +--- + gtk/Makefile.am | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index f60bec8..e923940 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -19,11 +19,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings % + endif + + SUBDIRS = inspector native . +-if OS_DARWIN +- ECHO="echo" +-else +- ECHO=echo -e +-endif ++ECHO=printf '%b\n' + + if HAVE_CLOUDPRINT + if HAVE_PAPI_CUPS +-- +2.0.4 + diff --git a/x11-libs/gtk+/gtk+-3.14.5.ebuild b/x11-libs/gtk+/gtk+-3.14.5.ebuild index 122f8e6..98e6e47 100644 --- a/x11-libs/gtk+/gtk+-3.14.5.ebuild +++ b/x11-libs/gtk+/gtk+-3.14.5.ebuild @@ -6,7 +6,7 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal +inherit eutils flag-o-matic autotools gnome2 multilib virtualx multilib-minimal DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/"; @@ -108,6 +108,9 @@ strip_builddir() { } src_prepare() { + # see bug #525928 + epatch "${FILESDIR}/${PN}-non-bash-support.patch" + # -O3 and company cause random crashes in applications. Bug #133469 replace-flags -O3 -O2 strip-flags @@ -128,6 +131,7 @@ src_prepare() { strip_builddir SRC_SUBDIRS examples Makefile.in fi + eautoreconf gnome2_src_prepare }
