[packages/anjuta] - added types fixes; release 7
qboosh
qboosh at pld-linux.org
Sat Mar 22 11:42:21 CET 2025
commit 0538e935661ed560a5e692fd426fac3663a87dfa
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Mar 22 10:43:05 2025 +0100
- added types fixes; release 7
anjuta-types.patch | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++
anjuta.spec | 4 +-
2 files changed, 216 insertions(+), 1 deletion(-)
---
diff --git a/anjuta.spec b/anjuta.spec
index 42a5506..ccbd7ae 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -4,7 +4,7 @@ Summary(pl.UTF-8): Zintegrowane środowisko programowania dla GNOME
Summary(pt_BR.UTF-8): Ambiente de desenvolvimento integrado C e C++
Name: anjuta
Version: 3.34.0
-Release: 6
+Release: 7
Epoch: 1
License: GPL v2+
Group: X11/Development/Tools
@@ -14,6 +14,7 @@ Patch0: %{name}-desktop.patch
Patch1: webkit-4.1.patch
Patch2: python3-link.patch
Patch3: no-gda6.patch
+Patch4: %{name}-types.patch
URL: https://wiki.gnome.org/Apps/Anjuta
BuildRequires: autoconf >= 2.65
BuildRequires: autogen
@@ -156,6 +157,7 @@ Dokumentacja API biblioteki libanjuta.
%patch -P 1 -p1
%patch -P 2 -p1
%patch -P 3 -p1
+%patch -P 4 -p1
%{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' plugins/tools/scripts/*.pl
diff --git a/anjuta-types.patch b/anjuta-types.patch
new file mode 100644
index 0000000..3f4b3b7
--- /dev/null
+++ b/anjuta-types.patch
@@ -0,0 +1,213 @@
+--- anjuta-3.34.0/libanjuta/anjuta-dock.c.orig 2018-10-22 21:25:42.000000000 +0200
++++ anjuta-3.34.0/libanjuta/anjuta-dock.c 2025-03-22 07:59:21.468043686 +0100
+@@ -403,7 +403,7 @@ anjuta_dock_set_command_bar (AnjutaDock
+ if (self->priv->command_bar)
+ g_object_unref (self->priv->command_bar);
+
+- self->priv->command_bar = g_object_ref (command_bar);
++ self->priv->command_bar = GTK_WIDGET (g_object_ref (command_bar));
+ }
+
+ /**
+--- anjuta-3.34.0/plugins/am-project/amp-group.c.orig 2018-10-22 21:25:42.000000000 +0200
++++ anjuta-3.34.0/plugins/am-project/amp-group.c 2025-03-22 08:01:51.332018627 +0100
+@@ -364,7 +364,7 @@ amp_group_node_update_preset_variable (A
+ root = anjuta_project_node_get_file (node);
+
+ /* Set source directory variables */
+- file = anjuta_project_node_get_file (group);
++ file = anjuta_project_node_get_file (ANJUTA_PROJECT_NODE (group));
+ value = anjuta_token_insert_token_list (FALSE, NULL,
+ ANJUTA_TOKEN_LIST, NULL,
+ ANJUTA_TOKEN_ARGUMENT, NULL,
+--- anjuta-3.34.0/plugins/glade/plugin.c.orig 2018-10-22 21:25:43.000000000 +0200
++++ anjuta-3.34.0/plugins/glade/plugin.c 2025-03-22 08:10:03.547454357 +0100
+@@ -487,7 +487,7 @@ add_glade_member (GladeWidget *widget,
+ return;
+
+ current_editor = IANJUTA_IS_EDITOR (doc) ? IANJUTA_EDITOR (doc)
+- : get_doc_with_associated_file (plugin, doc);
++ : get_doc_with_associated_file (ANJUTA_PLUGIN_GLADE (plugin), doc);
+
+ if (!current_editor)
+ return;
+--- anjuta-3.34.0/plugins/language-support-cpp-java/plugin.c.orig 2018-10-22 21:25:43.000000000 +0200
++++ anjuta-3.34.0/plugins/language-support-cpp-java/plugin.c 2025-03-22 08:55:49.525839153 +0100
+@@ -430,7 +430,7 @@ get_text_between (IAnjutaEditor *editor,
+
+ g_object_unref (result_end);
+
+- return ianjuta_editor_get_text (editor, prefix_end, suffix_start, NULL);
++ return ianjuta_editor_get_text (editor, IANJUTA_ITERABLE (prefix_end), IANJUTA_ITERABLE (suffix_start), NULL);
+ }
+
+ static gchar*
+@@ -846,7 +846,7 @@ static void
+ install_support (CppJavaPlugin *lang_plugin)
+ {
+ /* Searching for association */
+- gchar *ui_filename = get_text_between (lang_plugin->current_editor,
++ gchar *ui_filename = get_text_between (IANJUTA_EDITOR (lang_plugin->current_editor),
+ WIDGETS_DECLARATION_MARKER_PREFIX,
+ WIDGETS_DECLARATION_MARKER_SUFFIX);
+
+--- anjuta-3.34.0/plugins/language-support-js/util.c.orig 2018-10-22 21:25:43.000000000 +0200
++++ anjuta-3.34.0/plugins/language-support-js/util.c 2025-03-22 08:58:02.193071698 +0100
+@@ -109,7 +109,7 @@ highlight_lines (GList *lines)
+ JSLang* plugin = (JSLang*)getPlugin ();
+
+ if (!plugin->prefs)
+- plugin->prefs = anjuta_shell_get_preferences (ANJUTA_PLUGIN (plugin)->shell, NULL);
++ plugin->prefs = G_SETTINGS (anjuta_shell_get_preferences (ANJUTA_PLUGIN (plugin)->shell, NULL));
+
+ if (!g_settings_get_boolean (plugin->prefs, HIGHLIGHT_MISSEDSEMICOLON))
+ {
+@@ -240,7 +240,7 @@ get_gir_path ()
+ JSLang* plugin = (JSLang*)getPlugin ();
+
+ if (!plugin->prefs)
+- plugin->prefs = anjuta_shell_get_preferences (ANJUTA_PLUGIN (plugin)->shell, NULL);
++ plugin->prefs = G_SETTINGS (anjuta_shell_get_preferences (ANJUTA_PLUGIN (plugin)->shell, NULL));
+
+ gchar *path = g_settings_get_string (plugin->prefs, GIR_DIR_KEY);
+ if (!path || strlen (path) < 1)
+--- anjuta-3.34.0/plugins/project-manager/tree-data.c.orig 2018-10-22 21:25:43.000000000 +0200
++++ anjuta-3.34.0/plugins/project-manager/tree-data.c 2025-03-22 09:16:13.167725455 +0100
+@@ -63,7 +63,7 @@ gbf_tree_data_get_file (GbfTreeData *dat
+ {
+ if (data->source != NULL)
+ {
+- return g_object_ref (g_file_get_uri (data->source));
++ return G_FILE (g_object_ref (g_file_get_uri (data->source)));
+ }
+ else if (data->target != NULL)
+ {
+@@ -75,7 +75,7 @@ gbf_tree_data_get_file (GbfTreeData *dat
+ }
+ else if (data->group != NULL)
+ {
+- return g_object_ref (g_file_get_uri (data->group));
++ return G_FILE (g_object_ref (g_file_get_uri (data->group)));
+ }
+
+ return NULL;
+--- anjuta-3.34.0/plugins/python-loader/plugin.c.orig 2018-10-22 21:25:43.000000000 +0200
++++ anjuta-3.34.0/plugins/python-loader/plugin.c 2025-03-22 09:33:22.445451668 +0100
+@@ -98,7 +98,7 @@ pyl_plugin_activate (AnjutaPlugin *plugi
+ {
+ //PythonLoaderPlugin *self = ANJUTA_PYTHON_LOADER_PLUGIN (plugin);
+
+- char *argv[] = { "anjuta", NULL };
++ wchar_t *argv[] = { L"anjuta", NULL };
+ PyTypeObject *plugin_type = NULL;
+ PyObject *m;
+
+--- anjuta-3.34.0/plugins/starter/plugin.c.orig 2018-10-22 21:25:43.000000000 +0200
++++ anjuta-3.34.0/plugins/starter/plugin.c 2025-03-22 10:08:33.764479373 +0100
+@@ -153,7 +153,7 @@ on_row_activated (GtkListBox *box, GtkLi
+
+ if (row != NULL)
+ {
+- name = gtk_widget_get_name (row);
++ name = gtk_widget_get_name (GTK_WIDGET (row));
+ if (name != NULL) {
+ if (g_strcmp0 (name, CREATE_ROW) == 0)
+ on_new_project_activated (row, user_data);
+@@ -172,7 +172,7 @@ on_row_activated (GtkListBox *box, GtkLi
+ }
+
+ static void
+-add_recent_project_row (GtkListBox *recent_project_box, GtkRecentData *recent_project)
++add_recent_project_row (GtkListBox *recent_project_box, GtkRecentInfo *recent_project)
+ {
+ GtkBuilder *builder;
+ GFile *file;
+@@ -193,8 +193,8 @@ add_recent_project_row (GtkListBox *rece
+ if (g_file_query_exists (file, NULL))
+ {
+ recent_row = GTK_WIDGET (gtk_builder_get_object (builder, RECENT_ROW));
+- project_label = GTK_WIDGET (gtk_builder_get_object (builder, PROJECT_LABEL));
+- path_label = GTK_WIDGET (gtk_builder_get_object (builder, PATH_LABEL));
++ project_label = GTK_LABEL (gtk_builder_get_object (builder, PROJECT_LABEL));
++ path_label = GTK_LABEL (gtk_builder_get_object (builder, PATH_LABEL));
+ gtk_label_set_text (project_label, gtk_recent_info_get_display_name(recent_project));
+ gtk_label_set_text (path_label, g_file_get_path(file));
+ g_object_set_data_full (G_OBJECT (recent_row), URI_KEY, g_file_get_uri(file), g_free);
+@@ -212,7 +212,7 @@ refresh_recent_project_view (GtkListBox
+ {
+ GSettings *settings;
+ GtkRecentManager *manager;
+- GtkRecentData *recent_project;
++ GtkRecentInfo *recent_project;
+ GList *items, *list;
+ gint i;
+ guint recent_limit;
+@@ -252,9 +252,9 @@ on_remove_project_clicked (GtkButton *bu
+ error = NULL;
+ if (row != NULL)
+ {
+- if (gtk_recent_manager_remove_item (manager, g_object_get_data (row, URI_KEY), &error))
++ if (gtk_recent_manager_remove_item (manager, g_object_get_data (G_OBJECT (row), URI_KEY), &error))
+ {
+- gtk_container_remove (GTK_CONTAINER (recent_list_box), row);
++ gtk_container_remove (GTK_CONTAINER (recent_list_box), GTK_WIDGET (row));
+ }
+ else
+ {
+@@ -316,16 +316,16 @@ create_starter_widget (StarterPlugin* pl
+ /* Manually assembling stack and switcher because they are not available in glade yet */
+ switcher = gtk_stack_switcher_new ();
+ stack = gtk_stack_new ();
+- gtk_stack_switcher_set_stack (switcher, stack);
+- gtk_stack_set_transition_type (stack, GTK_STACK_TRANSITION_TYPE_CROSSFADE);
+- gtk_stack_set_transition_duration (stack, TRANSITION_TIME);
++ gtk_stack_switcher_set_stack (GTK_STACK_SWITCHER (switcher), GTK_STACK (stack));
++ gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_CROSSFADE);
++ gtk_stack_set_transition_duration (GTK_STACK (stack), TRANSITION_TIME);
+
+ starter_box = GTK_WIDGET (gtk_builder_get_object (builder, STARTER_BOX));
+ switcher_box = GTK_WIDGET (gtk_builder_get_object (builder, SWITCHER_BOX));
+ gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (starter_box)), starter_box);
+ g_object_ref (starter_box);
+- gtk_box_pack_start (switcher_box, switcher, FALSE, FALSE, 0);
+- gtk_box_pack_start (starter_box, stack, FALSE, FALSE, 0);
++ gtk_box_pack_start (GTK_BOX (switcher_box), switcher, FALSE, FALSE, 0);
++ gtk_box_pack_start (GTK_BOX (starter_box), stack, FALSE, FALSE, 0);
+ gtk_widget_show_all (starter_box);
+
+ actions_listbox = GTK_WIDGET (gtk_builder_get_object (builder, ACTIONS_LISTBOX));
+@@ -333,7 +333,7 @@ create_starter_widget (StarterPlugin* pl
+ actions_frame = GTK_WIDGET (gtk_builder_get_object (builder, ACTIONS_FRAME));
+ gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (actions_frame)), actions_frame);
+ g_object_ref (actions_frame);
+- gtk_stack_add_titled (stack, actions_frame, ACTIONS_ID, "Actions");
++ gtk_stack_add_titled (GTK_STACK (stack), actions_frame, ACTIONS_ID, "Actions");
+
+ recent_projects_box = GTK_WIDGET (gtk_builder_get_object (builder, RECENT_PROJECTS_BOX));
+ gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (recent_projects_box)), recent_projects_box);
+@@ -342,7 +342,7 @@ create_starter_widget (StarterPlugin* pl
+ recent_listbox = GTK_WIDGET (gtk_builder_get_object (builder, RECENT_LISTBOX));
+ refresh_recent_project_view (GTK_LIST_BOX (recent_listbox));
+
+- gtk_stack_add_titled (stack, recent_projects_box, RECENT_PROJECTS_ID, "Recent Projects");
++ gtk_stack_add_titled (GTK_STACK (stack), recent_projects_box, RECENT_PROJECTS_ID, "Recent Projects");
+
+ button = GTK_WIDGET (gtk_builder_get_object (builder, REMOVE_PROJECT_BUTTON));
+ g_signal_connect_object (G_OBJECT (button), "clicked",
+--- anjuta-3.34.0/plugins/symbol-db/plugin.c.orig 2018-10-22 21:25:43.000000000 +0200
++++ anjuta-3.34.0/plugins/symbol-db/plugin.c 2025-03-22 10:24:31.871932896 +0100
+@@ -584,11 +584,11 @@ static void
+ on_code_added (IAnjutaEditor *editor, IAnjutaIterable *position, gchar *code,
+ SymbolDBPlugin *sdb_plugin)
+ {
+- IAnjutaEditor *old_editor = sdb_plugin->current_editor;
+- sdb_plugin->current_editor = editor;
++ IAnjutaEditor *old_editor = IANJUTA_EDITOR (sdb_plugin->current_editor);
++ sdb_plugin->current_editor = G_OBJECT (editor);
+ sdb_plugin->need_symbols_update = TRUE;
+ editor_buffer_symbols_update (editor, sdb_plugin);
+- sdb_plugin->current_editor = old_editor;
++ sdb_plugin->current_editor = G_OBJECT (old_editor);
+ }
+
+ static void
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/anjuta.git/commitdiff/0538e935661ed560a5e692fd426fac3663a87dfa
More information about the pld-cvs-commit
mailing list