commit: 85f08ecc7d44f5c9b0e8ed474b049e36a70af724 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Oct 21 08:16:06 2023 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Oct 21 08:16:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85f08ecc
games-engines/odamex: Bump to 10.4.0, drop old 10.3.0-r1 Closes: https://bugs.gentoo.org/915983 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-engines/odamex/Manifest | 2 +- .../odamex/files/odamex-10.3.0-master-fix.patch | 31 ---------------------- ...damex-10.3.0-r1.ebuild => odamex-10.4.0.ebuild} | 1 - 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest index c2381d9c7a73..0bc5ecb71c7d 100644 --- a/games-engines/odamex/Manifest +++ b/games-engines/odamex/Manifest @@ -1 +1 @@ -DIST odamex-src-10.3.0.tar.gz 24281159 BLAKE2B f38eacf700f21caa1300e46d926f6e07b97944326cd0ef9d22c3e14af82e91f39e88ae055d90442b81237888b90b8a1c478a54fd599b9648790260863916fb1f SHA512 902f4d20b9246ea94b50099e0ab2c6cd17faad68df344114e9963e100c35a4ac141f3d109b7affb8860a4e082a39ffcfdfcea45d9e6ada6efe09f01c3546f92b +DIST odamex-src-10.4.0.tar.gz 24233204 BLAKE2B 377f14db15a367db3e84267a1483d5e138291fcefe53c2d522d2767ddd4a804df7ab31726d8818497c1eed93e6f0658fa4f855b6f4b0610f378a4ef3aab180b6 SHA512 12c114181aaf50e8c1f8c04d6e252f422fe887b5dc0be21974f5c1ac6645e1988091af638eb68fb9667ec4c7c2bdd5bb49981546644c33e90c80a9baefe2c930 diff --git a/games-engines/odamex/files/odamex-10.3.0-master-fix.patch b/games-engines/odamex/files/odamex-10.3.0-master-fix.patch deleted file mode 100644 index 1a20d8f6523c..000000000000 --- a/games-engines/odamex/files/odamex-10.3.0-master-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 10beb4212625ee5e6d5b8a55e94d22d70d630217 Mon Sep 17 00:00:00 2001 -From: Jan200101 <sentrycraft...@gmail.com> -Date: Wed, 19 Apr 2023 14:33:33 +0200 -Subject: [PATCH] include time.h on all platforms - ---- - master/main.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/master/main.cpp b/master/main.cpp -index a69af8dd0..3226792a7 100644 ---- a/master/main.cpp -+++ b/master/main.cpp -@@ -38,16 +38,15 @@ - #include <string.h> - - #include <stdint.h> -+#include <time.h> - - #ifdef UNIX - #include <netinet/in.h> - #include <unistd.h> --#include <sys/time.h> - #endif - - #ifdef _WIN32 - #include <winsock.h> --#include <time.h> - #define usleep(n) Sleep(n/1000) - #endif - diff --git a/games-engines/odamex/odamex-10.3.0-r1.ebuild b/games-engines/odamex/odamex-10.4.0.ebuild similarity index 98% rename from games-engines/odamex/odamex-10.3.0-r1.ebuild rename to games-engines/odamex/odamex-10.4.0.ebuild index 0c99afc1d885..594869339e54 100644 --- a/games-engines/odamex/odamex-10.3.0-r1.ebuild +++ b/games-engines/odamex/odamex-10.4.0.ebuild @@ -42,7 +42,6 @@ S="${WORKDIR}/${PN}-src-${PV}" PATCHES=( "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch - "${FILESDIR}"/${P}-master-fix.patch ) src_prepare() {