From efb9e571d79cf2ee5b130cb679dd164379f01e42 Mon Sep 17 00:00:00 2001 From: Nicole O'Connor Date: Fri, 5 Apr 2024 15:56:53 -0700 Subject: [PATCH] games-fps/gzdoom: remove also headers patch --- games-fps/gzdoom/Manifest | 3 +- .../gzdoom/files/gzdoom-4.10.0-headers.patch | 106 ------------------ games-fps/gzdoom/gzdoom-4.11.3.ebuild | 1 - metadata/md5-cache/app-emulation/cellar-0.4 | 2 +- metadata/md5-cache/games-fps/gzdoom-4.11.3 | 2 +- 5 files changed, 3 insertions(+), 111 deletions(-) delete mode 100644 games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest index 0505aa0..901b120 100644 --- a/games-fps/gzdoom/Manifest +++ b/games-fps/gzdoom/Manifest @@ -1,5 +1,4 @@ -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.11.3.tar.gz 24354699 BLAKE2B 3ff436ad477a379f4ebeb68c211a85f77b446130687f754f5835a3e82044dd641d0301fda4d5e2fcf35d8eeb4cf511147ea8842ec377576b5ed840a6c59ec4aa SHA512 0abe69f85e2f0946e92d6ae2bbc4710c1e184a6748d4ef8a5f0c0daf31b67779b9085154877467144da650314e6c8dcde429cd47db06b17ec1ea66c63759568d -EBUILD gzdoom-4.11.3.ebuild 2330 BLAKE2B 486b9505ecad0329d71ab07b2acb2f596af33669bd0906eaa9236dd113fbb181e304d1cfacb49fbbd8915033b8973a06fdc96f36e78bbc8a11588bf1e7f1c349 SHA512 318ccdd91f27bc7dfb158e35c0ed3ac91901de6e3f2891fd4de5c3dafc2e67ef9835d1472ea2633f2502403f01b9203cffff323bf853290ae3a95e7d3409e8b7 +EBUILD gzdoom-4.11.3.ebuild 2288 BLAKE2B 463cb92b3a4251643d4aee60337c0138f7ca401987bb925cfc3a9b9952067275ccf721cc7e9ad8faa265571057b703a31efe2ad833ca4253a1f9b0223d33f1de SHA512 f78d4162c9022f319d7ac6e9bef4ccb190e4ea6a6f5d2255413d2cb2cd5a323633f000cf4dbc4e305c9c979aeb89073dd9d8784d2e9df15b1500e5bf8d3c2adc MISC metadata.xml 244 BLAKE2B c868d151b81a299adb629476d8a1cf4aef25f0bfe22a0d3d1d0522dda5b9f18b7b6628655a1cea8a0ecf22c1284230b7fda98ee78eec53338d73e93d4df232d3 SHA512 e8dd6eabe095c2a205abbec715ce1d5ac0bd4209a78189b0141d2472165ca7dbee91cd49555f6861efa7a437ba621ae421308522b4dea9b5c6299721819fdafa diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch b/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch deleted file mode 100644 index 3a3a153..0000000 --- a/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch +++ /dev/null @@ -1,106 +0,0 @@ -From b95dbaf914618cccaeaa95c650e02be669e477f8 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -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.11.3.ebuild b/games-fps/gzdoom/gzdoom-4.11.3.ebuild index d7e41e3..67f26a8 100644 --- a/games-fps/gzdoom/gzdoom-4.11.3.ebuild +++ b/games-fps/gzdoom/gzdoom-4.11.3.ebuild @@ -30,7 +30,6 @@ S="${WORKDIR}/${PN}-g${PV}" PATCHES=( "${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch - "${FILESDIR}"/${PN}-4.10.0-headers.patch ) src_prepare() { diff --git a/metadata/md5-cache/app-emulation/cellar-0.4 b/metadata/md5-cache/app-emulation/cellar-0.4 index eecc6bc..66f24c5 100644 --- a/metadata/md5-cache/app-emulation/cellar-0.4 +++ b/metadata/md5-cache/app-emulation/cellar-0.4 @@ -11,5 +11,5 @@ LICENSE=Apache-2.0 RDEPEND=app-arch/gzip dev-libs/crypto++ >=dev-lang/python-3.7 SLOT=0 SRC_URI=https://vcs.otl-hga.net/nicole/cellar/archive/v0.4.tar.gz -> cellar-0.4.tar.gz -_eclasses_=toolchain-funcs e56c7649b804f051623c8bc1a1c44084 multilib c19072c3cd7ac5cb21de013f7e9832e0 flag-o-matic 24c947ff5f858625cf0b33c15eed4425 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 xdg-utils baea6080dd821f5562d715887954c9d3 cmake c7c9a62d6232cac66d4ea32d575c3e7c +_eclasses_=toolchain-funcs e56c7649b804f051623c8bc1a1c44084 multilib c19072c3cd7ac5cb21de013f7e9832e0 flag-o-matic 288c54efeb5e2aa70775e39032695ad4 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 xdg-utils baea6080dd821f5562d715887954c9d3 cmake c7c9a62d6232cac66d4ea32d575c3e7c _md5_=da4050c7358fdabdd5127cd09a42031d diff --git a/metadata/md5-cache/games-fps/gzdoom-4.11.3 b/metadata/md5-cache/games-fps/gzdoom-4.11.3 index bad6a8c..714bbac 100644 --- a/metadata/md5-cache/games-fps/gzdoom-4.11.3 +++ b/metadata/md5-cache/games-fps/gzdoom-4.11.3 @@ -13,4 +13,4 @@ RDEPEND=app-arch/bzip2 media-libs/libjpeg-turbo:0= media-libs/libsdl2[gles2?,ope SLOT=0 SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.11.3.tar.gz -> gzdoom-4.11.3.tar.gz _eclasses_=toolchain-funcs e56c7649b804f051623c8bc1a1c44084 multilib c19072c3cd7ac5cb21de013f7e9832e0 flag-o-matic 288c54efeb5e2aa70775e39032695ad4 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 xdg-utils baea6080dd821f5562d715887954c9d3 cmake c7c9a62d6232cac66d4ea32d575c3e7c desktop 021728fdc1b03b36357dbc89489e0f0d xdg 4a14c5c24f121e7da66e5aab4a168c6e -_md5_=723ba8f5c423f457d54a71176256afc3 +_md5_=3887deeeeb0c9ebee098adf65d5c4fe0