diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
| commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
| tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /dev-util/electron | |
| parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) | |
gentoo resync : 28.04.2019
Diffstat (limited to 'dev-util/electron')
| -rw-r--r-- | dev-util/electron/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/electron/electron-2.0.17-r1.ebuild (renamed from dev-util/electron/electron-2.0.17.ebuild) | 8 | ||||
| -rw-r--r-- | dev-util/electron/metadata.xml | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest index b21aadec67b8..04673a6a47e3 100644 --- a/dev-util/electron/Manifest +++ b/dev-util/electron/Manifest @@ -34,5 +34,5 @@ DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752ad EBUILD electron-1.6.18.ebuild 28186 BLAKE2B 746db1980065510845990dc5c426982f6de9ddd9c74f42503c91b84a04835550243eaa21804408068b143d0295a5bddf23457d811f836ad072d74e792018201e SHA512 0ea10454ec86607f2413d77af97ee9f8152b7f66792a7766723a4453f2c5b629e4d19ee3c57fb900dec888560b458493c3904d25c8cab9c7c32fa65add7e159c EBUILD electron-1.7.16.ebuild 28059 BLAKE2B 027bd8197783c279780f947483a95188609f5a8f138406e64eda10e033ede8b58939fad212a2a2bc24e2bdd4444645ab76c63cd89f513ff66fce6d5f2d6f98e1 SHA512 e9856a634e9cdf320e64296830db12968cafd2f22186b1f2d5d0d18f05998ff5ce2c0dd0775d83ee1af76c2586dec2c79989b41e5c8028f5090581df3db99adb EBUILD electron-2.0.10.ebuild 28636 BLAKE2B 9a1b85fe418e8088ba605bdd223d1c812cd9b77061f9b0ef0dd39a589f68fb65126f407256e6221763408b6eff0017410a27f04a4bd30bba3f8b69e060f65541 SHA512 a92a1178b6200236cf5d68a020ef3a6e54eb839b9077260163e5459237e5f0b3d9aa465fb6e6ce027667d740c7a855d4ea7708d05b38f6575058d0910fe2d584 -EBUILD electron-2.0.17.ebuild 28659 BLAKE2B e7d407b061a4c04c463ed6e9ad3f7742eccdce4cacf79956b0fec9b15623caa3555a8a194da5b60a02bb0dd0113ce0c195db0cae6225c1b66fa1e132869597d6 SHA512 76d8c0c1f3bf65501a487124cd203e7f6a9f83f45915465ed5add5c4291f35ec4f0a7915c0b039f3ef8c517a6e233afa15735dcaa1e322464f4b5294e0a09748 -MISC metadata.xml 1282 BLAKE2B 4d0e7a5542b8cab7a0124a12d74dea42fedf4404414225982d4868a1f806d7343907ea58658936ffb18c725ecbf9c809df7ce8fc41a78635989b13303978c2e8 SHA512 cf2da95e18f98bfb5282d6c330e57d973c592af000738e28cefabaa45154e5cf0f844bebbf745d70c2611c608ff14db1280e6fa783249d2edfba272faefcc760 +EBUILD electron-2.0.17-r1.ebuild 28664 BLAKE2B d4bcca9e6b9653681bed01a701e9a0dce2a63e83a70dea868e93c7fb25a575faa8e0a73d31ec97883d588f2fdff5a6eacdb52ca8fe6850e2e68db695ddca8825 SHA512 4617ad52c1df75835dd66a5f0d1d89eaa193b2788cf136073739ccca1056ac8d274805ffc404b4147fec28e052147d3163545aa17e11f48ed022b0f259515b2d +MISC metadata.xml 1361 BLAKE2B 58a37a5943813a7a526f98309ab79ba0c5148323a2b7a02aceee65282b1ab34d8451ed0e2e41110187014051bcbe33d2ecfc559490e51a66c047cd512c11295a SHA512 f2a2cb8e1093c5a5ac01a64f0213132213aa92307877c0b32e1946c513c7715b04d8a910f847c835533909dac9f52c11cb30e9793248dacc4965ea273bc8f732 diff --git a/dev-util/electron/electron-2.0.17.ebuild b/dev-util/electron/electron-2.0.17-r1.ebuild index 1e3871596b70..1671cd90af50 100644 --- a/dev-util/electron/electron-2.0.17.ebuild +++ b/dev-util/electron/electron-2.0.17-r1.ebuild @@ -79,7 +79,7 @@ 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 +tcmalloc" + +proprietary-codecs pulseaudio selinux +system-ffmpeg +system-ssl +tcmalloc" RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" # Native Client binaries are compiled with different set of flags, bug #452066. @@ -100,7 +100,7 @@ COMMON_DEPEND=" dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= - <dev-libs/openssl-1.1:0= + system-ssl? ( <dev-libs/openssl-1.1:0= ) >=dev-libs/re2-0.2016.05.01:= gconf? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) @@ -533,7 +533,6 @@ src_configure() { # TODO: use_system_libsrtp (bug #459932). # TODO: xml (bug #616818). # 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 @@ -688,7 +687,8 @@ src_configure() { # --shared-libuv cannot be used as electron's node fork # patches uv_loop structure. ./configure --shared --without-bundled-v8 \ - --shared-openssl --shared-http-parser --shared-zlib \ + $(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 diff --git a/dev-util/electron/metadata.xml b/dev-util/electron/metadata.xml index b401858fffc6..c291dd2197e5 100644 --- a/dev-util/electron/metadata.xml +++ b/dev-util/electron/metadata.xml @@ -17,6 +17,7 @@ <flag name="pic">Disable optimized assembly code that is not PIC friendly</flag> <flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag> <flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag> + <flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag> <flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag> </use> <upstream> |