gentoo auto-resync : 16:04:2025 - 08:45:29

4 files changed, 26 insertions, 3 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 59b6f0f957e2..f457b9bf9151 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index c82775ce786f..03353e2191ac 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,3 +1,4 @@
-DIST mandelbulber2-2.32.tar.gz 134765742 BLAKE2B a43ab2e445a65901190c42d6afb947e94d322ddb41f179a9a4763feee8ae5b8e510c2ab6f842b7f17b5b800184a73088b2a3ee4b8d359ffa5e15159eb7f957ad SHA512 f42cebd4939a7d1216c1c09f669bf3bf244e249a8428c02919a735959a5dd91c8614313d21b25cb6f26acd5f7d711287e3c10239c143f542887706f4f970fff4
-EBUILD mandelbulber-2.32.ebuild 1836 BLAKE2B 0f1b10b8948dd3de901810cc1635f6352fe4a932009cd834a1812c1d33772988f60772b403372d6cd9f75e27010d943eaca13e3bb428dda82b18015f04adc182 SHA512 706d1ef002d5268897e9b32df73582eb25d085d85cdb1e4414b30505665f43fcf2c6282cb2aa4b5b680184d59584bdcf4f1795d5155c87ad7b553a8dfa8772a7
+AUX mandelbulber-2.33-gsl.patch 689 BLAKE2B 0e2b98d66df59baa4f34fd916861fcada78a4e73ee513cc507dcb0aa21a2e2a1001b76b0f7849de8fabdfc5b98b21547c7f0e94b76f764454067e2d71f5161d7 SHA512 b9a0d327f22883287d0ec10dedf87a9330ff7c6ee06ef7dff6535d8929743af1dcf52aa2fae78c4922030a30efa2913a8b6f516b6c3e195ad4ca55ea5f0198b3
+DIST mandelbulber2-2.33.tar.gz 136014229 BLAKE2B 3650914f35245dd943a967a685d6c98e1cc7540f945c3c5275edf239e310d116b375bad72f1937c4bc519816cfffe1cb6940f1c15d17b43eb7847c41a6e33594 SHA512 6f199b233cf79f6e0210c1ebd56075bc7551c1e7f712856121e7bcadcbf265ed1c1dd4850a815fb2e53a07a846660e7c49f341aff0df9eb53dfc6c80a1dd7f00
+EBUILD mandelbulber-2.33.ebuild 1885 BLAKE2B c8bdab4abd0583348bfdd73bd56c154ac41d4b344494a5b9a950eed7d7a02c13d119f50fd0e380b0bb34d8c1850574ae556d68231091ba628c9a4a840e5b9582 SHA512 d68b7ff80b878867d879880216a191691f21197b114baf9eb5f819480d0aca4b6d1f4fb18939c04caa7c9d6cb704a75191c527b7ba23235d9138924212e430f3
 MISC metadata.xml 672 BLAKE2B 8b7d423df1cd3f405b43bbeea9f6de9438951cf55b2020016b3174376e5498f2bc903295afde6626bf342b77050210eec78db8672cf2555f344f12248f1e58be SHA512 4005cd3324e642b6ea382e992949c1a3f459cef6f6094eb896e58fbc5651cd1d88c6575ef76896673bd0589e46285d3df9858a110f9b4b4c867c797a329dee77
diff --git a/media-gfx/mandelbulber/files/mandelbulber-2.33-gsl.patch b/media-gfx/mandelbulber/files/mandelbulber-2.33-gsl.patch
new file mode 100644
index 000000000000..c047276b3c03
--- /dev/null
+++ b/media-gfx/mandelbulber/files/mandelbulber-2.33-gsl.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/834692
+https://github.com/buddhi1980/mandelbulber2/pull/972
+https://github.com/microsoft/GSL/issues/466
+
+By injecting -I/usr/include/gsl, `#include <algorithm>` starts to mean
+"use ms-gsl's algorithm" rather than the C++ stdlib one. But all of the
+includes for ms-gsl here are properly namespaced, e.g. <gsl/foo.h>, so
+we can drop the explicit -I*.
+--- a/makefiles/common.pri
++++ b/makefiles/common.pri
+@@ -122,7 +122,6 @@ macx:DEFINES += "SHARED_DIR_IS_APP_DIR"
+ # test hardcoded lib path for gsl in travis container 
+ #QMAKE_CXXFLAGS += -I/usr/include/gsl
+ 
+-QMAKE_CXXFLAGS += -I/usr/include/gsl
+ m1:QMAKE_CXXFLAGS += -I/opt/homebrew/include
+ 
+ # library linking
diff --git a/media-gfx/mandelbulber/mandelbulber-2.32.ebuild b/media-gfx/mandelbulber/mandelbulber-2.33.ebuild
index 328c2a2bef17..dc9c8f1b91bd 100644
--- a/media-gfx/mandelbulber/mandelbulber-2.32.ebuild
+++ b/media-gfx/mandelbulber/mandelbulber-2.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -41,6 +41,10 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.33-gsl.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
 }