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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 878AB158091 for ; Thu, 16 Jun 2022 21:14:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6B4CE086C; Thu, 16 Jun 2022 21:14:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 9C69EE086C for ; Thu, 16 Jun 2022 21:14:16 +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 8B2FD341FB5 for ; Thu, 16 Jun 2022 21:14:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11D93D3 for ; Thu, 16 Jun 2022 21:14:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1655413729.a6bf07acc01f5848f2b0b7c17b93e05611a651b5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/files/, media-libs/freeimage/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freeimage/files/freeimage-3.18.0-null-to-false.patch media-libs/freeimage/freeimage-3.18.0-r8.ebuild X-VCS-Directories: media-libs/freeimage/ media-libs/freeimage/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a6bf07acc01f5848f2b0b7c17b93e05611a651b5 X-VCS-Branch: master Date: Thu, 16 Jun 2022 21:14:12 +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: fbca4d5c-32b4-40ec-8c53-7148d5cd6988 X-Archives-Hash: dfe68e1ee48b9635d91df5f4fc23be55 commit: a6bf07acc01f5848f2b0b7c17b93e05611a651b5 Author: Alfred Persson Forsberg catcream org> AuthorDate: Thu Jun 16 18:54:32 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 16 21:08:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6bf07ac media-libs/freeimage: fix build with musl 1.2.3 FreeImage relies on NULL being 0, while on musl for stdc++ >= 11 it is defined as nullptr. This breaks the build for musl. Returning FALSE here is correct. Closes: https://bugs.gentoo.org/841973 Signed-off-by: Alfred Persson Forsberg catcream.org> Closes: https://github.com/gentoo/gentoo/pull/25926 Signed-off-by: Sam James gentoo.org> .../files/freeimage-3.18.0-null-to-false.patch | 22 ++++++++++++++++++++++ media-libs/freeimage/freeimage-3.18.0-r8.ebuild | 1 + 2 files changed, 23 insertions(+) diff --git a/media-libs/freeimage/files/freeimage-3.18.0-null-to-false.patch b/media-libs/freeimage/files/freeimage-3.18.0-null-to-false.patch new file mode 100644 index 000000000000..3e8e13a40b3c --- /dev/null +++ b/media-libs/freeimage/files/freeimage-3.18.0-null-to-false.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/841973 + +See also: +https://sourceforge.net/p/freeimage/mailman/message/37668470/ +https://git.alpinelinux.org/aports/commit/?id=9b938a7b38ea4b8d9a73f1bf0d90ee45bbfa9139 + +diff --git a/Source/FreeImage/PluginPSD.cpp b/Source/FreeImage/PluginPSD.cpp +index e5b5ffa..d9de81f 100644 +--- a/Source/FreeImage/PluginPSD.cpp ++++ b/Source/FreeImage/PluginPSD.cpp +@@ -127,7 +127,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { + static BOOL DLL_CALLCONV + Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) { + if(!handle) { +- return NULL; ++ return FALSE; + } + try { + psdParser parser; +-- +2.35.1 + diff --git a/media-libs/freeimage/freeimage-3.18.0-r8.ebuild b/media-libs/freeimage/freeimage-3.18.0-r8.ebuild index aef7915a1072..826ed42b593c 100644 --- a/media-libs/freeimage/freeimage-3.18.0-r8.ebuild +++ b/media-libs/freeimage/freeimage-3.18.0-r8.ebuild @@ -56,6 +56,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.18.0-openexr-3-imath.patch "${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch "${FILESDIR}"/${PN}-3.18.0-tiff-4.4.0.patch + "${FILESDIR}"/${PN}-3.18.0-null-to-false.patch ) src_prepare() {