From ca4ddad6d2f050f7f47797123b703839f0015480 Mon Sep 17 00:00:00 2001 From: jongough Date: Tue, 15 Nov 2022 12:26:06 +1100 Subject: [PATCH 1/3] Fix to put back in the use of extra libs removed in error --- CMakeLists.txt | 4 ++-- ci/circleci-build-flatpak.sh | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e862086..cd6f3a7f 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 "215") +set(VERSION_PATCH "216") set(VERSION_TWEAK "0") -set(VERSION_DATE "07/10/2022") # DD/MM/YYYY format +set(VERSION_DATE "15/11/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-flatpak.sh b/ci/circleci-build-flatpak.sh index d575eacc..de9ad5d0 100755 --- a/ci/circleci-build-flatpak.sh +++ b/ci/circleci-build-flatpak.sh @@ -28,6 +28,23 @@ sudo apt-get -q -y --allow-unauthenticated --allow-downgrades --allow-remove-ess sudo apt --allow-unauthenticated --allow-downgrades --allow-remove-essential --allow-change-held-packages install flatpak flatpak-builder +# Install extra build libs +ME=$(echo ${0##*/} | sed 's/\.sh//g') +EXTRA_LIBS=./ci/extras/extra_libs.txt +if test -f "$EXTRA_LIBS"; then + sudo apt update + while read line; do + sudo apt-get install $line + done < $EXTRA_LIBS +fi +EXTRA_LIBS=./ci/extras/${ME}_extra_libs.txt +if test -f "$EXTRA_LIBS"; then + sudo apt update + while read line; do + sudo apt-get install $line + done < $EXTRA_LIBS +fi + if [ -n "$CI" ]; then sudo apt update From 6d610411373e8a308e35edd596cde37a0e18a6c0 Mon Sep 17 00:00:00 2001 From: jongough Date: Tue, 15 Nov 2022 13:25:59 +1100 Subject: [PATCH 2/3] Add extra libs to check working --- ci/extras/circleci-build-flatpak_extra_libs.txt | 1 + ci/extras/extra_libs.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 ci/extras/circleci-build-flatpak_extra_libs.txt create mode 100644 ci/extras/extra_libs.txt diff --git a/ci/extras/circleci-build-flatpak_extra_libs.txt b/ci/extras/circleci-build-flatpak_extra_libs.txt new file mode 100644 index 00000000..1ce3f6b9 --- /dev/null +++ b/ci/extras/circleci-build-flatpak_extra_libs.txt @@ -0,0 +1 @@ +libcurl4-openssl-dev diff --git a/ci/extras/extra_libs.txt b/ci/extras/extra_libs.txt new file mode 100644 index 00000000..efaa0f4c --- /dev/null +++ b/ci/extras/extra_libs.txt @@ -0,0 +1 @@ +equivs From 7315c60b2a95ca4a4a2f970b8560cfc916d78ea4 Mon Sep 17 00:00:00 2001 From: jongough Date: Mon, 28 Nov 2022 16:49:26 +1100 Subject: [PATCH 3/3] Correct typo for flatpak options --- CMakeLists.txt | 4 ++-- cmake/PluginConfigure.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd6f3a7f..e454a60d 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 "216") +set(VERSION_PATCH "217") set(VERSION_TWEAK "0") -set(VERSION_DATE "15/11/2022") # DD/MM/YYYY format +set(VERSION_DATE "28/11/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/cmake/PluginConfigure.cmake b/cmake/PluginConfigure.cmake index 47ddbfdb..837c9d06 100644 --- a/cmake/PluginConfigure.cmake +++ b/cmake/PluginConfigure.cmake @@ -259,7 +259,7 @@ if(OCPN_FLATPAK_CONFIG) file(READ ${PLUGIN_FLATPAK_ARGS} finish_args) endif() find_file(PLUGIN_FLATPAK_OPTIONS NAMES flatpak_options.in PATHS cmake/in-files NO_DEFAULT_PATH ) - if(${PLUGIN_FLATPAK_ARGS} STREQUAL "PLUGIN_FLATPAK_OPTIONS-NOTFOUND") + if(${PLUGIN_FLATPAK_OPTIONS} STREQUAL "PLUGIN_FLATPAK_OPTIONS-NOTFOUND") message(STATUS "${CMLOC}PLUGIN_FLATPAK_OPTIONS: Not Found") set(build_options "") else()