Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Bernard Cafarelli (voyageur)" <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium: ChangeLog chromium-5.0.307.5.ebuild chromium-5.0.307.1.ebuild
Date: Fri, 05 Feb 2010 13:19:24
Message-Id: E1NdO5h-0005Kr-Vu@stork.gentoo.org
1 voyageur 10/02/05 13:19:21
2
3 Modified: ChangeLog
4 Added: chromium-5.0.307.5.ebuild
5 Removed: chromium-5.0.307.1.ebuild
6 Log:
7 Update chromium dev channel releases mask
8 (Portage version: 2.2_rc62/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.50 www-client/chromium/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.50&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.50&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?r1=1.49&r2=1.50
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
20 retrieving revision 1.49
21 retrieving revision 1.50
22 diff -u -r1.49 -r1.50
23 --- ChangeLog 3 Feb 2010 13:11:38 -0000 1.49
24 +++ ChangeLog 5 Feb 2010 13:19:21 -0000 1.50
25 @@ -1,6 +1,16 @@
26 # ChangeLog for www-client/chromium
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.49 2010/02/03 13:11:38 voyageur Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.50 2010/02/05 13:19:21 voyageur Exp $
30 +
31 + 05 Feb 2010; Bernard Cafarelli <voyageur@g.o>
32 + -chromium-5.0.307.1.ebuild, +chromium-5.0.307.5.ebuild:
33 + Bump to fix a few bugs in 5.0.307, mostly theme corruption after update
34 +
35 +*chromium-5.0.307.5 (05 Feb 2010)
36 +
37 + 05 Feb 2010; Bernard Cafarelli <voyageur@g.o>
38 + -chromium-5.0.307.1.ebuild, +chromium-5.0.307.5.ebuild:
39 + Bump to fix a few bugs in 5.0.307, mostly theme corruption after update
40
41 *chromium-5.0.307.1 (03 Feb 2010)
42
43
44
45
46 1.1 www-client/chromium/chromium-5.0.307.5.ebuild
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.307.5.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.307.5.ebuild?rev=1.1&content-type=text/plain
50
51 Index: chromium-5.0.307.5.ebuild
52 ===================================================================
53 # Copyright 1999-2010 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.5.ebuild,v 1.1 2010/02/05 13:19:21 voyageur Exp $
56
57 EAPI="2"
58 inherit eutils multilib toolchain-funcs flag-o-matic
59
60 DESCRIPTION="Open-source version of Google Chrome web browser"
61 HOMEPAGE="http://chromium.org/"
62 #SRC_URI="http://build.chromium.org/buildbot/archives/${P}.tar.bz2"
63 SRC_URI="mirror://gentoo/${P}.tar.bz2"
64
65 LICENSE="BSD"
66 SLOT="0"
67 KEYWORDS="~amd64 ~arm ~x86"
68 IUSE="+ffmpeg"
69
70 RDEPEND="app-arch/bzip2
71 >=dev-libs/libevent-1.4.13
72 dev-libs/libxml2
73 dev-libs/libxslt
74 >=dev-libs/nss-3.12.3
75 >=gnome-base/gconf-2.24.0
76 >=media-libs/alsa-lib-1.0.19
77 media-libs/jpeg
78 media-libs/libpng
79 ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
80 sys-libs/zlib
81 >=x11-libs/gtk+-2.14.7
82 x11-libs/libXScrnSaver
83 x11-misc/xdg-utils
84 || (
85 x11-themes/gnome-icon-theme
86 x11-themes/tango-icon-theme
87 x11-themes/xfce4-icon-theme
88 )"
89 # dev-db/sqlite:3
90 DEPEND="${RDEPEND}
91 >=dev-util/gperf-3.0.3
92 >=dev-util/pkgconfig-0.23
93 sys-devel/flex"
94
95 src_prepare() {
96 # Gentoo uses .kde4, not .kde
97 # TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
98 # would be better
99 sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
100 || die "kde proxy sed failed"
101 # Changing this in ~/include.gypi does not work
102 sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
103 # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
104 epatch "${FILESDIR}"/${PN}-drop_sse2.patch
105 # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
106 epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
107
108 # Disable prefixing to allow linking against system zlib
109 sed -e '/^#include "mozzconf.h"$/d' \
110 -i third_party/zlib/zconf.h \
111 || die "zlib sed failed"
112 }
113
114 src_configure() {
115 export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
116
117 # CFLAGS/LDFLAGS
118 mkdir -p "${S}"/.gyp
119 cat << EOF > "${S}"/.gyp/include.gypi
120 {
121 'target_defaults': {
122 'cflags': [ '${CFLAGS// /','}' ],
123 'ldflags': [ '${LDFLAGS// /','}' ],
124 },
125 }
126 EOF
127 export HOME="${S}"
128
129 # Configuration options (system libraries)
130 local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1"
131 # -Duse_system_sqlite=1 : http://crbug.com/22208
132 # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
133
134 # Sandbox paths
135 myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
136
137 if use amd64 ; then
138 myconf="${myconf} -Dtarget_arch=x64"
139 fi
140
141 if use x86 ; then
142 myconf="${myconf} -Dtarget_arch=ia32"
143 fi
144
145 if use arm; then
146 myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
147 append-flags -fno-tree-sink
148 fi
149
150 if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
151 myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
152 fi
153
154 build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
155 }
156
157 src_compile() {
158 emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
159 rootdir="${S}" \
160 CC=$(tc-getCC) \
161 CXX=$(tc-getCXX) \
162 AR=$(tc-getAR) \
163 RANLIB=$(tc-getRANLIB) \
164 || die "compilation failed"
165 }
166
167 src_install() {
168 # Chromium does not have "install" target in the build system.
169 export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
170
171 dodir ${CHROMIUM_HOME}
172
173 exeinto ${CHROMIUM_HOME}
174 doexe out/Release/chrome
175 doexe out/Release/chrome_sandbox
176 fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
177 doexe out/Release/xdg-settings
178 doexe "${FILESDIR}"/chromium-launcher.sh
179
180 insinto ${CHROMIUM_HOME}
181 doins out/Release/chrome.pak
182
183 doins -r out/Release/locales
184 doins -r out/Release/resources
185
186 # chrome.1 is for chromium --help
187 newman out/Release/chrome.1 chrome.1
188 newman out/Release/chrome.1 chromium.1
189
190 if use ffmpeg; then
191 # Chromium looks for these in its folder
192 # See media_posix.cc and base_paths_linux.cc
193 dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
194 dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
195 dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
196 fi
197
198 # Plugins symlink
199 dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
200
201 # Icon and desktop entry
202 newicon out/Release/product_logo_48.png ${PN}-browser.png
203 dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
204 make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
205 sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
206 || die "desktop file sed failed"
207 # Gnome default application entry
208 dodir /usr/share/gnome-control-center/default-apps
209 insinto /usr/share/gnome-control-center/default-apps
210 doins "${FILESDIR}"/chromium.xml
211
212 }
Report Message
Find on MARC Find on Google Groups