commit: 27834f7eebcac012b6e01af1a90c5e0623165d94 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Apr 28 11:40:00 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Apr 28 11:53:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27834f7e
dev-qt/qtwebengine: allow using libatomic-stub Adapted from linked PR given hasn't been updated yet and wanted to rebuild qtwebengine with the new dependencies on my llvm-musl chroot now. [atomic-builtins] is not enough given passes -latomic either way, and not planning to try to get this fixed in chromium. Also move to DEPEND-only, doesn't seem to be linked with shared libatomic for gcc (and stub is static-only). Skipping revbump given not worth rebuilds just to be able to depclean gcc and qtwebengine-6.9.1 is not that far off. Besides it's difficult to depclean given nodejs depends on it for libatomic at the moment still. Closes: https://github.com/gentoo/gentoo/pull/41689 Thanks-to: Michal Rostecki <vadorovsky <AT> disroot.org> Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild | 6 ++++-- dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild | 6 ++++-- dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild | 6 ++++-- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild index 26d726baf01b..66b6de0757c6 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild @@ -28,7 +28,6 @@ REQUIRED_USE=" " # dlopen: krb5, libva, pciutils, udev -# gcc: for -latomic RDEPEND=" app-arch/snappy:= dev-libs/expat @@ -53,7 +52,6 @@ RDEPEND=" media-libs/tiff:= sys-apps/dbus sys-apps/pciutils - sys-devel/gcc:* sys-libs/zlib:=[minizip] virtual/libudev x11-libs/libX11 @@ -81,6 +79,10 @@ RDEPEND=" " DEPEND=" ${RDEPEND} + || ( + sys-devel/gcc:* + llvm-runtimes/libatomic-stub + ) media-libs/libglvnd x11-base/xorg-proto x11-libs/libXcursor diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild index 553345282707..85e7418141b3 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild @@ -28,7 +28,6 @@ REQUIRED_USE=" " # dlopen: krb5, libva, pciutils -# gcc: for -latomic RDEPEND=" app-arch/snappy:= dev-libs/expat @@ -53,7 +52,6 @@ RDEPEND=" media-libs/tiff:= sys-apps/dbus sys-apps/pciutils - sys-devel/gcc:* sys-libs/zlib:=[minizip] virtual/libudev:= x11-libs/libX11 @@ -82,6 +80,10 @@ RDEPEND=" " DEPEND=" ${RDEPEND} + || ( + sys-devel/gcc:* + llvm-runtimes/libatomic-stub + ) media-libs/libglvnd x11-base/xorg-proto x11-libs/libXcursor diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild index 3df3a6306817..b6a282fa2323 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild @@ -28,7 +28,6 @@ REQUIRED_USE=" " # dlopen: krb5, libva, pciutils -# gcc: for -latomic RDEPEND=" app-arch/snappy:= dev-libs/expat @@ -53,7 +52,6 @@ RDEPEND=" media-libs/tiff:= sys-apps/dbus sys-apps/pciutils - sys-devel/gcc:* sys-libs/zlib:=[minizip] virtual/libudev:= x11-libs/libX11 @@ -82,6 +80,10 @@ RDEPEND=" " DEPEND=" ${RDEPEND} + || ( + sys-devel/gcc:* + llvm-runtimes/libatomic-stub + ) media-libs/libglvnd x11-base/xorg-proto x11-libs/libXcursor diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index e39783175f0f..b8b73d7ef1e9 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -28,7 +28,6 @@ REQUIRED_USE=" " # dlopen: krb5, libva, pciutils -# gcc: for -latomic RDEPEND=" app-arch/snappy:= dev-libs/expat @@ -53,7 +52,6 @@ RDEPEND=" media-libs/tiff:= sys-apps/dbus sys-apps/pciutils - sys-devel/gcc:* sys-libs/zlib:=[minizip] virtual/libudev:= x11-libs/libX11 @@ -82,6 +80,10 @@ RDEPEND=" " DEPEND=" ${RDEPEND} + || ( + sys-devel/gcc:* + llvm-runtimes/libatomic-stub + ) media-libs/libglvnd x11-base/xorg-proto x11-libs/libXcursor
