1 |
kevquinn 07/09/28 18:05:44 |
2 |
|
3 |
Modified: acroread-8.1.1.ebuild ChangeLog |
4 |
Log: |
5 |
Use XulRunner if present; setup /etc/gre.d/gre.conf if only mozilla-firefox is present - follow-up for bug #192527 |
6 |
(Portage version: 2.1.3.9) |
7 |
|
8 |
Revision Changes Path |
9 |
1.3 app-text/acroread/acroread-8.1.1.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild?rev=1.3&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild?rev=1.3&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild?r1=1.2&r2=1.3 |
14 |
|
15 |
Index: acroread-8.1.1.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild,v |
18 |
retrieving revision 1.2 |
19 |
retrieving revision 1.3 |
20 |
diff -u -r1.2 -r1.3 |
21 |
--- acroread-8.1.1.ebuild 28 Sep 2007 07:19:50 -0000 1.2 |
22 |
+++ acroread-8.1.1.ebuild 28 Sep 2007 18:05:43 -0000 1.3 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 1999-2007 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild,v 1.2 2007/09/28 07:19:50 mr_bones_ Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild,v 1.3 2007/09/28 18:05:43 kevquinn Exp $ |
28 |
|
29 |
inherit eutils nsplugins |
30 |
|
31 |
@@ -33,15 +33,17 @@ |
32 |
KEYWORDS="-* ~amd64 ~x86" |
33 |
RESTRICT="strip mirror" |
34 |
|
35 |
-# Firefox is needed for libgtkembedmoz.so which is used to render files with |
36 |
-# HTML. |
37 |
+# Needs libgtkembedmoz.so, which can come from xulrunner or mozilla-firefox. |
38 |
+# In the case of mozilla-firefox, need to create /etc/gre.d/gre.conf with |
39 |
+# GRE_PATH set to the /usr/lib/mozilla-firefox |
40 |
+# TODO: sort out libgtkembedmoz.so for amd64. |
41 |
RDEPEND="x86? ( >=x11-libs/gtk+-2.0 |
42 |
cups? ( net-print/cups ) |
43 |
- ldap? ( net-nds/openldap ) ) |
44 |
+ ldap? ( net-nds/openldap ) |
45 |
+ || ( net-libs/xulrunner |
46 |
+ www-client/mozilla-firefox ) ) |
47 |
amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.4.2 |
48 |
- >=app-emulation/emul-linux-x86-gtklibs-2.0 ) |
49 |
- || ( www-client/mozilla-firefox |
50 |
- www-client/mozilla-firefox-bin )" |
51 |
+ >=app-emulation/emul-linux-x86-gtklibs-2.0 )" |
52 |
QA_TEXTRELS="opt/Acrobat8/Reader/intellinux/plug_ins/PPKLite.api |
53 |
opt/Adobe/Adobe/Reader8/Browser/intellinux/nppdf.so |
54 |
opt/netscape/plugins/nppdf.so" |
55 |
@@ -208,6 +210,20 @@ |
56 |
|
57 |
pkg_postinst () { |
58 |
local ll lc |
59 |
+ grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null |
60 |
+ if [[ $? != "0" ]]; then |
61 |
+ for lib in /usr/lib/mozilla-firefox; do |
62 |
+ if [[ -f ${lib}/libgtkembedmoz.so ]]; then |
63 |
+ mkdir -p /etc/gre.d |
64 |
+ cat > /etc/gre.d/gre.conf <<-EOF |
65 |
+ GRE_PATH=${lib} |
66 |
+ EOF |
67 |
+ einfo "Acrobat Reader depends on libgtkembedmoz.so, which I've found" |
68 |
+ einfo "on your system in ${lib}, and configured in /etc/gre.d/gre.conf" |
69 |
+ break # don't search any more libraries |
70 |
+ fi |
71 |
+ done |
72 |
+ fi |
73 |
use ldap || |
74 |
elog "The Acrobat(TM) Security Plugin can be enabled with USE=ldap" |
75 |
use nsplugin || |
76 |
@@ -223,11 +239,14 @@ |
77 |
elog "version is installed). Users may need to remove their preferences in" |
78 |
elog "~/.adobe to switch languages." |
79 |
fi |
80 |
- ewarn "Acrobat Reader depends dynamically on libgtkembedmoz.so, which comes" |
81 |
- ewarn "with Mozilla Firefox. The first time you start acroread, it will" |
82 |
- ewarn "complain about this, telling you to add the path to it to your" |
83 |
- ewarn "preferences. Clear the error dialog, close the Beyond Acrobat" |
84 |
- ewarn "Reader dialog, go to Edit -> Preferences -> Internet, and set" |
85 |
- ewarn "the libgtkembedmoz directory to /usr/lib/mozilla-firefox, then" |
86 |
- ewarn "close and restart acroread." |
87 |
+ grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null |
88 |
+ if [[ $? != "0" ]]; then |
89 |
+ ewarn "Acrobat Reader depends dynamically on libgtkembedmoz.so, which should" |
90 |
+ ewarn "come with Mozilla Firefox or XULRunner, however it couldn't be found." |
91 |
+ ewarn "The first time you start acroread, it will complain about this, telling" |
92 |
+ ewarn "you to add the path to it to your preferences. Clear the error dialog," |
93 |
+ ewarn "close the Beyond Acrobat Reader dialog, go to Edit -> Preferences -> Internet" |
94 |
+ ewarn "and set the libgtkembedmoz directory to the place where it exists," |
95 |
+ ewarn "then close and restart acroread." |
96 |
+ fi |
97 |
} |
98 |
|
99 |
|
100 |
|
101 |
1.102 app-text/acroread/ChangeLog |
102 |
|
103 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/ChangeLog?rev=1.102&view=markup |
104 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/ChangeLog?rev=1.102&content-type=text/plain |
105 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/ChangeLog?r1=1.101&r2=1.102 |
106 |
|
107 |
Index: ChangeLog |
108 |
=================================================================== |
109 |
RCS file: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v |
110 |
retrieving revision 1.101 |
111 |
retrieving revision 1.102 |
112 |
diff -u -r1.101 -r1.102 |
113 |
--- ChangeLog 27 Sep 2007 21:13:17 -0000 1.101 |
114 |
+++ ChangeLog 28 Sep 2007 18:05:43 -0000 1.102 |
115 |
@@ -1,6 +1,10 @@ |
116 |
# ChangeLog for app-text/acroread |
117 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
118 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.101 2007/09/27 21:13:17 kevquinn Exp $ |
119 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.102 2007/09/28 18:05:43 kevquinn Exp $ |
120 |
+ |
121 |
+ 28 Sep 2007; Kevin F. Quinn <kevquinn@g.o> acroread-8.1.1.ebuild: |
122 |
+ Use XULRunner if available; also set /etc/gre.d/gre.conf for mozilla-firefox |
123 |
+ so that acroread can find libgtkembedmoz.so without setting preferences. |
124 |
|
125 |
*acroread-8.1.1 (27 Sep 2007) |
126 |
|
127 |
|
128 |
|
129 |
|
130 |
-- |
131 |
gentoo-commits@g.o mailing list |