Merge pull request #257 from jongough/updates

Updates
jongough · Apr 15, 2022 · eb40e33 · eb40e33
2 parents e5f6f5b + 973022a
commit eb40e33
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -51,14 +51,14 @@ workflows:
             <<: *std-filters
         - build-buster:
             <<: *std-filters
-        - build-flatpak-arm64:
-            <<: *std-filters
         - build-flatpak-x86-2008:
             <<: *std-filters
         - build-flatpak-x86-2008-beta:
             <<: *std-filters
         - build-flatpak-x86-1808:
             <<: *std-filters
+        - build-flatpak-arm64:
+            <<: *std-filters
         - build-macos:
             <<: *std-filters
         - build-macos-wx315:
@@ -436,7 +436,6 @@ jobs:
         - CLOUDSMITH_PKG_EXT: gz
         - SDK_VER: 20.08
         - DEPLOY_USE_ORB: true
-        - WXWIDGETS_FORCE_VERSION: 3.0
         steps:
         - checkout
         - run: chmod a+x ci/*.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,9 +39,9 @@ set(LONG_DESCRIPTION "testplugin Plugin is used to test out the ODraw API and de
 
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "0")
-set(VERSION_PATCH "194")
-set(VERSION_TWEAK "1")
-set(VERSION_DATE "31/03/2022") # DD/MM/YYYY format
+set(VERSION_PATCH "196")
+set(VERSION_TWEAK "0")
+set(VERSION_DATE "15/04/2022") # DD/MM/YYYY format
 set(OCPN_MIN_VERSION "ov50")
 set(OCPN_API_VERSION_MAJOR "1")
 set(OCPN_API_VERSION_MINOR "16")

diff --git a/ci/circleci-build-raspbian-armhf.sh b/ci/circleci-build-raspbian-armhf.sh
@@ -6,7 +6,7 @@
 
 # bailout on errors and echo commands.
 set -xe
-sudo apt-get -qq update
+#sudo apt-get -qq update
 
 DOCKER_SOCK="unix:///var/run/docker.sock"
 
@@ -78,27 +78,36 @@ else
         echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
         apt-get -qq update && DEBIAN_FRONTEND='noninteractive' TZ='America/New_York' apt-get -y --no-install-recommends install tzdata
         apt-get -y --no-install-recommends --fix-missing install \
-        software-properties-common devscripts equivs wget git build-essential gettext wx-common libgtk2.0-dev libwxbase3.0-dev libwxgtk3.0-gtk3-dev libbz2-dev libcurl4-openssl-dev libexpat1-dev libcairo2-dev libarchive-dev liblzma-dev libexif-dev lsb-release openssl libssl-dev
+        software-properties-common devscripts equivs wget git build-essential gettext wx-common libgtk2.0-dev libwxbase3.0-dev libbz2-dev libcurl4-openssl-dev libexpat1-dev libcairo2-dev libarchive-dev liblzma-dev libexif-dev lsb-release openssl libssl-dev
 EOF5
+        if [ "$OCPN_TARGET" = "buster-armhf" ]; then
+           cat >> build.sh << "EOF6"
+           apt-get -y --no-install-recommends --fix-missing install libwxgtk3.0-dev
+EOF6
+        else
+            cat >> build.sh << "EOF7"
+            apt-get -y --no-install-recommends --fix-missing install libwxgtk3.0-gtk3-dev
+EOF7
+        fi
         if [ "$OCPN_TARGET" = "focal-armhf" ]; then
-            cat >> build.sh << "EOF6"
+            cat >> build.sh << "EOF8"
             CMAKE_VERSION=3.20.5-0kitware1ubuntu20.04.1
             wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc --no-check-certificate 2>/dev/null | apt-key add -
             apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main'
             apt-get update
             apt install cmake=$CMAKE_VERSION cmake-data=$CMAKE_VERSION
-EOF6
+EOF8
         else
-            cat >> build.sh << "EOF7"
+            cat >> build.sh << "EOF9"
             apt install -y cmake
-EOF7
+EOF9
         fi
     else
-        cat > build.sh << "EOF8"
+        cat > build.sh << "EOF10"
         apt-get -qq update
         apt-get -y --no-install-recommends install \
         git cmake build-essential gettext wx-common libgtk2.0-dev libwxbase3.0-dev libwxgtk3.0-dev libbz2-dev libcurl4-openssl-dev libexpat1-dev libcairo2-dev libarchive-dev liblzma-dev libexif-dev lsb-release
-EOF8
+EOF10
     fi
 fi