diff options
Diffstat (limited to 'meta-oe/recipes-devtools/geany')
-rw-r--r-- | meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch | 24 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch | 45 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch | 89 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/geany/geany-plugins_2.0.bb (renamed from meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb) | 16 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch | 11 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch | 146 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/geany/geany_2.0.bb (renamed from meta-oe/recipes-devtools/geany/geany_1.38.bb) | 3 |
8 files changed, 347 insertions, 17 deletions
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch new file mode 100644 index 0000000000..5a0650aec1 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From 8dfd7f2cba428f5eb232fbbe3427c64171bae0f4 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com> | ||
3 | Date: Tue, 5 Mar 2024 18:36:37 +0100 | ||
4 | Subject: [PATCH 1/3] projectorganizer: fix invalid string comparison | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/8dfd7f2cba428f5eb232fbbe3427c64171bae0f4] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | projectorganizer/src/prjorg-sidebar.c | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c | ||
13 | index b6422f0..0139473 100644 | ||
14 | --- a/projectorganizer/src/prjorg-sidebar.c | ||
15 | +++ b/projectorganizer/src/prjorg-sidebar.c | ||
16 | @@ -346,7 +346,7 @@ static gchar *get_fallback_dir_of_selection(void) | ||
17 | { | ||
18 | locale_path = g_path_get_dirname(doc->real_path); | ||
19 | |||
20 | - if (locale_path && locale_path == '.') | ||
21 | + if (locale_path && *locale_path == '.') | ||
22 | { | ||
23 | g_free(locale_path); | ||
24 | locale_path = NULL; | ||
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch new file mode 100644 index 0000000000..c70f4d6e15 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 58d47e60bdcec62fe74b4a38eaf39d16a9c80d42 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com> | ||
3 | Date: Tue, 5 Mar 2024 18:40:10 +0100 | ||
4 | Subject: [PATCH 2/3] projectorganizer: fix various warnings | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/58d47e60bdcec62fe74b4a38eaf39d16a9c80d42] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | projectorganizer/src/prjorg-sidebar.c | 9 +++------ | ||
10 | 1 file changed, 3 insertions(+), 6 deletions(-) | ||
11 | |||
12 | diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c | ||
13 | index 0139473..e67cce2 100644 | ||
14 | --- a/projectorganizer/src/prjorg-sidebar.c | ||
15 | +++ b/projectorganizer/src/prjorg-sidebar.c | ||
16 | @@ -382,7 +382,8 @@ void on_open_file_manager(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gp | ||
17 | |||
18 | if (locale_path) | ||
19 | { | ||
20 | - gchar *command, *open_command; | ||
21 | + const gchar *open_command; | ||
22 | + gchar *command; | ||
23 | |||
24 | open_command = PRJORG_COMMAND_OPEN; | ||
25 | command = g_strconcat (open_command, " \"", locale_path, "\"", NULL); | ||
26 | @@ -1562,7 +1563,7 @@ gchar **prjorg_sidebar_get_expanded_paths(void) | ||
27 | (GtkTreeViewMappingFunc)on_map_expanded, expanded_paths); | ||
28 | g_ptr_array_add(expanded_paths, NULL); | ||
29 | |||
30 | - return g_ptr_array_free(expanded_paths, FALSE); | ||
31 | + return (gchar **)g_ptr_array_free(expanded_paths, FALSE); | ||
32 | } | ||
33 | |||
34 | |||
35 | @@ -1587,10 +1588,6 @@ void prjorg_sidebar_update_full(gboolean reload, gchar **expanded_paths) | ||
36 | |||
37 | if (reload) | ||
38 | { | ||
39 | - GtkTreeSelection *treesel; | ||
40 | - GtkTreeIter iter; | ||
41 | - GtkTreeModel *model; | ||
42 | - | ||
43 | expand_data->expanded_paths = expanded_paths != NULL ? expanded_paths : prjorg_sidebar_get_expanded_paths(); | ||
44 | expand_data->selected_path = get_selected_path(); | ||
45 | |||
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch new file mode 100644 index 0000000000..4c4e11c6cd --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch | |||
@@ -0,0 +1,89 @@ | |||
1 | From a4a7c4af7f62eb55c0bd100ed1d308e6512a66ce Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com> | ||
3 | Date: Tue, 23 Apr 2024 18:43:51 +0200 | ||
4 | Subject: [PATCH 3/3] projectorganizer: Use g_pattern_spec_match_string() instead of g_pattern_match_string() | ||
5 | |||
6 | Eliminates a warning on newer glib versions. Adds a fallback on older versions. | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/a4a7c4af7f62eb55c0bd100ed1d308e6512a66ce] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | projectorganizer/src/prjorg-project.c | 2 +- | ||
12 | projectorganizer/src/prjorg-sidebar.c | 4 ++-- | ||
13 | projectorganizer/src/prjorg-utils.c | 4 ++-- | ||
14 | projectorganizer/src/prjorg-utils.h | 5 +++++ | ||
15 | 4 files changed, 10 insertions(+), 5 deletions(-) | ||
16 | |||
17 | diff --git a/projectorganizer/src/prjorg-project.c b/projectorganizer/src/prjorg-project.c | ||
18 | index a767ab8..71dc6e1 100644 | ||
19 | --- a/projectorganizer/src/prjorg-project.c | ||
20 | +++ b/projectorganizer/src/prjorg-project.c | ||
21 | @@ -216,7 +216,7 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data) | ||
22 | { | ||
23 | GPatternSpec *pattern = g_pattern_spec_new(ft->pattern[j]); | ||
24 | |||
25 | - if (g_pattern_match_string(pattern, utf8_base_filename)) | ||
26 | + if (g_pattern_spec_match_string(pattern, utf8_base_filename)) | ||
27 | { | ||
28 | ret = TRUE; | ||
29 | g_pattern_spec_free(pattern); | ||
30 | diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c | ||
31 | index e67cce2..b7536ee 100644 | ||
32 | --- a/projectorganizer/src/prjorg-sidebar.c | ||
33 | +++ b/projectorganizer/src/prjorg-sidebar.c | ||
34 | @@ -657,7 +657,7 @@ static void find_file_recursive(GtkTreeIter *iter, gboolean case_sensitive, gboo | ||
35 | if (!case_sensitive) | ||
36 | SETPTR(utf8_name, g_utf8_strdown(utf8_name, -1)); | ||
37 | |||
38 | - if (g_pattern_match_string(pattern, utf8_name)) | ||
39 | + if (g_pattern_spec_match_string(pattern, utf8_name)) | ||
40 | { | ||
41 | gchar *utf8_base_path = get_project_base_path(); | ||
42 | gchar *utf8_path, *rel_path; | ||
43 | @@ -840,7 +840,7 @@ static gboolean match(TMTag *tag, const gchar *name, gboolean declaration, gbool | ||
44 | matches = g_strcmp0(name_case, name) == 0; | ||
45 | break; | ||
46 | case MATCH_PATTERN: | ||
47 | - matches = g_pattern_match_string(pspec, name_case); | ||
48 | + matches = g_pattern_spec_match_string(pspec, name_case); | ||
49 | break; | ||
50 | case MATCH_PREFIX: | ||
51 | matches = g_str_has_prefix(name_case, name); | ||
52 | diff --git a/projectorganizer/src/prjorg-utils.c b/projectorganizer/src/prjorg-utils.c | ||
53 | index 2a8847e..0b573e5 100644 | ||
54 | --- a/projectorganizer/src/prjorg-utils.c | ||
55 | +++ b/projectorganizer/src/prjorg-utils.c | ||
56 | @@ -80,7 +80,7 @@ gboolean patterns_match(GSList *patterns, const gchar *str) | ||
57 | foreach_slist (elem, patterns) | ||
58 | { | ||
59 | GPatternSpec *pattern = elem->data; | ||
60 | - if (g_pattern_match_string(pattern, str)) | ||
61 | + if (g_pattern_spec_match_string(pattern, str)) | ||
62 | return TRUE; | ||
63 | } | ||
64 | return FALSE; | ||
65 | @@ -269,7 +269,7 @@ gchar *try_find_header_source(gchar *utf8_file_name, gboolean is_header, GSList | ||
66 | full_name = elem->data; | ||
67 | gchar *base_name = g_path_get_basename(full_name); | ||
68 | |||
69 | - if (g_pattern_match_string(pattern, base_name)) | ||
70 | + if (g_pattern_spec_match_string(pattern, base_name)) | ||
71 | { | ||
72 | if ((is_header && patterns_match(source_patterns, base_name)) || | ||
73 | (!is_header && patterns_match(header_patterns, base_name))) | ||
74 | diff --git a/projectorganizer/src/prjorg-utils.h b/projectorganizer/src/prjorg-utils.h | ||
75 | index c3719a9..50ed123 100644 | ||
76 | --- a/projectorganizer/src/prjorg-utils.h | ||
77 | +++ b/projectorganizer/src/prjorg-utils.h | ||
78 | @@ -19,6 +19,11 @@ | ||
79 | #ifndef __PRJORG_UTILS_H__ | ||
80 | #define __PRJORG_UTILS_H__ | ||
81 | |||
82 | + | ||
83 | + #if ! GLIB_CHECK_VERSION(2, 70, 0) | ||
84 | + # define g_pattern_spec_match_string g_pattern_match_string | ||
85 | + #endif | ||
86 | + | ||
87 | gchar *get_relative_path(const gchar *utf8_parent, const gchar *utf8_descendant); | ||
88 | |||
89 | gboolean patterns_match(GSList *patterns, const gchar *str); | ||
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch b/meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch new file mode 100644 index 0000000000..563416bf92 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | Fix build with GCC-15 | ||
2 | |||
3 | Upstream-Status: Backport [https://github.com/geany/geany-plugins/pull/1389] | ||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | --- a/git-changebar/src/gcb-plugin.c | ||
6 | +++ b/git-changebar/src/gcb-plugin.c | ||
7 | @@ -1410,9 +1410,9 @@ read_setting_boolean (GKeyFile *kf, | ||
8 | const gchar *key, | ||
9 | gpointer value) | ||
10 | { | ||
11 | - gboolean *bool = value; | ||
12 | + gboolean *boolean = value; | ||
13 | |||
14 | - *bool = utils_get_setting_boolean (kf, group, key, *bool); | ||
15 | + *boolean = utils_get_setting_boolean (kf, group, key, *boolean); | ||
16 | } | ||
17 | |||
18 | static void | ||
19 | @@ -1421,9 +1421,9 @@ write_setting_boolean (GKeyFile *kf, | ||
20 | const gchar *key, | ||
21 | gconstpointer value) | ||
22 | { | ||
23 | - const gboolean *bool = value; | ||
24 | + const gboolean *boolean = value; | ||
25 | |||
26 | - g_key_file_set_boolean (kf, group, key, *bool); | ||
27 | + g_key_file_set_boolean (kf, group, key, *boolean); | ||
28 | } | ||
29 | |||
30 | /* loads @filename in @kf and return %FALSE if failed, emitting a warning | ||
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb b/meta-oe/recipes-devtools/geany/geany-plugins_2.0.bb index 1ed2993bf0..9a19e5dc98 100644 --- a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb +++ b/meta-oe/recipes-devtools/geany/geany-plugins_2.0.bb | |||
@@ -15,7 +15,7 @@ DEPENDS = " \ | |||
15 | fribidi \ | 15 | fribidi \ |
16 | geany \ | 16 | geany \ |
17 | libxml2 \ | 17 | libxml2 \ |
18 | libsoup-2.4 \ | 18 | libsoup \ |
19 | enchant2 \ | 19 | enchant2 \ |
20 | intltool-native \ | 20 | intltool-native \ |
21 | libassuan \ | 21 | libassuan \ |
@@ -30,12 +30,12 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
30 | 30 | ||
31 | SRC_URI = " \ | 31 | SRC_URI = " \ |
32 | https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ | 32 | https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ |
33 | file://0001-Use-pkg-config-to-find-gpgme.patch \ | 33 | file://geany-plugins-2.0-gcc15.patch \ |
34 | file://0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch \ | 34 | file://0001-projectorganizer-fix-invalid-string-comparison.patch \ |
35 | file://0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch \ | 35 | file://0002-projectorganizer-fix-various-warnings.patch \ |
36 | file://0001-scope-Use-0-instead-of-NULL-for-gboolean.patch \ | 36 | file://0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch \ |
37 | " | 37 | " |
38 | SRC_URI[sha256sum] = "1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586" | 38 | SRC_URI[sha256sum] = "9fc2ec5c99a74678fb9e8cdfbd245d3e2061a448d70fd110a6aefb62dd514705" |
39 | 39 | ||
40 | do_configure:prepend() { | 40 | do_configure:prepend() { |
41 | rm -f ${S}/build/cache/glib-gettext.m4 | 41 | rm -f ${S}/build/cache/glib-gettext.m4 |
@@ -75,8 +75,6 @@ PLUGINS += "${PN}-defineformat" | |||
75 | LIC_FILES_CHKSUM += "file://defineformat/COPYING;md5=751419260aa954499f7abaabaa882bbe" | 75 | LIC_FILES_CHKSUM += "file://defineformat/COPYING;md5=751419260aa954499f7abaabaa882bbe" |
76 | FILES:${PN}-defineformat = "${libdir}/geany/defineformat.so" | 76 | FILES:${PN}-defineformat = "${libdir}/geany/defineformat.so" |
77 | 77 | ||
78 | # no gnome devhelp in some common layer | ||
79 | EXTRA_OECONF += "--disable-devhelp" | ||
80 | #PLUGINS += "${PN}-devhelp" | 78 | #PLUGINS += "${PN}-devhelp" |
81 | #LIC_FILES_CHKSUM += "file://devhelp/COPYING;md5=d32239bcb673463ab874e80d47fae504" | 79 | #LIC_FILES_CHKSUM += "file://devhelp/COPYING;md5=d32239bcb673463ab874e80d47fae504" |
82 | #LICENSE:${PN}-devhelp = "GPLv3" | 80 | #LICENSE:${PN}-devhelp = "GPLv3" |
@@ -165,8 +163,6 @@ EXTRA_OECONF += "--disable-peg-markdown" | |||
165 | #LIC_FILES_CHKSUM += "file://markdown/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 163 | #LIC_FILES_CHKSUM += "file://markdown/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
166 | #FILES:${PN}-markdown = "${libdir}/geany/markdown.so" | 164 | #FILES:${PN}-markdown = "${libdir}/geany/markdown.so" |
167 | 165 | ||
168 | # | checking whether the GTK version in use is compatible with plugin multiterm... no | ||
169 | EXTRA_OECONF += "--disable-multiterm" | ||
170 | #PLUGINS += "${PN}-multiterm" | 166 | #PLUGINS += "${PN}-multiterm" |
171 | #LIC_FILES_CHKSUM += "file://multiterm/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 167 | #LIC_FILES_CHKSUM += "file://multiterm/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
172 | #FILES:${PN}-multiterm = "${libdir}/geany/multiterm.so" | 168 | #FILES:${PN}-multiterm = "${libdir}/geany/multiterm.so" |
diff --git a/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch b/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch index b966847195..e6db688974 100644 --- a/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch +++ b/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch | |||
@@ -11,12 +11,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
11 | 11 | ||
12 | --- a/configure.ac | 12 | --- a/configure.ac |
13 | +++ b/configure.ac | 13 | +++ b/configure.ac |
14 | @@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build-aux]) | 14 | @@ -9,6 +9,7 @@ AC_CONFIG_MACRO_DIR([m4]) |
15 | AC_CONFIG_MACRO_DIR([m4]) | ||
16 | AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects]) | 15 | AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects]) |
17 | AC_CONFIG_HEADERS([config.h]) | 16 | AC_CONFIG_HEADERS([config.h]) |
18 | - | ||
19 | +AC_PROG_INTLTOOL | ||
20 | m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) | ||
21 | 17 | ||
22 | GEANY_PREFIX | 18 | +AC_PROG_INTLTOOL |
19 | # Silence "AC_LINK_IFELSE before AC_USE_SYSTEM_EXTENSIONS" warnings | ||
20 | # Note: Enables _GNU_SOURCE on Linux | ||
21 | AC_USE_SYSTEM_EXTENSIONS | ||
diff --git a/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch b/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch new file mode 100644 index 0000000000..2886b73d22 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch | |||
@@ -0,0 +1,146 @@ | |||
1 | Fix build with GCC-15 | ||
2 | |||
3 | Upstream-Status: Backport [https://sourceforge.net/p/scintilla/code/ci/c7ffad21b23dfad4e8e9f36bb587acc2f6e84fee/] | ||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | --- a/scintilla/gtk/PlatGTK.cxx | ||
7 | +++ b/scintilla/gtk/PlatGTK.cxx | ||
8 | @@ -5,6 +5,7 @@ | ||
9 | |||
10 | #include <cstddef> | ||
11 | #include <cstdlib> | ||
12 | +#include <cstdint> | ||
13 | #include <cstring> | ||
14 | #include <cstdio> | ||
15 | #include <cmath> | ||
16 | --- a/scintilla/src/AutoComplete.cxx | ||
17 | +++ b/scintilla/src/AutoComplete.cxx | ||
18 | @@ -7,6 +7,7 @@ | ||
19 | |||
20 | #include <cstddef> | ||
21 | #include <cstdlib> | ||
22 | +#include <cstdint> | ||
23 | #include <cassert> | ||
24 | #include <cstring> | ||
25 | #include <cstdio> | ||
26 | --- a/scintilla/src/CallTip.cxx | ||
27 | +++ b/scintilla/src/CallTip.cxx | ||
28 | @@ -7,6 +7,7 @@ | ||
29 | |||
30 | #include <cstddef> | ||
31 | #include <cstdlib> | ||
32 | +#include <cstdint> | ||
33 | #include <cassert> | ||
34 | #include <cstring> | ||
35 | #include <cstdio> | ||
36 | --- a/scintilla/src/CellBuffer.cxx | ||
37 | +++ b/scintilla/src/CellBuffer.cxx | ||
38 | @@ -7,6 +7,7 @@ | ||
39 | |||
40 | #include <cstddef> | ||
41 | #include <cstdlib> | ||
42 | +#include <cstdint> | ||
43 | #include <cassert> | ||
44 | #include <cstring> | ||
45 | #include <cstdio> | ||
46 | --- a/scintilla/src/ChangeHistory.cxx | ||
47 | +++ b/scintilla/src/ChangeHistory.cxx | ||
48 | @@ -7,6 +7,7 @@ | ||
49 | |||
50 | #include <cstddef> | ||
51 | #include <cstdlib> | ||
52 | +#include <cstdint> | ||
53 | #include <cassert> | ||
54 | |||
55 | #include <stdexcept> | ||
56 | --- a/scintilla/src/Decoration.cxx | ||
57 | +++ b/scintilla/src/Decoration.cxx | ||
58 | @@ -6,6 +6,7 @@ | ||
59 | |||
60 | #include <cstddef> | ||
61 | #include <cstdlib> | ||
62 | +#include <cstdint> | ||
63 | #include <cstring> | ||
64 | #include <cstdio> | ||
65 | #include <cstdarg> | ||
66 | --- a/scintilla/src/Document.cxx | ||
67 | +++ b/scintilla/src/Document.cxx | ||
68 | @@ -7,6 +7,7 @@ | ||
69 | |||
70 | #include <cstddef> | ||
71 | #include <cstdlib> | ||
72 | +#include <cstdint> | ||
73 | #include <cassert> | ||
74 | #include <cstring> | ||
75 | #include <cstdio> | ||
76 | --- a/scintilla/src/Indicator.cxx | ||
77 | +++ b/scintilla/src/Indicator.cxx | ||
78 | @@ -5,6 +5,7 @@ | ||
79 | // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org> | ||
80 | // The License.txt file describes the conditions under which this software may be distributed. | ||
81 | |||
82 | +#include <cstdint> | ||
83 | #include <cmath> | ||
84 | |||
85 | #include <stdexcept> | ||
86 | --- a/scintilla/src/KeyMap.cxx | ||
87 | +++ b/scintilla/src/KeyMap.cxx | ||
88 | @@ -6,6 +6,7 @@ | ||
89 | // The License.txt file describes the conditions under which this software may be distributed. | ||
90 | |||
91 | #include <cstdlib> | ||
92 | +#include <cstdint> | ||
93 | |||
94 | #include <stdexcept> | ||
95 | #include <string_view> | ||
96 | --- a/scintilla/src/LineMarker.cxx | ||
97 | +++ b/scintilla/src/LineMarker.cxx | ||
98 | @@ -5,6 +5,7 @@ | ||
99 | // Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org> | ||
100 | // The License.txt file describes the conditions under which this software may be distributed. | ||
101 | |||
102 | +#include <cstdint> | ||
103 | #include <cstring> | ||
104 | #include <cmath> | ||
105 | |||
106 | --- a/scintilla/src/PerLine.cxx | ||
107 | +++ b/scintilla/src/PerLine.cxx | ||
108 | @@ -6,6 +6,7 @@ | ||
109 | // The License.txt file describes the conditions under which this software may be distributed. | ||
110 | |||
111 | #include <cstddef> | ||
112 | +#include <cstdint> | ||
113 | #include <cassert> | ||
114 | #include <cstring> | ||
115 | |||
116 | --- a/scintilla/src/Style.cxx | ||
117 | +++ b/scintilla/src/Style.cxx | ||
118 | @@ -5,6 +5,8 @@ | ||
119 | // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org> | ||
120 | // The License.txt file describes the conditions under which this software may be distributed. | ||
121 | |||
122 | +#include <cstdint> | ||
123 | + | ||
124 | #include <stdexcept> | ||
125 | #include <string_view> | ||
126 | #include <vector> | ||
127 | --- a/scintilla/src/ViewStyle.cxx | ||
128 | +++ b/scintilla/src/ViewStyle.cxx | ||
129 | @@ -6,6 +6,7 @@ | ||
130 | // The License.txt file describes the conditions under which this software may be distributed. | ||
131 | |||
132 | #include <cstddef> | ||
133 | +#include <cstdint> | ||
134 | #include <cassert> | ||
135 | #include <cstring> | ||
136 | #include <cmath> | ||
137 | --- a/scintilla/src/XPM.cxx | ||
138 | +++ b/scintilla/src/XPM.cxx | ||
139 | @@ -6,6 +6,7 @@ | ||
140 | // The License.txt file describes the conditions under which this software may be distributed. | ||
141 | |||
142 | #include <cstdlib> | ||
143 | +#include <cstdint> | ||
144 | #include <cstring> | ||
145 | #include <climits> | ||
146 | |||
diff --git a/meta-oe/recipes-devtools/geany/geany_1.38.bb b/meta-oe/recipes-devtools/geany/geany_2.0.bb index d75e3b57fb..4b51195e08 100644 --- a/meta-oe/recipes-devtools/geany/geany_1.38.bb +++ b/meta-oe/recipes-devtools/geany/geany_2.0.bb | |||
@@ -11,8 +11,9 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
11 | 11 | ||
12 | SRC_URI = "https://download.geany.org/${BP}.tar.bz2 \ | 12 | SRC_URI = "https://download.geany.org/${BP}.tar.bz2 \ |
13 | file://0001-configure-Upgrade-to-a-modern-Gettext.patch \ | 13 | file://0001-configure-Upgrade-to-a-modern-Gettext.patch \ |
14 | file://geany-2.0-gcc15.patch \ | ||
14 | " | 15 | " |
15 | SRC_URI[sha256sum] = "abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546" | 16 | SRC_URI[sha256sum] = "565b4cd2f0311c1e3a167ec71c4a32dba642e0fe554ae5bb6b8177b7a74ccc92" |
16 | 17 | ||
17 | FILES:${PN} += "${datadir}/icons" | 18 | FILES:${PN} += "${datadir}/icons" |
18 | 19 | ||