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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16FDD158089 for ; Mon, 9 Oct 2023 19:31:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 531582BC016; Mon, 9 Oct 2023 19:31:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38D522BC016 for ; Mon, 9 Oct 2023 19:31:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A782335C34 for ; Mon, 9 Oct 2023 19:31:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D853D992 for ; Mon, 9 Oct 2023 19:31:09 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1696879850.fbb42d862a08de57da2ed67b7b6fb6661ad706f5.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/gnuplot/files/gnuplot-5.4.9-unbal-braces.patch sci-visualization/gnuplot/gnuplot-5.4.9.ebuild X-VCS-Directories: sci-visualization/gnuplot/files/ sci-visualization/gnuplot/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: fbb42d862a08de57da2ed67b7b6fb6661ad706f5 X-VCS-Branch: master Date: Mon, 9 Oct 2023 19:31:09 +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: c5e18ec9-a3a3-4a59-ace9-7bc12b674878 X-Archives-Hash: ac733aaf4dc08a34cec17a76985732a9 commit: fbb42d862a08de57da2ed67b7b6fb6661ad706f5 Author: Ulrich Müller gentoo org> AuthorDate: Mon Oct 9 19:28:27 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Oct 9 19:30:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb42d86 sci-visualization/gnuplot: Fix unbalanced braces in C source Closes: https://bugs.gentoo.org/915492 Signed-off-by: Ulrich Müller gentoo.org> .../gnuplot/files/gnuplot-5.4.9-unbal-braces.patch | 31 ++++++++++++++++++++++ sci-visualization/gnuplot/gnuplot-5.4.9.ebuild | 1 + 2 files changed, 32 insertions(+) diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.9-unbal-braces.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.9-unbal-braces.patch new file mode 100644 index 000000000000..3261f60e61c1 --- /dev/null +++ b/sci-visualization/gnuplot/files/gnuplot-5.4.9-unbal-braces.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/915492 +Patch from upstream branch-5-4-stable branch + +commit b5b668ca442e0d7399e2b432fe5fe5fb4c48a1a2 +Author: Peter Korsgaard +Date: Sun Oct 1 10:20:31 2023 +0200 + + term/post.trm: unbreak !HAVE_DEFLATE_ENCODER builds + +--- a/term/post.trm ++++ b/term/post.trm +@@ -4000,17 +4000,16 @@ PS_image (unsigned int M, unsigned int N, coordval *image, gpiPoint *corner, t_i + cscale = 1.0; + + #ifdef HAVE_DEFLATE_ENCODER +- if (ps_params->level3) { ++ if (ps_params->level3) + encoded_image = (void *)PS_encode_png_image(M, N, image, color_mode, + bits_per_component, max_colors, cscale, + &num_encoded_bytes); +- } else { ++ else + #endif + encoded_image = PS_encode_image(M, N, image, color_mode, + bits_per_component, max_colors, cscale, + (ps_params->level1 ? PS_ASCII_HEX : PS_ASCII85), + &num_encoded_bytes); +- } + + + fputs("%%%%BeginImage\n", gppsfile); diff --git a/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild index 7a6239265ec3..f1d6a09bdf07 100644 --- a/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild @@ -80,6 +80,7 @@ TEXMF="${EPREFIX}/usr/share/texmf-site" PATCHES=( "${FILESDIR}"/${PN}-5.0.6-no-picins.patch + "${FILESDIR}"/${PN}-5.4.9-unbal-braces.patch ) pkg_setup() {