git: 17891319f238 - main - graphics/gnash: fix build with boost 1.91
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 27 Sep 2026 15:27:41 UTC
The branch main has been updated by dinoex:
URL: https://cgit.FreeBSD.org/ports/commit/?id=17891319f238eaeec99c024fd56f5e2b43f136d0
commit 17891319f238eaeec99c024fd56f5e2b43f136d0
Author: Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2026-09-27 15:27:27 +0000
Commit: Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2026-09-27 15:27:27 +0000
graphics/gnash: fix build with boost 1.91
PR: 297587
---
graphics/gnash/Makefile | 3 ---
graphics/gnash/files/patch-configure.ac | 6 +++---
...-gtk_canvas.cpp => patch-gui_gtk_gtk_canvas.cpp} | 0
...ibbase-Makefile.am => patch-libbase_Makefile.am} | 0
graphics/gnash/files/patch-libcore_FillStyle.h | 21 +++++++++++++++++++++
...-movie_root.cpp => patch-libcore_movie_root.cpp} | 0
...e.cpp => patch-libdevice_vaapi_VaapiSurface.cpp} | 0
...=> patch-libmedia_ffmpeg_VideoDecoderFfmpeg.cpp} | 0
..._part.cpp => patch-plugin_klash4_klash_part.cpp} | 0
...h_part.cpp => patch-plugin_klash_klash_part.cpp} | 0
10 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index cb5efcfc6d7d..46fe85c22e4c 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -42,9 +42,6 @@ GH_PROJECT= gnash
GH_TAGNAME= 583ccbc1
GNU_CONFIGURE= yes
PORTSCOUT= limit:^0\.
-BROKEN_amd64= regression with boost-1.91
-BROKEN_arm64= regression with boost-1.91
-BROKEN_i386= regression with boost-1.91
SYSCONFIGDIR= ${PREFIX}/etc
diff --git a/graphics/gnash/files/patch-configure.ac b/graphics/gnash/files/patch-configure.ac
index c9881689de80..a0ea30dbd4ab 100644
--- a/graphics/gnash/files/patch-configure.ac
+++ b/graphics/gnash/files/patch-configure.ac
@@ -1,4 +1,4 @@
---- configure.ac.orig 2016-07-21 12:25:09 UTC
+--- configure.ac.orig 2019-01-30 23:45:03 UTC
+++ configure.ac
@@ -1201,7 +1201,7 @@ if test x"${build_egl_device}" = xyes; then
build_egl_device=no
@@ -9,7 +9,7 @@
native_window_type=none
AC_MSG_CHECKING([For EGLNativeWindowType type])
AC_TRY_COMPILE([#include <EGL/eglplatform.h>], [
-@@ -4144,7 +4144,7 @@ if test x${build_ssl} = xyes; then
+@@ -4145,7 +4145,7 @@ if test x${build_ssl} = xyes; then
fi
echo " SSL libs are: $SSL_LIBS"
else
@@ -18,7 +18,7 @@
fi
fi
-@@ -4157,7 +4157,7 @@ if test x${build_ssh} = xyes; then
+@@ -4158,7 +4158,7 @@ if test x${build_ssh} = xyes; then
fi
echo " SSH libs are: $SSH_LIBS"
else
diff --git a/graphics/gnash/files/patch-gui-gtk-gtk_canvas.cpp b/graphics/gnash/files/patch-gui_gtk_gtk_canvas.cpp
similarity index 100%
rename from graphics/gnash/files/patch-gui-gtk-gtk_canvas.cpp
rename to graphics/gnash/files/patch-gui_gtk_gtk_canvas.cpp
diff --git a/graphics/gnash/files/patch-libbase-Makefile.am b/graphics/gnash/files/patch-libbase_Makefile.am
similarity index 100%
rename from graphics/gnash/files/patch-libbase-Makefile.am
rename to graphics/gnash/files/patch-libbase_Makefile.am
diff --git a/graphics/gnash/files/patch-libcore_FillStyle.h b/graphics/gnash/files/patch-libcore_FillStyle.h
new file mode 100644
index 000000000000..d890bcc1e50c
--- /dev/null
+++ b/graphics/gnash/files/patch-libcore_FillStyle.h
@@ -0,0 +1,21 @@
+--- libcore/FillStyle.h.orig
++++ libcore/FillStyle.h
+@@ -25,6 +25,7 @@
+ #include <iosfwd>
+ #include <boost/intrusive_ptr.hpp>
+ #include <cassert>
++#include <type_traits>
+
+ #include "SWFMatrix.h"
+ #include "SWF.h"
+@@ -289,7 +290,9 @@
+ /// The non-explicit templated contructor allows the same syntax as a
+ /// simple boost::variant:
+ /// FillStyle f = GradientFill();
+- template<typename T> FillStyle(const T& f) : fill(f) {}
++ template<typename T, typename = typename std::enable_if<
++ std::is_constructible<Fill, const T&>::value>::type>
++ FillStyle(const T& f) : fill(f) {}
+
+ FillStyle(const FillStyle& other)
+ :
diff --git a/graphics/gnash/files/patch-libcore-movie_root.cpp b/graphics/gnash/files/patch-libcore_movie_root.cpp
similarity index 100%
rename from graphics/gnash/files/patch-libcore-movie_root.cpp
rename to graphics/gnash/files/patch-libcore_movie_root.cpp
diff --git a/graphics/gnash/files/patch-libdevice-vaapi-VaapiSurface.cpp b/graphics/gnash/files/patch-libdevice_vaapi_VaapiSurface.cpp
similarity index 100%
rename from graphics/gnash/files/patch-libdevice-vaapi-VaapiSurface.cpp
rename to graphics/gnash/files/patch-libdevice_vaapi_VaapiSurface.cpp
diff --git a/graphics/gnash/files/patch-libmedia-ffmpeg-VideoDecoderFfmpeg.cpp b/graphics/gnash/files/patch-libmedia_ffmpeg_VideoDecoderFfmpeg.cpp
similarity index 100%
rename from graphics/gnash/files/patch-libmedia-ffmpeg-VideoDecoderFfmpeg.cpp
rename to graphics/gnash/files/patch-libmedia_ffmpeg_VideoDecoderFfmpeg.cpp
diff --git a/graphics/gnash/files/patch-plugin-klash4-klash_part.cpp b/graphics/gnash/files/patch-plugin_klash4_klash_part.cpp
similarity index 100%
rename from graphics/gnash/files/patch-plugin-klash4-klash_part.cpp
rename to graphics/gnash/files/patch-plugin_klash4_klash_part.cpp
diff --git a/graphics/gnash/files/patch-plugin-klash-klash_part.cpp b/graphics/gnash/files/patch-plugin_klash_klash_part.cpp
similarity index 100%
rename from graphics/gnash/files/patch-plugin-klash-klash_part.cpp
rename to graphics/gnash/files/patch-plugin_klash_klash_part.cpp