From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C8AF13835B for ; Fri, 26 Mar 2021 06:44:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 194F5E0821; Fri, 26 Mar 2021 06:44:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03F18E0821 for ; Fri, 26 Mar 2021 06:44:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F431340D91 for ; Fri, 26 Mar 2021 06:44:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22D9D632 for ; Fri, 26 Mar 2021 06:44:29 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1616741061.ce727418b3384636b59ead4086330e7bd2415925.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/rss-glx/files/, x11-misc/rss-glx/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/rss-glx/files/rss-glx-0.9.1-matrixview-copy-font.patch x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild X-VCS-Directories: x11-misc/rss-glx/ x11-misc/rss-glx/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: ce727418b3384636b59ead4086330e7bd2415925 X-VCS-Branch: master Date: Fri, 26 Mar 2021 06:44:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ebac0a3d-6078-4895-8ed6-4f41e65de026 X-Archives-Hash: c8fe4787feb3cc5cbed05457a181b4c3 commit: ce727418b3384636b59ead4086330e7bd2415925 Author: Alexander Miller gmx de> AuthorDate: Mon Mar 22 14:51:10 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Mar 26 06:44:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce727418 x11-misc/rss-glx: Fix matrixview segmentation faults with USE=-bzip2 Patch by Edward Sheldrake taken from the linked sourceforge bug. https://sourceforge.net/p/rss-glx/bugs/12/ Signed-off-by: Alexander Miller gmx.de> Closes: https://github.com/gentoo/gentoo/pull/20061 Signed-off-by: Joonas Niilola gentoo.org> .../files/rss-glx-0.9.1-matrixview-copy-font.patch | 27 ++++++++++++++++++++++ x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild | 1 + 2 files changed, 28 insertions(+) diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-matrixview-copy-font.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-matrixview-copy-font.patch new file mode 100644 index 00000000000..cb9f5e9a500 --- /dev/null +++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-matrixview-copy-font.patch @@ -0,0 +1,27 @@ +--- a/src/matrixview.c ++++ b/src/matrixview.c +@@ -537,7 +537,12 @@ void load_texture () + { + long a; + ++#ifdef HAVE_LIBBZ2 + LOAD_TEXTURE (font, cfont, cfont_compressedsize, cfont_size) ++#else ++ font = (unsigned char*) malloc (cfont_size); ++ memcpy (font, cfont, cfont_size); ++#endif + + for (a = 0; a < 131072; a++) { + if ((a >> 9) & 2) +@@ -579,7 +584,11 @@ void ourBuildTextures () + exit (-1); + } + ++#ifdef HAVE_LIBBZ2 + FREE_TEXTURE (font) ++#else ++ free (font); ++#endif + + glBindTexture (GL_TEXTURE_2D, 3); + diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild index 7dba5284904..1af7c945fa9 100644 --- a/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild +++ b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild @@ -41,6 +41,7 @@ PATCHES=( "${FILESDIR}"/${P}-imagemagick-7.patch "${FILESDIR}"/${P}-c++11-narrowing.patch "${FILESDIR}"/${P}-hang.patch + "${FILESDIR}"/${P}-matrixview-copy-font.patch ) src_prepare() {