commit: 0a56a8b1acb1a845003e63121029e7c5741a074b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 13:08:09 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 13:12:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a56a8b1
games-emulation/desmume: remove unused patches
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
...mume-0.9.11-fix-pointer-conversion-warning.diff | 11 -----
.../desmume/files/desmume-0.9.11-gcc6.patch | 47 ----------------------
.../desmume/files/desmume-0.9.11-gcc7.patch | 21 ----------
3 files changed, 79 deletions(-)
diff --git
a/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff
b/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff
deleted file mode 100644
index 8975085133f..00000000000
---
a/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/path.h 2015-02-14 16:05:26.000000000 +0100
-+++ b/src/path.h 2016-07-11 12:09:59.591987169 +0200
-@@ -375,7 +375,7 @@
- else if (strchr(strftimeArgs, *p))
- {
- char tmp[MAX_PATH];
-- char format[] = { '%', *p, NULL };
-+ char format[] = { '%', *p, '\0' };
- strftime(tmp, MAX_PATH, format,
time_struct);
- file.append(tmp);
- }
diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch
b/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch
deleted file mode 100644
index 761ccef045c..00000000000
--- a/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/src/wifi.cpp
-+++ b/src/wifi.cpp
-@@ -314,9 +314,9 @@
-
- #if (WIFI_LOGGING_LEVEL >= 1)
- #if WIFI_LOG_USE_LOGC
-- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL)
LOGC(8, "WIFI: "__VA_ARGS__);
-+ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL)
LOGC(8, "WIFI: " __VA_ARGS__);
- #else
-- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL)
printf("WIFI: "__VA_ARGS__);
-+ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL)
printf("WIFI: " __VA_ARGS__);
- #endif
- #else
- #define WIFI_LOG(level, ...) {}
---- a/src/MMU_timing.h
-+++ b/src/MMU_timing.h
-@@ -155,8 +155,8 @@
- enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT };
- enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT };
- enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT };
-- enum { TAGMASK = (u32)(~0 << TAGSHIFT) };
-- enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 <<
BLOCKSIZESHIFT) };
-+ enum { TAGMASK = (u32)(~0U << TAGSHIFT) };
-+ enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U <<
BLOCKSIZESHIFT) };
- enum { WORDSIZE = sizeof(u32) };
- enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE };
- enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY };
---- a/src/ctrlssdl.cpp
-+++ b/src/ctrlssdl.cpp
-@@ -200,7 +200,7 @@
- break;
- case SDL_JOYAXISMOTION:
- /* Dead zone of 50% */
-- if( (abs(event.jaxis.value) >> 14) != 0 )
-+ if( ((u32)abs(event.jaxis.value) >> 14) != 0 )
- {
- key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 |
((event.jaxis.axis & 127) << 1);
- if (event.jaxis.value > 0) {
-@@ -370,7 +370,7 @@
- Note: button constants have a 1bit offset. */
- case SDL_JOYAXISMOTION:
- key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 |
((event->jaxis.axis & 127) << 1);
-- if( (abs(event->jaxis.value) >> 14) != 0 )
-+ if( ((u32)abs(event->jaxis.value) >> 14) != 0 )
- {
- if (event->jaxis.value > 0)
- key_code |= 1;
diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
deleted file mode 100644
index 8b8a67f2291..00000000000
--- a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Bug: https://bugs.gentoo.org/646352
-Patch:
https://sources.debian.org/data/main/d/desmume/0.9.11-3/debian/patches/gcc7_fixes.patch
-
-From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001
-From: rogerman <roger...@users.sf.net>
-Date: Mon, 17 Aug 2015 21:15:04 +0000
-Subject: Fix bug with libfat string handling.
-
-diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp
-index 765d7ae5..b6d7f01f 100644
---- a/src/utils/libfat/directory.cpp
-+++ b/src/utils/libfat/directory.cpp
-@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const
char* src, size_t len
- int bytes;
- size_t count = 0;
-
-- while (count < len-1 && src != '\0') {
-+ while (count < len-1 && *src != '\0') {
- bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps);
- if (bytes > 0) {
- *dst = (ucs2_t)tempChar;
