diff options
author | joerg <joerg@pkgsrc.org> | 2020-03-26 02:35:31 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2020-03-26 02:35:31 +0000 |
commit | 2899bb537c00f2e2666c8c87b3a72a0a9df40328 (patch) | |
tree | 53485d1d40c1b381ef6557f50564392872565bb0 /emulators/vba/patches | |
parent | 49d8f735fb046f5948d55f3423c31cdd4ec27bcb (diff) | |
download | pkgsrc-2899bb537c00f2e2666c8c87b3a72a0a9df40328.tar.gz |
Deal with const issues. Do not put C headers into a namespace.
Diffstat (limited to 'emulators/vba/patches')
-rw-r--r-- | emulators/vba/patches/patch-ag | 38 | ||||
-rw-r--r-- | emulators/vba/patches/patch-src_GBA.cpp | 40 | ||||
-rw-r--r-- | emulators/vba/patches/patch-src_expr.cpp | 17 | ||||
-rw-r--r-- | emulators/vba/patches/patch-src_expr.y | 15 |
4 files changed, 109 insertions, 1 deletions
diff --git a/emulators/vba/patches/patch-ag b/emulators/vba/patches/patch-ag index dbbc13dee81..b15dc9e980a 100644 --- a/emulators/vba/patches/patch-ag +++ b/emulators/vba/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.3 2012/09/29 21:27:14 dholland Exp $ +$NetBSD: patch-ag,v 1.4 2020/03/26 02:35:31 joerg Exp $ - Fix build with png-1.5. - Do not use void * as a synonym for gzFile, as gzFile is no longer @@ -25,6 +25,42 @@ $NetBSD: patch-ag,v 1.3 2012/09/29 21:27:14 dholland Exp $ png_destroy_write_struct(&png_ptr,NULL); fclose(fp); return false; +@@ -478,7 +478,7 @@ bool utilIsGBAImage(const char * file) + { + cpuIsMultiBoot = false; + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gba") == 0) +@@ -502,7 +502,7 @@ bool utilIsGBAImage(const char * file) + bool utilIsGBImage(const char * file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gb") == 0) +@@ -522,7 +522,7 @@ bool utilIsGBImage(const char * file) + bool utilIsZipFile(const char *file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".zip") == 0) +@@ -552,7 +552,7 @@ bool utilIsRarFile(const char *file) + bool utilIsGzipFile(const char *file) + { + if(strlen(file) > 3) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gz") == 0) @@ -984,7 +984,7 @@ void utilWriteData(gzFile gzFile, variab gzFile utilGzOpen(const char *file, const char *mode) diff --git a/emulators/vba/patches/patch-src_GBA.cpp b/emulators/vba/patches/patch-src_GBA.cpp new file mode 100644 index 00000000000..bb1f99f52f6 --- /dev/null +++ b/emulators/vba/patches/patch-src_GBA.cpp @@ -0,0 +1,40 @@ +$NetBSD: patch-src_GBA.cpp,v 1.1 2020/03/26 02:35:31 joerg Exp $ + +--- src/GBA.cpp.orig 2020-03-26 01:54:39.059748437 +0000 ++++ src/GBA.cpp +@@ -1130,7 +1130,7 @@ bool CPUWriteBMPFile(const char *fileNam + bool CPUIsZipFile(const char * file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".zip") == 0) +@@ -1145,7 +1145,7 @@ bool CPUIsGBAImage(const char * file) + { + cpuIsMultiBoot = false; + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gba") == 0) +@@ -1169,7 +1169,7 @@ bool CPUIsGBAImage(const char * file) + bool CPUIsGBABios(const char * file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gba") == 0) +@@ -1189,7 +1189,7 @@ bool CPUIsGBABios(const char * file) + bool CPUIsELF(const char *file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".elf") == 0) diff --git a/emulators/vba/patches/patch-src_expr.cpp b/emulators/vba/patches/patch-src_expr.cpp new file mode 100644 index 00000000000..66bd5114a81 --- /dev/null +++ b/emulators/vba/patches/patch-src_expr.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-src_expr.cpp,v 1.1 2020/03/26 02:35:31 joerg Exp $ + +--- src/expr.cpp.orig 2020-03-26 02:01:18.613760749 +0000 ++++ src/expr.cpp +@@ -14,12 +14,10 @@ + + #line 1 "expr.y" + +-namespace std { + #include <stdio.h> + #include <memory.h> + #include <stdlib.h> + #include <string.h> +-} + + using namespace std; + diff --git a/emulators/vba/patches/patch-src_expr.y b/emulators/vba/patches/patch-src_expr.y new file mode 100644 index 00000000000..73ddda03603 --- /dev/null +++ b/emulators/vba/patches/patch-src_expr.y @@ -0,0 +1,15 @@ +$NetBSD: patch-src_expr.y,v 1.1 2020/03/26 02:35:31 joerg Exp $ + +--- src/expr.y.orig 2020-03-26 02:00:05.333831596 +0000 ++++ src/expr.y +@@ -1,10 +1,8 @@ + %{ +-namespace std { + #include <stdio.h> + #include <memory.h> + #include <stdlib.h> + #include <string.h> +-} + + using namespace std; + |