| 1 |
commit: eb72929fca0dd37787b69458bf38c47b1640e0d1 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 27 02:22:20 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 27 02:22:38 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb72929f |
| 7 |
|
| 8 |
www-client/chromium: stable channel bump (60.0.3112.78) |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1 |
| 11 |
|
| 12 |
www-client/chromium/Manifest | 2 +- |
| 13 |
...3112.32.ebuild => chromium-60.0.3112.78.ebuild} | 49 +++++++++++++++------- |
| 14 |
2 files changed, 34 insertions(+), 17 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
| 17 |
index aea984c4045..b21160d2754 100644 |
| 18 |
--- a/www-client/chromium/Manifest |
| 19 |
+++ b/www-client/chromium/Manifest |
| 20 |
@@ -1,5 +1,5 @@ |
| 21 |
DIST chromium-59.0.3071.104.tar.xz 531895868 SHA256 a949fa166cdcdbd8419fbdb4583804613d9845130f0c851e4c647d79a4c300d0 SHA512 419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf WHIRLPOOL ab2fbd1beeb485a5c07743a5a84c850b5ad8178a1f97421a0aa0573817b474e633a6ac65ad43f7db67d35d257183ea4eceacd12b4cad63f88cd9777cfa498e68 |
| 22 |
-DIST chromium-60.0.3112.32.tar.xz 537426032 SHA256 d972469bfc26a3d135a1863c22b88e23a9f00096841f6392dbb83b75ad0d17f1 SHA512 625bac567f0717d1077ac77023c87bdd2ad1244d63c50ce6935bcb41b85aab4c06b05fda7e0f48cc7305c331080a350a16592adb37583c13736c97a55404d6ab WHIRLPOOL 78af7bbf83466c044428f294209512c27ed649e746829df083edf8e8fc4eddb23618606ec8571bc4eb433a7d67e921236c562c2c175f3685017ef2576b3f7802 |
| 23 |
DIST chromium-60.0.3112.40.tar.xz 537575476 SHA256 4fdc590fc6ef4af16cc72d790b9eaa50829cd8193893a9ec0719481b03f328d3 SHA512 0e121887f7158d47a9fdb7c0be43a0b1cb32d19a893f99cfc13e2ce146e553e6428fdd82815180bacb430eace42f8bf83595073cf449f49e963633e8414b07ef WHIRLPOOL b7b2b62f61c18ed77890383ba1ac2d25094e14c12042fa1b1af50fa1f8d69807673a036fdb54078622e92b32eb7211040fda3513cb079598e3caf1219c594631 |
| 24 |
+DIST chromium-60.0.3112.78.tar.xz 537669428 SHA256 a82db2aa1b9348b619c01894db565eba686780de0e6fa9e83a8f406d06ce03ea SHA512 d6cccf2537233c12d7b0254b45adbf0abdf9ca43688ceed28b3d915290478563be30d30879018fd4d6f2acc9654d9911c0c6bbebba0cdeacd16d748e18296c41 WHIRLPOOL b7acf6a57bced89f1e81e389f72ef80cb4a24f9beed45c737bd511d8e5f64236c5b9888910ee58b746a6cdbbcc58cc1d665e8730e33471ee50782ef4ce883e8c |
| 25 |
DIST chromium-61.0.3153.4.tar.xz 545739052 SHA256 ef48c114fed9a9977b731296cf099e62f1b50df07835709b41868c44363c6ec1 SHA512 693f8f31fb97eb57277a23c2b2f88d055d9f06ed89004874449332186e8e2e7ed63af6566e884ee52c963e8cda0a2b95caae9ebba486b279daca3c9355cda711 WHIRLPOOL be65fe3342a761cc0150d3d42708b9055442e2f5f8619a7d956be173b1abef0cb7b4a0bc4f0e55be0990461665fc2ba1e3b899bdffe328b8d3adc1624b15ea03 |
| 26 |
DIST chromium-61.0.3159.5.tar.xz 546362372 SHA256 34e0e62f5c30df110bd8d5f872021a8a0ee21fc4b6c2d4efcb8a2232612f6e0a SHA512 325312223a1486fef1ca9d19c215147bdb37d7ab83437a6e38a076099bf450b79fbfba4060234307cba6385f9d82bf9d66c7a178f3ca33eeb0be1acee71e03f0 WHIRLPOOL cecab851eb6b247e7e381cfcac94d43d2b30d38631160ba1393920e241803e3b54402f719677b608ac15734c21ad6e762925e18f92b1b3e40f3aea93886aa721 |
| 27 |
|
| 28 |
diff --git a/www-client/chromium/chromium-60.0.3112.32.ebuild b/www-client/chromium/chromium-60.0.3112.78.ebuild |
| 29 |
similarity index 95% |
| 30 |
rename from www-client/chromium/chromium-60.0.3112.32.ebuild |
| 31 |
rename to www-client/chromium/chromium-60.0.3112.78.ebuild |
| 32 |
index b6eb7690264..a89dd6df1ae 100644 |
| 33 |
--- a/www-client/chromium/chromium-60.0.3112.32.ebuild |
| 34 |
+++ b/www-client/chromium/chromium-60.0.3112.78.ebuild |
| 35 |
@@ -32,7 +32,7 @@ COMMON_DEPEND=" |
| 36 |
cups? ( >=net-print/cups-1.3.11:= ) |
| 37 |
dev-libs/expat:= |
| 38 |
dev-libs/glib:2 |
| 39 |
- dev-libs/icu:= |
| 40 |
+ <dev-libs/icu-59:= |
| 41 |
dev-libs/libxslt:= |
| 42 |
dev-libs/nspr:= |
| 43 |
>=dev-libs/nss-3.14.3:= |
| 44 |
@@ -331,6 +331,22 @@ src_prepare() { |
| 45 |
build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die |
| 46 |
} |
| 47 |
|
| 48 |
+bootstrap_gn() { |
| 49 |
+ if tc-is-cross-compiler; then |
| 50 |
+ local -x AR=${BUILD_AR} |
| 51 |
+ local -x CC=${BUILD_CC} |
| 52 |
+ local -x CXX=${BUILD_CXX} |
| 53 |
+ local -x NM=${BUILD_NM} |
| 54 |
+ local -x CFLAGS=${BUILD_CFLAGS} |
| 55 |
+ local -x CXXFLAGS=${BUILD_CXXFLAGS} |
| 56 |
+ local -x LDFLAGS=${BUILD_LDFLAGS} |
| 57 |
+ fi |
| 58 |
+ einfo "Building GN..." |
| 59 |
+ set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean |
| 60 |
+ echo "$@" |
| 61 |
+ "$@" || die |
| 62 |
+} |
| 63 |
+ |
| 64 |
src_configure() { |
| 65 |
local myconf_gn="" |
| 66 |
|
| 67 |
@@ -396,7 +412,6 @@ src_configure() { |
| 68 |
|
| 69 |
if tc-is-clang; then |
| 70 |
myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
| 71 |
- myconf_gn+=" clang_base_path=\"$(realpath $(dirname `which clang`)/..)\"" |
| 72 |
else |
| 73 |
myconf_gn+=" is_clang=false" |
| 74 |
fi |
| 75 |
@@ -423,16 +438,16 @@ src_configure() { |
| 76 |
|
| 77 |
local myarch="$(tc-arch)" |
| 78 |
if [[ $myarch = amd64 ]] ; then |
| 79 |
- target_arch=x64 |
| 80 |
+ myconf_gn+=" target_cpu=\"x64\"" |
| 81 |
ffmpeg_target_arch=x64 |
| 82 |
elif [[ $myarch = x86 ]] ; then |
| 83 |
- target_arch=ia32 |
| 84 |
+ myconf_gn+=" target_cpu=\"x86\"" |
| 85 |
ffmpeg_target_arch=ia32 |
| 86 |
elif [[ $myarch = arm64 ]] ; then |
| 87 |
- target_arch=arm64 |
| 88 |
+ myconf_gn+=" target_cpu=\"arm64\"" |
| 89 |
ffmpeg_target_arch=arm64 |
| 90 |
elif [[ $myarch = arm ]] ; then |
| 91 |
- target_arch=arm |
| 92 |
+ myconf_gn+=" target_cpu=\"arm\"" |
| 93 |
ffmpeg_target_arch=$(usex neon arm-neon arm) |
| 94 |
else |
| 95 |
die "Failed to determine target arch, got '$myarch'." |
| 96 |
@@ -465,20 +480,19 @@ src_configure() { |
| 97 |
# Make sure the build system will use the right tools, bug #340795. |
| 98 |
tc-export AR CC CXX NM |
| 99 |
|
| 100 |
- # https://bugs.gentoo.org/588596 |
| 101 |
- append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
| 102 |
- |
| 103 |
# Define a custom toolchain for GN |
| 104 |
myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\"" |
| 105 |
|
| 106 |
- # Tools for building programs to be executed on the build system, bug #410883. |
| 107 |
if tc-is-cross-compiler; then |
| 108 |
- export AR_host=$(tc-getBUILD_AR) |
| 109 |
- export CC_host=$(tc-getBUILD_CC) |
| 110 |
- export CXX_host=$(tc-getBUILD_CXX) |
| 111 |
- export NM_host=$(tc-getBUILD_NM) |
| 112 |
+ tc-export BUILD_{AR,CC,CXX,NM} |
| 113 |
+ myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:host\"" |
| 114 |
+ else |
| 115 |
+ myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:default\"" |
| 116 |
fi |
| 117 |
|
| 118 |
+ # https://bugs.gentoo.org/588596 |
| 119 |
+ append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
| 120 |
+ |
| 121 |
# Bug 491582. |
| 122 |
export TMPDIR="${WORKDIR}/temp" |
| 123 |
mkdir -p -m 755 "${TMPDIR}" || die |
| 124 |
@@ -503,9 +517,12 @@ src_configure() { |
| 125 |
|
| 126 |
touch chrome/test/data/webui/i18n_process_css_test.html || die |
| 127 |
|
| 128 |
+ bootstrap_gn |
| 129 |
+ |
| 130 |
einfo "Configuring Chromium..." |
| 131 |
- tools/gn/bootstrap/bootstrap.py -v --no-clean --gn-gen-args "${myconf_gn}" || die |
| 132 |
- out/Release/gn gen --args="${myconf_gn}" out/Release || die |
| 133 |
+ set -- out/Release/gn gen --args="${myconf_gn}" out/Release |
| 134 |
+ echo "$@" |
| 135 |
+ "$@" || die |
| 136 |
} |
| 137 |
|
| 138 |
src_compile() { |
Archives