| 1 |
commit: 8e83d5804fe006f3da794768b288b4091536bd1e |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 27 16:31:33 2022 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 27 16:38:20 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e83d580 |
| 7 |
|
| 8 |
net-im/zoom: Don't depend on glibc[-clone3] |
| 9 |
|
| 10 |
Display an explanatory message in README.gentoo instead. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/835930 |
| 13 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 14 |
|
| 15 |
net-im/zoom/files/README.gentoo | 8 -------- |
| 16 |
net-im/zoom/zoom-5.10.3.2778.ebuild | 21 +++++++++++++++------ |
| 17 |
....10.4.2845.ebuild => zoom-5.10.4.2845-r1.ebuild} | 21 +++++++++++++++------ |
| 18 |
3 files changed, 30 insertions(+), 20 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-im/zoom/files/README.gentoo b/net-im/zoom/files/README.gentoo |
| 21 |
deleted file mode 100644 |
| 22 |
index 12e5058b397a..000000000000 |
| 23 |
--- a/net-im/zoom/files/README.gentoo |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,8 +0,0 @@ |
| 26 |
-Some of Zoom's screen share features (e.g., the whiteboard) require |
| 27 |
-display compositing. If you encounter a black window when sharing |
| 28 |
-the screen, then one of the following actions should help: |
| 29 |
-- Enable compositing in your window manager if it is supported |
| 30 |
-- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr) |
| 31 |
- |
| 32 |
-To enable screen sharing on GNOME Wayland, edit ~/.config/zoomus.conf |
| 33 |
-and change the value of enableWaylandShare to true. |
| 34 |
|
| 35 |
diff --git a/net-im/zoom/zoom-5.10.3.2778.ebuild b/net-im/zoom/zoom-5.10.3.2778.ebuild |
| 36 |
index fb4a05464d8c..6a6b21c08daf 100644 |
| 37 |
--- a/net-im/zoom/zoom-5.10.3.2778.ebuild |
| 38 |
+++ b/net-im/zoom/zoom-5.10.3.2778.ebuild |
| 39 |
@@ -34,7 +34,7 @@ RDEPEND="!games-engines/zoom |
| 40 |
net-print/cups |
| 41 |
sys-apps/dbus |
| 42 |
sys-apps/util-linux |
| 43 |
- || ( >=sys-libs/glibc-2.34[-clone3(+)] <sys-libs/glibc-2.34 ) |
| 44 |
+ sys-libs/glibc |
| 45 |
virtual/opengl |
| 46 |
x11-libs/cairo |
| 47 |
x11-libs/libdrm |
| 48 |
@@ -159,17 +159,26 @@ src_install() { |
| 49 |
application/x-zoom)" |
| 50 |
doicon videoconference-zoom.svg |
| 51 |
doicon -s scalable videoconference-zoom.svg |
| 52 |
+ |
| 53 |
+ local DOC_CONTENTS="Some of Zoom's screen share features (e.g. |
| 54 |
+ the whiteboard) require display compositing. If you encounter |
| 55 |
+ a black window when sharing the screen, then one of the following |
| 56 |
+ actions should help: |
| 57 |
+ \\n- Enable compositing in your window manager if it is supported |
| 58 |
+ \\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)" |
| 59 |
+ use wayland \ |
| 60 |
+ && DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland, |
| 61 |
+ edit ~/.config/zoomus.conf and change the value of |
| 62 |
+ enableWaylandShare to true." |
| 63 |
+ has_version ">=sys-libs/glibc-2.34[clone3(+)]" \ |
| 64 |
+ && DOC_CONTENTS+="\\n\\nIf you encounter illegal instruction errors, |
| 65 |
+ try disabling the clone3 use flag of sys-libs/glibc." |
| 66 |
readme.gentoo_create_doc |
| 67 |
} |
| 68 |
|
| 69 |
pkg_postinst() { |
| 70 |
xdg_desktop_database_update |
| 71 |
xdg_icon_cache_update |
| 72 |
- |
| 73 |
- local FORCE_PRINT_ELOG v |
| 74 |
- for v in ${REPLACING_VERSIONS}; do |
| 75 |
- ver_test ${v} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1 |
| 76 |
- done |
| 77 |
readme.gentoo_print_elog |
| 78 |
} |
| 79 |
|
| 80 |
|
| 81 |
diff --git a/net-im/zoom/zoom-5.10.4.2845.ebuild b/net-im/zoom/zoom-5.10.4.2845-r1.ebuild |
| 82 |
similarity index 87% |
| 83 |
rename from net-im/zoom/zoom-5.10.4.2845.ebuild |
| 84 |
rename to net-im/zoom/zoom-5.10.4.2845-r1.ebuild |
| 85 |
index fb4a05464d8c..6a6b21c08daf 100644 |
| 86 |
--- a/net-im/zoom/zoom-5.10.4.2845.ebuild |
| 87 |
+++ b/net-im/zoom/zoom-5.10.4.2845-r1.ebuild |
| 88 |
@@ -34,7 +34,7 @@ RDEPEND="!games-engines/zoom |
| 89 |
net-print/cups |
| 90 |
sys-apps/dbus |
| 91 |
sys-apps/util-linux |
| 92 |
- || ( >=sys-libs/glibc-2.34[-clone3(+)] <sys-libs/glibc-2.34 ) |
| 93 |
+ sys-libs/glibc |
| 94 |
virtual/opengl |
| 95 |
x11-libs/cairo |
| 96 |
x11-libs/libdrm |
| 97 |
@@ -159,17 +159,26 @@ src_install() { |
| 98 |
application/x-zoom)" |
| 99 |
doicon videoconference-zoom.svg |
| 100 |
doicon -s scalable videoconference-zoom.svg |
| 101 |
+ |
| 102 |
+ local DOC_CONTENTS="Some of Zoom's screen share features (e.g. |
| 103 |
+ the whiteboard) require display compositing. If you encounter |
| 104 |
+ a black window when sharing the screen, then one of the following |
| 105 |
+ actions should help: |
| 106 |
+ \\n- Enable compositing in your window manager if it is supported |
| 107 |
+ \\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)" |
| 108 |
+ use wayland \ |
| 109 |
+ && DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland, |
| 110 |
+ edit ~/.config/zoomus.conf and change the value of |
| 111 |
+ enableWaylandShare to true." |
| 112 |
+ has_version ">=sys-libs/glibc-2.34[clone3(+)]" \ |
| 113 |
+ && DOC_CONTENTS+="\\n\\nIf you encounter illegal instruction errors, |
| 114 |
+ try disabling the clone3 use flag of sys-libs/glibc." |
| 115 |
readme.gentoo_create_doc |
| 116 |
} |
| 117 |
|
| 118 |
pkg_postinst() { |
| 119 |
xdg_desktop_database_update |
| 120 |
xdg_icon_cache_update |
| 121 |
- |
| 122 |
- local FORCE_PRINT_ELOG v |
| 123 |
- for v in ${REPLACING_VERSIONS}; do |
| 124 |
- ver_test ${v} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1 |
| 125 |
- done |
| 126 |
readme.gentoo_print_elog |
| 127 |
} |
Archives