From bfd84a59e09f720c401ab2fe794a5fcf058ffab8 Mon Sep 17 00:00:00 2001 From: ston Date: Wed, 15 Mar 2023 13:58:03 +0800 Subject: [PATCH] net-im/tencent-qq: fix crash Signed-off-by: ston --- media-libs/vips/Manifest | 1 + media-libs/vips/metadata.xml | 26 +++++++++ media-libs/vips/vips-8.14.1.ebuild | 74 +++++++++++++++++++++++++ net-im/tencent-qq/metadata.xml | 36 ++++++------ net-im/tencent-qq/tencent-qq-3.1.0_p9572.ebuild | 12 +++- 5 files changed, 130 insertions(+), 19 deletions(-) create mode 100644 media-libs/vips/Manifest create mode 100644 media-libs/vips/metadata.xml create mode 100644 media-libs/vips/vips-8.14.1.ebuild rewrite net-im/tencent-qq/metadata.xml (71%) diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest new file mode 100644 index 000000000..418782945 --- /dev/null +++ b/media-libs/vips/Manifest @@ -0,0 +1 @@ +DIST vips-8.14.1.tar.xz 18650864 BLAKE2B cf6f76bde0bc8a843c3f8f69eb1646bce91cacfb1ce51c0992665687233c2673f904bac8182a1027079fa2d2def7902106b88a47b79d0faeec26ac9af4660f4b SHA512 95321ce29c8f5afdce99d9c0b13f8a2a674510eb0015e90c1638073f502dcd72f22d4c91dc7473e914c9a8c5ebf543db49593599766fc6630eafa4ff00bfbfe2 diff --git a/media-libs/vips/metadata.xml b/media-libs/vips/metadata.xml new file mode 100644 index 000000000..3cc15160a --- /dev/null +++ b/media-libs/vips/metadata.xml @@ -0,0 +1,26 @@ + + + + + Enable support for the FITS image format + through + sci-libs/cfitsio + + + Enable support for creating image pyramids + with dzsave + Enable support for HEIC images + Enable support for text rendering + + Enable support for 8bpp PNG via + media-gfx/libimagequant + + + ston.jia@qq.com + ston + + + libvips/libvips + + diff --git a/media-libs/vips/vips-8.14.1.ebuild b/media-libs/vips/vips-8.14.1.ebuild new file mode 100644 index 000000000..90c4e9257 --- /dev/null +++ b/media-libs/vips/vips-8.14.1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +DESCRIPTION="VIPS Image Processing Library" +SRC_URI="https://github.com/libvips/libvips/releases/download/v${PV}/${P}.tar.xz" +HOMEPAGE="https://libvips.github.io/libvips/" + +LICENSE="LGPL-2.1+" +SLOT="1" +KEYWORDS="~amd64 ~arm64" +IUSE="doc exif fftw fits heif gsf graphicsmagick imagemagick imagequant jpeg lcms openexr orc pango pdf png svg static-libs tiff webp zlib" + +RDEPEND=" + >=dev-libs/glib-2.6:2 + dev-libs/expat:= + fftw? ( sci-libs/fftw:3.0= ) + imagemagick? ( + graphicsmagick? ( media-gfx/graphicsmagick ) + !graphicsmagick? ( media-gfx/imagemagick ) + ) + imagequant? ( media-gfx/libimagequant:= ) + exif? ( >=media-libs/libexif-0.6 ) + fits? ( sci-libs/cfitsio ) + heif? ( >=media-libs/libheif-1.3.0:= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + gsf? ( gnome-extra/libgsf:= ) + lcms? ( media-libs/lcms ) + openexr? ( >=media-libs/openexr-1.2.2:= ) + orc? ( >=dev-lang/orc-0.4.11 ) + pango? ( x11-libs/pango ) + pdf? ( app-text/poppler[cairo] ) + png? ( >=media-libs/libpng-1.2.9:0= ) + svg? ( gnome-base/librsvg ) + tiff? ( media-libs/tiff:0= ) + webp? ( media-libs/libwebp ) + zlib? ( sys-libs/zlib ) +" + +DEPEND=" + doc? ( + dev-util/gtk-doc + dev-util/gtk-doc-am + ) + ${RDEPEND} +" + +src_configure() { + local emesonargs=( + $(meson_use doc gtk_doc) + $(meson_feature fftw) + $(meson_feature imagemagick magick) + $(meson_feature imagequant) + $(meson_feature exif) + $(meson_feature fits cfitsio) + $(meson_feature heif) + $(meson_feature jpeg) + $(meson_feature gsf) + $(meson_feature lcms) + $(meson_feature openexr) + $(meson_feature orc) + $(meson_feature pango pangocairo) + $(meson_feature pdf poppler) + $(meson_feature png) + $(meson_feature svg rsvg) + $(meson_feature tiff) + $(meson_feature webp) + $(meson_feature zlib) + ) + meson_src_configure +} diff --git a/net-im/tencent-qq/metadata.xml b/net-im/tencent-qq/metadata.xml dissimilarity index 71% index b9c950308..550a96b12 100644 --- a/net-im/tencent-qq/metadata.xml +++ b/net-im/tencent-qq/metadata.xml @@ -1,17 +1,19 @@ - - - - - git@xen0n.name - WANG Xuerui - - - ston.jia@qq.com - ston - - - Use sys-apps/bubblewrap to prevent private - information leakage - - + + + + + git@xen0n.name + WANG Xuerui + + + ston.jia@qq.com + ston + + + Use sys-apps/bubblewrap to prevent + private information leakage + Use media-libs/vips instead of + shipped libs. + + diff --git a/net-im/tencent-qq/tencent-qq-3.1.0_p9572.ebuild b/net-im/tencent-qq/tencent-qq-3.1.0_p9572.ebuild index b74dabaf5..67226317e 100644 --- a/net-im/tencent-qq/tencent-qq-3.1.0_p9572.ebuild +++ b/net-im/tencent-qq/tencent-qq-3.1.0_p9572.ebuild @@ -22,7 +22,7 @@ SRC_URI=" SLOT="0" KEYWORDS="-* ~amd64 ~arm64" -IUSE="bwrap split-usr" +IUSE="bwrap +system-vips split-usr" RDEPEND=" x11-libs/gtk+:3 x11-libs/libnotify @@ -35,7 +35,11 @@ RDEPEND=" app-crypt/libsecret virtual/krb5 sys-apps/keyutils - =media-libs/vips-8.14.1 + ) bwrap? ( sys-apps/bubblewrap ) " @@ -45,6 +49,10 @@ src_install() { insinto /opt doins -r opt/* + if use system-vips; then + rm -r "${D}"/opt/QQ/resources/app/sharp-lib || die + fi + fperms +x /opt/QQ/{qq,chrome_crashpad_handler,chrome-sandbox,libEGL.so,libffmpeg.so,libGLESv2.so,libvk_swiftshader.so,libvulkan.so.1} printf "#!/bin/bash\ncd /opt/QQ\n./qq \$@\n" >qq || die if use bwrap; then -- 2.11.4.GIT