gentoo auto-resync : 22:03:2023 - 18:43:12

4 files changed, 79 insertions, 1 deletions

diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index 8784aede800d..6d40c230b729 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1,5 +1,7 @@
+AUX dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch 964 BLAKE2B c0fb0dd89195eec975c30b83a35b0bd163e6fa5fc1fd17f8560a747f1b474420d9ec3fa3c808305e88de7748bbdc2c03ac0e4958a0f64d79bf2db2d88f44821f SHA512 24aad4db804e276a9a4e741aa169b35a5e35841ea72cf187231976f9b30f69540a2d8036cc09ae609522390e08be6ad0f4a9ec67fc253ce38b44719b0992e57b
 AUX dxx-rebirth-0.61.0_pre20210623-gcc-12.patch 1204 BLAKE2B 3482928a1ec1ca2020b77dbbea64f485bb40537c24373b01068a907f1abde7d3bea5d1e165c7f467256e4c1663e62c49c47845760df04e6093e06019ae25bf5d SHA512 33d213c7225bd0be1e2eea9ace068b5a7ffc28e3ce034014000e88b7c741dcaddbe44947fced67dfe3a9af8277df3dc196145433da3898d9572ea1a171603b5d
+AUX dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch 2754 BLAKE2B 088954d04e6ab23dacdf565adfc033af9d7b002a15ec86d07b66b2e864a6b013bed0532a58592f51b3790a1647b2c3fd780f35c3416f7c8a54618c7d0fdcef27 SHA512 b5df1e52b7f4602b6b2dbb7dc928749b532c57d59ede2af7d7329b8415b33347744b93cd2428e9344f1fb575dcf776c1de55b4b4263cacdc8c6dee6ec2005b3e
 DIST dxx-rebirth_20210623-src.tar.xz 1340044 BLAKE2B f16a8904d777559e789d719bc0d6d2dbb7d26c1128984117b6c64a334ae589dd5806439cc51e458a583e1b6cc831dae7c51bf7bd3fbc972989b0ce4e5b932a4e SHA512 150d873fa045df6fb2f9bb70334d08eeae0cc7a639e825f1352fed28501ab9541a27bf3395fc1929bc8d76ed9126b038eed67c5a01657f43116da4663e929821
-EBUILD dxx-rebirth-0.61.0_pre20210623.ebuild 8556 BLAKE2B 3d72ae79935c614705cdc8536f8d9e27a5b8f52e83cfc78d2fd0bbf02f6ab6732a2d1ebffe4b41fcd83a492f68ce78cf7ad12e42982fee8f4e4b2588a27743fb SHA512 63f35a5fdafa3e396c50e68871e1185ff951d8033c7f0a95cd710b77b2e17fbd74daa29b2296b87b34ed836ab286986efdac548f4dbfcddb56d815fcbed78923
+EBUILD dxx-rebirth-0.61.0_pre20210623.ebuild 8632 BLAKE2B 7f178fb25351f021b406f141781d815ecd3d3b5da8ce9eee30e2bb41bec196e51adf4f4825c3650ca9da30d066bdc0bcfcaaaafeb6155ceed3c0936c9cf8c7ee SHA512 af0c70052b494b32554c3ed9b14ea887b0994d8e5ad09fd652101f8f08732226eed3539263ed3d7691e7bc6447c12c3e996f275c3ebe18f9ae6d06b4b1038865
 EBUILD dxx-rebirth-9999.ebuild 8546 BLAKE2B 9634616c01b562de777d19f309dc197a152cf453368292dcd0824a454e6568d37420471d04140fc1de4f41a9b1488595f106b5e8d06fea4957be8f85dd3a1868 SHA512 b3e95904bfd97b86ada1d91bdd9d9669f47e8856c9decadcbdfdc8547d1e537d8314608c9fc97e766c47ffe9ed943185ae2d739358a28b75b885388ecd9767f7
 MISC metadata.xml 2538 BLAKE2B fd07b7eed8d0b484312d4ee54a6b13834b823ee2cd23eb8e5cef93a5b44b4311c2eee97946fed8d303883142b65243dbbefab921a7e01a111bc5126334230113 SHA512 9d07f6718f74adddcd9e3041758e29e456d62c8808c30f2e6963872a9d647491dea380134951973eeaad63dea0fb88710a5b6fc8e37461f011e6d8aea0e69693
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index f703b0ade70e..77aab2a2ddca 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -164,6 +164,8 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc-12.patch
+	"${FILESDIR}"/${P}-gcc-12-editor.patch
+	"${FILESDIR}"/${P}-scons-4.5.patch
 )
 
 dxx_scons() {
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'