From b7e7dc45701fce61b640cb5d945db6e1497c52ca Mon Sep 17 00:00:00 2001 From: jongough Date: Fri, 8 Apr 2022 16:46:24 +1000 Subject: [PATCH 1/2] Update to remove force wxversion whilst using stable flatpak --- .circleci/config.yml | 5 ++--- CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f58889f0..744f59a4 100644 --- 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 index 6e04165e..f2063775 100644 --- 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 "195") +set(VERSION_TWEAK "0") +set(VERSION_DATE "08/04/2022") # DD/MM/YYYY format set(OCPN_MIN_VERSION "ov50") set(OCPN_API_VERSION_MAJOR "1") set(OCPN_API_VERSION_MINOR "16") From 973022a0cd8e3fd80ff6e1df7456de493c9aa80c Mon Sep 17 00:00:00 2001 From: jongough Date: Fri, 15 Apr 2022 07:54:16 +1000 Subject: [PATCH 2/2] Update to link gtk2 for debian armhf buster --- CMakeLists.txt | 4 ++-- ci/circleci-build-raspbian-armhf.sh | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2063775..73532569 100644 --- 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 "195") +set(VERSION_PATCH "196") set(VERSION_TWEAK "0") -set(VERSION_DATE "08/04/2022") # DD/MM/YYYY format +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 index 7cbc2c07..0f661932 100644 --- 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