From 5d09fc9f5630bcabb50afc96e20ff662a0771440 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 22 Mar 2023 18:43:12 +0000
Subject: gentoo auto-resync : 22:03:2023 - 18:43:12

---
 ...-rebirth-0.61.0_pre20210623-gcc-12-editor.patch | 23 ++++++++++
 .../dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch | 51 ++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch
 create mode 100644 games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch

(limited to 'games-action/dxx-rebirth/files')

diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch
new file mode 100644
index 000000000000..fbb03cf8f334
--- /dev/null
+++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch
@@ -0,0 +1,23 @@
+With USE=editor and gcc12:
+
+    similar/main/piggy.cpp: In function 'void d2x::piggy_new_pigfile(char*)':
+    similar/main/piggy.cpp:870:62: error: '%u' directive output may be truncated writing between 1 and 10 bytes into a region of size between 7 and 19 [-Werror=format-truncation=]
+
+But the offending code is unused, so can just drop it.
+
+Backport from:
+https://github.com/dxx-rebirth/dxx-rebirth/commit/12cca97870efe419613462dc279963a77bc80d9a
+--- a/similar/main/piggy.cpp
++++ b/similar/main/piggy.cpp
+@@ -889,11 +889,8 @@ void piggy_new_pigfile(char *pigname)
+ 				}
+ 			
+ 				for (fnum=0;fnum<nframes; fnum++)       {
+-					char tempname[20];
+ 					int SuperX;
+ 
+-					snprintf(tempname, sizeof(tempname), "%s#%u", basename, fnum);
+-
+ 					//SuperX = (GameBitmaps[i+fnum].bm_flags&BM_FLAG_SUPER_TRANSPARENT)?254:-1;
+ 					SuperX = (GameBitmapFlags[i+fnum]&BM_FLAG_SUPER_TRANSPARENT)?254:-1;
+ 					//above makes assumption that supertransparent color is 254
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch
new file mode 100644
index 000000000000..0adc507cada5
--- /dev/null
+++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/902463
+
+https://github.com/dxx-rebirth/dxx-rebirth/pull/705
+https://github.com/dxx-rebirth/dxx-rebirth/commit/189ac23f61605903eb3eaa0004d287b7bd9296bc
+--- a/SConstruct
++++ b/SConstruct
+@@ -324,3 +324,3 @@
+ 		def __init__(self,env,keyviews,_l=[]):
+-			self.flags = {k: env.get(k, _l)[:] for k in itertools.chain.from_iterable(keyviews)}
++			self.flags = {k: env.get(k, _l).copy() for k in itertools.chain.from_iterable(keyviews)}
+ 		def restore(self,env):
+@@ -1493,3 +1493,3 @@
+ 			user_settings.max_axes_per_joystick = user_settings.max_buttons_per_joystick = user_settings.max_hats_per_joystick = 0
+-		successflags['CPPDEFINES'] = CPPDEFINES = successflags.get('CPPDEFINES', [])[:]
++		successflags['CPPDEFINES'] = CPPDEFINES = successflags.get('CPPDEFINES', []).copy()
+ 		# use Redbook if at least one of the following applies
+@@ -4608,3 +4608,3 @@
+ 		for test in runtime_test_boost_tests:
+-			LIBS = [] if test.nodefaultlibs else env['LIBS'][:]
++			LIBS = [] if test.nodefaultlibs else env['LIBS'].copy()
+ 			LIBS.append('boost_unit_test_framework')
+@@ -4850,3 +4850,3 @@
+ 			kwargs['CXXFLAGS'] = (env['CXXFLAGS'] or []) + ['-E']
+-			kwargs['CPPDEFINES'] = (env['CPPDEFINES'] or []) + [
++			kwargs['CPPDEFINES'] = list(env['CPPDEFINES'] or []) + [
+ 					# Define these tokens to themselves so that
+@@ -4870,3 +4870,3 @@
+ 	def _apply_env_version_seq(self,env,_empty={}):
+-		return _empty if self.user_settings.pch else {'CPPDEFINES' : env['CPPDEFINES'] + [('DXX_VERSION_SEQ', self.DXX_VERSION_SEQ)]}
++		return _empty if self.user_settings.pch else {'CPPDEFINES' : list(env['CPPDEFINES']) + [('DXX_VERSION_SEQ', self.DXX_VERSION_SEQ)]}
+ 	get_objects_similar_arch_ogl = DXXCommon.create_lazy_object_states_getter((LazyObjectState(sources=(
+@@ -4966,3 +4966,3 @@
+ ),
+-		transform_env = (lambda self, env: {'CPPDEFINES' : env['CPPDEFINES'] + env.__dxx_CPPDEFINE_SHAREPATH + env.__dxx_CPPDEFINE_git_version}),
++		transform_env = (lambda self, env: {'CPPDEFINES' : list(env['CPPDEFINES']) + env.__dxx_CPPDEFINE_SHAREPATH + env.__dxx_CPPDEFINE_git_version}),
+ 		transform_target=_apply_target_name,
+@@ -4976,3 +4976,3 @@
+ ),
+-		transform_env = (lambda self, env: {'CPPDEFINES' : env['CPPDEFINES'] + env.__dxx_CPPDEFINE_SHAREPATH}),
++		transform_env = (lambda self, env: {'CPPDEFINES' : list(env['CPPDEFINES']) + env.__dxx_CPPDEFINE_SHAREPATH}),
+ 		transform_target=_apply_target_name,
+@@ -5185,3 +5185,3 @@
+ 		versid_build_environ = ['CXX', 'CPPFLAGS', 'CXXFLAGS', 'LINKFLAGS']
+-		versid_cppdefines = env['CPPDEFINES'][:]
++		versid_cppdefines = env['CPPDEFINES'].copy()
+ 		extra_version = user_settings.extra_version
+@@ -5303,3 +5303,3 @@
+ 		else:
+-			syspath = sys.path[:]
++			syspath = sys.path.copy()
+ 			cocoa = 'common/arch/cocoa'
-- 
cgit v1.2.3