diff --git a/ports/gklib/fix-mingw.patch b/ports/gklib/fix-mingw.patch new file mode 100644 index 00000000000..6cb6136df00 --- /dev/null +++ b/ports/gklib/fix-mingw.patch @@ -0,0 +1,32 @@ +diff --git a/gk_arch.h b/gk_arch.h +index 122e087..c8a322f 100644 +--- a/gk_arch.h ++++ b/gk_arch.h +@@ -42,7 +42,9 @@ + #endif + #include + #include ++#ifndef _WIN32 # MinGW + #include ++#endif + #include + #include + #endif +diff --git a/gk_getopt.h b/gk_getopt.h +index 4bb8611..cc416ab 100644 +--- a/gk_getopt.h ++++ b/gk_getopt.h +@@ -52,10 +52,10 @@ struct gk_option { + + + /* Function prototypes */ +-extern int gk_getopt(int __argc, char **__argv, char *__shortopts); +-extern int gk_getopt_long(int __argc, char **__argv, char *__shortopts, ++extern int gk_getopt(int argc, char ** argv, char *__shortopts); ++extern int gk_getopt_long(int argc, char ** argv, char *__shortopts, + struct gk_option *__longopts, int *__longind); +-extern int gk_getopt_long_only (int __argc, char **__argv, ++extern int gk_getopt_long_only (int argc, char ** argv, + char *__shortopts, struct gk_option *__longopts, int *__longind); + + diff --git a/ports/gklib/portfile.cmake b/ports/gklib/portfile.cmake index 9c50870f007..9eb4867321d 100644 --- a/ports/gklib/portfile.cmake +++ b/ports/gklib/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( SHA512 e906c7af8b40ce1c4c4ea43cbfca3e3970e5595686333ac9ac80c6cbc558feb0e833f530f034161927030edac5272234c6ac9cad5287cb6edab0c0671ba3644c PATCHES build-fixes.patch + fix-mingw.patch ) # Delete files that are workarounds for very old copies of msvc. diff --git a/ports/gklib/vcpkg.json b/ports/gklib/vcpkg.json index f5f0a44ddad..c31e6f6e45f 100644 --- a/ports/gklib/vcpkg.json +++ b/ports/gklib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gklib", "version-date": "2022-07-27", - "port-version": 1, + "port-version": 2, "description": "General helper libraries for KarypisLab.", "homepage": "https://github.com/KarypisLab/GKlib/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 54fea596e6b..bcbcb568d79 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2566,7 +2566,7 @@ }, "gklib": { "baseline": "2022-07-27", - "port-version": 1 + "port-version": 2 }, "gl2ps": { "baseline": "1.4.2", diff --git a/versions/g-/gklib.json b/versions/g-/gklib.json index 5ba439c5555..a0af42d2b28 100644 --- a/versions/g-/gklib.json +++ b/versions/g-/gklib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f9c6f0e711860da19899fbe78e027d0a5e8cfc1", + "version-date": "2022-07-27", + "port-version": 2 + }, { "git-tree": "be7b5aca0025910c7dbbc260564bf7d56ada1a3c", "version-date": "2022-07-27",