1 |
commit: ab39e5c2ed121b11ce22876f481fd8ee91532d4a |
2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 25 16:19:12 2015 +0000 |
4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 25 16:20:03 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab39e5c2 |
7 |
|
8 |
www-client/chromium: dev channel bump (47.0.2516.0) |
9 |
|
10 |
Add experimental gtk3 support, bug #559378 by xpue |
11 |
|
12 |
Package-Manager: portage-2.2.20.1 |
13 |
|
14 |
www-client/chromium/Manifest | 2 +- |
15 |
...um-47.0.2503.0.ebuild => chromium-47.0.2516.0.ebuild} | 16 +++++++++------- |
16 |
www-client/chromium/metadata.xml | 1 + |
17 |
3 files changed, 11 insertions(+), 8 deletions(-) |
18 |
|
19 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
20 |
index 3759b32..5d02d4a 100644 |
21 |
--- a/www-client/chromium/Manifest |
22 |
+++ b/www-client/chromium/Manifest |
23 |
@@ -1,5 +1,5 @@ |
24 |
DIST chromium-45.0.2454.85-lite.tar.xz 242569440 SHA256 fafb4792c69c235d6ea85e904df68a64c51783cb338b783a1092b4ea6c888e71 SHA512 04f482ef18cddaf140224a98189ebd565416e3fe617877d58b2e691fb6030a3c9248720efcb7285cd18a034c345f9a65c677489d8a49f1ac95deafecb9b7d82a WHIRLPOOL 86b382b4dd2406559cef76ae260fcfe26e376bd957be3381b9822f706e8a5fb0ac7240fb00d64858ee1262eec17fadd253acae2b8a9318d3d996fb5d596de665 |
25 |
DIST chromium-46.0.2490.13-lite.tar.xz 261760812 SHA256 8b582b05a61b207ebec6a65577e413c00e5f7d330ec1adb24d9681d14640fc88 SHA512 d73f10a8521183ec8253dad8e82c8b6357c080cb76b91b8a8eb69cce05225dd843edf01c04a7478e04a7da22330332832f9c7a63f59346333eda83b9133c4213 WHIRLPOOL 098ec84c56ac43800bd3f5d5f60dcdc167b045b1cf3736bca72b21e1ffbf33937541f810cc2e976f6a86dca0035c4b59000a5532f4974ec2cee9156acd7c488d |
26 |
DIST chromium-46.0.2490.22-lite.tar.xz 261632508 SHA256 23a7448cfca032c240262a8d5760f23d9e89bf783ef54467353297856620edb6 SHA512 8d4f8c4cb2c7a4c3c9fb557b4fb2d34c5d7313a82c84fce340254ae59b5fcbc21b2d7b7723d8dd3f7b717175ac12e87373d0889397f01ce189c5718a7deb6de4 WHIRLPOOL dc1fee05d0acc46f9842281e475d1f9d006216c8d8e264ea3eecee63eb14054ff94ed6dd15e6d690305b08670516888a3361f5a3be8f0189c41472d77f0172bb |
27 |
-DIST chromium-47.0.2503.0.tar.xz 348185172 SHA256 af42ffc4e5c81685fdbdf8d626b28b9b1cbdb8fc2643bf03cb067e982de31ab9 SHA512 6ea58854c1ec83e35e12f247fce5c517f3770d06e42baf8192c5bc2ce731e3155c9a0de4679aa86f28f0a551d30dae75fab185905bacb825de8d0272809719f0 WHIRLPOOL cf2f93d3a0afde8325ac4a0726171ad4f2eae49e7a21c1ed857ff4ec1e89f59a1bcaaaeed070671b8fea9724cb8da2de56a0d84bcfc118912f2e1f562ef61ce4 |
28 |
DIST chromium-47.0.2508.0-lite.tar.xz 267576432 SHA256 d98aa27e686ea8d6e855125e1f1b7f4f0f0afe8c75b904d4715143f87a8c8c8f SHA512 9431f67c1a929254d74552f4e4bcc41240f24e28d44779c241ace2f7306111e6319ac321bd84c8ffdd1562920153a395845f798b0a4ba5f8ca1494258906b716 WHIRLPOOL 476ee722ad547ddfffeca231af5d8a6788b47c706cd9c27e3b6d6d6b541c9547b174cc55fde466b56ad99a63a80b0c2db66b1a0d553b0520ad6b8855073121b5 |
29 |
+DIST chromium-47.0.2516.0-lite.tar.xz 269320024 SHA256 ce90b6e6c99e661853946c992fdc8d88a3676a5f8cad318f887bee1950fb6da8 SHA512 47a62cd7013921ab46f00416cf4442c4550b1b38090ecc502c194e1f2822e07586e35ccb252f04968f4e2e8359bd472c2e12c7af71f2ba41be97839c1bae6941 WHIRLPOOL 877085833ea36f5ddd560563c1a90f31233b3fc81c5ee5ece7c8d50d16fdb979c42a8a7f86595e260632b134164f79eb7d260ee2be4a7b57abfc3a8b06417a5b |
30 |
|
31 |
diff --git a/www-client/chromium/chromium-47.0.2503.0.ebuild b/www-client/chromium/chromium-47.0.2516.0.ebuild |
32 |
similarity index 98% |
33 |
rename from www-client/chromium/chromium-47.0.2503.0.ebuild |
34 |
rename to www-client/chromium/chromium-47.0.2516.0.ebuild |
35 |
index bd7fc20..50afc7c 100644 |
36 |
--- a/www-client/chromium/chromium-47.0.2503.0.ebuild |
37 |
+++ b/www-client/chromium/chromium-47.0.2516.0.ebuild |
38 |
@@ -14,12 +14,12 @@ inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-uti |
39 |
|
40 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
41 |
HOMEPAGE="http://chromium.org/" |
42 |
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" |
43 |
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz" |
44 |
|
45 |
LICENSE="BSD hotwording? ( no-source-code )" |
46 |
SLOT="0" |
47 |
KEYWORDS="~amd64 ~arm ~x86" |
48 |
-IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine" |
49 |
+IUSE="cups gnome gnome-keyring gtk3 hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine" |
50 |
RESTRICT="proprietary-codecs? ( bindist )" |
51 |
|
52 |
# Native Client binaries are compiled with different set of flags, bug #452066. |
53 |
@@ -36,6 +36,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:= |
54 |
>=dev-libs/elfutils-0.149 |
55 |
dev-libs/expat:= |
56 |
dev-libs/glib:= |
57 |
+ >=dev-libs/icu-55.1:= |
58 |
>=dev-libs/jsoncpp-0.5.0-r1:= |
59 |
>=dev-libs/libevent-1.4.13:= |
60 |
dev-libs/libxml2:=[icu] |
61 |
@@ -63,7 +64,8 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:= |
62 |
virtual/udev |
63 |
x11-libs/cairo:= |
64 |
x11-libs/gdk-pixbuf:= |
65 |
- x11-libs/gtk+:2= |
66 |
+ gtk3? ( x11-libs/gtk+:3= ) |
67 |
+ !gtk3? ( x11-libs/gtk+:2= ) |
68 |
x11-libs/libdrm |
69 |
x11-libs/libX11:= |
70 |
x11-libs/libXcomposite:= |
71 |
@@ -241,7 +243,6 @@ src_prepare() { |
72 |
'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ |
73 |
'third_party/hunspell' \ |
74 |
'third_party/iccjpeg' \ |
75 |
- 'third_party/icu' \ |
76 |
'third_party/jstemplate' \ |
77 |
'third_party/khronos' \ |
78 |
'third_party/leveldatabase' \ |
79 |
@@ -253,8 +254,8 @@ src_prepare() { |
80 |
'third_party/libsrtp' \ |
81 |
'third_party/libudev' \ |
82 |
'third_party/libusb' \ |
83 |
- 'third_party/libvpx' \ |
84 |
- 'third_party/libvpx/source/libvpx/third_party/x86inc' \ |
85 |
+ 'third_party/libvpx_new' \ |
86 |
+ 'third_party/libvpx_new/source/libvpx/third_party/x86inc' \ |
87 |
'third_party/libxml/chromium' \ |
88 |
'third_party/libwebm' \ |
89 |
'third_party/libyuv' \ |
90 |
@@ -325,7 +326,6 @@ src_configure() { |
91 |
|
92 |
# Use system-provided libraries. |
93 |
# TODO: use_system_hunspell (upstream changes needed). |
94 |
- # TODO: use_system_icu |
95 |
# TODO: use_system_libsrtp (bug #459932). |
96 |
# TODO: use_system_libusb (http://crbug.com/266149). |
97 |
# TODO: use_system_libvpx (http://crbug.com/494939). |
98 |
@@ -337,6 +337,7 @@ src_configure() { |
99 |
-Duse_system_bzip2=1 |
100 |
-Duse_system_flac=1 |
101 |
-Duse_system_harfbuzz=1 |
102 |
+ -Duse_system_icu=1 |
103 |
-Duse_system_jsoncpp=1 |
104 |
-Duse_system_libevent=1 |
105 |
-Duse_system_libjpeg=1 |
106 |
@@ -368,6 +369,7 @@ src_configure() { |
107 |
$(gyp_use gnome use_gconf) |
108 |
$(gyp_use gnome-keyring use_gnome_keyring) |
109 |
$(gyp_use gnome-keyring linux_link_gnome_keyring) |
110 |
+ $(gyp_use gtk3) |
111 |
$(gyp_use hidpi enable_hidpi) |
112 |
$(gyp_use hotwording enable_hotwording) |
113 |
$(gyp_use kerberos) |
114 |
|
115 |
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml |
116 |
index 86d5ae4..2208094 100644 |
117 |
--- a/www-client/chromium/metadata.xml |
118 |
+++ b/www-client/chromium/metadata.xml |
119 |
@@ -4,6 +4,7 @@ |
120 |
<herd>chromium</herd> |
121 |
<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription> |
122 |
<use> |
123 |
+ <flag name="gtk3">Use gtk3 instead of gtk2</flag> |
124 |
<flag name="hidpi">Enable support for high-resolution screens (high dots per inch)</flag> |
125 |
<flag name="hotwording">Enable voice-recognition support (Ok Google)</flag> |
126 |
<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag> |