commit: 16f32b5962633d209b70528e43ea746f9a306c33 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Nov 19 14:47:59 2021 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Dec 12 21:31:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f32b59
mail-client/thunderbird: Add USE=system-png Since Thunderbird requires patched version of media-libs/libpng and the patches are known to break WebKit, provide the ability to build against vendored libpng in order to make it possible for the users to return to vanilla libpng. See-also: https://gitweb.gentoo.org/sites/projects/council.git/tree/meeting-logs/20211212.txt#n98 Bug: https://bugs.gentoo.org/824826 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> mail-client/thunderbird/thunderbird-78.13.0.ebuild | 6 +++--- mail-client/thunderbird/thunderbird-78.14.0.ebuild | 6 +++--- mail-client/thunderbird/thunderbird-91.3.0.ebuild | 6 +++--- mail-client/thunderbird/thunderbird-91.3.1.ebuild | 6 +++--- mail-client/thunderbird/thunderbird-91.3.2.ebuild | 6 +++--- mail-client/thunderbird/thunderbird-91.4.0.ebuild | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mail-client/thunderbird/thunderbird-78.13.0.ebuild b/mail-client/thunderbird/thunderbird-78.13.0.ebuild index f9d7cdbdfdca..bf3bd8a8296f 100644 --- a/mail-client/thunderbird/thunderbird-78.13.0.ebuild +++ b/mail-client/thunderbird/thunderbird-78.13.0.ebuild @@ -64,7 +64,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack lto +openh264 pgo pulseaudio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent - +system-libvpx +system-webp wayland wifi" + +system-libvpx system-png +system-webp wayland wifi" REQUIRED_USE="wifi? ( dbus )" @@ -121,7 +121,6 @@ CDEPEND=" >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 - >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 @@ -155,6 +154,7 @@ CDEPEND=" system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) + system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( @@ -612,7 +612,6 @@ src_configure() { --with-libclang-path="$(llvm-config --libdir)" \ --with-system-nspr \ --with-system-nss \ - --with-system-png \ --with-system-zlib \ --with-toolchain-prefix="${CHOST}-" \ --with-unsigned-addon-scopes=app,system \ @@ -671,6 +670,7 @@ src_configure() { mozconfig_use_with system-jpeg mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr" mozconfig_use_with system-libvpx + mozconfig_use_with system-png mozconfig_use_with system-webp mozconfig_use_enable dbus diff --git a/mail-client/thunderbird/thunderbird-78.14.0.ebuild b/mail-client/thunderbird/thunderbird-78.14.0.ebuild index e6e2f60de628..8f40283ad289 100644 --- a/mail-client/thunderbird/thunderbird-78.14.0.ebuild +++ b/mail-client/thunderbird/thunderbird-78.14.0.ebuild @@ -64,7 +64,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack lto +openh264 pgo pulseaudio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent - +system-libvpx +system-webp wayland wifi" + +system-libvpx system-png +system-webp wayland wifi" REQUIRED_USE="wifi? ( dbus )" @@ -129,7 +129,6 @@ CDEPEND=" >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 - >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 @@ -163,6 +162,7 @@ CDEPEND=" system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) + system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( @@ -623,7 +623,6 @@ src_configure() { --with-libclang-path="$(llvm-config --libdir)" \ --with-system-nspr \ --with-system-nss \ - --with-system-png \ --with-system-zlib \ --with-toolchain-prefix="${CHOST}-" \ --with-unsigned-addon-scopes=app,system \ @@ -682,6 +681,7 @@ src_configure() { mozconfig_use_with system-jpeg mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr" mozconfig_use_with system-libvpx + mozconfig_use_with system-png mozconfig_use_with system-webp mozconfig_use_enable dbus diff --git a/mail-client/thunderbird/thunderbird-91.3.0.ebuild b/mail-client/thunderbird/thunderbird-91.3.0.ebuild index d053304bbe36..c59bc92cafe2 100644 --- a/mail-client/thunderbird/thunderbird-91.3.0.ebuild +++ b/mail-client/thunderbird/thunderbird-91.3.0.ebuild @@ -64,7 +64,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel" IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux" -IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp" +IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp" IUSE+=" wayland wifi" REQUIRED_USE="debug? ( !system-av1 ) @@ -123,7 +123,6 @@ CDEPEND=" >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 - >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 @@ -158,6 +157,7 @@ CDEPEND=" system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) + system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( @@ -658,7 +658,6 @@ src_configure() { --with-libclang-path="$(llvm-config --libdir)" \ --with-system-nspr \ --with-system-nss \ - --with-system-png \ --with-system-zlib \ --with-toolchain-prefix="${CHOST}-" \ --with-unsigned-addon-scopes=app,system \ @@ -717,6 +716,7 @@ src_configure() { mozconfig_use_with system-jpeg mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr" mozconfig_use_with system-libvpx + mozconfig_use_with system-png mozconfig_use_with system-webp mozconfig_use_enable dbus diff --git a/mail-client/thunderbird/thunderbird-91.3.1.ebuild b/mail-client/thunderbird/thunderbird-91.3.1.ebuild index 053f6a6c0adc..7766cd7d97f2 100644 --- a/mail-client/thunderbird/thunderbird-91.3.1.ebuild +++ b/mail-client/thunderbird/thunderbird-91.3.1.ebuild @@ -64,7 +64,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel" IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux" -IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp" +IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp" IUSE+=" wayland wifi" REQUIRED_USE="debug? ( !system-av1 ) @@ -123,7 +123,6 @@ CDEPEND=" >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 - >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 @@ -158,6 +157,7 @@ CDEPEND=" system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) + system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( @@ -658,7 +658,6 @@ src_configure() { --with-libclang-path="$(llvm-config --libdir)" \ --with-system-nspr \ --with-system-nss \ - --with-system-png \ --with-system-zlib \ --with-toolchain-prefix="${CHOST}-" \ --with-unsigned-addon-scopes=app,system \ @@ -717,6 +716,7 @@ src_configure() { mozconfig_use_with system-jpeg mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr" mozconfig_use_with system-libvpx + mozconfig_use_with system-png mozconfig_use_with system-webp mozconfig_use_enable dbus diff --git a/mail-client/thunderbird/thunderbird-91.3.2.ebuild b/mail-client/thunderbird/thunderbird-91.3.2.ebuild index d053304bbe36..c59bc92cafe2 100644 --- a/mail-client/thunderbird/thunderbird-91.3.2.ebuild +++ b/mail-client/thunderbird/thunderbird-91.3.2.ebuild @@ -64,7 +64,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel" IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux" -IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp" +IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp" IUSE+=" wayland wifi" REQUIRED_USE="debug? ( !system-av1 ) @@ -123,7 +123,6 @@ CDEPEND=" >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 - >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 @@ -158,6 +157,7 @@ CDEPEND=" system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) + system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( @@ -658,7 +658,6 @@ src_configure() { --with-libclang-path="$(llvm-config --libdir)" \ --with-system-nspr \ --with-system-nss \ - --with-system-png \ --with-system-zlib \ --with-toolchain-prefix="${CHOST}-" \ --with-unsigned-addon-scopes=app,system \ @@ -717,6 +716,7 @@ src_configure() { mozconfig_use_with system-jpeg mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr" mozconfig_use_with system-libvpx + mozconfig_use_with system-png mozconfig_use_with system-webp mozconfig_use_enable dbus diff --git a/mail-client/thunderbird/thunderbird-91.4.0.ebuild b/mail-client/thunderbird/thunderbird-91.4.0.ebuild index e351e0d7190e..716a8a1e40f0 100644 --- a/mail-client/thunderbird/thunderbird-91.4.0.ebuild +++ b/mail-client/thunderbird/thunderbird-91.4.0.ebuild @@ -64,7 +64,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel" IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux" -IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp" +IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp" IUSE+=" wayland wifi" REQUIRED_USE="debug? ( !system-av1 ) @@ -116,7 +116,6 @@ CDEPEND=" >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 - >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 @@ -151,6 +150,7 @@ CDEPEND=" system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) + system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( @@ -651,7 +651,6 @@ src_configure() { --with-libclang-path="$(llvm-config --libdir)" \ --with-system-nspr \ --with-system-nss \ - --with-system-png \ --with-system-zlib \ --with-toolchain-prefix="${CHOST}-" \ --with-unsigned-addon-scopes=app,system \ @@ -710,6 +709,7 @@ src_configure() { mozconfig_use_with system-jpeg mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr" mozconfig_use_with system-libvpx + mozconfig_use_with system-png mozconfig_use_with system-webp mozconfig_use_enable dbus
