From: Paweł Hajdan Date: Sun, 4 Apr 2010 07:46:19 +0000 (+0000) Subject: Make sure all ebuilds have the fix for libpng-1.4, bug #310959 by X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba7de07954b89037ad828de3710ba417d4933381;p=gentoo.git Make sure all ebuilds have the fix for libpng-1.4, bug #310959 by loki_val. Remove old. Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 158d043786fd..f67c1b0f11d3 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/chromium # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.75 2010/04/03 20:45:49 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.76 2010/04/04 07:46:19 phajdan.jr Exp $ + + 04 Apr 2010; Pawel Hajdan jr + -chromium-5.0.307.11.ebuild, chromium-5.0.342.7.ebuild, + -chromium-5.0.360.0.ebuild, chromium-5.0.360.5.ebuild: + Make sure all ebuilds have the fix for libpng-1.4, bug #310959 by + loki_val. Remove old. 03 Apr 2010; Pawel Hajdan jr +files/chromium-libpng-1.4.patch, chromium-5.0.366.2.ebuild, diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index c8a3b9dad594..e82ceee95154 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -5,16 +5,12 @@ AUX chromium-fix-make-build.patch 677 RMD160 b0dd0057d6f28e5d79b0bd9fd45b8e7cb79 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506b SHA1 e96283b523a14e8fb369838b35051c8ba0cc6f96 SHA256 b92ba935589f01b28a4ddeb5fd7fd42f8f643eaf1e24cafc2458d97fa1489d8e AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a -DIST chromium-5.0.307.11.tar.bz2 153145874 RMD160 2e8820fae4bd2ca0b6e7c4c3f0d10eb0b4bcc2d3 SHA1 33b5a62501af3645076f3d48dba76356d4736471 SHA256 4578711c2359b9d6751c6fcecb541d0fb63c5bcde2a82346040d218c8de5a4ea DIST chromium-5.0.342.7.tar.bz2 155598620 RMD160 4afac79db21172596037c7aa03e797e722b1aaf4 SHA1 09fad49eb63863dcac515fc1c82aa51c8e2d7ebb SHA256 d3a2ad54b925da27dea290f421494b47a046123cb0659214f99502a0a86a4b3d -DIST chromium-5.0.360.0.tar.bz2 160952531 RMD160 3d3b978ad50c66148f18aa4ca6f20b998929f012 SHA1 54547459f38efca654715d725a4f2abea13e2ceb SHA256 161f5fb5f51962a90dc46df4154c48c0123c02cb320f97a0c42fcbc4b96f7a67 DIST chromium-5.0.360.5.tar.bz2 160968726 RMD160 7d53b3ccf59b6759704607c349322cefffb1d68e SHA1 f38e6a5234f5b39ea9e2262f933057ae9e7e8c5e SHA256 44da030ce701510f0949e9483dfd9480089f8054d89373a538d05ab0f3dcc108 DIST chromium-5.0.366.2.tar.bz2 162986774 RMD160 d18fc87d571d7c76bf59128438b52ce1122153a5 SHA1 cbf22badb06797972d94d3e4ca07fd4ac77de883 SHA256 11df6280383040bfb797ef0e64f6ca63281dfa18dcbb5612f71c3bd842555d0f -EBUILD chromium-5.0.307.11.ebuild 6141 RMD160 f457412c120d1d52c735a6a163d507ae052a330a SHA1 5f9ab48763b1657ff22f0f70869f5b50bcd68d68 SHA256 83809a7f2fd406a76e0de98f88b9ca91ebaf1d38ea192ca98bf5c5a35451343a -EBUILD chromium-5.0.342.7.ebuild 6449 RMD160 aa8a24a34332a43d1cb0284a9c9ee3a4209fda16 SHA1 d2e67b8bbe037d0105eedbe4f2cdb5ff118dec95 SHA256 2946eda059d79673013b7c235cf9d2a11baa56fd87ae049d630af79974fbe3f1 -EBUILD chromium-5.0.360.0.ebuild 6451 RMD160 86b1deeb8084b0c5eb388bca47bbe06ead1fc56d SHA1 b309bc663c4b6ef7c9e8076ba5e111e72503f82d SHA256 9ad943b3a68ef75841b0ee4242569452cb8c0d4f2e0da4fdb57ebff44d462e87 -EBUILD chromium-5.0.360.5.ebuild 6451 RMD160 825579af6bbcf0a8b37b31d46256b928fcf6cc83 SHA1 4952bf83c702edad474a59484b25c92b31d64ac3 SHA256 785ad6ed01dc26d8516b3d531e28ffcef443c34e9a3f4879402080a8c7718b0f +EBUILD chromium-5.0.342.7.ebuild 6546 RMD160 6043e7fb2e094db1815b85995a9baff0e9f4584d SHA1 2827418126a2f192c8e8980e5436f8703dc3e002 SHA256 e8e6829ff2fb1495c1c40eb3fe70a2825d4e1329549937d27af534e9cedd6e23 +EBUILD chromium-5.0.360.5.ebuild 6546 RMD160 a747caf550a37c195d9472e34582a6d52d534987 SHA1 a519225ee91342d317b868d477d181597ec71ba2 SHA256 2ed79b0854b1d91910a5ffd38ea63813a4e73fd2487498628e101e864b586abc EBUILD chromium-5.0.366.2.ebuild 6515 RMD160 4e45f2efeae24c67120b83cecec62a9c1b6a58d4 SHA1 d1d5d20b5c34fc69ee0892722b8dbddf1cbac39b SHA256 380cb130b4065963e37db7b18adcae0753b872f47251fe9430eaf7ed81bfb92a EBUILD chromium-9999.ebuild 8268 RMD160 7435478e5156aa17f47af317f1ccd2dfc5bb4143 SHA1 d80a44aa12f7b359f51dbc432b76b180ecf08fcb SHA256 dac8abde34a941175ee87111a1a4e4a8643d827c11c7a29e5dc9dcc0f48c3d73 -MISC ChangeLog 17235 RMD160 d8a98547ad4d73ba2b0cb012d43c7e24a0347fe1 SHA1 051f71f6c58158c1cd6bcc44ca83c4f902f604f0 SHA256 1a63f4e7c52a09b85b7f9aa6de23fb8fce45dc2e181d34ba3bc1df18aba5b6d5 +MISC ChangeLog 17498 RMD160 beaddcab994f011a6c1f7cf504c6f5415ee24959 SHA1 a925a0731b1a3beb2238a6794fc77113ce869268 SHA256 c52e35f88aba5b40b57ca656b4a04cde59ddbb52ce5f99a635ae430e3d1ba1fe MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c diff --git a/www-client/chromium/chromium-5.0.307.11.ebuild b/www-client/chromium/chromium-5.0.307.11.ebuild deleted file mode 100644 index e9aa09ff3fd6..000000000000 --- a/www-client/chromium/chromium-5.0.307.11.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.11.ebuild,v 1.4 2010/03/19 17:16:03 phajdan.jr Exp $ - -EAPI="2" -inherit eutils flag-o-matic multilib portability toolchain-funcs - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -#SRC_URI="http://build.chromium.org/buildbot/archives/${P}.tar.bz2" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+ffmpeg +plugins-symlink" - -RDEPEND="app-arch/bzip2 - >=dev-libs/libevent-1.4.13 - dev-libs/libxml2 - dev-libs/libxslt - >=dev-libs/nss-3.12.3 - >=gnome-base/gconf-2.24.0 - >=media-libs/alsa-lib-1.0.19 - media-libs/jpeg:0 - media-libs/libpng - ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 ) - sys-libs/zlib - >=x11-libs/gtk+-2.14.7 - x11-libs/libXScrnSaver" -# dev-db/sqlite:3 -DEPEND="${RDEPEND} - >=dev-util/gperf-3.0.3 - >=dev-util/pkgconfig-0.23 - sys-devel/flex" -RDEPEND+=" - || ( - x11-themes/gnome-icon-theme - x11-themes/tango-icon-theme - x11-themes/xfce4-icon-theme - ) - x11-misc/xdg-utils" - -# Incompatible system plugins: -# www-plugins/gecko-mediaplayer, bug #309231. -RDEPEND+=" - plugins-symlink? ( - !www-plugins/gecko-mediaplayer[gnome] - )" - -pkg_setup() { - if [[ "${ROOT}" == "/" ]]; then - # Prevent user problems like bug 299777. - if ! grep -q /dev/shm <<< $(get_mounts); then - eerror "You don't have tmpfs mounted at /dev/shm." - eerror "${PN} isn't going to work in that configuration." - eerror "Please uncomment the /dev/shm entry in /etc/fstab," - eerror "run 'mount /dev/shm' and try again." - die "/dev/shm is not mounted" - fi - if [ `stat -c %a /dev/shm` -ne 1777 ]; then - eerror "/dev/shm does not have correct permissions." - eerror "${PN} isn't going to work in that configuration." - eerror "Please run chmod 1777 /dev/shm and try again." - die "/dev/shm has incorrect permissions" - fi - fi - - elog "${PN} might crash occasionally. To get more useful backtraces" - elog "and submit better bug reports, please read" - elog "http://www.gentoo.org/proj/en/qa/backtraces.xml" -} - -src_prepare() { - # Gentoo uses .kde4, not .kde - # TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927 - # would be better - sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \ - || die "kde proxy sed failed" - # Changing this in ~/include.gypi does not work - sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed" - # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007 - epatch "${FILESDIR}"/${PN}-drop_sse2.patch - # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg - epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch - # Prevent the make build from filling entire disk space on some systems, - # bug 297273. - epatch "${FILESDIR}"/${PN}-fix-make-build.patch - - # Disable prefixing to allow linking against system zlib - sed -e '/^#include "mozzconf.h"$/d' \ - -i third_party/zlib/zconf.h \ - || die "zlib sed failed" -} - -src_configure() { - export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser - - # CFLAGS/LDFLAGS - mkdir -p "${S}"/.gyp - cat << EOF > "${S}"/.gyp/include.gypi -{ - 'target_defaults': { - 'cflags': [ '${CFLAGS// /','}' ], - 'ldflags': [ '${LDFLAGS// /','}' ], - }, -} -EOF - export HOME="${S}" - - # Configuration options (system libraries) - 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" - # -Duse_system_sqlite=1 : http://crbug.com/22208 - # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support) - - # Sandbox paths - myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - - if use amd64 ; then - myconf="${myconf} -Dtarget_arch=x64" - fi - - if use x86 ; then - myconf="${myconf} -Dtarget_arch=ia32" - fi - - if use arm; then - myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" - append-flags -fno-tree-sink - fi - - if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then - myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" - fi - - build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed" -} - -src_compile() { - emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \ - rootdir="${S}" \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) \ - || die "compilation failed" -} - -src_install() { - # Chromium does not have "install" target in the build system. - export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser - - dodir ${CHROMIUM_HOME} - - exeinto ${CHROMIUM_HOME} - doexe out/Release/chrome - doexe out/Release/chrome_sandbox - fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox - doexe out/Release/xdg-settings - doexe "${FILESDIR}"/chromium-launcher.sh - - insinto ${CHROMIUM_HOME} - doins out/Release/chrome.pak - - doins -r out/Release/locales - doins -r out/Release/resources - - # chrome.1 is for chromium --help - newman out/Release/chrome.1 chrome.1 - newman out/Release/chrome.1 chromium.1 - - if use ffmpeg; then - # Chromium looks for these in its folder - # See media_posix.cc and base_paths_linux.cc - dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME} - dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME} - dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME} - fi - - # Plugins symlink, optional wrt bug #301911 - if use plugins-symlink; then - dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins - fi - - # Icon and desktop entry - newicon out/Release/product_logo_48.png ${PN}-browser.png - dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium - make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" - sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \ - || die "desktop file sed failed" - # Gnome default application entry - dodir /usr/share/gnome-control-center/default-apps - insinto /usr/share/gnome-control-center/default-apps - doins "${FILESDIR}"/chromium.xml - -} diff --git a/www-client/chromium/chromium-5.0.342.7.ebuild b/www-client/chromium/chromium-5.0.342.7.ebuild index a1216a70be8c..ed4fd972e53c 100644 --- a/www-client/chromium/chromium-5.0.342.7.ebuild +++ b/www-client/chromium/chromium-5.0.342.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.342.7.ebuild,v 1.1 2010/03/25 11:52:12 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.342.7.ebuild,v 1.2 2010/04/04 07:46:19 phajdan.jr Exp $ EAPI="2" inherit eutils flag-o-matic multilib portability toolchain-funcs @@ -91,6 +91,8 @@ src_prepare() { # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch fi + # Fix build failure with libpng-1.4, bug 310959. + epatch "${FILESDIR}"/${PN}-libpng-1.4.patch # Prevent the make build from filling entire disk space on some systems, # bug 297273. epatch "${FILESDIR}"/${PN}-fix-make-build.patch diff --git a/www-client/chromium/chromium-5.0.360.0.ebuild b/www-client/chromium/chromium-5.0.360.0.ebuild deleted file mode 100644 index f91ddf5d30c0..000000000000 --- a/www-client/chromium/chromium-5.0.360.0.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.360.0.ebuild,v 1.1 2010/03/29 16:14:16 phajdan.jr Exp $ - -EAPI="2" -inherit eutils flag-o-matic multilib portability toolchain-funcs - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="bindist +ffmpeg +plugins-symlink" - -RDEPEND="app-arch/bzip2 - >=dev-libs/libevent-1.4.13 - dev-libs/libxml2 - dev-libs/libxslt - >=dev-libs/nss-3.12.3 - >=gnome-base/gconf-2.24.0 - >=media-libs/alsa-lib-1.0.19 - media-libs/jpeg:0 - media-libs/libpng - ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 ) - sys-libs/zlib - >=x11-libs/gtk+-2.14.7 - x11-libs/libXScrnSaver" -# dev-db/sqlite:3 -DEPEND="${RDEPEND} - >=dev-util/gperf-3.0.3 - >=dev-util/pkgconfig-0.23 - sys-devel/flex" -RDEPEND+=" - || ( - x11-themes/gnome-icon-theme - x11-themes/tango-icon-theme - x11-themes/xfce4-icon-theme - ) - x11-misc/xdg-utils" - -# Incompatible system plugins: -# www-plugins/gecko-mediaplayer, bug #309231. -RDEPEND+=" - plugins-symlink? ( - !www-plugins/gecko-mediaplayer[gnome] - )" - -pkg_setup() { - if [[ "${ROOT}" == "/" ]]; then - # Prevent user problems like bug 299777. - if ! grep -q /dev/shm <<< $(get_mounts); then - eerror "You don't have tmpfs mounted at /dev/shm." - eerror "${PN} isn't going to work in that configuration." - eerror "Please uncomment the /dev/shm entry in /etc/fstab," - eerror "run 'mount /dev/shm' and try again." - die "/dev/shm is not mounted" - fi - if [ `stat -c %a /dev/shm` -ne 1777 ]; then - eerror "/dev/shm does not have correct permissions." - eerror "${PN} isn't going to work in that configuration." - eerror "Please run chmod 1777 /dev/shm and try again." - die "/dev/shm has incorrect permissions" - fi - fi - - elog "${PN} might crash occasionally. To get more useful backtraces" - elog "and submit better bug reports, please read" - elog "http://www.gentoo.org/proj/en/qa/backtraces.xml" - - if ! use bindist; then - einfo - elog "You may not redistribute this build to any users on your network" - elog "or the internet." - elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" - fi -} - -src_prepare() { - # Gentoo uses .kde4, not .kde - # TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927 - # would be better - sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \ - || die "kde proxy sed failed" - # Changing this in ~/include.gypi does not work - sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed" - # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007 - epatch "${FILESDIR}"/${PN}-drop_sse2.patch - if ! use bindist; then - # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg - epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch - fi - # Prevent the make build from filling entire disk space on some systems, - # bug 297273. - epatch "${FILESDIR}"/${PN}-fix-make-build.patch - - # Disable prefixing to allow linking against system zlib - sed -e '/^#include "mozzconf.h"$/d' \ - -i third_party/zlib/zconf.h \ - || die "zlib sed failed" -} - -src_configure() { - export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser - - # Fails to build on arm if we don't do this - use arm && append-flags -fno-tree-sink - - # CFLAGS/LDFLAGS - mkdir -p "${S}"/.gyp - cat << EOF > "${S}"/.gyp/include.gypi -{ - 'target_defaults': { - 'cflags': [ '${CFLAGS// /','}' ], - 'ldflags': [ '${LDFLAGS// /','}' ], - }, -} -EOF - export HOME="${S}" - - # Configuration options (system libraries) - 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_sqlite=1 : http://crbug.com/22208 - # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support) - - # Sandbox paths - myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - - if use amd64 ; then - myconf="${myconf} -Dtarget_arch=x64" - fi - - if use x86 ; then - myconf="${myconf} -Dtarget_arch=ia32" - fi - - if use arm; then - myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" - fi - - if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then - myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" - fi - - if use ffmpeg; then - myconf="${myconf} -Duse_system_ffmpeg=1" - fi - - build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed" -} - -src_compile() { - emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \ - rootdir="${S}" \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) \ - || die "compilation failed" -} - -src_install() { - # Chromium does not have "install" target in the build system. - export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser - - dodir ${CHROMIUM_HOME} - - exeinto ${CHROMIUM_HOME} - doexe out/Release/chrome - doexe out/Release/chrome_sandbox - fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox - doexe out/Release/xdg-settings - doexe "${FILESDIR}"/chromium-launcher.sh - - insinto ${CHROMIUM_HOME} - doins out/Release/chrome.pak - - doins -r out/Release/locales - doins -r out/Release/resources - - # chrome.1 is for chromium --help - newman out/Release/chrome.1 chrome.1 - newman out/Release/chrome.1 chromium.1 - - if use ffmpeg; then - # Chromium looks for these in its folder - # See media_posix.cc and base_paths_linux.cc - dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME} - dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME} - dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME} - fi - - # Plugins symlink, optional wrt bug #301911 - if use plugins-symlink; then - dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins - fi - - # Icon and desktop entry - newicon out/Release/product_logo_48.png ${PN}-browser.png - dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium - make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" - sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \ - || die "desktop file sed failed" - # Gnome default application entry - dodir /usr/share/gnome-control-center/default-apps - insinto /usr/share/gnome-control-center/default-apps - doins "${FILESDIR}"/chromium.xml -} diff --git a/www-client/chromium/chromium-5.0.360.5.ebuild b/www-client/chromium/chromium-5.0.360.5.ebuild index 3a41c6daf117..516791024664 100644 --- a/www-client/chromium/chromium-5.0.360.5.ebuild +++ b/www-client/chromium/chromium-5.0.360.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.360.5.ebuild,v 1.1 2010/03/31 05:49:07 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.360.5.ebuild,v 1.2 2010/04/04 07:46:19 phajdan.jr Exp $ EAPI="2" inherit eutils flag-o-matic multilib portability toolchain-funcs @@ -91,6 +91,8 @@ src_prepare() { # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch fi + # Fix build failure with libpng-1.4, bug 310959. + epatch "${FILESDIR}"/${PN}-libpng-1.4.patch # Prevent the make build from filling entire disk space on some systems, # bug 297273. epatch "${FILESDIR}"/${PN}-fix-make-build.patch