Merge pull request #399 from jongough/updates

Updates

.circleci/config.yml

@@ -37,6 +37,10 @@ workflows:
             <<: *std-filters
         - build-flatpak-x86-2208:
             <<: *std-filters
+        - build-flatpak-arm64-2408:
+            <<: *std-filters
+        - build-flatpak-x86-2408:
+            <<: *std-filters
         - build-msvc-wx32-2022:
             <<: *std-filters
         - build-debian-arm64-12-bookworm:
@@ -236,6 +240,39 @@ jobs:
             command: bash ci/circleci-build-flatpak.sh
             no_output_timeout: 30m
         - deploy-code
+    build-flatpak-arm64-2408:
+        machine:
+            image: ubuntu-2204:current
+            resource_class: arm.medium
+        environment:
+        - OCPN_TARGET:  flatpak-arm64
+        - FLATPAK_BRANCH: stable
+        - CLOUDSMITH_PKG_EXT: gz
+        - SDK_VER: 24.08
+        - DEPLOY_USE_ORB: true
+        steps:
+        - checkout
+        - run: chmod a+x ci/*.sh
+        - run:
+            command: bash ci/circleci-build-flatpak.sh
+        - deploy-code
+    build-flatpak-x86-2408:
+        machine:
+            image: ubuntu-2204:current
+            resource_class: arm.medium
+        environment:
+        - OCPN_TARGET:  flatpak
+        - FLATPAK_BRANCH: stable
+        - CLOUDSMITH_PKG_EXT: gz
+        - SDK_VER: 24.08
+        - DEPLOY_USE_ORB: true
+        steps:
+        - checkout
+        - run: chmod a+x ci/*.sh
+        - run:
+            command: bash ci/circleci-build-flatpak.sh
+            no_output_timeout: 30m
+        - deploy-code
     build-debian-arm64-12-bookworm:
         machine:
             image: ubuntu-2204:current

CMakeLists.txt

@@ -19,7 +19,7 @@
 # - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,                                       *
 # - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx                                       *
 # -----------------------------------------------------------------------------
-# Frontend2 Author: Jon Gough Testplugin(TP) v1.0.302.0 04/06/2024 DD/MM/YYYY
+# Frontend2 Author: Jon Gough Testplugin(TP) v1.0.304.0 20/09/2024 DD/MM/YYYY
 # format buildCI:yes useODAPI:yes validateJSON:yes
 # ---------------------------------------------------------------------------
 # -- When changing this file do NOT change the order of the sections.    -- ##
@@ -63,9 +63,9 @@ set(LONG_DESCRIPTION
 
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "0")
-set(VERSION_PATCH "303")
+set(VERSION_PATCH "306")
 set(VERSION_TWEAK "0")
-set(VERSION_DATE "19/09/2024") # DD/MM/YYYY format
+set(VERSION_DATE "09/10/2024") # DD/MM/YYYY format
 set(OCPN_MIN_VERSION "ov58")
 
 set(OCPN_API_VERSION_MAJOR "1")

build-local-package-example.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# This file should be run from the local build directory you want to use
+# This file is a modification of the 'circleci local' build process, so it will complain the circleci-output directory is not found.
+# If you want to do a 'circleci local' build use the 'run-circleci-local.txt' file as the example to follow.
+#
+# Change the exports to meet the build requirements, i.e. the values in the config.yml file relevant to the particular job
+export OCPN_TARGET=bookworm
+export BUILD_GTK3=true
+export WX_VER=32
+export LOCAL_DEPLOY=true
+# this removes old xml files from the build directory
+rm *.xml
+# the actual configuration, build and installable package creation
+cmake -DCMAKE_BUILD_TYPE=Debug ..
+make -j2
+make package
+chmod a+x cloudsmith-upload.sh
+./cloudsmith-upload.sh
+

cmake/PluginConfigure.cmake

@@ -266,7 +266,9 @@ if (NOT WIN32
     AND NOT APPLE
     AND NOT QT_ANDROID
 )
-  find_package(GTK2)
+  if(FE2_FORCE_GTK2)
+      find_package(GTK2)
+  endif()
 
   if (GTK2_FOUND AND NOT "$ENV{BUILD_GTK3}" STREQUAL "TRUE")
     set(wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --toolkit=gtk2)