Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/icecat: icecat-4.0.1.ebuild ChangeLog icecat-4.0.ebuild
Date: Tue, 03 May 2011 21:11:25
Message-Id: 20110503211110.3DB5120057@flycatcher.gentoo.org
1 polynomial-c 11/05/03 21:11:10
2
3 Modified: ChangeLog
4 Added: icecat-4.0.1.ebuild
5 Removed: icecat-4.0.ebuild
6 Log:
7 Security bump. Removed old
8
9 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.81 www-client/icecat/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/ChangeLog?rev=1.81&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/ChangeLog?rev=1.81&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/ChangeLog?r1=1.80&r2=1.81
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v
21 retrieving revision 1.80
22 retrieving revision 1.81
23 diff -u -r1.80 -r1.81
24 --- ChangeLog 3 May 2011 09:28:06 -0000 1.80
25 +++ ChangeLog 3 May 2011 21:11:10 -0000 1.81
26 @@ -1,6 +1,13 @@
27 # ChangeLog for www-client/icecat
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.80 2011/05/03 09:28:06 polynomial-c Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.81 2011/05/03 21:11:10 polynomial-c Exp $
31 +
32 +*icecat-4.0.1 (03 May 2011)
33 +
34 + 03 May 2011; Lars Wendler <polynomial-c@g.o>
35 + files/2000-icecat_gentoo_install_dirs.patch, -icecat-4.0.ebuild,
36 + +icecat-4.0.1.ebuild:
37 + Security bump. Removed old.
38
39 *icecat-3.6.16-r1 (03 May 2011)
40
41
42
43
44 1.1 www-client/icecat/icecat-4.0.1.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-4.0.1.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-4.0.1.ebuild?rev=1.1&content-type=text/plain
48
49 Index: icecat-4.0.1.ebuild
50 ===================================================================
51 # Copyright 1999-2011 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-4.0.1.ebuild,v 1.1 2011/05/03 21:11:10 polynomial-c Exp $
54
55 EAPI="3"
56 WANT_AUTOCONF="2.1"
57
58 inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension versionator python
59
60 MAJ_XUL_PV="2.0"
61 MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
62 XUL_PV="${MAJ_XUL_PV}${PV/${MAJ_FF_PV}/}" # 1.9.3_alpha6, 1.9.2.3, etc.
63 FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
64 FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
65 FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
66 PATCH="firefox-4.0-patches-0.9"
67
68 DESCRIPTION="GNU project's edition of Mozilla Firefox"
69 HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
70
71 KEYWORDS="~amd64 ~x86"
72 SLOT="0"
73 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
74 IUSE="+ipc system-sqlite +webm"
75
76 # More URIs appended below...
77 SRC_URI="mirror://gnu/gnuzilla/${FF_PV}/${PN}-${FF_PV}.tar.bz2
78 http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
79 LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${FF_PV}"
80
81 RDEPEND="
82 >=sys-devel/binutils-2.16.1
83 >=dev-libs/nss-3.12.9
84 >=dev-libs/nspr-4.8.7
85 >=dev-libs/glib-2.26
86 >=media-libs/libpng-1.4.7[apng]
87 x11-libs/pango[X]
88 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
89 ~net-libs/xulrunner-${XUL_PV}[wifi=,libnotify=,system-sqlite=,webm=]
90 webm? ( media-libs/libvpx
91 media-libs/alsa-lib )"
92
93 DEPEND="${RDEPEND}
94 dev-util/pkgconfig
95 webm? ( dev-lang/yasm )"
96
97 # No language packs for alphas
98 if ! [[ ${PV} =~ alpha|beta ]]; then
99 # This list can be updated with scripts/get_langs.sh from mozilla overlay
100 LANGS="af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de
101 el en-US eo es-ES et eu fa fi fr fy-NL ga-IE gd gl gu-IN
102 he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk
103 ml mr nb-NO nl nn-NO nso or pa-IN pl pt-PT rm ro ru si sk sl
104 son sq sr sv-SE ta ta-LK te th tr uk vi zu"
105 NOSHORTLANGS="en-GB en-ZA es-AR es-CL es-MX pt-BR zh-CN zh-TW"
106
107 for X in ${LANGS} ; do
108 if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
109 SRC_URI="${SRC_URI}
110 linguas_${X/-/_}? ( ${LANGPACK_URI}/${X}.xpi -> ${P}-${X}.xpi )"
111 fi
112 IUSE="${IUSE} linguas_${X/-/_}"
113 # english is handled internally
114 if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
115 if [ "${X}" != "en-US" ]; then
116 SRC_URI="${SRC_URI}
117 linguas_${X%%-*}? ( ${LANGPACK_URI}/${X}.xpi -> ${P}-${X}.xpi )"
118 fi
119 IUSE="${IUSE} linguas_${X%%-*}"
120 fi
121 done
122 fi
123
124 QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/${PN}"
125
126 linguas() {
127 local LANG SLANG
128 for LANG in ${LINGUAS}; do
129 if has ${LANG} en en_US; then
130 has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
131 continue
132 elif has ${LANG} ${LANGS//-/_}; then
133 has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
134 continue
135 elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
136 for X in ${LANGS}; do
137 if [[ "${X}" == "${LANG}-"* ]] && \
138 [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
139 has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
140 continue 2
141 fi
142 done
143 fi
144 ewarn "Sorry, but ${P} does not support the ${LANG} LINGUA"
145 done
146 }
147
148 pkg_setup() {
149 moz_pkgsetup
150 }
151
152 src_unpack() {
153 unpack ${A}
154
155 linguas
156 for X in ${linguas}; do
157 # FIXME: Add support for unpacking xpis to portage
158 [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
159 done
160 }
161
162 src_prepare() {
163 # Fix preferences location
164 sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packages-static || die "sed failed"
165
166 # Apply our patches
167 EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch
168 5001_fix-prefs-directory.patch" \
169 EPATCH_SUFFIX="patch" \
170 EPATCH_FORCE="yes" \
171 epatch "${WORKDIR}"
172
173 epatch "${FILESDIR}"/2000-icecat_gentoo_install_dirs.patch \
174 "${FILESDIR}"/5001_fix-prefs-directory.patch
175 epatch "${FILESDIR}"/fix-preferences-gentoo.patch
176
177 # Fix rebranding
178 sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in
179
180 # Disable gnomevfs extension
181 sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \
182 || die "Failed to remove gnomevfs extension"
183
184 eautoreconf
185
186 cd js/src
187 eautoreconf
188 }
189
190 src_configure() {
191 # We will build our own .mozconfig
192 rm "${S}"/.mozconfig
193
194 MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
195 MEXTENSIONS="default"
196
197 ####################################
198 #
199 # mozconfig, CFLAGS and CXXFLAGS setup
200 #
201 ####################################
202
203 mozconfig_init
204 mozconfig_config
205
206 # It doesn't compile on alpha without this LDFLAGS
207 use alpha && append-ldflags "-Wl,--no-relax"
208
209 # Specific settings for icecat
210 echo "export MOZ_PHOENIX=1" >> "${S}"/.mozconfig
211 echo "mk_add_options MOZ_PHOENIX=1" "${S}"/.mozconfig
212 mozconfig_annotate '' --with-branding=browser/branding/unofficial
213 mozconfig_annotate '' --disable-official-branding
214 mozconfig_annotate '' --with-user-appdir=.icecat
215
216 mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
217 mozconfig_annotate '' --disable-mailnews
218 mozconfig_annotate '' --enable-canvas
219 mozconfig_annotate '' --enable-safe-browsing
220 mozconfig_annotate '' --with-system-png
221 mozconfig_annotate '' --with-system-libxul
222 mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
223
224 # Other browser-specific settings
225 mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
226
227 mozconfig_use_enable system-sqlite
228
229 # Finalize and report settings
230 mozconfig_final
231
232 if [[ $(gcc-major-version) -lt 4 ]]; then
233 append-cxxflags -fno-stack-protector
234 fi
235
236 ####################################
237 #
238 # Configure and build
239 #
240 ####################################
241
242 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
243 }
244
245 src_install() {
246 MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
247
248 # Enable very specific settings not inherited from xulrunner
249 cp "${FILESDIR}"/firefox-default-prefs.js \
250 "${S}/dist/bin/defaults/preferences/all-gentoo.js" || \
251 die "failed to cp firefox-default-prefs.js"
252
253 emake DESTDIR="${D}" install || die "emake install failed"
254
255 linguas
256 for X in ${linguas}; do
257 [[ ${X} != "en" ]] && xpi_install "${WORKDIR}/${P}-${X}"
258 done
259
260 local size sizes icon_path icon name
261 sizes="16 32 48"
262 icon_path="${S}/browser/branding/unofficial"
263
264 ## Install icons and .desktop for menu entry
265 for size in ${sizes}; do
266 insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
267 newins "${icon_path}/default${size}.png" "${PN}.png" || die
268 done
269 # The 128x128 icon has a different name
270 insinto "/usr/share/icons/hicolor/128x128/apps"
271 newins "${icon_path}/mozicon128.png" "${PN}.png" || die
272 # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
273 newicon "${icon_path}/content/icon48.png" "${PN}.png" || die
274 newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die
275
276 sed -e "/^Icon/s:${PN}-icon:${PN}:" -i \
277 "${ED}/usr/share/applications/${PN}.desktop" || die
278
279 # Add StartupNotify=true bug 237317
280 if use startup-notification ; then
281 echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop"
282 fi
283
284 pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/${PN}
285
286 # Plugins dir
287 dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
288 || die "failed to symlink"
289 }
290
291 pkg_preinst() {
292 gnome2_icon_savelist
293 }
294
295 pkg_postinst() {
296 # Update mimedb for the new .desktop file
297 fdo-mime_desktop_database_update
298 gnome2_icon_cache_update
299 }
300
301 pkg_postrm() {
302 gnome2_icon_cache_update
303 }