Skip to content

Commit a65ff33

Browse files
rinigusrinigus
authored
Merge pull request #711 from jonnius/noble
Let click package target Ubuntu Touch 24.04
2 parents 07aa83d + c67d3f2 commit a65ff33

7 files changed

Lines changed: 133 additions & 8 deletions

File tree

‎packaging/click/full-build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
clickable_minimum_required: 7.8.0
1+
clickable_minimum_required: 8.4.0
22

33
scripts:
44
prepare-deps: git submodule update --recursive --init && ENABLE_MIMIC=1 ${ROOT}/packaging/click/prepare-deps.sh
55

6-
framework: ubuntu-sdk-20.04
6+
framework: ubuntu-touch-24.04-1.x
77
kill: pure-maps
88

99
builder: cmake

‎packaging/click/patches/maplibre-gl-native/add-some-missing-cstdint-inclusions-872-874.patch‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
From 87025882ec733832d4314554c1d01efca9dbce0b Mon Sep 17 00:00:00 2001
2+
From: Fabian Vogt <fabian@ritter-vogt.de>
3+
Date: Fri, 3 Mar 2023 15:02:38 +0100
4+
Subject: [PATCH] Add some missing cstdint inclusions (#872) (#874)
5+
6+
---
7+
expression-test/expression_test_logger.hpp | 1 +
8+
include/mbgl/i18n/number_format.hpp | 1 +
9+
include/mbgl/util/geometry.hpp | 2 ++
10+
include/mbgl/util/string.hpp | 1 +
11+
src/mbgl/programs/gl/shaders.hpp | 1 +
12+
vendor/eternal | 2 +-
13+
6 files changed, 7 insertions(+), 1 deletion(-)
14+
15+
diff --git a/expression-test/expression_test_logger.hpp b/expression-test/expression_test_logger.hpp
16+
index 95b0697cb5b..ae03476fa3e 100644
17+
--- a/expression-test/expression_test_logger.hpp
18+
+++ b/expression-test/expression_test_logger.hpp
19+
@@ -1,5 +1,6 @@
20+
#pragma once
21+
22+
+#include <cstdint>
23+
#include <string>
24+
25+
#define ANSI_COLOR_RED "\x1b[31m"
26+
diff --git a/include/mbgl/i18n/number_format.hpp b/include/mbgl/i18n/number_format.hpp
27+
index cb1e94c7bd7..dceddfe96b1 100644
28+
--- a/include/mbgl/i18n/number_format.hpp
29+
+++ b/include/mbgl/i18n/number_format.hpp
30+
@@ -1,5 +1,6 @@
31+
#pragma once
32+
33+
+#include <cstdint>
34+
#include <string>
35+
36+
namespace mbgl {
37+
diff --git a/include/mbgl/util/geometry.hpp b/include/mbgl/util/geometry.hpp
38+
index c4fe52e87d9..5fc9c59e7f1 100644
39+
--- a/include/mbgl/util/geometry.hpp
40+
+++ b/include/mbgl/util/geometry.hpp
41+
@@ -1,5 +1,7 @@
42+
#pragma once
43+
44+
+#include <cstdint>
45+
+
46+
#include <mapbox/geometry/geometry.hpp>
47+
#include <mapbox/geometry/point_arithmetic.hpp>
48+
#include <mapbox/geometry/for_each_point.hpp>
49+
diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp
50+
index df205b9072d..370b08afaf7 100644
51+
--- a/include/mbgl/util/string.hpp
52+
+++ b/include/mbgl/util/string.hpp
53+
@@ -1,6 +1,7 @@
54+
#pragma once
55+
56+
#include <string>
57+
+#include <cstdint>
58+
#include <cstdlib>
59+
#include <type_traits>
60+
#include <exception>
61+
diff --git a/src/mbgl/programs/gl/shaders.hpp b/src/mbgl/programs/gl/shaders.hpp
62+
index 46a87f4af88..25a1e6cb506 100644
63+
--- a/src/mbgl/programs/gl/shaders.hpp
64+
+++ b/src/mbgl/programs/gl/shaders.hpp
65+
@@ -1,5 +1,6 @@
66+
#pragma once
67+
68+
+#include <cstdint>
69+
#include <string>
70+
71+
namespace mbgl {
72+
diff --git a/vendor/eternal b/vendor/eternal
73+
index 42801e2a736..dd2f5b9ff38 160000
74+
--- a/vendor/eternal
75+
+++ b/vendor/eternal
76+
@@ -1 +1 @@
77+
-Subproject commit 42801e2a736f362ae851b7962b4aa1d4f4b2d424
78+
+Subproject commit dd2f5b9ff38fcd36b59efd9d289127fa73efc6cb
79+
--
80+
2.43.0
81+

‎packaging/click/patches/maplibre-gl-native_eternal/missing-include.patch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/include/mapbox/eternal.hpp b/include/mapbox/eternal.hpp
2+
index 10c2f82..45dbbe6 100644
3+
--- a/include/mapbox/eternal.hpp
4+
+++ b/include/mapbox/eternal.hpp
5+
@@ -1,6 +1,7 @@
6+
#pragma once
7+
8+
#include <utility>
9+
+#include <cstdint>
10+
#include <functional>
11+
12+
// GCC 4.9 compatibility

‎packaging/click/patches/mimic/fix-compilation.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
unchanged:
2+
--- a/lang/cmu_indic_lang/cmu_indic_lang.h
3+
+++ b/lang/cmu_indic_lang/cmu_indic_lang.h
4+
@@ -51,7 +51,7 @@ void cmu_indic_lang_init(cst_voice *v);
5+
extern const cst_phoneset cmu_indic_phoneset;
6+
extern const cst_cart cmu_indic_phrasing_cart;
7+
8+
-const cst_regex * const cst_rx_not_indic;
9+
+extern const cst_regex * const cst_rx_not_indic;
10+
11+
#ifdef __cplusplus
12+
} /* extern "C" */
13+
only in patch2:
14+
unchanged:
15+
--- a/src/hts/hts_engine_API/lib/HTS_model.c
16+
+++ b/src/hts/hts_engine_API/lib/HTS_model.c
17+
@@ -698,7 +698,7 @@ static HTS_Boolean HTS_Model_load_pdf(HTS_Model * model, HTS_File * fp, size_t v
18+
}
19+
if (result == FALSE) {
20+
model->npdf += 2;
21+
- free(model->npdf);
22+
+ HTS_free(model->npdf);
23+
HTS_Model_initialize(model);
24+
return FALSE;
25+
}

‎packaging/click/prepare-deps.sh‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ MIMIC_VERSION="1.3.0.1"
1515
PICOTTS_SRC_DIR=$ROOT_DIR/libs/picotts
1616
ABSEIL_SRC_DIR=$ROOT_DIR/libs/abseil
1717
S2GEOMETRY_SRC_DIR=$ROOT_DIR/libs/s2geometry
18+
PATCH_DIR=$ROOT_DIR/packaging/click/patches
1819

1920
# Remove old downloads
2021
rm -rf $MAPLIBRE_GL_NATIVE_SRC_DIR $MAPBOX_GL_QML_SRC_DIR $QMLRUNNER_SRC_DIR $MIMIC_SRC_DIR $PICOTTS_SRC_DIR $S2GEOMETRY_SRC_DIR $ABSEIL_SRC_DIR
@@ -24,7 +25,7 @@ git clone -b qt-v2.0.1 ${CLONE_ARGS} https://github.com/maplibre/maplibre-gl-nat
2425
git clone -b 2.1.1 ${CLONE_ARGS} https://github.com/rinigus/mapbox-gl-qml.git $MAPBOX_GL_QML_SRC_DIR
2526
git clone -b 1.0.2 ${CLONE_ARGS} https://github.com/rinigus/qmlrunner.git $QMLRUNNER_SRC_DIR
2627
git clone -b v0.11.1 ${CLONE_ARGS} https://github.com/google/s2geometry.git $S2GEOMETRY_SRC_DIR
27-
git clone -b 20240722.0 ${CLONE_ARGS} https://github.com/abseil/abseil-cpp.git $ABSEIL_SRC_DIR
28+
git clone -b 20250127.1 ${CLONE_ARGS} https://github.com/abseil/abseil-cpp.git $ABSEIL_SRC_DIR
2829

2930
if [ "$ENABLE_MIMIC" == "1" ] ; then
3031
wget -qO- https://github.com/MycroftAI/mimic1/archive/${MIMIC_VERSION}.tar.gz | tar -xzv && mv mimic1-${MIMIC_VERSION} $MIMIC_SRC_DIR
@@ -36,7 +37,13 @@ fi
3637

3738
# Apply patches
3839
cd $MAPLIBRE_GL_NATIVE_SRC_DIR
39-
git apply $ROOT_DIR/packaging/click/patches/maplibre-gl-native/*.patch
40+
git apply $PATCH_DIR/maplibre-gl-native/*.patch
41+
42+
cd $MAPLIBRE_GL_NATIVE_SRC_DIR/vendor/eternal
43+
git apply $PATCH_DIR/maplibre-gl-native_eternal/*.patch
4044

4145
cd $ABSEIL_SRC_DIR
42-
git apply $ROOT_DIR/packaging/click/patches/abseil/*.patch
46+
git apply $PATCH_DIR/abseil/*.patch
47+
48+
cd $MIMIC_SRC_DIR
49+
patch -p1 < $PATCH_DIR/mimic/fix-compilation.patch

‎packaging/click/pure-maps.apparmor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"content_exchange",
77
"networking"
88
],
9-
"policy_version": 20.04
9+
"policy_version": "@APPARMOR_POLICY@"
1010
}

‎packaging/click/slim-build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
clickable_minimum_required: 7.8.0
1+
clickable_minimum_required: 8.4.0
22

33
scripts:
44
prepare-deps: git submodule update --recursive --init && ENABLE_MIMIC=0 ${ROOT}/packaging/click/prepare-deps.sh
55

6-
framework: ubuntu-sdk-20.04
6+
framework: ubuntu-touch-24.04-1.x
77
kill: pure-maps
88

99
builder: cmake

0 commit comments

Comments
 (0)