diff options
Diffstat (limited to 'net-im/zoom')
-rw-r--r-- | net-im/zoom/Manifest | 9 | ||||
-rw-r--r-- | net-im/zoom/files/zoom-videocam.svg | 4 | ||||
-rw-r--r-- | net-im/zoom/files/zoom-videocam.xpm | 32 | ||||
-rw-r--r-- | net-im/zoom/zoom-5.4.53391.1108-r1.ebuild (renamed from net-im/zoom/zoom-5.4.53391.1108.ebuild) | 35 | ||||
-rw-r--r-- | net-im/zoom/zoom-5.4.54779.1115-r3.ebuild | 142 | ||||
-rw-r--r-- | net-im/zoom/zoom-5.4.57450.1220.ebuild (renamed from net-im/zoom/zoom-5.4.56259.1207.ebuild) | 20 |
6 files changed, 38 insertions, 204 deletions
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest index 03785ecf9889..e8c3c1fa4a83 100644 --- a/net-im/zoom/Manifest +++ b/net-im/zoom/Manifest @@ -1,12 +1,9 @@ AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e -AUX zoom-videocam.svg 284 BLAKE2B fa118d489cafa1c14841c27ab4962c41d52987ee49b8ad0fb3e4c33d7cf376920e16a8f7358807d0809231fbf7ef8cafd4752ac90e85cc7395a56fbe07f6340d SHA512 a60345de0c86003dc49484fd5d3d22e3228b8b1c107796690289a7779769436809dd22b02b4951df2fc1e3a98c541dec4b0788ab7d112b2b9c8c29a46493a98d -AUX zoom-videocam.xpm 806 BLAKE2B dcb9d7e2a90f564ed6b7f0b733efb72867ecf2418177b25ecd5a00e204ab9f0f89c2b1f3b3078b3cf326c8c523480f183170a82d896b73848e7596b32a351a9b SHA512 a49e7cce25e6b3a1492b2ed834f7fe8f533b5374b0c4eea4089003459ac011ef264175c5c2322cceb77f8fb67e939e90e9abddeef415d2f570add8301cd10a48 DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba -DIST zoom-5.4.54779.1115_x86_64.tar.xz 45216096 BLAKE2B a65c7db96ac0ea5a99b6edba0145d766395ebd67402f28ee276e1a2ed87ca9c9c01bedef12eb4d99a6525f0ec0698de1471c3ca620e32ec29ada5b8edd55416c SHA512 e859060592dc110ccb42760fff54f632b079124ff2b8988e55dfd27d70b132b035d6b0ef8eec83b7d90ddf56a6e675dac4d04c29bec9faab377db4926fb2462d DIST zoom-5.4.56259.1207_x86_64.tar.xz 46333580 BLAKE2B e3603db12af4ecc88eee88715976d6944cf566f6c1afa35a36840ceba49da85d21cdf4c04216b76d30b700b07a098aea48b7f61c48ee3836168323adede5789f SHA512 b7567f8e01486dfe31118da9c6168be70ea0b6dc21ea07972d39a3ced360068ff2e7423663e74fb65387be18fa2a1bca7ebd2599c49b3c064872ae9d82266192 -EBUILD zoom-5.4.53391.1108.ebuild 2907 BLAKE2B 2ffd91cf8d742abf204d28736f2a63d3de3c370f465bdae217abb3a105fc7119d48e885f00c60bfc3303d4a4b3f678f2d406638c9dcd6b97db11840b5ec3b5e0 SHA512 5342ac23469035178db2ff8bb889f056ea7274929951c54c5e3700e8da8b1c8de96e7f6ea5478ebdfd57ee6134ea799c270c453165ee71c3d83903dcdc86bf53 -EBUILD zoom-5.4.54779.1115-r3.ebuild 4223 BLAKE2B e94321407cbb564771a8e739dd9fb80c6cb4cf206573ba2f4dff4280b659ad5996b21299490491c637ded79d2096242110ba429845c67b8f35e18bb3597e2a40 SHA512 1d4778df513c9be49862013123d7ac7fde014d7517ad40ab843c5c5692c7090a61261ab526e2ee3808fad655b371e8dd7b1898fcf54461337f85d67384c45807 +DIST zoom-5.4.57450.1220_x86_64.tar.xz 45788732 BLAKE2B 932187da18c52baeaba90114b7d7115bb973787fe690f94482d53527fbd4ded327eecee6d3097831a5e3c164c79b46dcb32ee3a28223f8b1543e166ea282d44f SHA512 cf8581f175518fdc83c6780bd6a1154d58db1c012bcaf14228e32d839532e741d8eaae4883f7905d181b7d2f0c1e2efe125377dd85eb5ebb742cc5252bbc4b54 +EBUILD zoom-5.4.53391.1108-r1.ebuild 3277 BLAKE2B 87dc8b01f6e9a1fa22800213151a90d05b0363d2bd1e8b50fc824d155646f4ef20c06b9ae74e128e35b9aebdce56e3a39d59096eda2867d4ce3df8b528c32ce2 SHA512 31bc281c49f9b5c6c9f8cfb03033fb759a5819240846c748386d66fa38c15b460ece32dab65992717bfaa979be661b8d799634dbebc855b0ae75524b82a655ca EBUILD zoom-5.4.56259.1207-r2.ebuild 4224 BLAKE2B 03e5a160745625da2ffc3afd9db10de7609ebbdce30c1854506d3e0c28f9db4b7100691d3cbdb5ea6e3bd1aa94efa7ddca6c11c4e57301babb1c584ea3ae16d1 SHA512 b1a937c3aaee6ad41cda81b7420882c365d2e0d9eeff18f28ea0ad60969d70b7836bab2e9e26b209c6fd7162b0c65b989f792ea4074acaace87ff7ea39a9d8b3 -EBUILD zoom-5.4.56259.1207.ebuild 4189 BLAKE2B f8cb9b6ec524189be00e26255ee2f0eaee57789a6a57793cedc102eaa6f60eaca4050166c9a6e29be35f724e2e3e073f2fb1e0f6554f34605e0d1d6d388191cd SHA512 bf3860669388a4abd3df240b06b1411312243f0ea34a8d657c89cfcefb22588dfccf128e839f8802fc622e569a452e977f6eb85aaac6a1fbe5d80f51ccd13c47 +EBUILD zoom-5.4.57450.1220.ebuild 4216 BLAKE2B 5686d389e8001afb71e2ba8768d6b30be62663c7eb231dea7e782e40294d6e7205a93af23dc2427a5646c9312ffacd41a63063c44263e9aa6bf1f13ab001db75 SHA512 f48332855183836ff75dd0a14eb6b8468e1130131048c0f26392453d86615246e2cc313fc2ea4a3dea4d1692095e66351f90804ccd628f56bebdea06766d3127 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425 diff --git a/net-im/zoom/files/zoom-videocam.svg b/net-im/zoom/files/zoom-videocam.svg deleted file mode 100644 index 33e4ac77b9fb..000000000000 --- a/net-im/zoom/files/zoom-videocam.svg +++ /dev/null @@ -1,4 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"> - <rect width="24" height="24" rx="6" ry="6" fill="#2d8cff"/> - <path d="M17 10.5V7c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-3.5l4 4v-11l-4 4z" fill="#ffffff"/> -</svg> diff --git a/net-im/zoom/files/zoom-videocam.xpm b/net-im/zoom/files/zoom-videocam.xpm deleted file mode 100644 index 380e86f2cc27..000000000000 --- a/net-im/zoom/files/zoom-videocam.xpm +++ /dev/null @@ -1,32 +0,0 @@ -/* XPM */ -static char * zoom_videocam_xpm[] = { -"24 24 5 1", -" c None", -". c #2D8CFF", -"+ c #469AFF", -"@ c #E3F0FF", -"# c #FFFFFF", -" ................ ", -" .................... ", -" ...................... ", -" ...................... ", -"........................", -"........................", -"...##############...+...", -"...##############..+@...", -"...##############.+@#...", -"...##############+@##...", -"...##############@###...", -"...##################...", -"...##################...", -"...##############@###...", -"...##############+@##...", -"...##############.+@#...", -"...##############..+@...", -"...##############...+...", -"........................", -"........................", -" ...................... ", -" ...................... ", -" .................... ", -" ................ "}; diff --git a/net-im/zoom/zoom-5.4.53391.1108.ebuild b/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild index b6642189422d..3d3b63c3854b 100644 --- a/net-im/zoom/zoom-5.4.53391.1108.ebuild +++ b/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop eutils readme.gentoo-r1 xdg-utils +inherit desktop eapi8-dosym readme.gentoo-r1 wrapper xdg-utils DESCRIPTION="Video conferencing and web conferencing service" HOMEPAGE="https://zoom.us/" @@ -11,7 +11,7 @@ SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_6 x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )" S="${WORKDIR}/${PN}" -LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon +LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="-* ~amd64 ~x86" IUSE="bundled-libjpeg-turbo pulseaudio" @@ -48,12 +48,18 @@ RDEPEND="!games-engines/zoom pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib )" -BDEPEND="!pulseaudio? ( dev-util/bbe )" +BDEPEND="dev-util/bbe" QA_PREBUILT="opt/zoom/*" src_prepare() { default + + # The tarball doesn't contain an icon, so extract it from the binary + bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \ + >zoom-videocam.svg && [[ -s zoom-videocam.svg ]] \ + || die "Extraction of icon failed" + if ! use pulseaudio; then # For some strange reason, zoom cannot use any ALSA sound devices if # it finds libpulse. This causes breakage if media-sound/apulse[sdk] @@ -69,23 +75,20 @@ src_install() { doins -r json ringtone sip timezones translations doins *.pcm *.pem *.sh Embedded.properties version.txt doexe zoom zoom.sh zopen ZoomLauncher - dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so - dosym {"../../usr/$(get_libdir)",/opt/zoom}/libquazip.so + dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so + dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so if use bundled-libjpeg-turbo; then doexe libturbojpeg.so else - dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106 + dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so fi - make_wrapper zoom ./zoom /opt/zoom + make_wrapper zoom /opt/zoom{/zoom,} make_desktop_entry "zoom %U" Zoom zoom-videocam "" \ "MimeType=x-scheme-handler/zoommtg;application/x-zoom;" - # The tarball doesn't contain an icon, so take a generic camera icon - # from https://github.com/google/material-design-icons, modified to be - # white on a blue background - doicon -s scalable "${FILESDIR}"/zoom-videocam.svg - doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm + doicon zoom-videocam.svg + doicon -s scalable zoom-videocam.svg readme.gentoo_create_doc } @@ -98,6 +101,14 @@ pkg_postinst() { ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1 done readme.gentoo_print_elog + + if use bundled-libjpeg-turbo; then + ewarn "If the \"bundled-libjpeg-turbo\" flag is enabled, you may see a" + ewarn "QA notice about insecure RPATHs in the libturbojpeg.so library" + ewarn "bundled with the upstream package. Please report this problem" + ewarn "directly to Zoom upstream. Do *not* file a Gentoo bug for it." + ewarn "See https://bugs.gentoo.org/715106 for further details." + fi } pkg_postrm() { diff --git a/net-im/zoom/zoom-5.4.54779.1115-r3.ebuild b/net-im/zoom/zoom-5.4.54779.1115-r3.ebuild deleted file mode 100644 index 70da5021389e..000000000000 --- a/net-im/zoom/zoom-5.4.54779.1115-r3.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop eapi8-dosym readme.gentoo-r1 wrapper xdg-utils - -DESCRIPTION="Video conferencing and web conferencing service" -HOMEPAGE="https://zoom.us/" -SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz" -S="${WORKDIR}/${PN}" - -LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="bundled-libjpeg-turbo +bundled-qt pulseaudio wayland" -RESTRICT="mirror bindist strip" - -RDEPEND="!games-engines/zoom - dev-libs/glib:2 - dev-libs/quazip - media-libs/fontconfig - media-libs/freetype - media-sound/mpg123 - sys-apps/dbus - sys-apps/util-linux - virtual/opengl - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libxkbcommon[X] - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - pulseaudio? ( media-sound/pulseaudio ) - !pulseaudio? ( media-libs/alsa-lib ) - wayland? ( dev-libs/wayland ) - !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) - !bundled-qt? ( - dev-libs/icu - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtdiag:5 - dev-qt/qtgraphicaleffects:5 - dev-qt/qtgui:5 - dev-qt/qtlocation:5 - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5[widgets] - dev-qt/qtscript:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - wayland? ( dev-qt/qtwayland ) - )" - -BDEPEND="!pulseaudio? ( dev-util/bbe )" - -QA_PREBUILT="opt/zoom/*" - -src_prepare() { - default - if ! use pulseaudio; then - # For some strange reason, zoom cannot use any ALSA sound devices if - # it finds libpulse. This causes breakage if media-sound/apulse[sdk] - # is installed. So, force zoom to ignore libpulse. - bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die - mv zoom.tmp zoom || die - fi -} - -src_install() { - insinto /opt/zoom - exeinto /opt/zoom - doins -r json ringtone sip timezones translations - doins *.pcm *.sh Embedded.properties version.txt - doexe zoom zoom.sh zopen ZoomLauncher - dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so - dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so - - if use bundled-libjpeg-turbo; then - doexe libturbojpeg.so - else - dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so - fi - - if use bundled-qt; then - doexe libicu*.so.56 libQt5*.so.5 - doins qt.conf - - local dirs="Qt* generic iconengines imageformats \ - platforminputcontexts platforms wayland* xcbglintegrations" - doins -r ${dirs} - find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \ - -printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die - - ( # Remove libs and plugins with unresolved soname dependencies - cd "${ED}"/opt/zoom || die - rm -r Qt/labs/calendar Qt/labs/location QtQml/RemoteObjects \ - QtQuick/Controls.2 QtQuick/LocalStorage QtQuick/Particles.2 \ - QtQuick/Scene2D QtQuick/Scene3D QtQuick/Shapes \ - QtQuick/Templates.2 QtQuick/XmlListModel \ - platforms/libqeglfs.so platforms/libqlinuxfb.so || die - use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \ - platforms/libqwayland*.so || die - ) - fi - - make_wrapper zoom /opt/zoom{/zoom,} $(usex bundled-qt /opt/zoom "") - make_desktop_entry "zoom %U" Zoom zoom-videocam "" \ - "MimeType=x-scheme-handler/zoommtg;application/x-zoom;" - # The tarball doesn't contain an icon, so take a generic camera icon - # from https://github.com/google/material-design-icons, modified to be - # white on a blue background - doicon -s scalable "${FILESDIR}"/zoom-videocam.svg - doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - - local FORCE_PRINT_ELOG v - for v in ${REPLACING_VERSIONS}; do - ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1 - done - readme.gentoo_print_elog - - if use bundled-libjpeg-turbo; then - ewarn "If the \"bundled-libjpeg-turbo\" flag is enabled, you may see a" - ewarn "QA notice about insecure RPATHs in the libturbojpeg.so library" - ewarn "bundled with the upstream package. Please report this problem" - ewarn "directly to Zoom upstream. Do *not* file a Gentoo bug for it." - fi -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/net-im/zoom/zoom-5.4.56259.1207.ebuild b/net-im/zoom/zoom-5.4.57450.1220.ebuild index e31ede8492b4..985fec29e240 100644 --- a/net-im/zoom/zoom-5.4.56259.1207.ebuild +++ b/net-im/zoom/zoom-5.4.57450.1220.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://zoom.us/" SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz" S="${WORKDIR}/${PN}" -LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon +LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="-* ~amd64" IUSE="bundled-libjpeg-turbo +bundled-qt pulseaudio wayland" @@ -56,12 +56,18 @@ RDEPEND="!games-engines/zoom wayland? ( dev-qt/qtwayland ) )" -BDEPEND="!pulseaudio? ( dev-util/bbe )" +BDEPEND="dev-util/bbe" QA_PREBUILT="opt/zoom/*" src_prepare() { default + + # The tarball doesn't contain an icon, so extract it from the binary + bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \ + >zoom-videocam.svg && [[ -s zoom-videocam.svg ]] \ + || die "Extraction of icon failed" + if ! use pulseaudio; then # For some strange reason, zoom cannot use any ALSA sound devices if # it finds libpulse. This causes breakage if media-sound/apulse[sdk] @@ -76,7 +82,7 @@ src_install() { exeinto /opt/zoom doins -r json ringtone sip timezones translations doins *.pcm *.sh Embedded.properties version.txt - doexe zoom zoom.sh zopen ZoomLauncher + doexe zoom zopen ZoomLauncher dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so @@ -110,11 +116,8 @@ src_install() { make_wrapper zoom /opt/zoom{/zoom,} $(usex bundled-qt /opt/zoom "") make_desktop_entry "zoom %U" Zoom zoom-videocam "" \ "MimeType=x-scheme-handler/zoommtg;application/x-zoom;" - # The tarball doesn't contain an icon, so take a generic camera icon - # from https://github.com/google/material-design-icons, modified to be - # white on a blue background - doicon -s scalable "${FILESDIR}"/zoom-videocam.svg - doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm + doicon zoom-videocam.svg + doicon -s scalable zoom-videocam.svg readme.gentoo_create_doc } @@ -133,6 +136,7 @@ pkg_postinst() { ewarn "QA notice about insecure RPATHs in the libturbojpeg.so library" ewarn "bundled with the upstream package. Please report this problem" ewarn "directly to Zoom upstream. Do *not* file a Gentoo bug for it." + ewarn "See https://bugs.gentoo.org/715106 for further details." fi } |