Support OTA updates in snap builds for Linux

vslavik · Nov 6, 2023 · 449fe8e · 449fe8e
1 parent 41f3a89
commit 449fe8e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -105,7 +105,7 @@ parts:
       ./bootstrap
       ./configure \
         --with-wx-prefix="$SNAPCRAFT_STAGE" \
-        CPPFLAGS="-I${SNAPCRAFT_STAGE}/include -I${SNAPCRAFT_PART_INSTALL}/../build/deps/json/src" \
+        CPPFLAGS="-DSNAPCRAFT -I${SNAPCRAFT_STAGE}/include -I${SNAPCRAFT_PART_INSTALL}/../build/deps/json/src" \
         LDFLAGS="-Wl,--copy-dt-needed-entries -L${SNAPCRAFT_STAGE}/lib" \
         PKG_CONFIG_PATH="${SNAPCRAFT_STAGE}"/lib/pkgconfig
       make -j1

diff --git a/src/edapp.cpp b/src/edapp.cpp
@@ -644,7 +644,7 @@ void PoeditApp::SetupLanguage()
 #ifdef SUPPORTS_OTA_UPDATES
 void PoeditApp::SetupOTALanguageUpdate(wxTranslations *trans, const wxString& lang)
 {
-    if (lang == "en")
+    if (lang == "en" || lang == "en_US")
         return;
 
     // normalize language code for requests

diff --git a/src/edapp.h b/src/edapp.h
@@ -39,7 +39,7 @@
 class WXDLLIMPEXP_FWD_BASE wxConfigBase;
 class WXDLLIMPEXP_FWD_BASE wxSingleInstanceChecker;
 
-#if defined(HAVE_HTTP_CLIENT) && (defined(__WXMSW__) || defined(__WXOSX__))
+#if defined(HAVE_HTTP_CLIENT) && (defined(__WXMSW__) || defined(__WXOSX__) || defined(SNAPCRAFT))
     #define SUPPORTS_OTA_UPDATES
 #endif