1 |
commit: f6aa75a8258c9764f902ac9c623fce5ce5fe3fb0 |
2 |
Author: Rémi Cardona <remi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 30 16:57:52 2014 +0000 |
4 |
Commit: Remi Cardona <remi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 30 17:03:21 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f6aa75a8 |
7 |
|
8 |
app-text/evince: Fix build with non-bash /bin/sh |
9 |
|
10 |
Patch comes from upstream git, so -9999 doesn't need it. |
11 |
|
12 |
--- |
13 |
app-text/evince/evince-3.14.1.ebuild | 7 +++++- |
14 |
.../evince/files/evince-non-bash-support.patch | 28 ++++++++++++++++++++++ |
15 |
2 files changed, 34 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/app-text/evince/evince-3.14.1.ebuild b/app-text/evince/evince-3.14.1.ebuild |
18 |
index 01283b1..0ed7b71 100644 |
19 |
--- a/app-text/evince/evince-3.14.1.ebuild |
20 |
+++ b/app-text/evince/evince-3.14.1.ebuild |
21 |
@@ -6,7 +6,7 @@ EAPI="5" |
22 |
GCONF_DEBUG="yes" |
23 |
GNOME2_LA_PUNT="yes" |
24 |
|
25 |
-inherit eutils gnome2 |
26 |
+inherit eutils autotools gnome2 |
27 |
|
28 |
DESCRIPTION="Simple document viewer for GNOME" |
29 |
HOMEPAGE="https://wiki.gnome.org/Apps/Evince" |
30 |
@@ -67,6 +67,11 @@ DEPEND="${COMMON_DEPEND} |
31 |
RESTRICT="test" |
32 |
|
33 |
src_prepare() { |
34 |
+ # Fix build with non-bash /bin/sh, see bug #526410 |
35 |
+ epatch "${FILESDIR}/${PN}-non-bash-support.patch" |
36 |
+ |
37 |
+ eautoreconf |
38 |
+ |
39 |
gnome2_src_prepare |
40 |
|
41 |
# Do not depend on adwaita-icon-theme, bug #326855, #391859 |
42 |
|
43 |
diff --git a/app-text/evince/files/evince-non-bash-support.patch b/app-text/evince/files/evince-non-bash-support.patch |
44 |
new file mode 100644 |
45 |
index 0000000..979d186 |
46 |
--- /dev/null |
47 |
+++ b/app-text/evince/files/evince-non-bash-support.patch |
48 |
@@ -0,0 +1,28 @@ |
49 |
+From 59daf398bc0f1d7895eee3a776b33a9c9310ad21 Mon Sep 17 00:00:00 2001 |
50 |
+From: Alexander Tsoy <alexander@××××.me> |
51 |
+Date: Sun, 26 Oct 2014 23:54:47 +0300 |
52 |
+Subject: configure.ac: workaround quoting issues |
53 |
+ |
54 |
+BROWSER_PLUGIN_DIR variable substitution is not portable. In particular |
55 |
+it does not work in dash. Replace it with conditional. |
56 |
+ |
57 |
+https://bugzilla.gnome.org/show_bug.cgi?id=739226 |
58 |
+ |
59 |
+diff --git a/configure.ac b/configure.ac |
60 |
+index 56bf93c..dd4bcab 100644 |
61 |
+--- a/configure.ac |
62 |
++++ b/configure.ac |
63 |
+@@ -455,7 +455,9 @@ AC_ARG_ENABLE([browser-plugin], |
64 |
+ if test x$enable_browser_plugin = "xyes" ; then |
65 |
+ PKG_CHECK_MODULES([BROWSER_PLUGIN],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED]) |
66 |
+ |
67 |
+- BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}" |
68 |
++ if test -z "${BROWSER_PLUGIN_DIR}"; then |
69 |
++ BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins" |
70 |
++ fi |
71 |
+ AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to]) |
72 |
+ fi |
73 |
+ |
74 |
+-- |
75 |
+cgit v0.10.1 |
76 |
+ |