diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-10-11 18:29:23 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-10-11 18:35:15 +0000 |
| commit | 3c39f8786cf34b5f5ed9ee893df1cf44a17d50d6 (patch) | |
| tree | 3f12963a66e9fb3df2fe49823011ad864239e4b3 /community/opencpn/compile-without-wxUSE_XLOCALE.patch | |
| parent | 319b7568e7c37714ee24b98f6664b28158129b00 (diff) | |
| download | aports-3c39f8786cf34b5f5ed9ee893df1cf44a17d50d6.tar.bz2 aports-3c39f8786cf34b5f5ed9ee893df1cf44a17d50d6.tar.xz | |
community/opencpn: upgrade to 4.8.8
Diffstat (limited to 'community/opencpn/compile-without-wxUSE_XLOCALE.patch')
| -rw-r--r-- | community/opencpn/compile-without-wxUSE_XLOCALE.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/community/opencpn/compile-without-wxUSE_XLOCALE.patch b/community/opencpn/compile-without-wxUSE_XLOCALE.patch new file mode 100644 index 0000000000..7e0a84c039 --- /dev/null +++ b/community/opencpn/compile-without-wxUSE_XLOCALE.patch @@ -0,0 +1,45 @@ +From 9ad3d30db042f0a89673195de92d0c81a50affd3 Mon Sep 17 00:00:00 2001 +From: didier <didier@users.sourceforge.net> +Date: Mon, 17 Dec 2018 15:12:38 +0100 +Subject: [PATCH] compile without wxUSE_XLOCALE + +--- + include/OCPNPlatform.h | 2 +- + src/OCPNPlatform.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/OCPNPlatform.h b/include/OCPNPlatform.h +index d6bc4915d1..751ae8590c 100644 +--- a/include/OCPNPlatform.h ++++ b/include/OCPNPlatform.h +@@ -160,9 +160,9 @@ class OCPNPlatform + + void SetLocaleSearchPrefixes( void ); + wxString GetDefaultSystemLocale(); +- wxString GetAdjustedAppLocale(); + + #if wxUSE_XLOCALE ++ wxString GetAdjustedAppLocale(); + wxString ChangeLocale(wxString &newLocaleID, wxLocale *presentLocale, wxLocale** newLocale); + #endif + +diff --git a/src/OCPNPlatform.cpp b/src/OCPNPlatform.cpp +index 785ff183b5..70ac73306d 100644 +--- a/src/OCPNPlatform.cpp ++++ b/src/OCPNPlatform.cpp +@@ -818,6 +818,7 @@ wxString OCPNPlatform::GetDefaultSystemLocale() + } + + ++#if wxUSE_XLOCALE || !wxCHECK_VERSION(3,0,0) + wxString OCPNPlatform::GetAdjustedAppLocale() + { + wxString adjLocale = g_locale; +@@ -851,7 +852,6 @@ wxString OCPNPlatform::GetAdjustedAppLocale() + } + + +-#if wxUSE_XLOCALE || !wxCHECK_VERSION(3,0,0) + + wxString OCPNPlatform::ChangeLocale(wxString &newLocaleID, wxLocale *presentLocale, wxLocale** newLocale) + { |