diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-02 15:59:12 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-02 15:59:12 +0000 |
| commit | 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (patch) | |
| tree | 8d58c1f4b049da677b33209b072f2b3057268fe0 /www-client | |
| parent | 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (diff) | |
gentoo resync : 02.03.2018
Diffstat (limited to 'www-client')
30 files changed, 898 insertions, 587 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz Binary files differindex 6ad756d10947..71b605c88e10 100644 --- a/www-client/Manifest.gz +++ b/www-client/Manifest.gz diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 5519f2df35fa..2112fdbfbf53 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -5,21 +5,20 @@ AUX chromium-clang-r2.patch 731 BLAKE2B 6a0560107c89ab4406d62700312bb4437b49b5b1 AUX chromium-clang-r3.patch 361 BLAKE2B b0f833153a11a15b498bb5892119e1978573ba250ff10e555a7b7393bad5d00959611702beca58f88453a933eb66a8a456048aaf1e934876af40a601a4f7b2c8 SHA512 ed5ad35dbd43eabe5fdca518975c5c775d1698f2c8d5b2c74e52616532f62c83e60001bffa02cdea536af31f29021db6ada7e037e2c8f92cbdf1dc500090f070 AUX chromium-cups-r0.patch 1350 BLAKE2B 91c32a88d5a03ba4f16e54a4498cf6de121b8d6dfbb76630afc69925bfa192c456f6d1349e0ba0b9f71373608ce983910630bf2f278ca884ec8bde4d132b9201 SHA512 404aea01f732132c65fc66c60926c671daad0a1d9446422d36eb6788820f1d23a2bea9d81971f7341f4c36d157bfc9c840b58d7f5f62a913b789d00362c7d005 AUX chromium-ffmpeg-r0.patch 830 BLAKE2B be12eb6ce7aa66667122ebd7abe31dc18d3997c309b034c46771158848c9f7472731e3e0e66ccc4d7ff029c9295bedeabc82ce05c21e5f8944b6d8e5e037436e SHA512 7cdd79d04447029ac4981df06c2c16a3674420925ba9e210a676fe32e9424ea4d475a73d4d3e265bdfc10a36936124764315b11fb4efae22e9dffc39ffdbceb5 -AUX chromium-gcc-r0.patch 2344 BLAKE2B f7fdff3e72e57c222e02a202fffa6785eeb90408094099b8e04cd8cecfc5cd5006801ffaafaa8561a4402ee5fa4bd8b9f489ac6ac3e34c212a683f5793c21124 SHA512 0e29192c8637b050c4976455c798ce0dc078c1e92ec0ed51da71866c2d35242e720f4ca468a431e8ea696700c8ef003a71e8ec06c573bab5355b96e8388a2844 -AUX chromium-gcc-u2f.patch 1670 BLAKE2B 9d83331ec5e9d4ef3b58e9119c7c152abe61daf8b32e168662de9e734d935c24913b603c631d148ed1cb7b5364e751cbb9bcc7e58e5c34f375958898fc0cf8f5 SHA512 f10486ef46940fa740ca2d7e8225924704a4f89b709ef3dfb7ad128865982c220f8971d169515d9d1be08ee112aef1cac95281f0a5af4615256d9760966545f1 AUX chromium-gn-r0.patch 1233 BLAKE2B 53c0a3cd692d19eac60be0f5aa61f9cbda7d473e42adc0cd95fc78dd44c39ead9825b862347314351133b5c80f9b2fd58daacdc9568efeccefb1dd0ec6526d85 SHA512 de085e2e159ea1fb14c39d630e77459f0e67497479169ce3253bc098a06deea75020289c091e816df1ee81ccec9de695ecd59f29e9d847c20693ef2710659dcd AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d AUX chromium-math.h-r0.patch 1092 BLAKE2B abdef69cacaa5af0cd84b293b300fa5db631b7df8d4f1237449e858dc3ff56589a3f46d8228fc0c969552f41bd9cf2a0c2cbf4a1936c2729f701aa1d4ad86b94 SHA512 91a0d74ec51a6776bfc4212a132963fbc4688c47ee1da40cfbebf696ef26a766f5189cb0a972ef2cf4338daa5355ce79002d624b5f30a7c2de36e40b07355f8d AUX chromium-memcpy-r0.patch 1306 BLAKE2B 585c015fbc6cfda61fb28c451da1433047c21e439c6a23e2f27844c308984a2066a70913669b3e1797233f86e25a119e494156c0b869eccc94d21c2abaeadba4 SHA512 1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a AUX chromium-stdint.patch 623 BLAKE2B a4bc24a472bef266cc8e67fde8249b17dcd407fd86e6f614f24bb5acb18426b620b7b5e8e4d392940cab3474e8e8ee9633c61a99853f6316c77417ff78f1c034 SHA512 adfd265ecb2326f221eae07f910b7217f5bccf6be4ba750069bc05d7ae458f3b32ae825782d032299330e7c29a93a76fc732c5f5865669ea5eecbe167e04133a -AUX chromium-vulkan-r0.patch 4070 BLAKE2B d4b272fce24bee6a961f58d2f4ef74ddf6a56e8f07382752d7d42b97d970b28a1422773eb297096b61988ebad1daf88a0b36cadb226ee19731e2ad56268c4692 SHA512 d16dc06dca3b52302d805589dbcc5a31de26f71b1aa0d721e53cf941e7e995b5196a8ddc93150b5f8f661f88015fd64203633b0f04cbd479272f0b45bc106b16 AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b018af2bbe7e701b878b78f1480317bfb6394b0184b49da3c4361acebf6f6eb164b12246a61a9b205e209d8e598b SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051 AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab56248cdf378ae4d6fe99f239f95e89f28fd0b2b7dc36dd85557e7a5403d9a30a8189b7f56a9bae678831dfa49d2b SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 DIST chromium-64.0.3282.167.tar.xz 482246360 BLAKE2B b4785c20f33081015ac31fed9dbd108dc78160d95c4ea7055b8fffdb714fe9ef120727cd6b88d4e4a15b0c429f04c7c512cca90c5313128e0001a4ae5b908b6f SHA512 1bee80d2e8d4332cfc307efdac8eb11a48e42f3927e63e7a9d5ff2bbad6c4534926669f21defbf0553160f5bb28596723be8bd0e3dfa19ca9a1e854bcf42fd77 -DIST chromium-65.0.3315.3.tar.xz 532475512 BLAKE2B 1a118ddd05f2b939ff0fd84f85e1c22789713351776d889bafb55ddb2b897b2921050a3df3b7d5e3224be84539d95dddce1a27a948c61b29c788ed9f8e194e02 SHA512 c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce +DIST chromium-64.0.3282.186.tar.xz 482247144 BLAKE2B b59c5afeeed33fe081f35d0ee228a0d67a97fc1370c7d3ab90304ea6e236ee0f7fecd2c36df0acbdf384f42e2f90926cbdd56e683afc95e78d4bdc64b6d24453 SHA512 a8a435ee8506cfefaaf2df7447010df5db69fa6907844872d00643f55723a9bd7771649658f5151c857ac037adcbc8bdf2a5375dd105f78d068277ef021af7d8 DIST chromium-65.0.3325.73.tar.xz 570268564 BLAKE2B 8d1a9cf38f12ea3566463f42772671268de68d8c49170d60733be8eee7492850be739f19377365366740dcbad3414538eb00765281c966b6cedb85b74709448f SHA512 96ed3862c3fc21afac8d18f4b43f98d29a086e83dfe25af54b6358e139a8b3c9ec761cc463ce287b04a9082c5e62dbc605d4c97f8ec358599a24c7830c890418 +DIST chromium-65.0.3325.88.tar.xz 570275184 BLAKE2B a08ae19acfd7a80ae43c0654432588bfa7ea09a0b0f14583cf8e79b3c5997a348bcba12e52002d79214576030574695d32069cbe7037b53dad120aadf6c2a830 SHA512 5166e64f96e5b2bd30b28ed769a8c93b2c1de3eb52c18776222b16758002b6d87ca241bd95c7b37316e1afc5379ff49b77fbf552ab9c0ea868105d66ce400070 EBUILD chromium-64.0.3282.167.ebuild 20382 BLAKE2B fd9418350769258f0d509656bf529ffd748707b45d176d1a341c4b8572c77b9437e02713b0af65f57e9448df0aa16c9a724a2530036306f2e9583da89ed08b66 SHA512 2eb14c821275918b9fc8233ccddbd1a3ec53b559162e2283cd93afc1b111a8d1320f81933c1aae4f0efe55c5b08a90eceb74e4d7dca0c7d1a404496e392f02a4 -EBUILD chromium-65.0.3315.3.ebuild 20513 BLAKE2B e32383801314add6f6997a26e0a11c091b38f8cc27e4ba974c8ba96a6a01707c67f9118a37204af993a15d3746755f0e504b17afda7a33be2dc98a9a75f33142 SHA512 27c13ce2174e0f0fff75b54946760fdc58976330e9c5ba2e52ccdf9bf5c3c9c8d4577db3246b6e754447af11d08ce7588f1957953920cee96b0e189540ca1ca3 +EBUILD chromium-64.0.3282.186.ebuild 20383 BLAKE2B 8a4d61ebeddca6263a76dde876d9f90238279d095c74b8db75f2cbdacda534289f329d05e1269ec05fbcfc9a9c70a1ac4d453e04902d2f9f6e551e83161eaf65 SHA512 224ddaf94c439efe0e93f3f8f72659b60c8abc25d51277a5b1abe33dda4a7e6197046bf302f11870bc9c5161169f588ff5f58f43e829d665574cd48ab222398e EBUILD chromium-65.0.3325.73.ebuild 20818 BLAKE2B df933acd00f0d7ff2176ce5969887a9acec86708f62e7c424596ed2cdfd25bfdd9002708eaaf464ab91c444e78434b98d2e0d6917dc105d924658a9f1277c329 SHA512 1351ee669870c4b3ee5be1b5f8de29cc11df1d3c81d1d6f6c5778a705705fc8fed287ba9b576aed519c0a28ef71122a5402b0b9b2c15439bf97cbc3ed7b2ba5c +EBUILD chromium-65.0.3325.88.ebuild 20818 BLAKE2B df933acd00f0d7ff2176ce5969887a9acec86708f62e7c424596ed2cdfd25bfdd9002708eaaf464ab91c444e78434b98d2e0d6917dc105d924658a9f1277c329 SHA512 1351ee669870c4b3ee5be1b5f8de29cc11df1d3c81d1d6f6c5778a705705fc8fed287ba9b576aed519c0a28ef71122a5402b0b9b2c15439bf97cbc3ed7b2ba5c MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039 diff --git a/www-client/chromium/chromium-65.0.3315.3.ebuild b/www-client/chromium/chromium-64.0.3282.186.ebuild index c2d2f2fcaf78..1f79ba7bd6fa 100644 --- a/www-client/chromium/chromium-65.0.3315.3.ebuild +++ b/www-client/chromium/chromium-64.0.3282.186.ebuild @@ -37,7 +37,7 @@ COMMON_DEPEND=" >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= - >=media-libs/harfbuzz-1.6.0:=[icu(-)] + >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) @@ -148,10 +148,9 @@ PATCHES=( "${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch" "${FILESDIR}/chromium-webrtc-r0.patch" "${FILESDIR}/chromium-memcpy-r0.patch" + "${FILESDIR}/chromium-cups-r0.patch" "${FILESDIR}/chromium-clang-r2.patch" - "${FILESDIR}/chromium-gn-r0.patch" - "${FILESDIR}/chromium-vulkan-r0.patch" - "${FILESDIR}/chromium-gcc-r0.patch" + "${FILESDIR}/chromium-angle-r0.patch" "${FILESDIR}/chromium-ffmpeg-r0.patch" ) @@ -264,8 +263,6 @@ src_prepare() { third_party/leveldatabase third_party/libXNVCtrl third_party/libaddressinput - third_party/libaom - third_party/libaom/source/libaom/third_party/x86inc third_party/libjingle third_party/libphonenumber third_party/libsecret @@ -300,7 +297,6 @@ src_prepare() { third_party/protobuf third_party/protobuf/third_party/six third_party/qcms - third_party/s2cellid third_party/sfntly third_party/skia third_party/skia/third_party/gif @@ -323,7 +319,6 @@ src_prepare() { third_party/zlib/google url/third_party/mozilla v8/src/third_party/valgrind - v8/src/third_party/utf8-decoder v8/third_party/inspector_protocol # gyp -> gn leftovers @@ -390,7 +385,7 @@ src_configure() { myconf_gn+=" enable_nacl=false" # Use system-provided libraries. - # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). + # TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). # TODO: use_system_hunspell (upstream changes needed). # TODO: use_system_libsrtp (bug #459932). # TODO: use_system_protobuf (bug #525560). @@ -400,8 +395,6 @@ src_configure() { # libevent: https://bugs.gentoo.org/593458 local gn_system_libraries=( flac - fontconfig - freetype # Need harfbuzz_from_pkgconfig target #harfbuzz-ng libdrm @@ -434,6 +427,7 @@ src_configure() { myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" myconf_gn+=" enable_widevine=$(usex widevine true false)" myconf_gn+=" use_cups=$(usex cups true false)" + myconf_gn+=" use_gconf=false" myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" myconf_gn+=" use_kerberos=$(usex kerberos true false)" myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" @@ -634,8 +628,10 @@ src_install() { doins -r out/Release/locales doins -r out/Release/resources - insinto "${CHROMIUM_HOME}/swiftshader" - doins out/Release/swiftshader/*.so + if [[ -d out/Release/swiftshader ]]; then + insinto "${CHROMIUM_HOME}/swiftshader" + doins out/Release/swiftshader/*.so + fi # Install icons and desktop entry. local branding size diff --git a/www-client/chromium/chromium-65.0.3325.88.ebuild b/www-client/chromium/chromium-65.0.3325.88.ebuild new file mode 100644 index 000000000000..ede298f25fde --- /dev/null +++ b/www-client/chromium/chromium-65.0.3325.88.ebuild @@ -0,0 +1,694 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PYTHON_COMPAT=( python2_7 ) + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr + sv sw ta te th tr uk vi zh-CN zh-TW" + +inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://chromium.org/" +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" +RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" + +COMMON_DEPEND=" + app-accessibility/at-spi2-atk:2 + app-arch/bzip2:= + cups? ( >=net-print/cups-1.3.11:= ) + dev-libs/atk + dev-libs/expat:= + dev-libs/glib:2 + system-icu? ( >=dev-libs/icu-59:= ) + >=dev-libs/libxml2-2.9.4-r3:=[icu] + dev-libs/libxslt:= + dev-libs/nspr:= + >=dev-libs/nss-3.26:= + >=dev-libs/re2-0.2016.05.01:= + gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) + >=media-libs/alsa-lib-1.0.19:= + media-libs/fontconfig:= + media-libs/freetype:= + >=media-libs/harfbuzz-1.6.0:=[icu(-)] + media-libs/libjpeg-turbo:= + media-libs/libpng:= + system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) + >=media-libs/openh264-1.6.0:= + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( + >=media-video/ffmpeg-3:= + || ( + media-video/ffmpeg[-samba] + >=net-fs/samba-4.5.10-r1[-debug(-)] + ) + !=net-fs/samba-4.5.12 + media-libs/opus:= + ) + sys-apps/dbus:= + sys-apps/pciutils:= + virtual/udev + x11-libs/cairo:= + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + x11-libs/libX11:= + x11-libs/libXcomposite:= + x11-libs/libXcursor:= + x11-libs/libXdamage:= + x11-libs/libXext:= + x11-libs/libXfixes:= + >=x11-libs/libXi-1.6.0:= + x11-libs/libXrandr:= + x11-libs/libXrender:= + x11-libs/libXScrnSaver:= + x11-libs/libXtst:= + x11-libs/pango:= + app-arch/snappy:= + media-libs/flac:= + >=media-libs/libwebp-0.4.0:= + sys-libs/zlib:=[minizip] + kerberos? ( virtual/krb5 ) +" +# For nvidia-drivers blocker, see bug #413637 . +RDEPEND="${COMMON_DEPEND} + !=www-client/chromium-9999 + !<www-plugins/chrome-binary-plugins-57 + x11-misc/xdg-utils + virtual/opengl + virtual/ttf-fonts + selinux? ( sec-policy/selinux-chromium ) + tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) + widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] ) +" +# dev-vcs/git - https://bugs.gentoo.org/593476 +# sys-apps/sandbox - https://crbug.com/586444 +DEPEND="${COMMON_DEPEND} + >=app-arch/gzip-1.7 + !arm? ( + dev-lang/yasm + ) + dev-lang/perl + >=dev-util/gperf-3.0.3 + >=dev-util/ninja-1.7.2 + >=net-libs/nodejs-6.9.4 + sys-apps/hwids[usb(+)] + >=sys-devel/bison-2.4.3 + sys-devel/flex + >=sys-devel/clang-5 + virtual/pkgconfig + dev-vcs/git + $(python_gen_any_dep ' + dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] + >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}] + dev-python/html5lib[${PYTHON_USEDEP}] + dev-python/simplejson[${PYTHON_USEDEP}] + ') +" + +# Keep this in sync with the python_gen_any_dep call. +python_check_deps() { + has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && + has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" && + has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" && + has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]" +} + +if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then + EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; +fi + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Some web pages may require additional fonts to display properly. +Try installing some of the following packages if some characters +are not displayed properly: +- media-fonts/arphicfonts +- media-fonts/bitstream-cyberbit +- media-fonts/droid +- media-fonts/ipamonafont +- media-fonts/noto +- media-fonts/ja-ipafonts +- media-fonts/takao-fonts +- media-fonts/wqy-microhei +- media-fonts/wqy-zenhei + +To fix broken icons on the Downloads page, you should install an icon +theme that covers the appropriate MIME types, and configure this as your +GTK+ icon theme. +" + +PATCHES=( + "${FILESDIR}/chromium-widevine-r1.patch" + "${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch" + "${FILESDIR}/chromium-webrtc-r0.patch" + "${FILESDIR}/chromium-memcpy-r0.patch" + "${FILESDIR}/chromium-clang-r2.patch" + "${FILESDIR}/chromium-gn-r0.patch" + "${FILESDIR}/chromium-math.h-r0.patch" + "${FILESDIR}/chromium-clang-r3.patch" + "${FILESDIR}/chromium-stdint.patch" +) + +pre_build_checks() { + #if [[ ${MERGE_TYPE} != binary ]]; then + # local -x CPP="$(tc-getCXX) -E" + # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then + # # bugs: #601654 + # die "At least clang 3.9.1 is required" + # fi + # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then + # # bugs: #535730, #525374, #518668, #600288, #627356 + # die "At least gcc 5.0 is required" + # fi + #fi + + # Check build requirements, bug #541816 and bug #471810 . + CHECKREQS_MEMORY="3G" + CHECKREQS_DISK_BUILD="5G" + eshopts_push -s extglob + if is-flagq '-g?(gdb)?([1-9])'; then + CHECKREQS_DISK_BUILD="25G" + if ! use component-build; then + CHECKREQS_MEMORY="16G" + fi + fi + eshopts_pop + check-reqs_pkg_setup +} + +pkg_pretend() { + pre_build_checks +} + +pkg_setup() { + pre_build_checks + + chromium_suid_sandbox_check_kernel_config +} + +src_prepare() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + default + + mkdir -p third_party/node/linux/node-linux-x64/bin || die + ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die + + local keeplibs=( + base/third_party/dmg_fp + base/third_party/dynamic_annotations + base/third_party/icu + base/third_party/nspr + base/third_party/superfasthash + base/third_party/symbolize + base/third_party/valgrind + base/third_party/xdg_mime + base/third_party/xdg_user_dirs + chrome/third_party/mozilla_security_manager + courgette/third_party + net/third_party/mozilla_security_manager + net/third_party/nss + third_party/WebKit + third_party/analytics + third_party/angle + third_party/angle/src/common/third_party/base + third_party/angle/src/common/third_party/smhasher + third_party/angle/src/third_party/compiler + third_party/angle/src/third_party/libXNVCtrl + third_party/angle/src/third_party/trace_event + third_party/blink + third_party/boringssl + third_party/boringssl/src/third_party/fiat + third_party/breakpad + third_party/breakpad/breakpad/src/third_party/curl + third_party/brotli + third_party/cacheinvalidation + third_party/catapult + third_party/catapult/common/py_vulcanize/third_party/rcssmin + third_party/catapult/common/py_vulcanize/third_party/rjsmin + third_party/catapult/third_party/polymer + third_party/catapult/tracing/third_party/d3 + third_party/catapult/tracing/third_party/gl-matrix + third_party/catapult/tracing/third_party/jszip + third_party/catapult/tracing/third_party/mannwhitneyu + third_party/catapult/tracing/third_party/oboe + third_party/catapult/tracing/third_party/pako + third_party/ced + third_party/cld_3 + third_party/crc32c + third_party/cros_system_api + third_party/devscripts + third_party/dom_distiller_js + third_party/fips181 + third_party/flatbuffers + third_party/flot + third_party/freetype + third_party/glslang-angle + third_party/google_input_tools + third_party/google_input_tools/third_party/closure_library + third_party/google_input_tools/third_party/closure_library/third_party/closure + third_party/googletest + third_party/hunspell + third_party/iccjpeg + third_party/inspector_protocol + third_party/jinja2 + third_party/jstemplate + third_party/khronos + third_party/leveldatabase + third_party/libXNVCtrl + third_party/libaddressinput + third_party/libaom + third_party/libjingle + third_party/libphonenumber + third_party/libsecret + third_party/libsrtp + third_party/libudev + third_party/libwebm + third_party/libxml/chromium + third_party/libyuv + third_party/llvm + third_party/lss + third_party/lzma_sdk + third_party/markupsafe + third_party/mesa + third_party/metrics_proto + third_party/modp_b64 + third_party/mt19937ar + third_party/node + third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 + third_party/openmax_dl + third_party/ots + third_party/pdfium + third_party/pdfium/third_party/agg23 + third_party/pdfium/third_party/base + third_party/pdfium/third_party/build + third_party/pdfium/third_party/bigint + third_party/pdfium/third_party/freetype + third_party/pdfium/third_party/lcms + third_party/pdfium/third_party/libopenjpeg20 + third_party/pdfium/third_party/libpng16 + third_party/pdfium/third_party/libtiff + third_party/ply + third_party/polymer + third_party/protobuf + third_party/protobuf/third_party/six + third_party/qcms + third_party/s2cellid + third_party/sfntly + third_party/skia + third_party/skia/third_party/gif + third_party/skia/third_party/vulkan + third_party/smhasher + third_party/spirv-headers + third_party/spirv-tools-angle + third_party/sqlite + third_party/swiftshader + third_party/swiftshader/third_party/llvm-subzero + third_party/swiftshader/third_party/subzero + third_party/usrsctp + third_party/vulkan + third_party/vulkan-validation-layers + third_party/web-animations-js + third_party/webdriver + third_party/webrtc + third_party/widevine + third_party/woff2 + third_party/zlib/google + url/third_party/mozilla + v8/src/third_party/valgrind + v8/src/third_party/utf8-decoder + v8/third_party/inspector_protocol + + # gyp -> gn leftovers + base/third_party/libevent + third_party/adobe + third_party/speech-dispatcher + third_party/usb_ids + third_party/xdg-utils + third_party/yasm/run_yasm.py + ) + if ! use system-ffmpeg; then + keeplibs+=( third_party/ffmpeg third_party/opus ) + fi + if ! use system-icu; then + keeplibs+=( third_party/icu ) + fi + if ! use system-libvpx; then + keeplibs+=( third_party/libvpx ) + keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) + fi + if use tcmalloc; then + keeplibs+=( third_party/tcmalloc ) + fi + + # Remove most bundled libraries. Some are still needed. + build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die +} + +bootstrap_gn() { + if tc-is-cross-compiler; then + local -x AR=${BUILD_AR} + local -x CC=${BUILD_CC} + local -x CXX=${BUILD_CXX} + local -x NM=${BUILD_NM} + local -x CFLAGS=${BUILD_CFLAGS} + local -x CXXFLAGS=${BUILD_CXXFLAGS} + local -x LDFLAGS=${BUILD_LDFLAGS} + fi + einfo "Building GN..." + set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean + echo "$@" + "$@" || die +} + +src_configure() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + local myconf_gn="" + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX NM + + if ! tc-is-clang; then + # Force clang since gcc is pretty broken at the moment. + CC=clang + CXX=clang++ + fi + + if tc-is-clang; then + myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" + else + myconf_gn+=" is_clang=false" + fi + + # Define a custom toolchain for GN + myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" + + if tc-is-cross-compiler; then + tc-export BUILD_{AR,CC,CXX,NM} + myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" + myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" + else + myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" + fi + + # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. + myconf_gn+=" is_debug=false" + + # Component build isn't generally intended for use by end users. It's mostly useful + # for development and debugging. + myconf_gn+=" is_component_build=$(usex component-build true false)" + + # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md + myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)" + + myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" + + # Disable nacl, we can't build without pnacl (http://crbug.com/269560). + myconf_gn+=" enable_nacl=false" + + # Use system-provided libraries. + # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). + # TODO: use_system_hunspell (upstream changes needed). + # TODO: use_system_libsrtp (bug #459932). + # TODO: use_system_protobuf (bug #525560). + # TODO: use_system_ssl (http://crbug.com/58087). + # TODO: use_system_sqlite (http://crbug.com/22208). + + # libevent: https://bugs.gentoo.org/593458 + local gn_system_libraries=( + flac + fontconfig + freetype + # Need harfbuzz_from_pkgconfig target + #harfbuzz-ng + libdrm + libjpeg + libpng + libwebp + libxml + libxslt + openh264 + re2 + snappy + yasm + zlib + ) + if use system-ffmpeg; then + gn_system_libraries+=( ffmpeg opus ) + fi + if use system-icu; then + gn_system_libraries+=( icu ) + fi + if use system-libvpx; then + gn_system_libraries+=( libvpx ) + fi + build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die + + # See dependency logic in third_party/BUILD.gn + myconf_gn+=" use_system_harfbuzz=true" + + # Optional dependencies. + myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" + myconf_gn+=" enable_widevine=$(usex widevine true false)" + myconf_gn+=" use_cups=$(usex cups true false)" + myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" + myconf_gn+=" use_kerberos=$(usex kerberos true false)" + myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" + + # TODO: link_pulseaudio=true for GN. + + myconf_gn+=" fieldtrial_testing_like_official_build=true" + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + # Trying to use gold results in linker crash. + myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" + + # Disable forced lld, bug 641556 + myconf_gn+=" use_lld=false" + + ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" + myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" + myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" + + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . + # Note: these are for Gentoo use ONLY. For your own distribution, + # please get your own set of keys. Feel free to contact chromium@gentoo.org + # for more info. + local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" + local google_default_client_id="329227923882.apps.googleusercontent.com" + local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" + myconf_gn+=" google_api_key=\"${google_api_key}\"" + myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" + myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" + + local myarch="$(tc-arch)" + if [[ $myarch = amd64 ]] ; then + myconf_gn+=" target_cpu=\"x64\"" + ffmpeg_target_arch=x64 + elif [[ $myarch = x86 ]] ; then + myconf_gn+=" target_cpu=\"x86\"" + ffmpeg_target_arch=ia32 + elif [[ $myarch = arm64 ]] ; then + myconf_gn+=" target_cpu=\"arm64\"" + ffmpeg_target_arch=arm64 + elif [[ $myarch = arm ]] ; then + myconf_gn+=" target_cpu=\"arm\"" + ffmpeg_target_arch=$(usex neon arm-neon arm) + else + die "Failed to determine target arch, got '$myarch'." + fi + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf_gn+=" treat_warnings_as_errors=false" + + # Disable fatal linker warnings, bug 506268. + myconf_gn+=" fatal_linker_warnings=false" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + replace-flags "-Os" "-O2" + strip-flags + + # Prevent linker from running out of address space, bug #471810 . + if use x86; then + filter-flags "-g*" + fi + + # Prevent libvpx build failures. Bug 530248, 544702, 546984. + if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then + filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 + fi + fi + + # https://bugs.gentoo.org/588596 + #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) + + # Bug 491582. + export TMPDIR="${WORKDIR}/temp" + mkdir -p -m 755 "${TMPDIR}" || die + + if ! use system-ffmpeg; then + local build_ffmpeg_args="" + if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then + build_ffmpeg_args+=" --disable-asm" + fi + + # Re-configure bundled ffmpeg. See bug #491378 for example reasons. + einfo "Configuring bundled ffmpeg..." + pushd third_party/ffmpeg > /dev/null || die + chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ + --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die + chromium/scripts/copy_config.sh || die + chromium/scripts/generate_gn.py || die + popd > /dev/null || die + fi + + bootstrap_gn + + einfo "Configuring Chromium..." + set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release + echo "$@" + "$@" || die +} + +src_compile() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die + + # Build mksnapshot and pax-mark it. + local x + for x in mksnapshot v8_context_snapshot_generator; do + if tc-is-cross-compiler; then + eninja -C out/Release "host/${x}" + pax-mark m "out/Release/host/${x}" + else + eninja -C out/Release "${x}" + pax-mark m "out/Release/${x}" + fi + done + + # Work around circular dep issue + # https://chromium-review.googlesource.com/c/chromium/src/+/617768 + eninja -C out/Release gen/ui/accessibility/ax_enums.h + + # Even though ninja autodetects number of CPUs, we respect + # user's options, for debugging with -j 1 or any other reason. + eninja -C out/Release chrome chromedriver + use suid && eninja -C out/Release chrome_sandbox + + pax-mark m out/Release/chrome +} + +src_install() { + local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome + + if use suid; then + newexe out/Release/chrome_sandbox chrome-sandbox + fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + fi + + doexe out/Release/chromedriver + + local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die + doexe chromium-launcher.sh + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium + + dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver + + # Allow users to override command-line options, bug #357629. + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" + + pushd out/Release/locales > /dev/null || die + chromium_remove_language_paks + popd + + if use widevine; then + # These will be provided by chrome-binary-plugins + rm out/Release/libwidevinecdm*.so || die + fi + + insinto "${CHROMIUM_HOME}" + doins out/Release/*.bin + doins out/Release/*.pak + doins out/Release/*.so + + if ! use system-icu; then + doins out/Release/icudtl.dat + fi + + doins -r out/Release/locales + doins -r out/Release/resources + + if [[ -d out/Release/swiftshader ]]; then + insinto "${CHROMIUM_HOME}/swiftshader" + doins out/Release/swiftshader/*.so + fi + + # Install icons and desktop entry. + local branding size + for size in 16 22 24 32 48 64 128 256 ; do + case ${size} in + 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; + *) branding="chrome/app/theme/chromium" ;; + esac + newicon -s ${size} "${branding}/product_logo_${size}.png" \ + chromium-browser.png + done + + local mime_types="text/html;text/xml;application/xhtml+xml;" + mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 + mime_types+="x-scheme-handler/ftp;" # bug #412185 + mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 + make_desktop_entry \ + chromium-browser \ + "Chromium" \ + chromium-browser \ + "Network;WebBrowser" \ + "MimeType=${mime_types}\nStartupWMClass=chromium-browser" + sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die + + # Install GNOME default application entry (bug #303100). + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml + + readme.gentoo_create_doc +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + readme.gentoo_print_elog +} diff --git a/www-client/chromium/files/chromium-gcc-r0.patch b/www-client/chromium/files/chromium-gcc-r0.patch deleted file mode 100644 index b0aaae8de558..000000000000 --- a/www-client/chromium/files/chromium-gcc-r0.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 353219b1d808a8980af93eff5412ec2863557e35 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jose.dapena@lge.com> -Date: Wed, 10 Jan 2018 15:34:25 +0000 -Subject: [PATCH] GCC fixes: avoid symbol collision between Element::ComputedAccessibleNode and ComputedAccessibleNode. - -GCC at least fails to compile if the method has the same name of the class. To avoid -this we rename the getter method to be prefixed with Get. - -Change-Id: I7f7ac2ecf0947718f72e78ccef019c3239c9b921 -Reviewed-on: https://chromium-review.googlesource.com/857716 -Reviewed-by: Daniel Cheng <dcheng@chromium.org> -Reviewed-by: Hayato Ito <hayato@chromium.org> -Commit-Queue: José Dapena Paz <jose.dapena@lge.com> -Cr-Commit-Position: refs/heads/master@{#528322} ---- - -diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp -index 4f50b7d..d0fa7b1 100644 ---- a/third_party/WebKit/Source/core/dom/Element.cpp -+++ b/third_party/WebKit/Source/core/dom/Element.cpp -@@ -1276,7 +1276,7 @@ - return rare_data.EnsureAccessibleNode(this); - } - --ComputedAccessibleNode* Element::ComputedAccessibleNode() { -+ComputedAccessibleNode* Element::GetComputedAccessibleNode() { - if (!RuntimeEnabledFeatures::AccessibilityObjectModelEnabled()) - return nullptr; - -diff --git a/third_party/WebKit/Source/core/dom/Element.h b/third_party/WebKit/Source/core/dom/Element.h -index 733596b..986e31a 100644 ---- a/third_party/WebKit/Source/core/dom/Element.h -+++ b/third_party/WebKit/Source/core/dom/Element.h -@@ -295,7 +295,7 @@ - AccessibleNode* ExistingAccessibleNode() const; - AccessibleNode* accessibleNode(); - -- ComputedAccessibleNode* ComputedAccessibleNode(); -+ ComputedAccessibleNode* GetComputedAccessibleNode(); - - void DidMoveToNewDocument(Document&) override; - -diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp -index 642f55f..f6a8d8e 100644 ---- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp -+++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp -@@ -1110,7 +1110,7 @@ - Element* element) { - DCHECK(element); - ComputedAccessibleNode* computed_accessible_node = -- element->ComputedAccessibleNode(); -+ element->GetComputedAccessibleNode(); - return computed_accessible_node->ComputePromiseProperty(script_state); - } - diff --git a/www-client/chromium/files/chromium-gcc-u2f.patch b/www-client/chromium/files/chromium-gcc-u2f.patch deleted file mode 100644 index 20608da58d00..000000000000 --- a/www-client/chromium/files/chromium-gcc-u2f.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ee7f5ecc3b869660ded9882a9904cc7c6db7dc0d Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jose.dapena@lge.com> -Date: Tue, 19 Dec 2017 19:25:00 +0000 -Subject: [PATCH] GCC build: workaround GCC bad "this" handling on lambda by - not using lambda. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is a workaround for the bug in GCC "Inconsistent `this->` -required when calling member function in a lambda -capturing `this` through another function" -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67274 - -This fix just replaces the foreach call using lambda with a -regular C++ for-each-like for (:) construct in u2f discovery. - -Change-Id: I9ddf212a7687e02cd7d2d2b43cf76e21dd5dada2 -Reviewed-on: https://chromium-review.googlesource.com/833886 -Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org> -Commit-Queue: José Dapena Paz <jose.dapena@lge.com> -Cr-Commit-Position: refs/heads/master@{#525104} ---- - device/u2f/u2f_hid_discovery.cc | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/device/u2f/u2f_hid_discovery.cc b/device/u2f/u2f_hid_discovery.cc -index 0695778d2aab..6c4e71179ce7 100644 ---- a/device/u2f/u2f_hid_discovery.cc -+++ b/device/u2f/u2f_hid_discovery.cc -@@ -55,9 +55,8 @@ void U2fHidDiscovery::DeviceRemoved( - - void U2fHidDiscovery::OnGetDevices( - std::vector<device::mojom::HidDeviceInfoPtr> device_infos) { -- std::for_each( -- device_infos.begin(), device_infos.end(), -- [this](auto& device_info) { DeviceAdded(std::move(device_info)); }); -+ for (auto& device_info : device_infos) -+ DeviceAdded(std::move(device_info)); - NotifyDiscoveryStarted(true); - } - --- -2.15.1 - diff --git a/www-client/chromium/files/chromium-vulkan-r0.patch b/www-client/chromium/files/chromium-vulkan-r0.patch deleted file mode 100644 index 4553bb766679..000000000000 --- a/www-client/chromium/files/chromium-vulkan-r0.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 949b4f07fd1ef5b208136fe38327c28c95f18928 Mon Sep 17 00:00:00 2001 -From: Jamie Madill <jmadill@chromium.org> -Date: Mon, 08 Jan 2018 11:15:38 -0500 -Subject: [PATCH] Vulkan: Allow for no .git directory in build. - -The SPIRV-Tools 'external revision generate' script is coded such that -it assumes a .git folder is present. This causes a problem for the -tarball build. We can fix this by using the same tooling we use for -ANGLE's commit id script to check if the .git directory is present -before running the generator. If it is missing, we insert a hard-coded -dummy header. Also use the 'DEPS' file as a placeholder for .git/HEAD -to check if the current revision needs updating. - -Bug: chromium:799620 -Bug: angleproject:2237 -Change-Id: Icea8e9c66f1600df7dca2aaa45fe449f687f5b55 -Reviewed-on: https://chromium-review.googlesource.com/854255 -Reviewed-by: Jamie Madill <jmadill@chromium.org> -Commit-Queue: Jamie Madill <jmadill@chromium.org> ---- - -diff --git a/third_party/angle/src/commit_id.py b/third_party/angle/src/commit_id.py -index bbdb810..57651a5 100644 ---- a/third_party/angle/src/commit_id.py -+++ b/third_party/angle/src/commit_id.py -@@ -23,6 +23,9 @@ - print("0") - sys.exit(0) - -+if len(sys.argv) < 4 or operation != 'gen': -+ sys.exit(usage) -+ - output_file = sys.argv[3] - commit_id_size = 12 - -diff --git a/third_party/angle/src/vulkan_support/BUILD.gn b/third_party/angle/src/vulkan_support/BUILD.gn -index fe61826..24f5a3a 100644 ---- a/third_party/angle/src/vulkan_support/BUILD.gn -+++ b/third_party/angle/src/vulkan_support/BUILD.gn -@@ -145,21 +145,40 @@ - } - } - --# This could be generalized to a foreach if other revisions are added. --action("spirv_tools_external_revision_generate") { -- script = "$vulkan_layers_dir/scripts/external_revision_generator.py" -- inputs = [ -- "$spirv_tools_dir/.git/HEAD", -- "$spirv_tools_dir/.git/index", -- ] -- outputs = [ -- "$vulkan_gen_dir/spirv_tools_commit_id.h", -- ] -- args = [ -- "$raw_spirv_tools_dir", -- "SPIRV_TOOLS_COMMIT_ID", -- "$raw_vulkan_gen_dir/spirv_tools_commit_id.h", -- ] -+spirv_git_is_present = exec_script("$angle_root/src/commit_id.py", -+ [ -+ "check", -+ raw_spirv_tools_dir, -+ ], -+ "value") -+ -+spirv_use_commit_id = spirv_git_is_present == 1 -+ -+if (spirv_use_commit_id) { -+ # This could be generalized to a foreach if other revisions are added. -+ action("spirv_tools_external_revision_generate") { -+ script = "$vulkan_layers_dir/scripts/external_revision_generator.py" -+ inputs = [ -+ "$angle_root/DEPS", -+ ] -+ outputs = [ -+ "$vulkan_gen_dir/spirv_tools_commit_id.h", -+ ] -+ args = [ -+ "$raw_spirv_tools_dir", -+ "SPIRV_TOOLS_COMMIT_ID", -+ "$raw_vulkan_gen_dir/spirv_tools_commit_id.h", -+ ] -+ } -+} else { -+ copy("spirv_tools_external_revision_generate") { -+ sources = [ -+ "dummy_spirv_tools_commit_id.h", -+ ] -+ outputs = [ -+ "$vulkan_gen_dir/spirv_tools_commit_id.h", -+ ] -+ } - } - - config("vulkan_generate_helper_files_config") { -@@ -864,7 +883,7 @@ - sources += [ "$vulkan_layers_dir/layers/VkLayer_$name.def" ] - } - if (is_linux) { -- ldflags = [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ] -+ ldflags = [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ] - } - } - } -diff --git a/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h -new file mode 100644 -index 0000000..e1793bd ---- /dev/null -+++ b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h -@@ -0,0 +1,10 @@ -+// -+// Copyright 2018 The ANGLE Project Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+// -+// This file is a dummy file to enable building SPIRV tools when git is absent. -+ -+#pragma once -+ -+#define SPIRV_TOOLS_COMMIT_ID "0000000000000000000000000000000000000000" diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest new file mode 100644 index 000000000000..058e14fedf18 --- /dev/null +++ b/www-client/falkon/Manifest @@ -0,0 +1,3 @@ +DIST falkon-3.0.0.tar.xz 1985800 BLAKE2B 8505e2c91600d265c28f70c37bf9e8f669ecd907dd9263371a4a4c10b854d32415ec1a3fd6ac163b297d0a9f42c542d4691a6cd417ed81864585f0c66b769e34 SHA512 1d99ecd47022986570dd6bb9b57484abe30838bf52daf669c977e1d2a9381efdd60912fd72b97e0b43b6102159f4343c4d1589d4f6442d0ed62c24f1482a8d97 +EBUILD falkon-3.0.0.ebuild 1583 BLAKE2B 518f7ef4219a2b3bf3bd24842075e1427355182b441a1f35cdd7aab0c743375553856e95a7db7bd8566169319d953e5bffb650b97d1b8338dcaba7d58b3b5cbc SHA512 8425a175b9dce7976ee78cfd83e4a43a08529176ece6d3fefe560f73a52d3cae8ef637dc5a40d6f4b83fe146d543ea9e902ee4671de7ef47ba54927bdcda9384 +MISC metadata.xml 369 BLAKE2B de669dca0f4ec7ab36e7dfb4fc71d68bf8e5f829e0501be7f1e68cd1d8e0866e48ea53396f6c1cf37333032b1254744430d57a17b7cc5c52677b6606dbdb66d5 SHA512 befbc1782dffeb3f3cb44fe7046a8b44037268ee741e774e30dff433b624e6488e4edb09d3c5e796721a16b8887d1df334a70cb26326ae71401db8e7d14f0304 diff --git a/www-client/falkon/falkon-3.0.0.ebuild b/www-client/falkon/falkon-3.0.0.ebuild new file mode 100644 index 000000000000..6da8f0a0600f --- /dev/null +++ b/www-client/falkon/falkon-3.0.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_TEST="true" +QT_MINIMAL="5.9.2" +inherit kde5 + +DESCRIPTION="Cross-platform web browser using QtWebEngine" +HOMEPAGE="https://www.qupzilla.com/" +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz" +fi + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dbus gnome-keyring kwallet libressl +X" + +COMMON_DEPEND=" + $(add_qt_dep qtdeclarative 'widgets') + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork 'ssl') + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsql 'sqlite') + $(add_qt_dep qtwebchannel) + $(add_qt_dep qtwebengine 'widgets') + $(add_qt_dep qtwidgets) + dbus? ( $(add_qt_dep qtdbus) ) + gnome-keyring? ( gnome-base/gnome-keyring ) + kwallet? ( $(add_frameworks_dep kwallet) ) + libressl? ( dev-libs/libressl:= ) + !libressl? ( dev-libs/openssl:0= ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libxcb:= + ) +" +DEPEND="${COMMON_DEPEND} + $(add_qt_dep linguist-tools) + $(add_qt_dep qtconcurrent) + gnome-keyring? ( virtual/pkgconfig ) +" +RDEPEND="${COMMON_DEPEND} + !www-client/qupzilla + $(add_qt_dep qtsvg) +" + +src_configure() { + local mycmakeargs=( + -DDISABLE_DBUS=$(usex !dbus) + -DBUILD_KEYRING=$(usex gnome-keyring) + $(cmake-utils_use_find_package kwallet KF5Wallet) + -DNO_X11=$(usex !X) + ) + kde5_src_configure +} + +pkg_postinst() { + kde5_pkg_postinst + elog "If you were previously using QupZilla, you can manually migrate your profiles" + elog "by moving the config directory from ~/.config/qupzilla to ~/.config/falkon" +} diff --git a/www-client/falkon/metadata.xml b/www-client/falkon/metadata.xml new file mode 100644 index 000000000000..007c58ff2baa --- /dev/null +++ b/www-client/falkon/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>qt@gentoo.org</email> + <name>Gentoo Qt Project</name> + </maintainer> + <use> + <flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag> + </use> +</pkgmetadata> diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest index a2ccd379cdc6..9b8bb6e7cfab 100644 --- a/www-client/google-chrome-unstable/Manifest +++ b/www-client/google-chrome-unstable/Manifest @@ -1,3 +1,3 @@ -DIST google-chrome-unstable_66.0.3346.8-1_amd64.deb 53240758 BLAKE2B 049aba2587fcdec63beee14a91b6b38e2326c68013156960793428b2b6b501d513a57cbf0efa0ad8904b5e96759420d5ab269644c8e158263e04a208642d208b SHA512 67be40fcb54ae956a1af837e5860cee8eaa536645dd943ec7a5dff4882bfc3141d73ab91a27b53cc8fd702f105e6f998345276857d904bca7ed470f33e68b17c -EBUILD google-chrome-unstable-66.0.3346.8.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15 +DIST google-chrome-unstable_66.0.3355.0-1_amd64.deb 53407588 BLAKE2B 75d00854f3e0157ee5c298bd858cfcdb4499230be6ffb6e8af784e422a7670e6d31ad1893ab3f714a5d07bf8d503378cea3b8333d6903bc2182f17f92a2f6cc1 SHA512 fd4485ad561356b8aa4392726eeea8fb427adf7bd0f36fa7fb72e188afeb5485413e31fe394007f8316cc2c406e7ff6a8bd6f738bd6bd11817b56b6a108ebf9f +EBUILD google-chrome-unstable-66.0.3355.0.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3346.8.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3355.0.ebuild index 43d5352b4dd5..43d5352b4dd5 100644 --- a/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3346.8.ebuild +++ b/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3355.0.ebuild diff --git a/www-client/links/Manifest b/www-client/links/Manifest index 8a14c6b3d7ba..88315aeb7b57 100644 --- a/www-client/links/Manifest +++ b/www-client/links/Manifest @@ -1,5 +1,5 @@ DIST links-2.14.tar.bz2 6535707 BLAKE2B e0a2f804e05fde94be50ee2dce1453c0c616aac29bd91a73f78b1976119aa5cfa8aa4b3df5e7feeb193bba74fbe3b32be50f4947babb4115a3e79835c2c241fb SHA512 d03b091957e0a2e06605fcf7c9bc56d48ebbcdc695f4ce894901540008455a9bc6544abdecd787faa041e2dbdff28b0d6ddcc9d26528d39d7d72750655c73575 DIST links2_2.10-2.debian.tar.xz 13964 BLAKE2B 2de4e49281a53d37d3d9bc53b5e49c3bac534f3ba5d7a57748f3ef998e6ff7f5309b5d6c7a00f72d623525fc1413fc15d1585ffa84c186d684467539cb807cef SHA512 01101edef00ede0b95857ea28d305e98198306c428b79bb9c05da16285d8b4052b7f800f7def67a945d498db440745d81b7e3b6a03c9b077d5bcf5da1cb2691e -EBUILD links-2.14-r1.ebuild 3270 BLAKE2B cfcde6fe6a267d4a40eee410c7d7b440c892202e0e2da2877640ec055ef824b86b1ecfec43ed417652de59af6996033501adc83db41db35a34cebd569a961f35 SHA512 2320ef4accaa8486446a9c9f371def6155ab200037d171140eeb4bea33d626cc623371cf83b6390fd8f27b7ccf8456a8533e700a9bccac161df0980e2c29cecd +EBUILD links-2.14-r1.ebuild 3269 BLAKE2B c0bc6ce45d482505be7f906e04333610a3a3f6f947c621995bce78758708e8a269e36889e2b7ab9c46ac52906fc2164d41a0792ef20035f75309c22356b7bc84 SHA512 2a49fe6521b2b17ab71da4b184e7bf6d5823b2ece5ccb735eed4ea20844c635cee53c951b0e8b98c01dc43a8b3025990e996ce3a2079b93ff3bae717949d83f8 EBUILD links-2.14.ebuild 3332 BLAKE2B e1aa4ff36c8765869b25a374ee8a854a8f34fa5235a29c2b1a6f18f212df87b82cc5906b71d378c60cd9f18ad1bfd584b99908bbbdfb238f246c9b8ce03218de SHA512 b2f55df94ffda2db4bcab87115ae8caa92da6e993cc05e903b5675eef2ec6dfba711b3fd899f945a57800226c4fd479ed548c296a4d10d3640abc740970e02ba MISC metadata.xml 345 BLAKE2B 5d91a968b8b9185cc9c61d02a1980369e5cf8c87bef6a5de4e05d3b375473548d3cbec311920d52cd7aad4517fbc2ddb2d900d520e5b1d2b3445e1424ac16662 SHA512 40528fd846439acf44ddf1e49a65d7195aecb6d78e9d20d3d734fbb48b4cef842975cbe8383a8feba6e6894ebe0fa6b7cbc27c1ac663cc563aa1e8884e09c7d9 diff --git a/www-client/links/links-2.14-r1.ebuild b/www-client/links/links-2.14-r1.ebuild index b95ba2965930..6feedb5655b5 100644 --- a/www-client/links/links-2.14-r1.ebuild +++ b/www-client/links/links-2.14-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2 LICENSE="GPL-2" SLOT="2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib" GRAPHICS_DEPEND="media-libs/libpng:0=" diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest index 93c52ddbd0c5..9dc0ca73cbcc 100644 --- a/www-client/opera-beta/Manifest +++ b/www-client/opera-beta/Manifest @@ -1,5 +1,5 @@ -DIST opera-beta_51.0.2830.23_amd64.deb 52635002 BLAKE2B 79a2ca80798f9c904f2915c93ae3b9537b58c54db87880017c60c72439b554218fbd18252c1fd73b33842d5793f6e85fe7e6b1384c43c9e80ea2fcd34ec65f40 SHA512 8271fdec291a767698e497fc0fbf3ad0bc40d78b43ff468b3e1974ef235f88b7104521fa8b752b19b54b6e45bdfc581a25fe7c8bc963d83f16f51805254fa13d DIST opera-beta_52.0.2871.3_amd64.deb 54132430 BLAKE2B 385d1249a6e90a31f21bc75fc505e95f16833b591536ba154526414a1738bf873717b1d89935ee0c8d892c42ec34d4351fd007e106744128f09d5984ffcb1fbe SHA512 8d4187e575c927078eb39b9972620ff3c164adf34f7f79935a2472d4cbf888bba606bf18fd18210423dd3d96157066e54d270cfdd75f45932773d29ef9f08355 -EBUILD opera-beta-51.0.2830.23.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1 +DIST opera-beta_52.0.2871.9_amd64.deb 53358140 BLAKE2B 7e1de88e79a188126d3e4000b06a059022344ad4d1c498d6f4dcb16be83a71da898bbfae8ff45c15b86240dca3c81223a5e71d01426faacd12b338a70dcf99ac SHA512 75c222958ad539fdddf2d8c31a62d3a883164ca221c5d63db7fe8f11a77d3135c38965fa46fab057b83d6b680ca2ad3168391546d165456378d4348ed6346ee9 EBUILD opera-beta-52.0.2871.3.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1 +EBUILD opera-beta-52.0.2871.9.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 diff --git a/www-client/opera-beta/opera-beta-51.0.2830.23.ebuild b/www-client/opera-beta/opera-beta-52.0.2871.9.ebuild index 308b38bc8be3..308b38bc8be3 100644 --- a/www-client/opera-beta/opera-beta-51.0.2830.23.ebuild +++ b/www-client/opera-beta/opera-beta-52.0.2871.9.ebuild diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest index f0fa654b7a3d..b0dd81a194ef 100644 --- a/www-client/opera-developer/Manifest +++ b/www-client/opera-developer/Manifest @@ -1,3 +1,3 @@ -DIST opera-developer_52.0.2871.0_amd64.deb 53851070 BLAKE2B 0422fab31f792640e46c5e0105c3cd4d6cbcaa514946c2617ad37b2f0dc0cfad5a3716a9fb027157c294f664c96c1cda5b879577a9f2e92e784b3abd6e1a0d92 SHA512 cb1c1edfdf25d3a0bdfe016b1b6932970c43bd41046d5ba725e66a5d925e929ac8c0e976fc0bcb52cb513b94dd6764bbb98af74fde0cd5dc38d6d2884025b58b -EBUILD opera-developer-52.0.2871.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8 +DIST opera-developer_53.0.2880.0_amd64.deb 54207438 BLAKE2B 0e2f9dd67b3e10badad0ae15d940637a54a8d490eb0522a6e257d161e12a73776aed8b78f8d1e87a7632126fdea8864cf3220a0df16396b0bdcb1c9554a341d7 SHA512 25b49c1aabf9e05d47cb19847f224b53ad3053217c033775b7eaa728eba3f3ba0019997cf88f985366f7c5092bbfc2b3b75cf7c1de4a452c2a2cb9a347751413 +EBUILD opera-developer-53.0.2880.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 diff --git a/www-client/opera-developer/opera-developer-52.0.2871.0.ebuild b/www-client/opera-developer/opera-developer-53.0.2880.0.ebuild index 12a41bce61c8..12a41bce61c8 100644 --- a/www-client/opera-developer/opera-developer-52.0.2871.0.ebuild +++ b/www-client/opera-developer/opera-developer-53.0.2880.0.ebuild diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest index 85f08e9e0ef5..7f956dd34a95 100644 --- a/www-client/otter/Manifest +++ b/www-client/otter/Manifest @@ -1,6 +1,8 @@ DIST otter-0.9.94.tar.gz 4585316 BLAKE2B 7fd450b1cb0102006680964fa9f858b5bed12094e076b4ab5a0cfdb9f790f5627b67d1521d2715919ff3d469b7c953680833e0f091be1320dade9cfc4ea844a4 SHA512 33943c145d40b9fed0afdfa90cf46d2604978347421ac39bfa7d1e9a90c61542fcd8899d039a4b68fc4e7cd6f9175ac9381966e3bc4a822d45ca70a66b6e9f95 DIST otter-0.9.95.tar.gz 4592078 BLAKE2B 075a8f7bb9e2e88c4f797328052f3139dc7bbb122d7a5c8485ff8ea7fa111fcabf39863bb5d4fe8a8a3c5883ed78174cd7efa05087bf2dd599c2e23f330e0f36 SHA512 cda1c4e0e8e9fbb78eaaf9317749b5513d972a450a2c88936c120de9646452315067b308c63c8b61c98eff22c4fb7d9e75ca69054b87acd6706a9731f37a1b80 +DIST otter-0.9.96.tar.gz 4654502 BLAKE2B e56914aa0926c29de36cee5020b030d488c97801a5186e453941abaf9010cacc598b14ab43eba1d30a1bfc240188eec8d46138a635cd7b240eac40832cdfdd8b SHA512 3ced414122d912a61dca12dcf9e7477ff9eea209c6fa72bad4fbe100f2066e958de09f0d4d986ac1cf0b184f55169966669bebb998cdd033a01a6e3e6df1160b EBUILD otter-0.9.94.ebuild 1546 BLAKE2B e65b7c8c6616a68c377eac9117167b3de7226be22aa74fe38814d952ec1419032e7836c4f83143697bf19f367861386af9e5ae4bb018c7c65c5e0ee1ad4a5509 SHA512 6a53e5efbd4a6c1fd3c4965b1db558e5a9ff755edaee6866de67fd50f206231b71f5e7c2ffe53c9412969da80cef97c37572219db18b89ebded681e43e853123 EBUILD otter-0.9.95.ebuild 1546 BLAKE2B e65b7c8c6616a68c377eac9117167b3de7226be22aa74fe38814d952ec1419032e7836c4f83143697bf19f367861386af9e5ae4bb018c7c65c5e0ee1ad4a5509 SHA512 6a53e5efbd4a6c1fd3c4965b1db558e5a9ff755edaee6866de67fd50f206231b71f5e7c2ffe53c9412969da80cef97c37572219db18b89ebded681e43e853123 +EBUILD otter-0.9.96.ebuild 1828 BLAKE2B ca512989ca55ab7a34bab0432b7fda987bc39954246e653b034cf414eca73fbef739cfeb1241ff9f8b61755d6c615a6a77a402bf149af9fa2173b5812382ab44 SHA512 2c88b5adcac2bef2d878d7fbe10fbf9fdbab30441c58d82dcdaba6e96db64f0d18c3baa7f7e40a16121abce399929afcfe39f8042b55f5cf2d1119d8ce396b6b EBUILD otter-9999.ebuild 1454 BLAKE2B 44a2b89a5ab1b01a9d16440d25b4de7889e02fac35a5c4e5bb755a3323b8c68baaa27d8518905246bcb6741cec19e81713130dd3b516f23500bf6c3d6dc8e2d5 SHA512 ae93d8bae4b15c1cb99d304d28ce9547bd068bbcc29924091523af470293bce0f077a06042785a76b66a89a431f297af52c5b35eba987de2e7ac769066b983b4 -MISC metadata.xml 325 BLAKE2B ee91f4276d3774d42ad171b37d424ea4288824542e2978487a59ceab9cc8f29abe1c9622ed764c4f58d0b57566b29ad9ddaecbcd46eb3d20adf295aa4b770420 SHA512 d0128fdfdd72910c0941999fe60becfef1fc3628640f58f6fd1a21d618fd1f46e72aa13a117e43ce97099e06dbe36e402f495287955c43c1e9e1307d776062b3 +MISC metadata.xml 466 BLAKE2B 95a6b3f8c4a297c6a57f514173a99b2e6a6dda37cd90c0b9a3bb9069a272daad73dc7b9c3a054741331e813b625e14f1a395263409255ad12692f049f557d5ff SHA512 3c07f030c4ae6777cca5e122f32a6b2f5844a2dc5bba27a6ea17b36ae56ef43174deefe0460128a6e31d709857e5b915d340b8e6e50049e43c87bfcf58f95f22 diff --git a/www-client/otter/metadata.xml b/www-client/otter/metadata.xml index 7c78c00a46c8..2fe0e982fcf1 100644 --- a/www-client/otter/metadata.xml +++ b/www-client/otter/metadata.xml @@ -5,6 +5,9 @@ <email>jer@gentoo.org</email> <name>Jeroen Roovers</name> </maintainer> +<use> +<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> as backend instead of <pkg>dev-qt/qtwebkit</pkg> (experimental)</flag> +</use> <upstream> <remote-id type="github">OtterBrowser/otter-browser</remote-id> </upstream> diff --git a/www-client/otter/otter-0.9.96.ebuild b/www-client/otter/otter-0.9.96.ebuild new file mode 100644 index 000000000000..8796679bc7db --- /dev/null +++ b/www-client/otter/otter-0.9.96.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils cmake-utils gnome2-utils xdg-utils + +DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5" +HOMEPAGE="http://otter-browser.org/" +SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="webengine spell" + +DEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + dev-qt/qtxmlpatterns:5 + spell? ( kde-frameworks/sonnet ) + webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] ) +" +RDEPEND=" + ${DEPEND} +" + +S=${WORKDIR}/${PN}-browser-${PV/_p/-dev} +DOCS=( CHANGELOG CONTRIBUTING.md TODO ) + +src_prepare() { + cmake-utils_src_prepare + + if [[ -n ${LINGUAS} ]]; then + local lingua + for lingua in resources/translations/*.qm; do + lingua=$(basename ${lingua}) + lingua=${lingua/otter-browser_/} + lingua=${lingua/.qm/} + if ! has ${lingua} ${LINGUAS}; then + rm resources/translations/otter-browser_${lingua}.qm || die + fi + done + fi + + if ! use spell; then + sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die + fi +} + +src_configure() { + if use webengine; then + mycmakeargs=( + -DENABLE_QTWEBENGINE=yes + -DENABLE_QTWEBKIT=no + ) + else + mycmakeargs=( + -DENABLE_QTWEBENGINE=no + -DENABLE_QTWEBKIT=yes + ) + fi + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + domenu ${PN}-browser.desktop +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest index 3b704cab2fa6..9a0a012039a9 100644 --- a/www-client/vivaldi-snapshot/Manifest +++ b/www-client/vivaldi-snapshot/Manifest @@ -1,10 +1,10 @@ AUX vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch 603 BLAKE2B a4b048e605d70544de30e69245b50615162aa8b983bb254b3979ee6060d93a1e04de16d4e8b2b0426a7faea471a89644be3d6896206de35affb2158941c0f542 SHA512 60aedeeb8e8443c3177f19b4aa745415138ad9f3fa4f3696ad00d2b93889e145f401c59298454e62462f0a8afa619ff2d07bb481ff5895735b89c3701d270be9 -DIST vivaldi-snapshot-1.15.1099.3_p1-amd64.deb 53496850 BLAKE2B 7b3d11970055876707729779511a05d58fc838247e392f9275c24a54a1a9fc781f38c11df57a60f59e5614e579565993a8e973d1a602e41221f85d1aac9dd683 SHA512 04c172ce69fc3ea293164c72acfb0fe8497773fc952ed4dcd305586a88aae06064d0c7e8e89ddeeecbcc20fe368c64486ded3cd2f1e714a4e78cf0d154d78db2 -DIST vivaldi-snapshot-1.15.1099.3_p1-armhf.deb 47287988 BLAKE2B 2aa23c15d0700c92aac6333400ea62b77647038e40a22141369735908be5b9c1478d5f66855c8130a553890b55e15db4cd3566183ac1ec064a4f4a6af1bce26a SHA512 6869c105ea623e08b9d68480dba03e94807cb0848e0d69c3432f61f7a9fd069de3553a5d26be49fd8286fea88b26b102079a75a6e9d1a0f37697286b4fb83c0b -DIST vivaldi-snapshot-1.15.1099.3_p1-i386.deb 53044498 BLAKE2B 975bd2608dcb2a15c8963a4a6a333727fa9f57becc98ebbcbacf3ddee66439462947b70660c318727a99fb852013c00c6e61f54ea70a903ac9303e653dac182d SHA512 a39ec548b9fe5526df8140a8c724b52b34a38e4d02b32ed0f14cf1cef429392a39f244d978336c3cf7596be3db96bff421deb22adcc1c4e7e09b82f9839e2c4c DIST vivaldi-snapshot-1.15.1104.3_p1-amd64.deb 53518054 BLAKE2B 7227273bbbd7022c16ca53e24bd3515d89a2628cb048188b768dc6153831d553f89c884f4bbfed711427a3b0296f98247ac93f9dcfc6f1ea720b795374a07c32 SHA512 af45edc856c5124891c716a95187dbd7b94204cc1e0ee45808b1da4d62a1ef7c335c3d96c013835d32990bb0af78e606bbddb5e023d7ff319d738d2b989622b5 DIST vivaldi-snapshot-1.15.1104.3_p1-armhf.deb 47345008 BLAKE2B e5ef619baf89ca05d3abfb2e832a93227901b251ec9433f290c21f9a8444f6e7228f8e9a071de638a73a9631ad83b9bed7e3a3f6669cd6cdb52ec193954790b7 SHA512 e6765bca96d9fd6d03032dcaf8d3b489ff9794514d8daca07174438e4d9e6eb54a52b7f0574b39f4aceee8dc7d5db1f0e1208bd7f02083d7fa7666fee8c6c386 DIST vivaldi-snapshot-1.15.1104.3_p1-i386.deb 53092768 BLAKE2B 1675a34bcdd1ab5c47f2c143d8a9867de4dbb121d9e2a08fd64a2ea3df92030f9afa9267275a535be762c082aa5dc6806dc4f5dec426cded9073b1aa8f891430 SHA512 4f0287bbf94e8ed5ada018811cfd203ff3bafe6644d252c84a1bfb2695e0745d7ae4e9edf485ec3744d0381c0a2f977a56f888eb0fbfabd984a02dabe3a90eb9 -EBUILD vivaldi-snapshot-1.15.1099.3_p1.ebuild 2631 BLAKE2B 1f736c60ee67e0dae5fbd7682d546f79609fcbf416bfa14cabad3d6cbace0c68469d3d9c30dd9c604a0b18ad7e9ed795f64c440adabb5914472b37f765986462 SHA512 d4fec030632f8c5eef4d47b525970f9d2b9671e3ed1afac95b34ec8790b15cd431a17abd8fc4346241f4cd6ac31309424bb057832732c3586c4b75128cdaec0c +DIST vivaldi-snapshot-1.15.1111.3_p1-amd64.deb 53551928 BLAKE2B aab84cc405c2d79b9aae8008b4a7fe1bcb0016edfeb4ea69aca2e418e9923e347f77f891c86e5f6f009d5723506015560d779279570aec19ead8fd38d76558f2 SHA512 c439687c0f49fe8cbc412ef6a68de2996fea7dbb68c49ef71cb9593c00a7517ceab6484226556df232942e608f92c76475f282a92cbc2aca6e03a54e59af425c +DIST vivaldi-snapshot-1.15.1111.3_p1-armhf.deb 47359170 BLAKE2B 191c96c73bb81b1770bf4cb537cadd551f7d4ba25b2c51e0a49e6e6f579ecc1408eb52482523e2178570ee296f7e8c661bc502b65f578614924fd26139279777 SHA512 ddbfdddafa2a62feaed7d1550a4d9794bb5e1f411219cc08e1508b1843c602da28cb97c4550bd97cf61444eaac7edc43db26c5a7f9ccca2824e277a9fb25e905 +DIST vivaldi-snapshot-1.15.1111.3_p1-i386.deb 53107268 BLAKE2B 30917a72703010d4709375d12399fa465172c87572ce01b160f86bf533f8d5cae6375524a34f6ca7e6996853cc213ac0448da1056a43f07cc58bdfc8861db707 SHA512 c07621fd73a3b785700083f060ea2183c14607b2afa13351f10414c215300ea716b29b90b676b6fa809b56ea0430d70f3f571a7a788a353de6d15ddb8f1b8b49 EBUILD vivaldi-snapshot-1.15.1104.3_p1-r1.ebuild 2631 BLAKE2B 1f736c60ee67e0dae5fbd7682d546f79609fcbf416bfa14cabad3d6cbace0c68469d3d9c30dd9c604a0b18ad7e9ed795f64c440adabb5914472b37f765986462 SHA512 d4fec030632f8c5eef4d47b525970f9d2b9671e3ed1afac95b34ec8790b15cd431a17abd8fc4346241f4cd6ac31309424bb057832732c3586c4b75128cdaec0c +EBUILD vivaldi-snapshot-1.15.1111.3_p1.ebuild 2631 BLAKE2B 1f736c60ee67e0dae5fbd7682d546f79609fcbf416bfa14cabad3d6cbace0c68469d3d9c30dd9c604a0b18ad7e9ed795f64c440adabb5914472b37f765986462 SHA512 d4fec030632f8c5eef4d47b525970f9d2b9671e3ed1afac95b34ec8790b15cd431a17abd8fc4346241f4cd6ac31309424bb057832732c3586c4b75128cdaec0c MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1099.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1111.3_p1.ebuild index ee9ad44cb619..ee9ad44cb619 100644 --- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1099.3_p1.ebuild +++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1111.3_p1.ebuild diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest index d2642628900e..eae468a546bd 100644 --- a/www-client/vivaldi/Manifest +++ b/www-client/vivaldi/Manifest @@ -1,17 +1,6 @@ -AUX vivaldi-1.13.1008.44_p1-libffmpeg.patch 1106 BLAKE2B 4e15ad477669e534c78ab8973e3b0057597e97cd0b37a110be2acece86a49ecddb5c0a03c958bf42c4d1b2ad54d4b400e9e1319385ccb4bb1fc0448512d8aa09 SHA512 93c6454c3107c665c3c5799561544294c140a8dd187bed79b489f7794648941cb91a51eab8f96f8f304e5453d03e4b35b55b647c3d6f7425825dae9cafa3c3d9 -AUX vivaldi-1.14.1072.3_p1-desktop.patch 343 BLAKE2B 1fb9f37e1a8cb011cf13d0bdead1519cbe3884b92b2920b2564a745aa81ca1b7abac00925e58ad425986bc0cfb18e30ed1b2cd633e40601af14eebdfa73c0739 SHA512 2afbdc5f23b85b84dc94ad1da39e7ffe12e584a1496090db6d7706f6944cf1e9c71a8afded1ab386cbc1dbaadedb9e181f91b064946330c33941dfef66b91e7e -AUX vivaldi-1.14.1072.3_p1-libffmpeg.patch 1235 BLAKE2B 35325a2661ace46829514d07a0b0999eb7230554517bdbfa11862c72f7ebcee12987b9fd7bee58bfcc8e22560cd84607d244fc5bbb1b0514cafa888f096f3611 SHA512 08b13b8aae472ed827e3383eb6be0e1842d56bd003e3b4bf1d51ee73e55673a04ddf508d8ba3a6d766b27068101e890d5d80a936211c75fec38b6e1ece21a41a AUX vivaldi-1.14.1077.45_p1-libffmpeg.patch 567 BLAKE2B b26ad49c8d4336e572ca4fc4ffb1b90240b0b9d568e48706965fafdfd5681014e33fe0ee418ebde8cbfd55d840bf5ddb1a3e6baa8f69acc92255bfdfee8811ec SHA512 02bafb3edb17cab08b72629a17de772b097883ae132e36c8ccff2d03ef6bc861cba968e746379db612d0f012b81314f19a2a2f90f1b4af4c5cf67e048eeeb9ef -DIST vivaldi-1.13.1008.44_p1-amd64.deb 49265816 BLAKE2B 4d49e00cb0bb7fbf72303eb32da01751b22f9ec252766205893ead6c65e95695457065d2d9dcd5c4d42621a1382b012b2718e67b7f514df2ee7b1ea959eeaeca SHA512 3bb7f5ac0e01b1b3d36b4faae8a0a7874ab8acad5398663c9e51b6f9f26a6f00f01c3a183ff964e18eda2358009c99b270e65a3d35d99cea1de72554a7f6255a -DIST vivaldi-1.13.1008.44_p1-armhf.deb 45147556 BLAKE2B 90d8c056c129273e2c759247d452d4a825cb0ad41052716674fac790bb488d3f0743fa692f302f1c7af3f22adb91b1a115e1bd5c2745560577c14e0645fe0afd SHA512 f390ef2a6afa98212458a803b2411e53849bc2be3ebf54f3fdedc15bd38462239f7590dd31870c312319a38bb0e293948e1bbd1f1a0cdf243747780925c9762c -DIST vivaldi-1.13.1008.44_p1-i386.deb 50145626 BLAKE2B 44c913c2e8242d2b4b5b24fb63bc21dd8636283ebbcc5b72178b7dd4a34e2fc0e5d45fe41fef9ce7c918809e0bfffa1cf3ddbe436626afaa6237b4c85d27c09e SHA512 2f34facdc0ee2662d0ce03347346f8e510c288259aa92306f22c1eced6fc8626275f766401f6468b7a3037c2e7d5e65f692de39753553c7c8537b6c7f7a57a7a -DIST vivaldi-1.14.1077.41_p1-amd64.deb 52284634 BLAKE2B 91a96b201f6d3947145685a519e79a4ebff921df5c5873c5ce790f269e337f6944df71307b45649d0d754aec8b8ff6691748919d680d2354997a4cbb3440a211 SHA512 f6f8afc76699924edcfeacd51f60364506e2e9c07773d0411207507c0493b7427ba0373402c5eab7a10dde699cfee7e6e5c42179bf63c285123ff7e0e88f15b2 -DIST vivaldi-1.14.1077.41_p1-armhf.deb 46360044 BLAKE2B d7fba11b524936ebf047162de597a829da1fc362e1d245b1de131431f288219085e17572853537c06637f7ce25ca482a19a703c58939855ee1a0a2ca7fc381a2 SHA512 8a6abbb6b362327aeefb2b526825caac0896b80d8f45870dfe78ad6cf56228deb0b932c157c3e85e66bde6e73dbde0470879d35cbfbf41b984222e2f3da6dc77 -DIST vivaldi-1.14.1077.41_p1-i386.deb 51911354 BLAKE2B 050b9b2fb8495d9b9eaf51c61d1dd5bfcbbca0804bfa39e084dc8ded5c4ecd4aea31b459d6f1cba8fc0b5626ed926ed03d0263c47590bbdb024bf31fedc15fcf SHA512 538ff94c056c2fe3ac5c5042191dd3e7fc385d833a6375a05894df2f3945e363c017bb9e717a46b060cba9be81cdbc610cfd3ad3880a6da43ec5a89242a0f8bf -DIST vivaldi-1.14.1077.45_p1-amd64.deb 52300970 BLAKE2B 20473795e9c8decd47f0ce1594c46a04895129ea3a7e2a3ba5120217e0352933df015816cfe6b900cf1374f18be83d2181087bd52062f250a687e060c515c392 SHA512 331f7e15fde92e8fb0ec7d4713e2cf98fd5de50c650b03c0b2f041464b29ba3c327d8a2a60935238bbded6114ce02d2ce64d053df5e5da2c52eea8d383ba345b -DIST vivaldi-1.14.1077.45_p1-armhf.deb 46339572 BLAKE2B 8552e9cf2d90499cae9ec5bc431f6c20a16c1828e3a786c736d0119ee75391e21e1934024521c835129f6258d874650835cb06f0a23f3810edcc2aa77a5cf5e6 SHA512 ace2a414729464ad38a278c8fa6ef6a085cc393d14e6f64a0e36c414fbbe42d26b246ffe5eb2b6b20783a12506260d7b9353acb48f3844519e87e37719bc28b5 -DIST vivaldi-1.14.1077.45_p1-i386.deb 51923676 BLAKE2B fb3e15f8f1f9354beb85b92ae807807ea8eb9b62363c40b9c1cc4b2835f8ae3daeb9179869fa3681763da03d69216f057bae0f2127b7ce32f034c4069275e311 SHA512 60ac8449d39ff7689801fcbf9597d441116de72a90f1503338caa927990b8b59246cf02adbdf25beb8ad371aebca19254ee92dfeb706d2bcab87cd526cab5d0c -EBUILD vivaldi-1.13.1008.44_p1.ebuild 2982 BLAKE2B cfb6f088c8ea68f7821aff956a6706b517e2cd8c7f1aafc59267d3e4779d4eccccfe558621d69e8b784ca5e36368293d522d0faa1cc2a8fdf2599bec5e53c77f SHA512 651c20386b716ac98b1a32a46d480de06584a07372ad073edd9865c55ac88f4a3c5cccb0e97e42828cd20dc63766ccd9e7f86797fc610739cbeafa54d7424db7 -EBUILD vivaldi-1.14.1077.41_p1.ebuild 3040 BLAKE2B 16bdbb0f33399e053ea38ba55b904360de7b31364da3e7b9f14e404d71fab4a1cf241570bd7c70d92b08f9006b9c1646f758ff24ad146b89228483692ce04960 SHA512 35c2b5885daa0c33cbe710cf5f24c9ed224616f0546eebebf40da5b784e337b455cf9f6c2148d890b7bec43d0563ec028d85f80d3c4808e92b44bed349630569 -EBUILD vivaldi-1.14.1077.45_p1.ebuild 2984 BLAKE2B d97401a2132162dd86f01559d5abda6ce321d4ee2ec723a35125b6950ec82a074d8959d08e2e6b7f415e3abc72a0611dcfe53b53147b66acdc27aa4755908442 SHA512 bc1f7fe69db70c7d103f1eb8a401d356e0f49fb4d2f85a33b94ef4125b24215975b3b0bdfa6843c7d465f03c240ed267e3649a1d3ffbd8b43ded35b189eed618 +DIST vivaldi-1.14.1077.55_p1-amd64.deb 52307562 BLAKE2B a8f324b567018af12c18b4af49e1226f6d5be14e65d2f43683d63d8012591f17832914014b95916f307709545dec77be8a7296d86574cc0e1b2677c95f6b076e SHA512 a3c86e8da67dc5c6fe84fec30420d73182a63f59322514a961b7d573ff44fe5c68bb14ee2921870b2c7f30359c46e0a2583a00cfefde075cef2e3e3e1d78e89a +DIST vivaldi-1.14.1077.55_p1-armhf.deb 46372028 BLAKE2B 022bbb4a60535f99275ba6223c2e5956b5363dac145d00d1b8f46389b6904c1665a36ce609d3b538bd923921879a2743e6912cbb1e6d10753f98ae3b58e596b3 SHA512 7801475b385d25f2f96800d0b9252a4a04aa8895305339c9dd20ad6af75adba0ad9f83e319ce90da51850664c455d2e1bd3b8e0e32c17c5eb0532b1bdb062bde +DIST vivaldi-1.14.1077.55_p1-i386.deb 51936812 BLAKE2B 460cdd7d1139e2069f96592d0b22d312a7b071448cc9b4c09dfd3057e141b2c515b8c4919825758d8575f986a9c2929bed9feecc0ecd4b43bd229ba7a844eebb SHA512 8fcfed4969093be429902679c888f07e0e06bfa645e5298f3f77cc4e631c53ceace62d3aa2d100e56d30c8c8885cff6e598014b3aaffd68b382bbd7b94874f10 +EBUILD vivaldi-1.14.1077.55_p1.ebuild 2982 BLAKE2B 18d5f570f0aea0827caa35d22412bcdaea4ad7871853100673f2f3de9216b4e489c01ada0fcf25361585049f4796b33e363170b4ada378750b2e3c7c1cc60228 SHA512 ce4a2a851cd65c6c5d8fc9f01de11eac937016ec9e2fee4f3ed23ad25bd97174d1214a69154b63483fe108a201c9c6cdb5fb1188d88b9167edc115efec7a7b6e MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 diff --git a/www-client/vivaldi/files/vivaldi-1.13.1008.44_p1-libffmpeg.patch b/www-client/vivaldi/files/vivaldi-1.13.1008.44_p1-libffmpeg.patch deleted file mode 100644 index 99213e265b16..000000000000 --- a/www-client/vivaldi/files/vivaldi-1.13.1008.44_p1-libffmpeg.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/opt/vivaldi/vivaldi -+++ b/opt/vivaldi/vivaldi -@@ -34,14 +34,14 @@ - # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h - if [ -r "$1" ]; then - FFMPEG_VERSION=`grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -- if [ "$FFMPEG_VERSION" -ge "82746" -a "$FFMPEG_VERSION" -le "88062" ]; then -+# if [ "$FFMPEG_VERSION" -ge "82746" -a "$FFMPEG_VERSION" -le "88062" ]; then - if [[ -n "$LD_PRELOAD" ]]; then - export LD_PRELOAD="$LD_PRELOAD:$1" - else - export LD_PRELOAD="$1" - fi - export VIVALDI_FFMPEG_FOUND=YES -- fi -+# fi - fi - fi - fi -@@ -54,6 +54,7 @@ - # Check for libs in preferred order. - # Where possible, use other files/directories to confirm it's the correct variant. - VIVALDI_FFMPEG_FOUND=NO -+checkffmpeg "/usr/lib64/chromium/libffmpeg.so" - checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra' - checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra' - diff --git a/www-client/vivaldi/files/vivaldi-1.14.1072.3_p1-desktop.patch b/www-client/vivaldi/files/vivaldi-1.14.1072.3_p1-desktop.patch deleted file mode 100644 index 31f5371d8be0..000000000000 --- a/www-client/vivaldi/files/vivaldi-1.14.1072.3_p1-desktop.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/usr/share/applications/vivaldi-stable.desktop -+++ b/usr/share/applications/vivaldi-stable.desktop -@@ -111,4 +111,3 @@ - Type=Application - Categories=Network;WebBrowser; - MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; --Actions=new-window;new-private-window; diff --git a/www-client/vivaldi/files/vivaldi-1.14.1072.3_p1-libffmpeg.patch b/www-client/vivaldi/files/vivaldi-1.14.1072.3_p1-libffmpeg.patch deleted file mode 100644 index 8c6a574fccb6..000000000000 --- a/www-client/vivaldi/files/vivaldi-1.14.1072.3_p1-libffmpeg.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/opt/vivaldi/vivaldi -+++ b/opt/vivaldi/vivaldi -@@ -32,14 +32,14 @@ - # Chromium's FFMpeg version N-89284-gba4dfad is the oldest known working version - # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h - if [ -r "$1" ]; then -- if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "89284" ]; then -+# if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "89284" ]; then - if [[ -n "$LD_PRELOAD" ]]; then - export LD_PRELOAD="$LD_PRELOAD:$1" - else - export LD_PRELOAD="$1" - fi - export VIVALDI_FFMPEG_FOUND=YES -- fi -+# fi - fi - fi - fi -@@ -54,6 +54,7 @@ - # Check for libs in preferred order. - # Where possible, use other files/directories to confirm it's the correct variant. - VIVALDI_FFMPEG_FOUND=NO -+checkffmpeg '/usr/lib64/chromium/libffmpeg.so' - checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra' - checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra' - checkffmpeg '/usr/lib64/chromium-ffmpeg-extra/libffmpeg.so' '/usr/share/doc/packages/chromium-ffmpeg-extra' diff --git a/www-client/vivaldi/vivaldi-1.13.1008.44_p1.ebuild b/www-client/vivaldi/vivaldi-1.13.1008.44_p1.ebuild deleted file mode 100644 index 78c70beff4f9..000000000000 --- a/www-client/vivaldi/vivaldi-1.13.1008.44_p1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -CHROMIUM_LANGS=" - am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi - hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv - sw ta te th tr uk vi zh-CN zh-TW -" -inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils - -#VIVALDI_BRANCH="snapshot" - -VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}" -VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}" -VIVALDI_HOME="opt/${VIVALDI_BIN}" -DESCRIPTION="A new browser for our friends" -HOMEPAGE="http://vivaldi.com/" -VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_" -SRC_URI=" - amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb ) - arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb ) - x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb ) -" - -LICENSE="Vivaldi" -SLOT="0" -KEYWORDS="-* amd64 ~arm x86" -RESTRICT="bindist mirror" - -DEPEND=" - virtual/libiconv -" -RDEPEND=" - >=dev-libs/openssl-1.0.1:0 - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - gnome-base/gconf:2 - media-libs/alsa-lib - media-libs/fontconfig - media-libs/freetype - media-libs/speex - net-print/cups - sys-apps/dbus - sys-libs/libcap - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango[X] -" -QA_PREBUILT="*" -S=${WORKDIR} - -src_unpack() { - unpack_deb ${A} -} - -src_prepare() { - iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die - mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die - - sed -i \ - -e "s|${VIVALDI_BIN}|${PN}|g" \ - usr/share/applications/${VIVALDI_PN}.desktop \ - usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die - - mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die - chmod 0755 usr/share/doc/${PF} || die - - rm \ - _gpgbuilder \ - etc/cron.daily/${VIVALDI_BIN} \ - ${VIVALDI_HOME}/libwidevinecdm.so \ - || die - rmdir \ - etc/cron.daily/ \ - etc/ \ - || die - - local c d - for d in 16 22 24 32 48 64 128 256; do - mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die - cp \ - ${VIVALDI_HOME}/product_logo_${d}.png \ - usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die - done - - pushd "${VIVALDI_HOME}/locales" > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - epatch "${FILESDIR}"/${PN}-1.13.1008.44_p1-libffmpeg.patch - - epatch_user -} - -src_install() { - mv * "${D}" || die - dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN} - - fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/www-client/vivaldi/vivaldi-1.14.1077.41_p1.ebuild b/www-client/vivaldi/vivaldi-1.14.1077.41_p1.ebuild deleted file mode 100644 index cddb182a307c..000000000000 --- a/www-client/vivaldi/vivaldi-1.14.1077.41_p1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -CHROMIUM_LANGS=" - am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi - hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv - sw ta te th tr uk vi zh-CN zh-TW -" -inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils - -#VIVALDI_BRANCH="snapshot" - -VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}" -VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}" -VIVALDI_HOME="opt/${VIVALDI_BIN}" -DESCRIPTION="A new browser for our friends" -HOMEPAGE="http://vivaldi.com/" -VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_" -SRC_URI=" - amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb ) - arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb ) - x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb ) -" - -LICENSE="Vivaldi" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~x86" -RESTRICT="bindist mirror" - -DEPEND=" - virtual/libiconv -" -RDEPEND=" - >=dev-libs/openssl-1.0.1:0 - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - gnome-base/gconf:2 - media-libs/alsa-lib - media-libs/fontconfig - media-libs/freetype - media-libs/speex - net-print/cups - sys-apps/dbus - sys-libs/libcap - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango[X] -" -QA_PREBUILT="*" -S=${WORKDIR} - -src_unpack() { - unpack_deb ${A} -} - -src_prepare() { - iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die - mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die - - sed -i \ - -e "s|${VIVALDI_BIN}|${PN}|g" \ - usr/share/applications/${VIVALDI_PN}.desktop \ - usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die - - mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die - chmod 0755 usr/share/doc/${PF} || die - - rm \ - _gpgbuilder \ - etc/cron.daily/${VIVALDI_BIN} \ - ${VIVALDI_HOME}/libwidevinecdm.so \ - || die - rmdir \ - etc/cron.daily/ \ - etc/ \ - || die - - local c d - for d in 16 22 24 32 48 64 128 256; do - mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die - cp \ - ${VIVALDI_HOME}/product_logo_${d}.png \ - usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die - done - - pushd "${VIVALDI_HOME}/locales" > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - epatch "${FILESDIR}"/${PN}-1.14.1072.3_p1-desktop.patch - epatch "${FILESDIR}"/${PN}-1.14.1072.3_p1-libffmpeg.patch - - epatch_user -} - -src_install() { - mv * "${D}" || die - dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN} - - fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/www-client/vivaldi/vivaldi-1.14.1077.45_p1.ebuild b/www-client/vivaldi/vivaldi-1.14.1077.55_p1.ebuild index 74cfe863016e..772c185172c8 100644 --- a/www-client/vivaldi/vivaldi-1.14.1077.45_p1.ebuild +++ b/www-client/vivaldi/vivaldi-1.14.1077.55_p1.ebuild @@ -25,7 +25,7 @@ SRC_URI=" LICENSE="Vivaldi" SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~x86" +KEYWORDS="-* amd64 ~arm x86" RESTRICT="bindist mirror" DEPEND=" |