From d302a5d7fc9caafba5c8a404f2891bb6ccdec311 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 May 2018 13:19:56 +0100 Subject: gentoo resync : 15.05.2018 --- www-client/Manifest.gz | Bin 7048 -> 7049 bytes www-client/chromium/Manifest | 2 + www-client/chromium/chromium-66.0.3359.170.ebuild | 701 +++++++++++++++++++++ www-client/firefox/Manifest | 2 +- www-client/firefox/firefox-52.8.0.ebuild | 2 +- www-client/google-chrome/Manifest | 4 +- .../google-chrome-66.0.3359.139.ebuild | 157 ----- .../google-chrome-66.0.3359.170.ebuild | 157 +++++ www-client/lynx/Manifest | 2 +- www-client/lynx/lynx-2.8.9_pre16.ebuild | 2 +- www-client/midori/Manifest | 4 +- .../midori/files/midori-0.5.11-vala-0.35.patch | 101 +++ www-client/midori/midori-0.5.11-r2.ebuild | 29 +- www-client/midori/midori-0.5.11-r3.ebuild | 89 +++ www-client/vivaldi/Manifest | 4 + www-client/vivaldi/vivaldi-1.15.1147.42_p1.ebuild | 127 ++++ 16 files changed, 1212 insertions(+), 171 deletions(-) create mode 100644 www-client/chromium/chromium-66.0.3359.170.ebuild delete mode 100644 www-client/google-chrome/google-chrome-66.0.3359.139.ebuild create mode 100644 www-client/google-chrome/google-chrome-66.0.3359.170.ebuild create mode 100644 www-client/midori/files/midori-0.5.11-vala-0.35.patch create mode 100644 www-client/midori/midori-0.5.11-r3.ebuild create mode 100644 www-client/vivaldi/vivaldi-1.15.1147.42_p1.ebuild (limited to 'www-client') diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz index 30fbbe78d6de..ae3e2239b102 100644 Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 65ff9ed08f83..eb7e5793d57c 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -17,10 +17,12 @@ AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab5 AUX chromium-widevine-r2.patch 1488 BLAKE2B fc4dc6ce40b2d2a152a0bbc5958d8050d9a7f4176cd0121d81ae1a9e76d361c064f54e034fb9213fc802e0a4b1b8d661788dbe9089daf8b197414724a057d4e4 SHA512 6fe8eb7b0e6c88e00d1b3dadf433b886c71cbf9b3dd4e712845a636a689cad6bc58fa8b20b412a1f7a8a1b649bccc8c961e762fa5f4d4ae092355e70db0a9cfe AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 DIST chromium-66.0.3359.139.tar.xz 583978636 BLAKE2B 0727ba9f87a738b691b2120dee7f45f7b16b234e871988b1257f01589a6a5ec2cd2470e8d95fc3087be2ab140f71afce63c7fccc851e87a932f69326966c3303 SHA512 9fe78fb6970fc5a3455e6545a4869d3a73075329ccd26719f503fd9bbfbdd6aec4f3db4cc748e8f12abb81adb318b8f8b42c7ab5c289a1f698536e81b7d2f14f +DIST chromium-66.0.3359.170.tar.xz 583956312 BLAKE2B 313ac8c785147e940ead222aeb30181af3c5848bdc7e706bf83a42078c63ce71431a7d17ad4937a6a37cc72beb67725ead790f489a1d31c70a9a94a2e73a9c45 SHA512 69c78975c517d6d59225c92968c1be879e3a2ca2a3671f38a5f8b6303719f6bc441b1d1fe0b19818ab7f9a06cd15bf8631d03ad4931da6fdc641ba2894eecad2 DIST chromium-67.0.3396.30.tar.xz 589816436 BLAKE2B 05f2d9c1119f5819793e343c485d49296b0e6b852bb49aef7558c8f492ed62db29e30957d7f299aef45eae3ea8a292c526975141abd843524e776ffe20d716e9 SHA512 c1ce45d899f34a1ee492ee4176a23aceefc3aaeacbe36effda7616c6cfe40187102b07763267295d07d862c6dba0210e03db7447320dd02b4cc95b52ac6e6ac0 DIST chromium-67.0.3396.40.tar.xz 589878296 BLAKE2B e02d8980cb882fb67eb6e048dfa8534fb423259af257040cdda8198aac9433a221d6218873a8e5623ae3cfb8e081f22bfc40444e53be38b17a0ebff77537263d SHA512 1d4986d444076a4a48bf9ad7061dbb424f520e46f2f58f8f84dfee2fefea05a3b019ef27acda553efb9a75db9731acbc0c80f5dfb39a9137e9e27336306d5981 DIST chromium-68.0.3409.2.tar.xz 595647380 BLAKE2B 3f3ebb7de759ae92b8feca74a931c10c4bdf4f75a0a7aeb2f56b59e635e1f03becccdf2b26d306e5753d9379eadede6ef50ec4e44338a3a6bdfb960b74003770 SHA512 2ce35251392570bcfe0cc02813bf6cee1761b2227888a135491828bfdfa9eafa4538e8fb981165503f901eecbf91cc8ce17cebab1681c63a43f0625dae7a2dd8 EBUILD chromium-66.0.3359.139.ebuild 21079 BLAKE2B ad63d299090512b44fe6d1deccb754a9c3471abeb4cdb013c5e2b4743d500cfb3a3434ee842310c5b5e1a3145028b98a112ecbf0f31004cf1966aeb92a1a16a8 SHA512 17d7f7856cfbe4b9006e153d312b43c43ffccb9c1c5f2e9f4f920eefccc83000f29177028319597bae453148a6c8c255695694345b289ef5b6da2842abe4e4c6 +EBUILD chromium-66.0.3359.170.ebuild 21080 BLAKE2B 886abfd8535cf3069938bd5c7e048b0bf27b08c451e9225e514ba63b7d4181a7febbacdcaf8540f8db683aff6903027ca09644de1fba6a4ffc9e0dd70d27d998 SHA512 d054f5fc67cc2e538c7d9136e07214f203d76e88afe23b9defbe269cb17173f6eee5336f7552818221f4c57bf21545c359611156da07df4aa71307db41a4c025 EBUILD chromium-67.0.3396.30.ebuild 20970 BLAKE2B 7a26f21631d49d99a738775de819c4abb3df639a13a3eebfd5c38780cc94e208a8e1b3dd785c06c0e91b9a1a7ed1c5a0e564fc9392f6e9b031c58c8fa7ac363e SHA512 3a19fd0b2fd59c86a59625097d56e8d16e698df56279327f0c9c929a0654913dca957be153e0f9c6b92e812f7b16118225089af50dc9751f99cbf789a231e4dd EBUILD chromium-67.0.3396.40.ebuild 20970 BLAKE2B 7a26f21631d49d99a738775de819c4abb3df639a13a3eebfd5c38780cc94e208a8e1b3dd785c06c0e91b9a1a7ed1c5a0e564fc9392f6e9b031c58c8fa7ac363e SHA512 3a19fd0b2fd59c86a59625097d56e8d16e698df56279327f0c9c929a0654913dca957be153e0f9c6b92e812f7b16118225089af50dc9751f99cbf789a231e4dd EBUILD chromium-68.0.3409.2.ebuild 21128 BLAKE2B c0b3f816629ad411e9a1173d8613b56b265ac2d64c314d0ffcc146e6692ab3a997cc4390658ed8f8926bad36be480a907ad7c0f455d90be445277c56a28622bf SHA512 619db1868802d4857193c91531539084a40177dabc3b622bdedf35f1b3e5a48c751c8a106d19035dc3d6da86e003a2d9a74d936c30cb5c3225b827c39784018a diff --git a/www-client/chromium/chromium-66.0.3359.170.ebuild b/www-client/chromium/chromium-66.0.3359.170.ebuild new file mode 100644 index 000000000000..dc900e5faf63 --- /dev/null +++ b/www-client/chromium/chromium-66.0.3359.170.ebuild @@ -0,0 +1,701 @@ +# 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 ~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 + !=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/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-math.h-r0.patch" + "${FILESDIR}/chromium-stdint.patch" + "${FILESDIR}/chromium-clang-r4.patch" + "${FILESDIR}/chromium-ffmpeg-r1.patch" + "${FILESDIR}/chromium-ffmpeg-clang.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 + buildtools/third_party/libc++ + buildtools/third_party/libc++abi + 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/angle/third_party/glslang + third_party/angle/third_party/spirv-headers + third_party/angle/third_party/spirv-tools + third_party/angle/third_party/vulkan-validation-layers + 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/libaom/source/libaom/third_party/x86inc + 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/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/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/pdfium/third_party/skia_shared + 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/unrar + 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=${CHOST}-clang + CXX=${CHOST}-clang++ + strip-unsupported-flags + 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 + + # https://bugs.gentoo.org/654216 + addpredict /dev/dri/ + + 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 + + # 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/firefox/Manifest b/www-client/firefox/Manifest index 536e8a88b1b2..4cf9d2b3d135 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -281,6 +281,6 @@ DIST firefox-60.0-zh-CN.xpi 542804 BLAKE2B bd5cd289fe0c6b5d7f46f885c29d286c24649 DIST firefox-60.0-zh-TW.xpi 541119 BLAKE2B 33cc14ea7cc6b3e36f84a3e710b65e84c5ebdb07612c5977509650419a1dc0087b567452cc4be343841ffd53e9434811f0596396aa7d50b299feeaba8e1fd370 SHA512 1523c61e27a063438dc4c4baa50809fbadb509b7f278aa71af4b1b7b1f6a843632f041c84f00f3a7ae7c9363efcc59cf9ed9520660a17fecd036e868f043ab1c DIST firefox-60.0.source.tar.xz 266717500 BLAKE2B 1cc4fcb0ca26b3cbbe0e0e8278ebb6edf4d38b6e65201db78df921bae44350eae6a0566c3fcf688df33fc90c605738254acbcd93f3346988e7acabf1f4565e6f SHA512 63c156238a6b6b6188f093d2658d3152cd0ff6a1e275dd819a6d111dd4f964cac548632f45cd0f561b17537cde2740afe681e28d5a4d69477d9f39030567a0fc EBUILD firefox-52.6.0.ebuild 12940 BLAKE2B 357e3e6cd6b355af23afdeb5db93ebab0dc2049436f8f448e7ff0e34e5c84414a2db4efb05cc13f050f1fd02626797395b53bf3bc5e416dd13ebdd90dec6de02 SHA512 bb0b364de552649c5fc0b58d13c8ae4d3dcc6497aae83acd014af89545f4355791d0ed6a1002e25630e8a5d797386e3a1b1ad6ae314574e6b12fb50673bc231b -EBUILD firefox-52.8.0.ebuild 12942 BLAKE2B 3a2ad99dc3921d6a521018eb929e1734c5cbb2b6a68304a6bcb11c7c9f1a34745cf3e370503608a92eeebc41fce42a4cb72df73b6f082f10d0676301cabb8720 SHA512 80de5c32d8dee01a842b57da8511077b13241be2544b9f9c2a770081ff41293740437c56e2a60d31488c111ca2fe8772665922878db1a9116a5391dcee1cb309 +EBUILD firefox-52.8.0.ebuild 12940 BLAKE2B 357e3e6cd6b355af23afdeb5db93ebab0dc2049436f8f448e7ff0e34e5c84414a2db4efb05cc13f050f1fd02626797395b53bf3bc5e416dd13ebdd90dec6de02 SHA512 bb0b364de552649c5fc0b58d13c8ae4d3dcc6497aae83acd014af89545f4355791d0ed6a1002e25630e8a5d797386e3a1b1ad6ae314574e6b12fb50673bc231b EBUILD firefox-60.0.ebuild 11594 BLAKE2B b3794f33290128423366e31af961417ffcc3f2012337602d984eb597ea30c7b0c13ba336dea2418921a9852f4f64867c4b01699603e1fa3aba300d774f9cd234 SHA512 b6e39b384335c27463128b1f17af815fca5fb014b67ca15a995beeaee73252b749dfcfef679e0690bf21f28489062a2af23088854843aa7a6d00547d18d78e5c MISC metadata.xml 2097 BLAKE2B 48891b46d3fbb16b3e0355ac35bea758fb24e6d1fd5d6123bc5b62ba4416c814daa8761dcd439d8c77ea30ceca5eb07306c10e7110fbc3ad063519ec97f7adc6 SHA512 563e087dfc1f413dbc1d97d81f3187666e2cad46acd87e579e8cd1c0ffb01f49402c71e06856056cf08be14beb62f1e0ed67044fd8afa09c4e8558127cef7bc2 diff --git a/www-client/firefox/firefox-52.8.0.ebuild b/www-client/firefox/firefox-52.8.0.ebuild index b1698a54023f..963759931c8b 100644 --- a/www-client/firefox/firefox-52.8.0.ebuild +++ b/www-client/firefox/firefox-52.8.0.ebuild @@ -35,7 +35,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6 DESCRIPTION="Firefox Web Browser" HOMEPAGE="https://www.mozilla.org/en-US/firefox/" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index 3e3216eaaea8..5ad01feded7f 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -1,3 +1,3 @@ -DIST google-chrome-stable_66.0.3359.139-1_amd64.deb 52214770 BLAKE2B 2eebeb728e921cd89db1c06ff3c7d55f08f1565ac59f0260b9f079a951c21b8af944aac7d2ac2af6eac1833e4d0b0ad5ce5cc09705c5f7fabb1a5a0d5e4cab4f SHA512 7eacb4c6bcdcb330c3ce0a39ff7035117ac0040bfd647135562b6a01cbe214ac2edf5d110b7f69ffb58ca60f128be3cc948e8eb8ce94c803a4d4294279b9dac6 -EBUILD google-chrome-66.0.3359.139.ebuild 3609 BLAKE2B af5bc703e53acabf3360003c1b4e71e1e3f5e1d5fe57d9c63ea3a2ab7e87344e0146b369666c678c5bc6011dd407d14175757e84540bb608b0046fe89801a1b3 SHA512 d484e3674f6f72fe23a20b4e4734cfcdfb3a8630616e412cc299575df2e9ccb9397c3e0a919ccd5ae3290c3d460ae65047bd013847d436f2521f0a2630965b74 +DIST google-chrome-stable_66.0.3359.170-1_amd64.deb 52207438 BLAKE2B cd2b5cdac9ce79e8296ff616e77f3af3611e2461fb7fe1d9cfd6f96acf1876f7670b85b949b6445630505e58d0c4995076c28ae15f5bc162bdb013c2b01624ca SHA512 a518dae7e42594621d78d0dc00698308544055575c7a5b0a9c8994547a87ca310bc7e24884ac947f3f0aefbf9e352889ab78485174145d1764fa50551d720725 +EBUILD google-chrome-66.0.3359.170.ebuild 3609 BLAKE2B af5bc703e53acabf3360003c1b4e71e1e3f5e1d5fe57d9c63ea3a2ab7e87344e0146b369666c678c5bc6011dd407d14175757e84540bb608b0046fe89801a1b3 SHA512 d484e3674f6f72fe23a20b4e4734cfcdfb3a8630616e412cc299575df2e9ccb9397c3e0a919ccd5ae3290c3d460ae65047bd013847d436f2521f0a2630965b74 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af diff --git a/www-client/google-chrome/google-chrome-66.0.3359.139.ebuild b/www-client/google-chrome/google-chrome-66.0.3359.139.ebuild deleted file mode 100644 index 38dbe68c340a..000000000000 --- a/www-client/google-chrome/google-chrome-66.0.3359.139.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -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 readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils - -DESCRIPTION="The web browser from Google" -HOMEPAGE="https://www.google.com/chrome" - -if [[ ${PN} == google-chrome ]]; then - MY_PN=${PN}-stable -else - MY_PN=${PN} -fi - -MY_P="${MY_PN}_${PV}-1" - -SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb" - -LICENSE="google-chrome" -SLOT="0" -KEYWORDS="-* amd64" -IUSE="+plugins" -RESTRICT="bindist mirror strip" - -DEPEND="" -RDEPEND=" - app-accessibility/at-spi2-atk:2 - app-arch/bzip2 - app-misc/ca-certificates - dev-libs/atk - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - >=dev-libs/nss-3.26 - gnome-base/gconf:2 - media-libs/alsa-lib - media-libs/fontconfig - media-libs/freetype:2 - net-print/cups - sys-apps/dbus - sys-libs/libcap - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - >=x11-libs/libX11-1.5.0 - 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/libXScrnSaver - x11-libs/libXtst - x11-libs/libxcb - x11-libs/pango - x11-misc/xdg-utils -" - -QA_PREBUILT="*" -QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop" -S=${WORKDIR} -CHROME_HOME="opt/google/chrome${PN#google-chrome}" - -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/ja-ipafonts -- media-fonts/takao-fonts -- media-fonts/wqy-microhei -- media-fonts/wqy-zenhei - -Depending on your desktop environment, you may need -to install additional packages to get icons on the Downloads page. - -For KDE, the required package is kde-frameworks/oxygen-icons. - -For other desktop environments, try one of the following: -- x11-themes/adwaita-icon-theme -- x11-themes/tango-icon-theme - -Please notice the bundled flash player (PepperFlash). -You can (de)activate all flash plugins via chrome://plugins -" - -pkg_nofetch() { - eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures." -} - -pkg_pretend() { - # Protect against people using autounmask overzealously - use amd64 || die "google-chrome only works on amd64" -} - -pkg_setup() { - chromium_suid_sandbox_check_kernel_config -} - -src_unpack() { - : -} - -src_install() { - dodir / - cd "${ED}" || die - unpacker - - rm -r etc usr/share/menu || die - mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die - - pushd "${CHROME_HOME}/locales" > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - if use plugins ; then - local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins" - sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \ - -i "${CHROME_HOME}/${PN}" || die - fi - - local size - for size in 16 22 24 32 48 64 128 256 ; do - newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png - done - - pax-mark m "${CHROME_HOME}/chrome" - - 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/google-chrome/google-chrome-66.0.3359.170.ebuild b/www-client/google-chrome/google-chrome-66.0.3359.170.ebuild new file mode 100644 index 000000000000..38dbe68c340a --- /dev/null +++ b/www-client/google-chrome/google-chrome-66.0.3359.170.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +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 readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils + +DESCRIPTION="The web browser from Google" +HOMEPAGE="https://www.google.com/chrome" + +if [[ ${PN} == google-chrome ]]; then + MY_PN=${PN}-stable +else + MY_PN=${PN} +fi + +MY_P="${MY_PN}_${PV}-1" + +SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb" + +LICENSE="google-chrome" +SLOT="0" +KEYWORDS="-* amd64" +IUSE="+plugins" +RESTRICT="bindist mirror strip" + +DEPEND="" +RDEPEND=" + app-accessibility/at-spi2-atk:2 + app-arch/bzip2 + app-misc/ca-certificates + dev-libs/atk + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + >=dev-libs/nss-3.26 + gnome-base/gconf:2 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype:2 + net-print/cups + sys-apps/dbus + sys-libs/libcap + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + >=x11-libs/libX11-1.5.0 + 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/libXScrnSaver + x11-libs/libXtst + x11-libs/libxcb + x11-libs/pango + x11-misc/xdg-utils +" + +QA_PREBUILT="*" +QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop" +S=${WORKDIR} +CHROME_HOME="opt/google/chrome${PN#google-chrome}" + +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/ja-ipafonts +- media-fonts/takao-fonts +- media-fonts/wqy-microhei +- media-fonts/wqy-zenhei + +Depending on your desktop environment, you may need +to install additional packages to get icons on the Downloads page. + +For KDE, the required package is kde-frameworks/oxygen-icons. + +For other desktop environments, try one of the following: +- x11-themes/adwaita-icon-theme +- x11-themes/tango-icon-theme + +Please notice the bundled flash player (PepperFlash). +You can (de)activate all flash plugins via chrome://plugins +" + +pkg_nofetch() { + eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures." +} + +pkg_pretend() { + # Protect against people using autounmask overzealously + use amd64 || die "google-chrome only works on amd64" +} + +pkg_setup() { + chromium_suid_sandbox_check_kernel_config +} + +src_unpack() { + : +} + +src_install() { + dodir / + cd "${ED}" || die + unpacker + + rm -r etc usr/share/menu || die + mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die + + pushd "${CHROME_HOME}/locales" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + if use plugins ; then + local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins" + sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \ + -i "${CHROME_HOME}/${PN}" || die + fi + + local size + for size in 16 22 24 32 48 64 128 256 ; do + newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png + done + + pax-mark m "${CHROME_HOME}/chrome" + + 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/lynx/Manifest b/www-client/lynx/Manifest index ff45ccfd2727..efd51d15b0f1 100644 --- a/www-client/lynx/Manifest +++ b/www-client/lynx/Manifest @@ -3,5 +3,5 @@ AUX lynx-2.8.8_p1-parallel.patch 2112 BLAKE2B 8bba1efae94cf7e55eccdb00692c0a7e3a DIST lynx2.8.9dev.11.tar.bz2 2665470 BLAKE2B 3fa28252ff619bc7d82d4e1460b7407b6f2f40bb111b8b54ce478327a023748c51e45dbd8e0ae74daff24d59fc3b6a5776a78057c846b8f3bbb153b4c4b92f17 SHA512 702be6cb4f97bae4765d3de3d6ef1cd09e2ef27b570dfbea4f26a411f5bba2ab6d16aee5dbec0ebe63533de17664684ff42fb857b2d17d416774777b38083f50 DIST lynx2.8.9dev.16.tar.bz2 2674662 BLAKE2B 3771199e4d74dcc38c15b8b75207810d3a4f3afabb76d5d8dc7dcd33c5dd0119f0f28a1a719f54df7ed0ecdfb972942c6439536486f99a685febbc252127cc3f SHA512 6aa5e869924c6e42aa68113985aecfb75dc6eb68d5d7db8cedb9843621d29c36c17078e7a692f472e3e7f1edf7ca666e3614bc3bdb092a3631877733d5e3d518 EBUILD lynx-2.8.9_pre11.ebuild 2474 BLAKE2B 55f353231ff7bc0551a6fec2c77e14f448db280842ad2e255479323422d3386c854067807c6df9b4bdb78511ab82637d65e1f250a6c1aaf6d9812abd884b7263 SHA512 9a343cbe5f5bc0350eaaf347e92415b9227877302bda4267f5e9ccb3e0cc4f694e043b6b5d2615b383c1aa474125b75e4d6e91483b4fbf4429fc9db72aa28db8 -EBUILD lynx-2.8.9_pre16.ebuild 2594 BLAKE2B 6c41bb659065db4c6f1e29a87f64368c7310bf6a1a8aed045e9a49ceaf011036ed5a32a3b94ca81a3a981845f654823cb08a5bc82c14db523359dd8db4f7809c SHA512 b44de6d67c12d79da430e7e681dfebb6a7a8fcebf361285f136fa77c78a7b62b585356994bfd8fa4bf012b95eb71947ceb19b12b96f179224f93dd63991e5322 +EBUILD lynx-2.8.9_pre16.ebuild 2593 BLAKE2B 68ca701129df998ff8f294fb1aab72a552fc224596ddbfaed8c83ed48370a9893579cd6d4023f825302d728c896bb4ed84f19107bb1a76ba34b35ea2ccc92b2d SHA512 b36f77406ee82d2ad0c9b59292e52710905b44f57a5a3b1c1f7c917fce0b1699549588203f328d054c82bd6019584e6af064d9e142ff1a30b13c5311cc5c987e MISC metadata.xml 427 BLAKE2B 12b6661d5a6d2881e78dea8bd97e8ea4f7aa34b2134d2a5a91736c02f2e186fcb4f6c01d704f12bfa9bf0b240e17c11a68a4551087cb1cff1e16e4936bbc125c SHA512 74b58082b7c81f4104e401dd9d958dec9f001ea4e574b8c7d49540c1a11376bfe97d0224e5437291e3cf8eed8aeda2b84669b3ab226b521a7598b51dbc7d48ac diff --git a/www-client/lynx/lynx-2.8.9_pre16.ebuild b/www-client/lynx/lynx-2.8.9_pre16.ebuild index 310ae826ffcb..eba754b694d1 100644 --- a/www-client/lynx/lynx-2.8.9_pre16.ebuild +++ b/www-client/lynx/lynx-2.8.9_pre16.ebuild @@ -21,7 +21,7 @@ SRC_URI="http://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl" RDEPEND=" diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest index 02db98307398..fc7fd794069e 100644 --- a/www-client/midori/Manifest +++ b/www-client/midori/Manifest @@ -1,4 +1,6 @@ AUX midori-0.5.11-libsoup.patch 3311 BLAKE2B 4f77de58b28508941dd1033a9178cc54a8b9a3fb8b312aa23ff5dd306eba63008e9304a00e669cb2b90aedb505c2a432f7feaba390b7db4f700d8da3ead3b51c SHA512 987cc42e19aca9355facac4d4b91d5f6206d24dae6d816e4c39e81c8c6141f564742154c74d22c806aea0f0c0db807b606fc387f46011253736260b827b7a464 +AUX midori-0.5.11-vala-0.35.patch 5048 BLAKE2B 894ae8e212682d01a3591e9a76b4ca0e519baa7dcd6b1b20152170a29ba82ed33ef0bf864c10e7b5bd2a57e9965d25ec59f4dafcefdc9c8423a829c819c226ce SHA512 f21b7daeb77daec74b87bd04ccd9eab83dc69405b72435c928042f993259f74847819609f5710518cb7f1b96285d57febb0a93a4650feb5c0fc82013e3deec18 DIST midori_0.5.11_all_.tar.bz2 1428791 BLAKE2B c19872b3271360877b2affa0ab86d93884895037a72cb9182a44a597bf930394153fea5a744c1cf225f2c4bd8f3c691c5622d0b4abdb33c202c4aa1da48b5ee5 SHA512 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d -EBUILD midori-0.5.11-r2.ebuild 1589 BLAKE2B cb500c710ba40e439e5f06de14fe58c9a0e77b9b3360d53958ccaa312afe106adb8e7e97580b2cd8e2d87ea8c2c67755c1ee3578a4bc5230ed252e7b85b79bcf SHA512 4c70e8a0b78aee9e613c61e6a1a240f0fa656c25a64bf6dac3db1fe65fd27b6c96a74573d68b274bdbe8b6ccd711e65ff2b63df375babf35a325756bb3b28fe8 +EBUILD midori-0.5.11-r2.ebuild 1824 BLAKE2B f39d27f55a24a9553ad4a6ca4d3aa344ea0d646291c993468f64dbedfea7a2b9c81cfcc9de4826b036648f0e3c721df6fdcc7b043a67bffac74f940694fd25fa SHA512 d9032de0ac8157d88b53f573a37f5156b73d541b7086a26c7ee98b188fbbce337c58f886689dc5860654b76d8d3ea52ca73607ea870bc41d42354c58edb810c9 +EBUILD midori-0.5.11-r3.ebuild 1876 BLAKE2B 6acc263207529706146b6de8987d3fe341bf46908d60c40feba1cbad625ca9d915bd2ce01e14d93fd8b2fdb3fdc64162992769a0e8dd692687e4a2d120d682fc SHA512 7a758ba109c28a738253be5e9f12b8c4ece87495e239bb6d1ecaedde3afc4263d71713ee531cc9960f245a8a8b686f69615ad78248c1e04e685ca08240e29b15 MISC metadata.xml 366 BLAKE2B e64689abe46fbfea37056e542427ea966cfed6ee5a7f70b89fe0e3e48c5cc5c6c0505f5cdd8c78449a56ceb2c7e8b51469f9b0bbdf8505b2fcc9e24df09e8a6b SHA512 af119fa95a79e7e74ff02d5da3b8daaf48ea562f7a3f47a60e7f73790350e45c8a8fac6a165230d45adf7d1aabeb69672fd156f6631d2b32a86b6cf309b94ef2 diff --git a/www-client/midori/files/midori-0.5.11-vala-0.35.patch b/www-client/midori/files/midori-0.5.11-vala-0.35.patch new file mode 100644 index 000000000000..4192b6084934 --- /dev/null +++ b/www-client/midori/files/midori-0.5.11-vala-0.35.patch @@ -0,0 +1,101 @@ +Patch provided by Sander Sweers on https://bugs.gentoo.org/628108#c9 + +diff -ur midori-0.5.11.orig/extensions/adblock/widgets.vala midori-0.5.11/extensions/adblock/widgets.vala +--- midori-0.5.11.orig/extensions/adblock/widgets.vala 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11/extensions/adblock/widgets.vala 2017-09-30 01:07:04.033922383 +0200 +@@ -227,7 +227,7 @@ + liststore.get (iter, 0, out sub); + if (sub.mutable) { + config.remove (sub); +- liststore.remove (iter); ++ liststore.remove (ref iter); + return true; + } + } +diff -ur midori-0.5.11.orig/extensions/apps.vala midori-0.5.11/extensions/apps.vala +--- midori-0.5.11.orig/extensions/apps.vala 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11/extensions/apps.vala 2017-09-30 01:08:12.831916408 +0200 +@@ -265,7 +265,7 @@ + store.get (iter, 0, out launcher); + try { + launcher.file.trash (null); +- store.remove (iter); ++ store.remove (ref iter); + + string filename = Midori.Download.clean_filename (launcher.name); + #if HAVE_WIN32 +diff -ur midori-0.5.11.orig/extensions/history-list.vala midori-0.5.11/extensions/history-list.vala +--- midori-0.5.11.orig/extensions/history-list.vala 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11/extensions/history-list.vala 2017-09-30 01:10:25.137904917 +0200 +@@ -223,7 +223,7 @@ + FixMe: the retrun value of `Gtk.ListStore.remove` should be checked + Note: in some cases the return value of `Gtk.ListStore.remove` is wrong + */ +- model.remove (iter); ++ model.remove (ref iter); + this.browser.close_tab (view); + if (length > 2) + this.resize_treeview (); +diff -ur midori-0.5.11.orig/extensions/notes.vala midori-0.5.11/extensions/notes.vala +--- midori-0.5.11.orig/extensions/notes.vala 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11/extensions/notes.vala 2017-09-30 01:09:14.703911034 +0200 +@@ -116,7 +116,7 @@ + if (current_note == note) { + current_note = null; + } +- notes_list_store.remove (iter); ++ notes_list_store.remove (ref iter); + break; + } + } while (notes_list_store.iter_next (ref iter)); +diff -ur midori-0.5.11.orig/extensions/transfers.vala midori-0.5.11/extensions/transfers.vala +--- midori-0.5.11.orig/extensions/transfers.vala 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11/extensions/transfers.vala 2017-09-30 01:05:00.916933075 +0200 +@@ -275,7 +275,7 @@ + Transfer found; + store.get (iter, 0, out found); + if (transfer == found) { +- store.remove (iter); ++ store.remove (ref iter); + break; + } + } while (store.iter_next (ref iter)); +@@ -455,7 +455,7 @@ + if (notifications.length () == 1) + msg = _("The file '%s' has been downloaded.").printf (filename); + else +- msg = _("'%s' and %d other files have been downloaded.").printf (filename, notifications.length ()); ++ msg = _("'%s' and %d other files have been downloaded.").printf (filename, (int) notifications.length ()); + get_app ().send_notification (_("Transfer completed"), msg); + notifications = new GLib.List (); + } +diff -ur midori-0.5.11.orig/midori/midori-notebook.vala midori-0.5.11/midori/midori-notebook.vala +--- midori-0.5.11.orig/midori/midori-notebook.vala 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11/midori/midori-notebook.vala 2017-09-30 00:49:47.947012362 +0200 +@@ -10,7 +10,7 @@ + */ + + namespace Midori { +- protected class Tally : Gtk.EventBox { ++ internal class Tally : Gtk.EventBox { + public Midori.Tab tab { get; set; } + Gtk.Spinner spinner; + public Gtk.Label label; +@@ -22,7 +22,7 @@ + public bool close_button_left { get; set; default = false; } + public bool close_button_visible { get; set; default = false; } + +- protected Tally (Midori.Tab tab) { ++ internal Tally (Midori.Tab tab) { + this.tab = tab; + box = new Gtk.HBox (false, 1); + add (box); +@@ -155,7 +155,7 @@ + int last_tab_size = 0; + + #if !HAVE_GTK3 +- static const string style_fixup = """ ++ const string style_fixup = """ + style "midori-close-button-style" + { + GtkWidget::focus-padding = 0 diff --git a/www-client/midori/midori-0.5.11-r2.ebuild b/www-client/midori/midori-0.5.11-r2.ebuild index 84149ddb07ec..6b7ef90da648 100644 --- a/www-client/midori/midori-0.5.11-r2.ebuild +++ b/www-client/midori/midori-0.5.11-r2.ebuild @@ -6,7 +6,9 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='threads(+)' -inherit gnome2 pax-utils python-any-r1 cmake-utils vala +VALA_MAX_API_VERSION=0.34 + +inherit cmake-utils gnome2-utils pax-utils python-any-r1 vala virtualx xdg-utils DESCRIPTION="A lightweight web browser based on WebKitGTK+" HOMEPAGE="http://www.midori-browser.org/" @@ -25,10 +27,12 @@ RDEPEND=" dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4 >=x11-libs/libnotify-0.7 - xscreensaver? ( x11-libs/libXScrnSaver ) >=x11-libs/gtk+-3.10.0:3 >=net-libs/webkit-gtk-2.3.91:4[jit=] granite? ( >=dev-libs/granite-0.2 ) + xscreensaver? ( + x11-libs/libX11 + x11-libs/libXScrnSaver ) " DEPEND="${RDEPEND} ${PYTHON_DEPS} @@ -47,7 +51,6 @@ src_prepare() { eapply "${FILESDIR}"/${P}-libsoup.patch #587448 cmake-utils_src_prepare - gnome2_src_prepare vala_src_prepare sed -i -e '/^install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die } @@ -59,15 +62,27 @@ src_configure() { -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} -DUSE_APIDOCS="$(usex doc)" -DUSE_GRANITE="$(usex granite)" - -DUSE_XSCREENSAVER="$(usex xscreensaver)" + -DUSE_ZEITGEIST=OFF -DVALA_EXECUTABLE="${VALAC}" -DUSE_GTK3=ON -DHALF_BRO_INCOM_WEBKIT2=ON - ) + ) + + use xscreensaver || mycmakeargs+=( -DXSS=XSS-NOTFOUND ) cmake-utils_src_configure } -src_install() { - cmake-utils_src_install +src_test() { + virtx cmake-utils_src_test +} + +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/midori/midori-0.5.11-r3.ebuild b/www-client/midori/midori-0.5.11-r3.ebuild new file mode 100644 index 000000000000..f7bfd147bf80 --- /dev/null +++ b/www-client/midori/midori-0.5.11-r3.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE='threads(+)' + +VALA_MIN_API_VERSION=0.36 + +inherit cmake-utils gnome2-utils pax-utils python-any-r1 vala virtualx xdg-utils + +DESCRIPTION="A lightweight web browser based on WebKitGTK+" +HOMEPAGE="http://www.midori-browser.org/" +SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2" + +KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd" + +LICENSE="LGPL-2.1 MIT" +SLOT="0" +IUSE="doc granite xscreensaver +jit" + +RDEPEND=" + >=app-crypt/gcr-3:=[gtk] + >=dev-db/sqlite-3.6.19:3 + >=dev-libs/glib-2.32.3:2 + dev-libs/libxml2 + >=net-libs/libsoup-2.38:2.4 + >=x11-libs/libnotify-0.7 + >=x11-libs/gtk+-3.10.0:3 + >=net-libs/webkit-gtk-2.3.91:4[jit=] + granite? ( >=dev-libs/granite-0.2 ) + xscreensaver? ( + x11-libs/libX11 + x11-libs/libXScrnSaver ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + $(vala_depend) + dev-util/intltool + gnome-base/librsvg + sys-devel/gettext + doc? ( dev-util/gtk-doc ) +" + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + eapply "${FILESDIR}"/${P}-libsoup.patch #587448 + eapply "${FILESDIR}"/${P}-vala-0.35.patch #628108 + + cmake-utils_src_prepare + vala_src_prepare + sed -i -e '/^install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die +} + +src_configure() { + strip-linguas -i po + + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DUSE_APIDOCS="$(usex doc)" + -DUSE_GRANITE="$(usex granite)" + -DUSE_ZEITGEIST=OFF + -DVALA_EXECUTABLE="${VALAC}" + -DUSE_GTK3=ON + -DHALF_BRO_INCOM_WEBKIT2=ON + ) + + use xscreensaver || mycmakeargs+=( -DXSS=XSS-NOTFOUND ) + + cmake-utils_src_configure +} + +src_test() { + virtx cmake-utils_src_test +} + +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/Manifest b/www-client/vivaldi/Manifest index e462699eeb5e..4daff8ef6a9a 100644 --- a/www-client/vivaldi/Manifest +++ b/www-client/vivaldi/Manifest @@ -2,5 +2,9 @@ AUX vivaldi-1.14.1077.45_p1-libffmpeg.patch 567 BLAKE2B b26ad49c8d4336e572ca4fc4 DIST vivaldi-1.15.1147.36_p1-amd64.deb 52848048 BLAKE2B ab10837423cd6c0f300bccc482c118da054e81504d072b2eda08fb366bb4a11226a44c432d23ca619b702315c879fba46b82371cf12d93e9427becd533ea895e SHA512 35ee2d20f7448cd968b22336a9cfc6b12400fba2b4bcb6cadc79e992da8b7cbd6365c98bcb61ae51342479191e38fe7e73c48d8ff2bdb9291824e83f970779b0 DIST vivaldi-1.15.1147.36_p1-armhf.deb 46834630 BLAKE2B bb62b63dce82e397d93300757df025a7c2cb8f62a27a1373157079f581a92afa22340f2a19a9667408565a8e34de4de815bacf1c424ea847e8deb3827ecd4931 SHA512 74592afba850aa155f5b58fd4c383d39c5b87a0c7c532f5c52a0504d2437c2663a5fe6a75ab758269e2c5add7eed64db13ac16122c76440660cfa342dab33e2d DIST vivaldi-1.15.1147.36_p1-i386.deb 52483148 BLAKE2B 113b6640373f7e6d0989379e5a20b116a92ea8f7f1e9745ee5a15097b13abd6e1df91bb4a805ac0fef9d0d9d1c578b92cc3c974ed116932eac41d33575366bc3 SHA512 6ba0a2633ba4da5fe96e3d6d754587ffea572f5581cfdec76b4085848f52147fa0a253e023e5dc0e8f824a820a77570ac30a5124f74e34dc2818eee0b1570699 +DIST vivaldi-1.15.1147.42_p1-amd64.deb 52832888 BLAKE2B f978b6a4bc9b7d987da5bb918223f1949cd2e69db123cd39b2a429ad3ebe25c74156243619607c792193c7ff1a60ba63e3efc88e726bf436b92d5c2e044f9251 SHA512 c50e323b38fc885abe2af2768657fa509f3be10ce65921b180025257b8e703d641b65c8ae8c38de059f13b6885b8f9a29fc36c97cd33410abeeb12f528d26c0e +DIST vivaldi-1.15.1147.42_p1-armhf.deb 46821578 BLAKE2B bbd764ade5139578df67d026baf61eda81a24931df531b7f400532d1d472ab1a1d5e69b7d031f63606f7d168d2f7261d3c78e45d88b25abaabee3c91b39e3354 SHA512 f6c27871c4c142f20fbcb23a65890d58472b58139fbf99a1ada47dd51ec2f9ec3134401cd2512c60614bb1b315d00d8f00aa89acd8932a04ff14461df33ce245 +DIST vivaldi-1.15.1147.42_p1-i386.deb 52494812 BLAKE2B 69ed16baf62567465f6fee14f7920203330c1ab7479ac6be7a97c2532f0d52922667cd33bc3ac1eaf061bb47951c4b317b377460b74ca39d25a7e7b49f52322b SHA512 8bbbbea4527a76e7980333ab8077df1b00480213dc6c5e033eece8f5650f61e20e2da31f086e2a2ad734930e6daff167eb28b9f9877d88f17d18f0a6831a555a EBUILD vivaldi-1.15.1147.36_p1.ebuild 2934 BLAKE2B 0e2f38e50554b5d46a75c63226665dadb0286319552ea748104c9518a20a3d13aabc902d94ba3b63ad663204e3ec16eb6dcd73deb70eab4ab5505a505ed34957 SHA512 4d89da50f050174623a36b828e13563995090872905fefa6bf4f6ac6dafb04a9492d4ec3b40eb99bceac7758dd382793b9bcb081ec93d6da433f04922f59c1b1 +EBUILD vivaldi-1.15.1147.42_p1.ebuild 2936 BLAKE2B b03d8c06e0a499c790cb9a53a0b5f472ddc0941f26c35eca3b450502586130fcbdcd9e74c7696fc549bdf3cf6492ce707600ac5ac6ff00acaa4df9a885d48d4d SHA512 290fbb1eab03eaa6678c5d28d02c17a052468679b7ed99e7ad5a9c319c055df05338da6dbba9845ed4091f2eda64231592566fa6a116216287e1db100fea4975 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 diff --git a/www-client/vivaldi/vivaldi-1.15.1147.42_p1.ebuild b/www-client/vivaldi/vivaldi-1.15.1147.42_p1.ebuild new file mode 100644 index 000000000000..9a671c805d00 --- /dev/null +++ b/www-client/vivaldi/vivaldi-1.15.1147.42_p1.ebuild @@ -0,0 +1,127 @@ +# 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/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + 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.1077.45_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 +} -- cgit v1.2.3