From 45c50662e803f118709ae148e6e846f06e89b6b4 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Mon, 2 Sep 2024 22:29:47 +0200 Subject: [PATCH 1/2] add alpine-edge build target --- scripts/build-targets/Dockerfile.alpine-edge | 3 +++ scripts/build-targets/Makefile | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 scripts/build-targets/Dockerfile.alpine-edge diff --git a/scripts/build-targets/Dockerfile.alpine-edge b/scripts/build-targets/Dockerfile.alpine-edge new file mode 100644 index 00000000..bc816d2c --- /dev/null +++ b/scripts/build-targets/Dockerfile.alpine-edge @@ -0,0 +1,3 @@ +FROM alpine:edge +RUN apk add alpine-sdk git cmake ninja-build nlohmann-json openssl-dev meson zlib-dev linux-headers +RUN git config --global --add safe.directory '*' # this makes meson's vcs_tag() work diff --git a/scripts/build-targets/Makefile b/scripts/build-targets/Makefile index 38faef37..592eebb8 100644 --- a/scripts/build-targets/Makefile +++ b/scripts/build-targets/Makefile @@ -2,3 +2,6 @@ all: armel armel: docker build -f Dockerfile.armel -t voorkant-builder:armel . + +alpine-edge: + docker build -f Dockerfile.alpine-edge -t voorkant-builder:alpine-edge . From d50350e64b05ec5ae6cecf5311ed041edbccb663 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Mon, 2 Sep 2024 22:29:53 +0200 Subject: [PATCH 2/2] disable UIApexCard for now, it is unhappy here --- meson.build | 2 +- src/front-lvgl.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index e39207b6..232867bb 100644 --- a/meson.build +++ b/meson.build @@ -208,7 +208,7 @@ if get_option('front-lvgl').enabled() 'src/uicomponents/imgs/white24.c', 'src/uicomponents/uirgblight.cpp', 'src/uicomponents/UILogBox.cpp', - 'src/uicomponents/uiapexcard.cpp', + # 'src/uicomponents/uiapexcard.cpp', 'src/uicomponents/UIComponents.cpp', 'src/front-lvgl.cpp', 'src/lv_conf.h', diff --git a/src/front-lvgl.cpp b/src/front-lvgl.cpp index ae7acfa7..6e3d2b70 100644 --- a/src/front-lvgl.cpp +++ b/src/front-lvgl.cpp @@ -274,12 +274,12 @@ void uithread(int _argc, char* _argv[]) g_log << Logger::Warning << "Card is of type button, but no entity found: " << card << std::endl; } } - else if (card["type"] == "custom:apexcharts-card") { + // else if (card["type"] == "custom:apexcharts-card") { - std::unique_ptr apex = std::make_unique(card, cont_row); - uielements.push_back(std::move(apex)); - g_log << Logger::Warning << "got apex card" << std::endl; - } + // std::unique_ptr apex = std::make_unique(card, cont_row); + // uielements.push_back(std::move(apex)); + // g_log << Logger::Warning << "got apex card" << std::endl; + // } else { if (card.contains(("entity"))) { g_log << Logger::Warning << "Card of type " << card["type"] << " found, but we have no matching UIEntity. Creating dummy for entity." << card["entity"] << std::endl;