summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/geany/geany-plugins
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-devtools/geany/geany-plugins')
-rw-r--r--meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch24
-rw-r--r--meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch45
-rw-r--r--meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch89
-rw-r--r--meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch30
4 files changed, 188 insertions, 0 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 @@
1From 8dfd7f2cba428f5eb232fbbe3427c64171bae0f4 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com>
3Date: Tue, 5 Mar 2024 18:36:37 +0100
4Subject: [PATCH 1/3] projectorganizer: fix invalid string comparison
5
6Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/8dfd7f2cba428f5eb232fbbe3427c64171bae0f4]
7Signed-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
12diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c
13index 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 @@
1From 58d47e60bdcec62fe74b4a38eaf39d16a9c80d42 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com>
3Date: Tue, 5 Mar 2024 18:40:10 +0100
4Subject: [PATCH 2/3] projectorganizer: fix various warnings
5
6Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/58d47e60bdcec62fe74b4a38eaf39d16a9c80d42]
7Signed-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
12diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c
13index 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 @@
1From a4a7c4af7f62eb55c0bd100ed1d308e6512a66ce Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com>
3Date: Tue, 23 Apr 2024 18:43:51 +0200
4Subject: [PATCH 3/3] projectorganizer: Use g_pattern_spec_match_string() instead of g_pattern_match_string()
5
6Eliminates a warning on newer glib versions. Adds a fallback on older versions.
7
8Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/a4a7c4af7f62eb55c0bd100ed1d308e6512a66ce]
9Signed-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
17diff --git a/projectorganizer/src/prjorg-project.c b/projectorganizer/src/prjorg-project.c
18index 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);
30diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c
31index 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);
52diff --git a/projectorganizer/src/prjorg-utils.c b/projectorganizer/src/prjorg-utils.c
53index 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)))
74diff --git a/projectorganizer/src/prjorg-utils.h b/projectorganizer/src/prjorg-utils.h
75index 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 @@
1Fix build with GCC-15
2
3Upstream-Status: Backport [https://github.com/geany/geany-plugins/pull/1389]
4Signed-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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 07:02:25 +0000