From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- dev-util/electron/Manifest | 16 - dev-util/electron/electron-2.0.17-r2.ebuild | 918 ---------------------------- dev-util/electron/files/toolchain/BUILD.gn | 37 -- dev-util/electron/metadata.xml | 21 - 4 files changed, 992 deletions(-) delete mode 100644 dev-util/electron/Manifest delete mode 100644 dev-util/electron/electron-2.0.17-r2.ebuild delete mode 100644 dev-util/electron/files/toolchain/BUILD.gn delete mode 100644 dev-util/electron/metadata.xml (limited to 'dev-util/electron') diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest deleted file mode 100644 index 90aa7167a1cd..000000000000 --- a/dev-util/electron/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -AUX toolchain/BUILD.gn 799 BLAKE2B c1a088f005100fe77846bde9405ff8e68b65ce8798c4f746609575afdcbefe402e8d10ca55ecc195080752db9c48489ec66aaa658045e32337b9fb599b4d9b36 SHA512 8da134d99f050ecdecb06d4ec34287747cd9ee57ccbf6fe334b034812fb95fdee3af8421b10be3ee4f71020ca4029de626cd2770865b1e527bfac966d6d8ea2d -DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee -DIST browserify-14.0.0.tar.gz 1847439 BLAKE2B 50d84f51d8640fa881751339e1d37f04d6ba3ea5aa17222c1e9a29bc805ade5f14ce95bb97fb494e0a1a71e6a5da672566aeb0fbbea4b48d9ad19d20405a0b11 SHA512 fea8219ab2c5b422c15cc8c305a8aa0396f3de46c8d602eb4976af1d2b0a043214f808e3fa8e31cae0ad7c76d9ddc38239d0208911105f9c851efddfaf96b0c7 -DIST chromium-61.0.3163.100.tar.xz 556305252 BLAKE2B 88b9dc05d626ec33c2044cd8bb5a5bd2e36c4ba5c231230b5b6529d62cc100874099d17633ca320a0c668b130797d6b222107d2efcd6f80b5b0b460d378f4454 SHA512 4dfd3a493ceb7c605eeab6f387541273d529e8b935a6104927e34836469aedcfcbb4a1154591585621d5c2e842e68701d32328acba842f840a20498822165f78 -DIST electron-2.0.17.tar.gz 3015019 BLAKE2B 314d155e772492d81ca2b092b9ee264a82feffdfc85c05a4f18e4f9c3b151afb8012bdab2e1edbc8889db0433c04d6124b539ed7cc974dc23a43286c058a19a6 SHA512 8ecf9786b4b77483f1c3b77789a91b997254645343fff9a30cf846715a2eba53f338eb2de2eee2dd1164424c07697ffe3d21931c56f373e70e77f8e0a96bee0a -DIST electron-breakpad-67f738b7adb47dc1e3b272fb99062f4192fa6651.tar.gz 5168487 BLAKE2B 41583e3297c2e8a612720f2087720cb7bc4ebf0aaaf5481029bd65458b26e5e824da283f474cf70d8933f80538e9f6c4b8a5843f27a6448b727ec9f12578b526 SHA512 303d1545dbe8e5fdece0fcd90c2ad09fab24483b176df1491580b9b382a607c0a814681cd58bcb7166b9cfc5af882a2b0d2fcc175d23f747b37c921040b68310 -DIST electron-chromium-breakpad-82f0452e6b687b3c1e14e08d172b2f3fb79ae91a.tar.gz 1141359 BLAKE2B 7145fc178dcb62e9f14123da03e98f5e37c29f3a58799e675b3638eb0694771d1320de8bc70d97daa5c8c21db548efa3aa3c86d2018d6cea95f288b39cae4020 SHA512 4c8353a34061f4e061bb9e23945c0fb7a56f1b9f249b323cd3315cafcecdaca5c1f63940e2334ded03413cf26f5aa4a5bd8f1720fb2ba422a97d70f121d7d3d4 -DIST electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz 378461 BLAKE2B cb194cca884419f1c85524740860db244b06a237428add2cd9afaae8e0fe63ccb266b8e5e44f2125da57d263f167aec6c46c9c3451c5217100d58825f4322ecd SHA512 515797740421d5f80912b33dab2039c35b2ae432a0c4351aa031461ef6c82b7a1775c3d4d41ba6c646f81ba3ddf3bbfcb35b81da1ef88b486a2a67d15f09ec86 -DIST electron-libchromiumcontent-daf9bdcdfdfd6bad258b5e1e48b2e17d06c1a987.tar.gz 168368 BLAKE2B f915cb7e0f6be5f64c3bca64a121c1acf39d0a11cd67c4113d29757f7f44827d5807058c4b29e04c0ae8ab053e42aa66ba3da57b0a9b9bd4c7f22e7f56b91aae SHA512 6d4ca21f463540eec825dfe5075770b341de606c1726ce443b72cdf09c7153e201dbc7c2a4bacdcd926634e9b3795e59b3f1b27f017c7bc0a7507c9a4b6f5ce5 -DIST electron-native-mate-6a3d238b7e1e3742f2bb495336a84021d927a24f.tar.gz 24130 BLAKE2B b807a13d01ccd07a3310d8551cafee69a111bb342ee9e15bc0a20243c6f98638e3f18ddd716389fcabace064d4b98acbe50ff6eed862d8d46d152c8bd6f562b2 SHA512 c9ca33f7f96f52aae132f0e4cbd141fe28cea96b9e2c9fadcac40e3bd09d417469fac2851ad1c49790a4533174df0bec9d5ad45203a1358b3d4a2c0df49903fa -DIST electron-node-51abeb37cad3f2098c0f0fffdff739f4ac2393e8.tar.gz 50344964 BLAKE2B 36f91e8ae7d1ae4e99c44128398589e015224c664c86d3869327a4c433fdf8efdb758d4462ec3d8997399bf6d62cfe63f91ae8ee4886aab7817b1654c94592a2 SHA512 8f31577a4ef836b5535ec69d8a020c06e92c01667a0d4b857fcb6789025a6903d42ba3f9b51fd0828d39e88dd7ba44a07cfb3a59023b04c4f5cb89e1a27874bc -DIST electron-patches-26715595f4fe3658a73adb0d2fb338f62c79e492.tar.gz 115022 BLAKE2B 04f0982d9ac63068fd9e83f53341e43fec8f375d9591777dbcb6612213ecf0473be6d38883cdf0f99fe412f65b494d8765818260ecefd9e77dbd503d5459d9be SHA512 8d05f21d2ab4242cd896f58d1608ccee5ba3b65dae73cacb2261458e2f163e216176276d036cf8fe3375c06a94d08f7a04af79e92eb3d4312d975acd870103d8 -DIST electron-pdf-viewer-a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz 42117 BLAKE2B afd5ca8897ff70cc8d1d51855c6b1cfdf9a6e1ffb667c740f323ef9e4e11ed22ecac7e8c0447dbaa6488e4b11ba4e8606e654f792bb42d0b4c805e7d4a32aab4 SHA512 2db9c756ebff5148c6011775b2740671b7ab6693242400b417893eace648720c51e709bd108d766910f24b543b88c60fd292ba9aa8aa88bff1ea40d43961ad5b -DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2 -EBUILD electron-2.0.17-r2.ebuild 28869 BLAKE2B 439286b89124d39e0cfb659d9ab94274e89f0eae7b464c9c2ee88bbde2e88bbe1666a7f6fe0ca422d3e1733bd45ee1a68a4d45145b04dba3fbf1c356c4417b23 SHA512 ea5ba7d5cfed03d3a7daab12849c5cfe9e891d3b14524c24d70be1f1a771673d37e3ef0288225788821e36eae379db7a11d33239d8b2ac46968121de62d8487a -MISC metadata.xml 1044 BLAKE2B 27a2ca05df19d0ce20ea4840b15666a029b6d1373dc19ca7fad6be5cf8e4f3575c78e2b7e860bbc840834d182d1067cab721b615de2c7b9ed0ad8ff1ba715d19 SHA512 4142fd1aa0d4a9e5d55655cc137fe915f3d56dbda71b680c00b6ab66eab6ebb358949be371fe14c86754a6dae24ce18cfca0f441845998a5e33645fabf418176 diff --git a/dev-util/electron/electron-2.0.17-r2.ebuild b/dev-util/electron/electron-2.0.17-r2.ebuild deleted file mode 100644 index 9f577d4e3046..000000000000 --- a/dev-util/electron/electron-2.0.17-r2.ebuild +++ /dev/null @@ -1,918 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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 eapi7-ver estack gnome2-utils flag-o-matic multilib \ - multiprocessing ninja-utils pax-utils portability python-any-r1 \ - toolchain-funcs virtualx xdg-utils - -# Keep this in sync with vendor/libchromiumcontent/VERSION -CHROMIUM_VERSION="61.0.3163.100" -# Keep this in sync with vendor/breakpad -BREAKPAD_COMMIT="82f0452e6b687b3c1e14e08d172b2f3fb79ae91a" -# Keep this in sync with vendor/breakpad/src (and find the corresponding -# commit in https://github.com/google/breakpad/) -BREAKPAD_SRC_COMMIT="67f738b7adb47dc1e3b272fb99062f4192fa6651" -# Keep this in sync with vendor/node -NODE_COMMIT="51abeb37cad3f2098c0f0fffdff739f4ac2393e8" -# Keep this in sync with vendor/native_mate -NATIVE_MATE_COMMIT="6a3d238b7e1e3742f2bb495336a84021d927a24f" -# Keep this in sync with vendor/pdf_viewer -PDF_VIEWER_COMMIT="a5251e497fb52e699b28f627e3cbb6d8cefb62df" -# Keep this in sync with vendor/pdf_viewer/vendor/grit -GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd" -# Keep this in sync with vendor/libchromiumcontent -LIBCHROMIUMCONTENT_COMMIT="daf9bdcdfdfd6bad258b5e1e48b2e17d06c1a987" -# Keep this in sync with package.json#devDependencies -ASAR_VERSION="0.13.0" -BROWSERIFY_VERSION="14.0.0" -NINJA_VERSION="1.8.2" -GENTOO_PATCHES_VERSION="26715595f4fe3658a73adb0d2fb338f62c79e492" - -PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}" -CHROMIUM_P="chromium-${CHROMIUM_VERSION}" -BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}" -BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}" -NODE_P="node-${NODE_COMMIT}" -NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}" -PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}" -GRIT_P="grit-${GRIT_COMMIT}" -LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}" -ASAR_P="asar-${ASAR_VERSION}" -BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}" - -DESCRIPTION="Cross platform application development framework based on web technologies" -HOMEPAGE="https://electronjs.org/" -SRC_URI=" - https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz - https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/electron/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz - https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_P}.tar.gz - https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz - https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> electron-${NATIVE_MATE_P}.tar.gz - https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz - https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz - https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz - https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz - https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz - https://github.com/elprans/gentoo-electron-patches/archive/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.tar.gz - https://github.com/ninja-build/ninja/archive/v${NINJA_VERSION}.tar.gz -> ninja-${NINJA_VERSION}.tar.gz -" - -S="${WORKDIR}/${P}" -CHROMIUM_S="${S}/chromium" -NODE_S="${S}/vendor/node" -BREAKPAD_S="${S}/vendor/breakpad" -BREAKPAD_SRC_S="${BREAKPAD_S}/src" -NATIVE_MATE_S="${S}/vendor/native_mate" -PDF_VIEWER_S="${S}/vendor/pdf_viewer" -GRIT_S="${PDF_VIEWER_S}/vendor/grit" -LIBCC_S="${S}/vendor/libchromiumcontent" - -LICENSE="BSD" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64" -IUSE="cups custom-cflags gconf gnome-keyring kerberos lto neon pic - +proprietary-codecs pulseaudio selinux +system-ffmpeg +system-libvpx - +system-ssl +tcmalloc" -RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) ) - !test? ( test )" - -# Native Client binaries are compiled with different set of flags, bug #452066. -QA_FLAGS_IGNORED=".*\.nexe" - -# Native Client binaries may be stripped by the build system, which uses the -# right tools for it, bug #469144 . -QA_PRESTRIPPED=".*\.nexe" - -COMMON_DEPEND=" - app-arch/bzip2:= - >=app-eselect/eselect-electron-2.0 - cups? ( >=net-print/cups-1.3.11:= ) - dev-libs/expat:= - dev-libs/glib:2 - >=dev-libs/icu-58:= - dev-libs/libxml2:=[icu] - dev-libs/libxslt:= - dev-libs/nspr:= - >=dev-libs/nss-3.14.3:= - system-ssl? ( =dev-libs/re2-0.2016.05.01:= - gconf? ( >=gnome-base/gconf-2.24.0:= ) - 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.4.2:=[icu(+)] - media-libs/libexif:= - media-libs/libjpeg-turbo:= - media-libs/libpng:= - system-libvpx? ( - =media-libs/libvpx-1.7*:=[postproc,svc] - ) - >=media-libs/openh264-1.6.0:= - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( - >=media-video/ffmpeg-4:= - || ( - media-video/ffmpeg[-samba] - >=net-fs/samba-4.5.10-r1[-debug(-)] - ) - media-libs/opus:= - ) - >=net-dns/c-ares-1.13.0:= - >=net-libs/nghttp2-1.32.0:= - sys-apps/dbus:= - sys-apps/pciutils:= - virtual/udev - x11-libs/cairo:= - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3[X] - x11-libs/libdrm - x11-libs/libnotify:= - 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} - x11-misc/xdg-utils - virtual/opengl - virtual/ttf-fonts - selinux? ( sec-policy/selinux-chromium ) - tcmalloc? ( !=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 - -pre_build_checks() { - if [[ ${MERGE_TYPE} != binary ]]; then - local -x CPP="$(tc-getCXX) -E" - if tc-is-clang && ! ver_test "$(clang-fullversion)" -ge 3.9.1; then - # bugs: #601654 - die "At least clang 3.9.1 is required" - fi - if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; then - # bugs: #535730, #525374, #518668, #600288 - die "At least gcc 4.9 is required" - fi - fi - - # LTO pass requires more file descriptors - if use lto; then - local lto_n_rlimit_min="16384" - local maxfiles=$(ulimit -n -H) - if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then - eerror "" - eerror "Building with USE=\"lto\" requires file descriptor" \ - "limit to be no less than ${lto_n_rlimit_min}." - eerror "The current limit for portage is ${maxfiles}." - eerror "Please add the following to /etc/security/limits.conf:" - eerror "" - eerror " root hard nofile ${lto_n_rlimit_min}" - eerror " root soft nofile ${lto_n_rlimit_min}" - eerror "" - die - fi - fi - - # Check build requirements, bug #541816 and bug #471810 . - CHECKREQS_MEMORY="3G" - use lto && CHECKREQS_MEMORY="7G" - CHECKREQS_DISK_BUILD="5G" - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - CHECKREQS_DISK_BUILD="25G" - CHECKREQS_MEMORY="16G" - fi - eshopts_pop - check-reqs_pkg_pretend -} - -pkg_pretend() { - pre_build_checks -} - -pkg_setup() { - pre_build_checks - - # Make sure the build system will use the right python, bug #344367. - python-any-r1_pkg_setup - - chromium_suid_sandbox_check_kernel_config -} - -_unnest_patches() { - local _s="${1%/}/" - local path - local relpath - local out - - (find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \ - | while read -r path; do - relpath="$(dirname ${path})" - out="${_s}/__${relpath////_}_$(basename ${path})" - sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \ - "${_s}/${path}" > "${out}" || die - done -} - -_get_install_suffix() { - local c=(${SLOT//\// }) - local slot=${c[0]} - local suffix - - if [[ "${slot}" == "0" ]]; then - suffix="" - else - suffix="-${slot}" - fi - - echo -n "${suffix}" -} - -_get_install_dir() { - echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)" -} - -_get_target_arch() { - local myarch="$(tc-arch)" - local target_arch - - if [[ $myarch = amd64 ]] ; then - target_arch=x64 - elif [[ $myarch = x86 ]] ; then - target_arch=ia32 - elif [[ $myarch = arm64 ]] ; then - target_arch=arm64 - elif [[ $myarch = arm ]] ; then - target_arch=arm - else - die "Failed to determine target arch, got '$myarch'." - fi - - echo -n "${target_arch}" -} - -src_prepare() { - mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die - rm -r "${NODE_S}" && - mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die - rm -r "${BREAKPAD_S}" && - mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die - rm -r "${BREAKPAD_SRC_S}" && - mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die - rm -r "${NATIVE_MATE_S}" && - mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die - rm -r "${PDF_VIEWER_S}" && - mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die - rm -r "${GRIT_S}" && - mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die - rm -r "${LIBCC_S}" && - mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die - rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \ - "${S}/node_modules/" || die - rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \ - "${S}/node_modules/" || die - - # node patches - cd "${NODE_S}" || die - # make sure node uses the correct version of v8 - rm -r deps/v8 || die - ln -s "${CHROMIUM_S}/v8" deps/ || die - - # make sure we use python2.* while using gyp - sed -i -e "s/python/${EPYTHON}/" \ - deps/npm/node_modules/node-gyp/gyp/gyp || die - sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" \ - deps/npm/node_modules/node-gyp/lib/configure.js || die - - python_fix_shebang "${CHROMIUM_S}/chrome/browser" - python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium" - python_fix_shebang "${S}/tools/" - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen - # https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die - sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die - - # Apply Gentoo patches for Electron itself. - cd "${S}" || die - _unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}/electron/" - eapply "${WORKDIR}/${PATCHES_P}/${PV}/electron/" - - # Apply Chromium patches from libchromiumcontent. - cd "${CHROMIUM_S}" || die - _unnest_patches "${LIBCC_S}/patches" - eapply "${LIBCC_S}/patches" - - # Finally, apply Gentoo patches for Chromium. - eapply "${WORKDIR}/${PATCHES_P}/${PV}/chromium/" - - # Merge chromiumcontent component into chromium source tree. - mkdir -p "${CHROMIUM_S}/chromiumcontent" || die - cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die - cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || 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 - breakpad/src/third_party/curl - 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/murmurhash - third_party/angle/src/third_party/compiler - third_party/angle/src/third_party/libXNVCtrl - third_party/angle/src/third_party/trace_event - third_party/boringssl - third_party/brotli - third_party/cacheinvalidation - third_party/catapult - third_party/catapult/third_party/polymer - third_party/catapult/third_party/py_vulcanize - third_party/catapult/third_party/py_vulcanize/third_party/rcssmin - third_party/catapult/third_party/py_vulcanize/third_party/rjsmin - 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/ced - third_party/cld_2 - third_party/cld_3 - 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/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/lss - third_party/lzma_sdk - third_party/markupsafe - third_party/mesa - third_party/modp_b64 - third_party/mt19937ar - third_party/node - third_party/node/node_modules/vulcanize/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/lcms2-2.6 - 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/sfntly - third_party/skia - 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/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-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 - - cd "${CHROMIUM_S}" || die - - # Remove most bundled libraries. Some are still needed. - ebegin "Unbundling libraries" - build/linux/unbundle/remove_bundled_libraries.py \ - "${keeplibs[@]}" --do-remove || die - eend - - cd "${S}" || die - - eapply_user -} - -src_configure() { - local myconf_gn="" - local myconf_gyp="" - - cd "${CHROMIUM_S}" || die - - # GN needs explicit config for Debug/Release as opposed to - # inferring it from build directory. - myconf_gn+=" is_debug=false" - - # Disable nacl, we can't build without pnacl (http://crbug.com/269560). - myconf_gn+=" enable_nacl=false" - - # Use system-provided libraries. - # 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: xml (bug #616818). - # TODO: use_system_protobuf (bug #525560). - # TODO: use_system_sqlite (http://crbug.com/22208). - - # libevent: https://bugs.gentoo.org/593458 - local gn_system_libraries=( - flac - harfbuzz-ng - icu - libdrm - libjpeg - libpng - libvpx - libwebp - libxml - libxslt - openh264 - re2 - snappy - yasm - zlib) - if use system-ffmpeg; then - gn_system_libraries+=( libvpx ffmpeg opus ) - fi - if use system-libvpx; then - gn_system_libraries+=( libvpx ) - fi - build/linux/unbundle/replace_gn_files.py \ - --system-libraries ${gn_system_libraries[@]} || die - - # Optional dependencies. - myconf_gn+=" use_cups=$(usex cups true false)" - myconf_gn+=" use_gconf=$(usex gconf 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" - - if tc-is-clang; then - myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false" - else - myconf_gn+=" is_clang=false" - fi - - # 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" - myconf_gn+=" linux_use_bundled_binutils=false use_custom_libcxx=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 target_arch=$(_get_target_arch) - local ffmpeg_target_arch="${target_arch}" - - if [[ ${ffmpeg_target_arch} = arm ]]; then - ffmpeg_target_arch=$(usex neon arm-neon arm) - 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 - - filter-flags "-Wl,--as-needed" - - # 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 - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX NM - - # Define a custom toolchain for GN - myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\"" - - if tc-is-cross-compiler; then - tc-export BUILD_{AR,CC,CXX,NM} - myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:host\"" - myconf_gn+=" v8_snapshot_toolchain=\"${FILESDIR}/toolchain:host\"" - else - myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:default\"" - fi - - # https://bugs.gentoo.org/588596 - append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) - - myconf_gn+=" icu_use_data_file=false" - - use lto && myconf_gn+=" allow_posix_link_time_opt=true" - - # Tools for building programs to be executed on the build system, bug #410883. - if tc-is-cross-compiler; then - export AR_host=$(tc-getBUILD_AR) - export CC_host=$(tc-getBUILD_CC) - export CXX_host=$(tc-getBUILD_CXX) - export NM_host=$(tc-getBUILD_NM) - fi - - # 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 - - third_party/libaddressinput/chromium/tools/update-strings.py || die - - touch chrome/test/data/webui/i18n_process_css_test.html || die - - einfo "Configuring bundled nodejs..." - pushd "${S}/vendor/node" > /dev/null || die - # --shared-libuv cannot be used as electron's node fork - # patches uv_loop structure. - ./configure --shared --without-bundled-v8 \ - $(usex system-ssl '--shared-openssl' '' ) \ - --shared-http-parser --shared-zlib \ - --shared-nghttp2 --shared-cares \ - --without-npm --with-intl=system-icu --without-dtrace \ - --dest-cpu=${target_arch} --prefix="" || die - popd > /dev/null || die - - # libchromiumcontent configuration - myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]" - myconf_gn+=" is_electron_build = true" - myconf_gn+=" is_component_build = false" - myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" - - einfo "Configuring chromiumcontent..." - set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release - echo "$@" - "$@" || die - - cd "${S}" || die -} - -eninja() { - if [[ -z ${NINJAOPTS+set} ]]; then - local jobs=$(makeopts_jobs) - local loadavg=$(makeopts_loadavg) - - if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then - NINJAOPTS+=" -j ${jobs}" - fi - if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then - NINJAOPTS+=" -l ${loadavg}" - fi - fi - set -- ninja -v ${NINJAOPTS} "$@" - echo "$@" - "$@" || die -} - -src_compile() { - local compile_target="${S}/out/R" - local myconf_gyp="" - local chromium_target="${CHROMIUM_S}/out/Release" - local libcc_path="${S}/vendor/libchromiumcontent" - local libcc_dist_path="${libcc_path}/dist/main" - local libcc_dist_static_path="${libcc_dist_path}/static_library" - local libcc_dist_shared_path="${libcc_dist_path}/shared_library" - local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent" - local libcc_output_shared="${libcc_output}-shared" - local target_arch=$(_get_target_arch) - local l="" - local create_dist_args="" - - tc-export AR CC CXX NM - - mkdir -p "${compile_target}" || die - - cd "${CHROMIUM_S}" || die - - # Build mksnapshot and pax-mark it. - eninja -C "${chromium_target}" mksnapshot || die - pax-mark m "${chromium_target}/mksnapshot" - cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die - - # Build chromedriver. - eninja -C "${chromium_target}" chromedriver - cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die - - # Build libchromiumcontent components. - eninja -C "${chromium_target}" chromiumcontent:chromiumcontent - CHROMIUMCONTENT_2ND_PASS=1 \ - eninja -C "${chromium_target}" chromiumcontent:libs - - cd "${S}" || die - - # Gather and prepare built components of libchromiumcontent. - create_dist_args+=" --target_arch=${target_arch} --component=static_library" - create_dist_args+=" --no_zip" - create_dist_args+=" --system-icu" - CHROMIUM_BUILD_DIR="${chromium_target}" \ - PYTHONPATH="${WORKDIR}/ninja-${NINJA_VERSION}/misc" \ - "${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die - - # v8 is built as a shared library, so copy it manually - # for generate_filenames_gypi to find. - mkdir -p "${libcc_dist_shared_path}" || die - cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die - - "${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \ - "${libcc_dist_path}/filenames.gypi" \ - "${CHROMIUM_S}" \ - "${libcc_dist_shared_path}" \ - "${libcc_dist_static_path}" - - # Configure electron. - myconf_gyp+=" - $(gyp_use cups) - $(gyp_use gconf use_gconf) - $(gyp_use gnome-keyring use_gnome_keyring) - $(gyp_use gnome-keyring linux_link_gnome_keyring) - $(gyp_use lto)" - - myconf_gyp+=" -Duse_system_icu=1" - - if [[ $(tc-getCC) == *clang* ]]; then - myconf_gyp+=" -Dclang=1" - else - myconf_gyp+=" -Dclang=0" - fi - - # Never use bundled gold binary. Disable gold linker flags for now. - # Do not use bundled clang. - myconf_gyp+=" - -Dclang_use_chrome_plugins=0 - -Dhost_clang=0 - -Dlinux_use_bundled_binutils=0 - -Dlinux_use_bundled_gold=0 - -Dlinux_use_gold_flags=0 - -Dsysroot=" - - myconf_gyp+=" -Dtarget_arch=${target_arch}" - myconf_gyp+=" -Dpython=${EPYTHON}" - - # 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_gyp+=" -Dwerror=" - - # Disable fatal linker warnings, bug 506268. - myconf_gyp+=" -Ddisable_fatal_linker_warnings=1" - - myconf_gyp+=" -Dicu_use_data_file_flag=0" - myconf_gyp+=" -Dgenerate_character_data=0" - - myconf_gyp+=" -Dmas_build=0" - myconf_gyp+=" -Dlibchromiumcontent_component=0" - myconf_gyp+=" -Dcomponent=static_library" - myconf_gyp+=" -Dlibrary=static_library" - myconf_gyp+=" -Icommon.gypi electron.gyp" - - EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \ - egyp_chromium ${myconf_gyp} || die - - mkdir -p "${compile_target}/lib/" || die - # Copy libv8 and snapshot files so the node binary can find them. - cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die - cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die - cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die - - # Copy generated shim headers. - mkdir -p "${compile_target}/gen" || die - cp -r "${chromium_target}/gen/shim_headers" \ - "${compile_target}/gen" || die - - # Build the Node binary and pax-mark it. - eninja -C ${compile_target} nodebin - pax-mark m ${compile_target}/nodebin - - # Finally, build Electron. - eninja -C ${compile_target} electron - pax-mark m ${compile_target}/electron - - echo "v${PV}" > ${compile_target}/version -} - -src_install() { - local install_dir="$(_get_install_dir)" - local install_suffix="$(_get_install_suffix)" - local LIBDIR="${ED}/usr/$(get_libdir)" - - pushd out/R/locales > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - # Install Electron - insinto "${install_dir}" - exeinto "${install_dir}" - newexe out/R/nodebin node - doexe out/R/electron - doexe out/R/chromedriver - doexe out/R/mksnapshot - doins out/R/libv8.so - fperms +x "${install_dir}/libv8.so" - doins out/R/libnode.so - fperms +x "${install_dir}/libnode.so" - doins out/R/natives_blob.bin - doins out/R/snapshot_blob.bin - doins out/R/blink_image_resources_200_percent.pak - doins out/R/content_resources_200_percent.pak - doins out/R/content_shell.pak - doins out/R/pdf_viewer_resources.pak - doins out/R/ui_resources_200_percent.pak - doins out/R/views_resources_200_percent.pak - doins -r out/R/resources - doins -r out/R/locales - dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}" - - doins out/R/version - - # Install Node headers - HEADERS_ONLY=1 \ - "${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die - # set up a symlink structure that npm expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - dodir "/usr/include/electron${install_suffix}" - mv "${ED}/usr/include/node" \ - "${ED}/usr/include/electron${install_suffix}/node" || die -} - -pkg_postinst() { - electron-config update -} - -pkg_postrm() { - electron-config update -} diff --git a/dev-util/electron/files/toolchain/BUILD.gn b/dev-util/electron/files/toolchain/BUILD.gn deleted file mode 100644 index f88d3afdcfda..000000000000 --- a/dev-util/electron/files/toolchain/BUILD.gn +++ /dev/null @@ -1,37 +0,0 @@ -import("//build/toolchain/gcc_toolchain.gni") - -gcc_toolchain("default") { - cc = getenv("CC") - cxx = getenv("CXX") - ar = getenv("AR") - nm = getenv("NM") - ld = cxx - - extra_cflags = getenv("CFLAGS") - extra_cppflags = getenv("CPPFLAGS") - extra_cxxflags = getenv("CXXFLAGS") - extra_ldflags = getenv("LDFLAGS") - - toolchain_args = { - current_cpu = current_cpu - current_os = current_os - } -} - -gcc_toolchain("host") { - cc = getenv("BUILD_CC") - cxx = getenv("BUILD_CXX") - ar = getenv("BUILD_AR") - nm = getenv("BUILD_NM") - ld = cxx - - extra_cflags = getenv("BUILD_CFLAGS") - extra_cppflags = getenv("BUILD_CPPFLAGS") - extra_cxxflags = getenv("BUILD_CXXFLAGS") - extra_ldflags = getenv("BUILD_LDFLAGS") - - toolchain_args = { - current_cpu = current_cpu - current_os = current_os - } -} diff --git a/dev-util/electron/metadata.xml b/dev-util/electron/metadata.xml deleted file mode 100644 index 382b50dd07db..000000000000 --- a/dev-util/electron/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - Use gnome-base/gconf - Build with link time optimization enabled - Disable optimized assembly code that is not PIC friendly - Enable proprietary codecs like H.264, MP3 - Use system ffmpeg instead of the bundled one - Use system libvpx instead of the bundled one - Use system OpenSSL instead of the bundled one - Use bundled tcmalloc instead of system malloc - - - elprans/asar - elprans/gentoo-electron-patches - elprans/grit - elprans/node-browserify - - -- cgit v1.2.3