[packages/blender] upstream build fix for boost 1.81
atler
atler at pld-linux.org
Tue Feb 21 14:38:02 CET 2023
commit 938d797ac0f98767645637d6dd9556c8c4cc1133
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Feb 21 14:37:18 2023 +0100
upstream build fix for boost 1.81
blender.spec | 2 ++
boost1.81.patch | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+)
---
diff --git a/blender.spec b/blender.spec
index bd45131..7243d52 100644
--- a/blender.spec
+++ b/blender.spec
@@ -12,6 +12,7 @@ Source0: https://download.blender.org/source/%{name}-%{version}.tar.xz
# Source0-md5: 483e16f010cc8c2363ba05b716fde3d0
Patch0: %{name}-2.76-droid.patch
Patch1: format-security.patch
+Patch2: boost1.81.patch
URL: https://www.blender.org/
BuildRequires: OpenAL-devel
BuildRequires: OpenColorIO-devel
@@ -74,6 +75,7 @@ Blender to darmowy i w pełni funkcjonalny pakiet do tworzenia animacji
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
release/scripts/addons/io_curve_svg/svg_util_test.py \
diff --git a/boost1.81.patch b/boost1.81.patch
new file mode 100644
index 0000000..914047a
--- /dev/null
+++ b/boost1.81.patch
@@ -0,0 +1,22 @@
+From 79837c5ed4b57925bf6c6bb9e7c2248f6f52bbb0 Mon Sep 17 00:00:00 2001
+From: Sebastian Parborg <darkdefende at gmail.com>
+Date: Wed, 4 Jan 2023 15:23:26 +0100
+Subject: [PATCH] Fix building with boost >= 1.81
+
+In boost 1.81 they no longer implicitly include <iostream> anymore.
+---
+ intern/locale/boost_locale_wrapper.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/intern/locale/boost_locale_wrapper.cpp b/intern/locale/boost_locale_wrapper.cpp
+index fb0e194352a7..80e8d89799a8 100644
+--- a/intern/locale/boost_locale_wrapper.cpp
++++ b/intern/locale/boost_locale_wrapper.cpp
+@@ -6,6 +6,7 @@
+ */
+
+ #include <boost/locale.hpp>
++#include <iostream>
+ #include <stdio.h>
+
+ #include "boost_locale_wrapper.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/blender.git/commitdiff/a6ef6de900b659c1a8b19af22e6249f4ce4d5cfb
More information about the pld-cvs-commit
mailing list