1 |
lack 08/08/25 19:12:16 |
2 |
|
3 |
Modified: ChangeLog netscape-flash-10_beta20080811.ebuild |
4 |
Log: |
5 |
Use a custom 'flash-libcompat' tarball which contains the libraries previously used from app-text/acroread, to remove that dependency. |
6 |
(Portage version: 2.2_rc4/cvs/Linux 2.6.24-gentoo x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.71 net-www/netscape-flash/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/ChangeLog?rev=1.71&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/ChangeLog?rev=1.71&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/ChangeLog?r1=1.70&r2=1.71 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v |
18 |
retrieving revision 1.70 |
19 |
retrieving revision 1.71 |
20 |
diff -u -r1.70 -r1.71 |
21 |
--- ChangeLog 23 Aug 2008 00:25:28 -0000 1.70 |
22 |
+++ ChangeLog 25 Aug 2008 19:12:16 -0000 1.71 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for net-www/netscape-flash |
25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.70 2008/08/23 00:25:28 lack Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.71 2008/08/25 19:12:16 lack Exp $ |
28 |
+ |
29 |
+ 25 Aug 2008; Jim Ramsay <lack@g.o> |
30 |
+ netscape-flash-10_beta20080811.ebuild: |
31 |
+ Use a custom 'flash-libcompat' tarball which contains the libraries |
32 |
+ previously used from app-text/acroread, to remove that dependency. |
33 |
|
34 |
*netscape-flash-10_beta20080811 (22 Aug 2008) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 net-www/netscape-flash/netscape-flash-10_beta20080811.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/netscape-flash-10_beta20080811.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/netscape-flash-10_beta20080811.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/netscape-flash-10_beta20080811.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: netscape-flash-10_beta20080811.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10_beta20080811.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- netscape-flash-10_beta20080811.ebuild 23 Aug 2008 00:25:28 -0000 1.1 |
52 |
+++ netscape-flash-10_beta20080811.ebuild 25 Aug 2008 19:12:16 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2008 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10_beta20080811.ebuild,v 1.1 2008/08/23 00:25:28 lack Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10_beta20080811.ebuild,v 1.2 2008/08/25 19:12:16 lack Exp $ |
58 |
|
59 |
inherit nsplugins versionator |
60 |
|
61 |
@@ -14,7 +14,8 @@ |
62 |
BV=${BETA:4:2}${BETA:6:2}${BETA:2:2} |
63 |
|
64 |
DESCRIPTION="Adobe Flash Player" |
65 |
-SRC_URI="http://download.macromedia.com/pub/labs/flashplayer${MV}/flashplayer${MV}_install_linux_${BV}.tar.gz" |
66 |
+SRC_URI="http://download.macromedia.com/pub/labs/flashplayer${MV}/flashplayer${MV}_install_linux_${BV}.tar.gz |
67 |
+mirror://gentoo/flash-libcompat-0.1.tar.bz2" |
68 |
HOMEPAGE="http://www.adobe.com/" |
69 |
IUSE="" |
70 |
SLOT="0" |
71 |
@@ -28,8 +29,8 @@ |
72 |
DEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs |
73 |
app-emulation/emul-linux-x86-gtklibs |
74 |
app-emulation/emul-linux-x86-soundlibs |
75 |
- app-emulation/emul-linux-x86-xlibs |
76 |
- net-libs/xulrunner-bin ) |
77 |
+ app-emulation/emul-linux-x86-xlibs |
78 |
+ || ( net-libs/xulrunner-bin www-client/mozilla-firefox-bin ) ) |
79 |
x86? ( x11-libs/libXext |
80 |
x11-libs/libX11 |
81 |
x11-libs/libXt |
82 |
@@ -39,9 +40,12 @@ |
83 |
dev-libs/nss |
84 |
net-misc/curl |
85 |
>=sys-libs/glibc-2.4 ) |
86 |
- app-text/acroread |
87 |
media-fonts/corefonts" |
88 |
|
89 |
+# Our new flash-libcompat suffers from the same EXESTACK problem as libcrypto |
90 |
+# from app-text/acroread, so tell QA to ignore it: |
91 |
+QA_EXECSTACK="opt/flash-libcompat/libcrypto.so.0.9.7" |
92 |
+ |
93 |
pkg_setup() { |
94 |
# This is a binary x86 package => ABI=x86 |
95 |
# Please keep this in future versions |
96 |
@@ -54,16 +58,20 @@ |
97 |
doexe libflashplayer.so |
98 |
inst_plugin /opt/netscape/plugins/libflashplayer.so |
99 |
|
100 |
- # This version especially is ugly in that it hard-requires libcurl.so.3. On |
101 |
- # x86 systems, we could just symlink to libcurl.so.4, but by using acroread |
102 |
- # to provide the needed libs we have a single solution that works for both |
103 |
- # amd64 and x86, which I like marginally better. |
104 |
- echo 'LDPATH="/opt/Adobe/Reader8/Reader/intellinux/lib"' > 99flash-10-libhack |
105 |
- doenvd 99flash-10-libhack |
106 |
+ # This version especially is ugly in that it hard-requires libcurl.so.3, |
107 |
+ # libcrypto.so.0.9.7 and libssl.so.0.9.7, so we just provide our own 32-bit |
108 |
+ # binary version of these libs. |
109 |
+ exeinto /opt/flash-libcompat |
110 |
+ pushd "${WORKDIR}/flash-libcompat-0.1/" |
111 |
+ doexe * |
112 |
+ popd |
113 |
+ echo 'LDPATH="/opt/flash-libcompat"' > 99flash-libcompat |
114 |
+ doenvd 99flash-libcompat |
115 |
|
116 |
# Apparently the next release will dynamically check for libcurl.so.4 and |
117 |
- # libcurl.so.3, so this will be much less ugly (especially if we can get |
118 |
- # libcurl into one of the emul-linux-x86 packages). |
119 |
+ # libcurl.so.3 (and maybe the SSLs too, I hope) , so this will be slightly |
120 |
+ # less ugly (especially if we can get libcurl into one of the emul-linux-x86 |
121 |
+ # packages) |
122 |
} |
123 |
|
124 |
pkg_postinst() { |