gentoo auto-resync : 07:08:2023 - 21:25:57

4 files changed, 110 insertions, 2 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 3d1bf997e46f..18946e7b3d4e 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index c9c92c6ae92b..3665bfb511b2 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,5 +1,6 @@
 AUX gzdoom-4.10.0-gcc-13.patch 497 BLAKE2B 400f439c3ae4e956e205357051edeb23732db9a8d43e72e8dd6f38900869f3f10d720bec6b0077f8e7a9567d7f8bd6c5204d405302802cde6bb41ecf3e36804c SHA512 22e11299121fd0f74e5b5e09c1530e3e158f50fb49402715a92397b3fdcb7d9944ce41f30efbbe8b98c57939c067f4689b7e96ddacf17d0da72059829d5f5e29
+AUX gzdoom-4.10.0-headers.patch 3999 BLAKE2B 88a024fee77f89d4a58c29b51617f2f28ba8abc914b319bf0dfbbcc6e44dbc34a3af1d79f9196b9b3dad1a72ddbad4dfde879761728aef404b9138da712a4f60 SHA512 175d6ca534e2e8e934c385b399067a55055bb5de7162a3e1e01f396c7a97c229aabddc9bde133df6db9f2ccf53eb59afc823abfb0f749cd9705429fd13cca50b
 AUX gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch 1209 BLAKE2B b3cf80ab4d6328dbcb14ceb9514883ed58b8086dab02182f4cf8964140095dd8d6ac0503c68a4c7442c0f9cc92b4bb6b3e084eee026be52842413e15118a13be SHA512 a08c29fe6b867dbbe60035c99c31d1bce73c1ff37ca2c15f659e060b77366f6fcdc11d2319dee3331d9874115e92566b9c0a6364604869f3815fbb0ee7179ef6
 DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586 SHA512 fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6
-EBUILD gzdoom-4.10.0.ebuild 2314 BLAKE2B 59e23ec80bd842c2fafede5ca9fe5f9aa4ff8b232a24e907ceb540026245f0207d7ad7995020909112b4c54996415a28b8330b23147dec56fc15a010eda76bc4 SHA512 99492f1fe0a17b3371ceb4a8e1a89669b9171be8ab05e9b400dff318d083c91a46052a208bcf01f770349ce74fded03045b26072cc33ab45e24e0c14fd3476c8
+EBUILD gzdoom-4.10.0.ebuild 2348 BLAKE2B 7df7ceaad500561d6be8a12c44c726f36cfa842c08286e8e951141575f3511dad12b9a7b98f5ece1b31e3678223aab4bb3cd9e30f33bf3a5a88b8f5a3452eeec SHA512 966c031675d45424e8f5ed2be484297d3345b5b6e9e9524cc9056c5a26d6f8418a1054dd86baa0c6530619c3a03c42d5c2bae311918e4a654f6c5bb8633a83d6
 MISC metadata.xml 880 BLAKE2B 2567e34ed2a970d0d8ca70590dc6e6440b09f9949f2283c9b028a4245265db826d8ecc27710226738cf418a64aeaa0776b2909c377db3f06efa6dabd2d624fff SHA512 037a5f1e53ffc75178d895e0c232ce62181785155875e3eee0f814273ece452baaead182185d3dd6f5cea4ddb110a17072b796559c964694a46bd52ec0290822
diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch b/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch
new file mode 100644
index 000000000000..3a3a153b5a6e
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch
@@ -0,0 +1,106 @@
+From b95dbaf914618cccaeaa95c650e02be669e477f8 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 1 Jul 2023 13:36:48 +0100
+Subject: [PATCH] Ensure local headers are used over system headers to avoid
+ breakage
+
+types.h was being picked up from webp rather than locally due to the
+`include_directories` call for GTK (and therefore its -I arguments)
+coming before the same call for the local sources. webp can be pulled in
+via GTK -> gdk-pixbuf -> tiff -> webp.
+
+This can be avoided by specifying `SYSTEM` or `BEFORE` as appropriate
+when calling `include_directories`. I have done both for good measure.
+---
+ src/CMakeLists.txt          | 18 ++++++++++--------
+ tools/zipdir/CMakeLists.txt |  2 +-
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index cf254ad6a..b4d06f9ce 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -97,7 +97,7 @@ else()
+ 				if( NOT DYN_GTK )
+ 					set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK3_LIBRARIES} )
+ 				endif()
+-				include_directories( ${GTK3_INCLUDE_DIRS} )
++				include_directories( SYSTEM ${GTK3_INCLUDE_DIRS} )
+ 				link_directories( ${GTK3_LIBRARY_DIRS} )
+ 			else()
+ 				pkg_check_modules( GTK2 gtk+-2.0 )
+@@ -105,7 +105,7 @@ else()
+ 					if( NOT DYN_GTK )
+ 						set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK2_LIBRARIES} )
+ 					endif()
+-					include_directories( ${GTK2_INCLUDE_DIRS} )
++					include_directories( SYSTEM ${GTK2_INCLUDE_DIRS} )
+ 					link_directories( ${GTK2_LIBRARY_DIRS} )
+ 				else()
+ 					set( NO_GTK ON )
+@@ -132,7 +132,7 @@ else()
+ 	# Non-Windows version also needs SDL except native OS X backend
+ 	if( NOT APPLE OR NOT OSX_COCOA_BACKEND )
+ 		find_package( SDL2 REQUIRED )
+-		include_directories( "${SDL2_INCLUDE_DIR}" )
++		include_directories( SYSTEM "${SDL2_INCLUDE_DIR}" )
+ 		set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${SDL2_LIBRARY}" )
+ 	endif()
+ 
+@@ -143,7 +143,7 @@ if( NOT NO_OPENAL )
+ 		find_package( OpenAL )
+ 		mark_as_advanced(CLEAR OPENAL_INCLUDE_DIR)
+ 		if( OPENAL_INCLUDE_DIR )
+-			include_directories( ${OPENAL_INCLUDE_DIR} )
++			include_directories( SYSTEM ${OPENAL_INCLUDE_DIR} )
+ 			mark_as_advanced(CLEAR OPENAL_LIBRARY)
+ 			if( OPENAL_LIBRARY )
+ 				set( PROJECT_LIBRARIES ${OPENAL_LIBRARY} ${PROJECT_LIBRARIES} )
+@@ -373,17 +373,17 @@ endif()
+ 
+ if( VPX_FOUND )
+ 	add_definitions( "-DUSE_LIBVPX=1" )
+-	include_directories( "${VPX_INCLUDE_DIR}" )
++	include_directories( SYSTEM "${VPX_INCLUDE_DIR}" )
+ 	set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${VPX_LIBRARIES} )
+ else()
+ 	message( SEND_ERROR "Could not find libvpx" )
+ endif()
+ 
+-include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}")
++include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}")
+ 
+ if( ${HAVE_VM_JIT} )
+ 	add_definitions( -DHAVE_VM_JIT )
+-	include_directories( "${ASMJIT_INCLUDE_DIR}" )
++	include_directories( SYSTEM "${ASMJIT_INCLUDE_DIR}" )
+ 	set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ASMJIT_LIBRARIES}")
+ endif()
+ 
+@@ -1243,7 +1243,9 @@ endif()
+ 
+ target_link_libraries( zdoom ${PROJECT_LIBRARIES} gdtoa lzma ${ZMUSIC_LIBRARIES} )
+ 
+-include_directories( .
++include_directories(
++	BEFORE
++	.
+ 	common/audio/sound
+ 	common/audio/music
+ 	common/2d
+diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt
+index 65eb2fb72..762d9027f 100644
+--- a/tools/zipdir/CMakeLists.txt
++++ b/tools/zipdir/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required( VERSION 3.1.0 )
+ 
+ if( NOT CMAKE_CROSSCOMPILING )
+-	include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )
++	include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )
+ 	add_executable( zipdir
+ 		zipdir.c )
+ 	target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma )
+-- 
+2.41.0
+
diff --git a/games-fps/gzdoom/gzdoom-4.10.0.ebuild b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
index 16c223070e34..605c7cdcf993 100644
--- a/games-fps/gzdoom/gzdoom-4.10.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,6 +31,7 @@ S="${WORKDIR}/${PN}-g${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
 	"${FILESDIR}"/${P}-gcc-13.patch
+	"${FILESDIR}"/${P}-headers.patch
 )
 
 src_prepare() {