From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6593C1389E2 for ; Sun, 30 Nov 2014 17:03:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2179E089B; Sun, 30 Nov 2014 17:03:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90DF2E089B for ; Sun, 30 Nov 2014 17:03:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B31033FFDF for ; Sun, 30 Nov 2014 17:03:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3708FB3B8 for ; Sun, 30 Nov 2014 17:03:50 +0000 (UTC) From: "Remi Cardona" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Remi Cardona" Message-ID: <1417367001.f6aa75a8258c9764f902ac9c623fce5ce5fe3fb0.remi@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: app-text/evince/, app-text/evince/files/ X-VCS-Repository: proj/gnome X-VCS-Files: app-text/evince/evince-3.14.1.ebuild app-text/evince/files/evince-non-bash-support.patch X-VCS-Directories: app-text/evince/ app-text/evince/files/ X-VCS-Committer: remi X-VCS-Committer-Name: Remi Cardona X-VCS-Revision: f6aa75a8258c9764f902ac9c623fce5ce5fe3fb0 X-VCS-Branch: master Date: Sun, 30 Nov 2014 17:03:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c677a58b-ecc7-4e93-aefb-eba69d771f1e X-Archives-Hash: 23a0baeac1df2b427d40eaf81682f8b5 commit: f6aa75a8258c9764f902ac9c623fce5ce5fe3fb0 Author: Rémi Cardona gentoo org> AuthorDate: Sun Nov 30 16:57:52 2014 +0000 Commit: Remi Cardona gentoo org> CommitDate: Sun Nov 30 17:03:21 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f6aa75a8 app-text/evince: Fix build with non-bash /bin/sh Patch comes from upstream git, so -9999 doesn't need it. --- app-text/evince/evince-3.14.1.ebuild | 7 +++++- .../evince/files/evince-non-bash-support.patch | 28 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app-text/evince/evince-3.14.1.ebuild b/app-text/evince/evince-3.14.1.ebuild index 01283b1..0ed7b71 100644 --- a/app-text/evince/evince-3.14.1.ebuild +++ b/app-text/evince/evince-3.14.1.ebuild @@ -6,7 +6,7 @@ EAPI="5" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" -inherit eutils gnome2 +inherit eutils autotools gnome2 DESCRIPTION="Simple document viewer for GNOME" HOMEPAGE="https://wiki.gnome.org/Apps/Evince" @@ -67,6 +67,11 @@ DEPEND="${COMMON_DEPEND} RESTRICT="test" src_prepare() { + # Fix build with non-bash /bin/sh, see bug #526410 + epatch "${FILESDIR}/${PN}-non-bash-support.patch" + + eautoreconf + gnome2_src_prepare # Do not depend on adwaita-icon-theme, bug #326855, #391859 diff --git a/app-text/evince/files/evince-non-bash-support.patch b/app-text/evince/files/evince-non-bash-support.patch new file mode 100644 index 0000000..979d186 --- /dev/null +++ b/app-text/evince/files/evince-non-bash-support.patch @@ -0,0 +1,28 @@ +From 59daf398bc0f1d7895eee3a776b33a9c9310ad21 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Sun, 26 Oct 2014 23:54:47 +0300 +Subject: configure.ac: workaround quoting issues + +BROWSER_PLUGIN_DIR variable substitution is not portable. In particular +it does not work in dash. Replace it with conditional. + +https://bugzilla.gnome.org/show_bug.cgi?id=739226 + +diff --git a/configure.ac b/configure.ac +index 56bf93c..dd4bcab 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -455,7 +455,9 @@ AC_ARG_ENABLE([browser-plugin], + if test x$enable_browser_plugin = "xyes" ; then + PKG_CHECK_MODULES([BROWSER_PLUGIN],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED]) + +- BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}" ++ if test -z "${BROWSER_PLUGIN_DIR}"; then ++ BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins" ++ fi + AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to]) + fi + +-- +cgit v0.10.1 +