diff --git a/anjuta.spec b/anjuta.spec index eb1a284..5179df1 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,16 +10,13 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 29%{?dist} +Release: 11%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) -License: GPL-2.0-or-later +License: GPLv2+ URL: http://www.anjuta.org/ Source0: http://download.gnome.org/sources/anjuta/3.34/%{name}-%{version}.tar.xz Patch0: cpp-java.patch -Patch1: webkit-4.1.patch -Patch2: autoconf-2.72.patch -Patch3: pointer-types.patch BuildRequires: autogen BuildRequires: chrpath @@ -30,10 +27,9 @@ BuildRequires: glade-devel BuildRequires: graphviz-devel BuildRequires: gtksourceview3-devel >= 2.91.8 BuildRequires: intltool -BuildRequires: libgda5-devel >= 5.1.0 +BuildRequires: libgda-devel >= 5.1.0 BuildRequires: libgdl-devel >= 2.91.4 BuildRequires: libuuid-devel -BuildRequires: libxcrypt-devel BuildRequires: neon-devel BuildRequires: perl-generators BuildRequires: perl(Locale::gettext) @@ -54,17 +50,13 @@ BuildRequires: bison BuildRequires: itstool BuildRequires: libappstream-glib BuildRequires: gcc-c++ -BuildRequires: make -BuildRequires: gnome-common -BuildRequires: automake -BuildRequires: autoconf -BuildRequires: gtk-doc +BuildRequires: make Requires: autogen Requires: gdb >= 7.0 Requires: git Requires: hicolor-icon-theme -Requires: libgda5-sqlite >= 5.1.0 +Requires: libgda-sqlite >= 5.1.0 Requires: automake Requires: autoconf Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -93,13 +85,9 @@ This package contains library files for %{name}. %prep %setup -q -%patch -P 0 -p0 -b .cpp-java -%patch -P 1 -p1 -b .webkit -%patch -P 2 -p1 -b .autoconf -%patch -P 3 -p0 -b .pointer +%patch0 -p0 -b .cpp-java %build -autoreconf -fi %if 0%{?with_python3} export PYTHON=%{__python3} %endif @@ -194,60 +182,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 1:3.34.0-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 1:3.34.0-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Feb 01 2025 Björn Esser - 1:3.34.0-27 -- Add explicit BR: libxcrypt-devel - -* Thu Jan 16 2025 Fedora Release Engineering - 1:3.34.0-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jan 08 2025 Gwyn Ciesla - 1:3.34.0-25 -- Fix FTBFS - -* Wed Jul 17 2024 Fedora Release Engineering - 1:3.34.0-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 31 2024 Gwyn Ciesla - 1:3.34.0-23 -- Patch for modern C. - -* Mon Jan 22 2024 Fedora Release Engineering - 1:3.34.0-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1:3.34.0-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1:3.34.0-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Mar 08 2023 Gwyn Ciesla - 1:3.34.0-19 -- migrated to SPDX license - -* Wed Jan 18 2023 Fedora Release Engineering - 1:3.34.0-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Nov 18 2022 Gwyn Ciesla - 1:3.34.0-17 -- Patch for autoconf 2.72 - -* Fri Sep 23 2022 Gwyn Ciesla - 1:3.34.0-16 -- Fix libgda requires. - -* Thu Sep 01 2022 Gwyn Ciesla - 1:3.34.0-15 -- Update webkit patch. - -* Thu Aug 04 2022 Gwyn Ciesla - 1:3.34.0-14 -- libgda rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1:3.34.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 1:3.34.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - * Wed Dec 15 2021 Gwyn Ciesla - 1:3.34.0-11 - Patch for source file hang. diff --git a/autoconf-2.72.patch b/autoconf-2.72.patch deleted file mode 100644 index a148caa..0000000 --- a/autoconf-2.72.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -r -U5 anjuta-3.34.0.old/configure.ac anjuta-3.34.0/configure.ac ---- anjuta-3.34.0.old/configure.ac 2022-11-17 14:53:51.042100150 +0100 -+++ anjuta-3.34.0/configure.ac 2022-11-17 17:07:23.233317448 +0100 -@@ -468,21 +468,21 @@ - dnl ------------------------- - dnl CHECK_HEADER_DEFINE(LABEL, HEADER [,ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ] ]) - AC_DEFUN([CHECK_HEADER_DEFINE], - [ - AC_MSG_CHECKING("if $1 is defined in $2") -- AC_EGREP_CPP(yes, --[#include <$2> --#ifdef $1 -- yes -+ AC_PREPROC_IFELSE( -+[[#include <$2> -+#ifndef $1 -+#error not defined - #endif --], [ -+]], [ - AC_MSG_RESULT(yes) -- $3 -+ [$3] - ], [ - AC_MSG_RESULT(no) -- $4 -+ [$4] - ]) ]) - - dnl Checks for header files. - AC_CHECK_HEADERS(dirent.h fcntl.h fnmatch.h stat.h stdlib.h string.h stdint.h) - AC_CHECK_HEADERS(time.h types.h unistd.h) -diff -r -U5 anjuta-3.34.0.old/configure.ac.webkit anjuta-3.34.0/configure.ac.webkit ---- anjuta-3.34.0.old/configure.ac.webkit 2022-11-17 14:53:50.954100638 +0100 -+++ anjuta-3.34.0/configure.ac.webkit 2022-11-17 17:07:46.886183426 +0100 -@@ -468,21 +468,21 @@ - dnl ------------------------- - dnl CHECK_HEADER_DEFINE(LABEL, HEADER [,ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ] ]) - AC_DEFUN([CHECK_HEADER_DEFINE], - [ - AC_MSG_CHECKING("if $1 is defined in $2") -- AC_EGREP_CPP(yes, --[#include <$2> --#ifdef $1 -- yes -+ AC_PREPROC_IFELSE( -+[[#include <$2> -+#ifndef $1 -+#error not defined - #endif --], [ -+]], [ - AC_MSG_RESULT(yes) -- $3 -+ [$3] - ], [ - AC_MSG_RESULT(no) -- $4 -+ [$4] - ]) ]) - - dnl Checks for header files. - AC_CHECK_HEADERS(dirent.h fcntl.h fnmatch.h stat.h stdlib.h string.h stdint.h) - AC_CHECK_HEADERS(time.h types.h unistd.h) diff --git a/pointer-types.patch b/pointer-types.patch deleted file mode 100644 index 3a8f962..0000000 --- a/pointer-types.patch +++ /dev/null @@ -1,204 +0,0 @@ ---- libanjuta/anjuta-dock.c~ 2018-10-22 14:25:42.000000000 -0500 -+++ libanjuta/anjuta-dock.c 2024-01-31 14:35:57.853677632 -0600 -@@ -403,7 +403,7 @@ - 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 = (GtkWidget *)(g_object_ref (command_bar)); - } - - /** ---- plugins/am-project/amp-group.c~ 2018-10-22 14:25:42.000000000 -0500 -+++ plugins/am-project/amp-group.c 2024-01-31 14:50:30.237118169 -0600 -@@ -364,7 +364,7 @@ - root = anjuta_project_node_get_file (node); - - /* Set source directory variables */ -- file = anjuta_project_node_get_file (group); -+ file = (GFile *)(anjuta_project_node_get_file ((const AnjutaProjectNode *)group)); - value = anjuta_token_insert_token_list (FALSE, NULL, - ANJUTA_TOKEN_LIST, NULL, - ANJUTA_TOKEN_ARGUMENT, NULL, ---- plugins/glade/plugin.c~ 2018-10-22 14:25:43.000000000 -0500 -+++ plugins/glade/plugin.c 2024-01-31 15:41:47.657244584 -0600 -@@ -487,7 +487,7 @@ - return; - - current_editor = IANJUTA_IS_EDITOR (doc) ? IANJUTA_EDITOR (doc) -- : get_doc_with_associated_file (plugin, doc); -+ : get_doc_with_associated_file ((GladePlugin *)plugin, doc); - - if (!current_editor) - return; ---- plugins/language-support-cpp-java/plugin.c~ 2018-10-22 14:25:43.000000000 -0500 -+++ plugins/language-support-cpp-java/plugin.c 2024-01-31 16:15:41.523962397 -0600 -@@ -430,7 +430,7 @@ - - g_object_unref (result_end); - -- return ianjuta_editor_get_text (editor, prefix_end, suffix_start, NULL); -+ return ianjuta_editor_get_text (editor, (IAnjutaIterable *)prefix_end, (IAnjutaIterable *)suffix_start, NULL); - } - - static gchar* ---- plugins/language-support-cpp-java/plugin.c~ 2024-01-31 16:15:41.523962397 -0600 -+++ plugins/language-support-cpp-java/plugin.c 2024-01-31 16:16:37.785595579 -0600 -@@ -846,7 +846,7 @@ - install_support (CppJavaPlugin *lang_plugin) - { - /* Searching for association */ -- gchar *ui_filename = get_text_between (lang_plugin->current_editor, -+ gchar *ui_filename = get_text_between ((IAnjutaEditor *)lang_plugin->current_editor, - WIDGETS_DECLARATION_MARKER_PREFIX, - WIDGETS_DECLARATION_MARKER_SUFFIX); - ---- plugins/language-support-js/util.c~ 2018-10-22 14:25:43.000000000 -0500 -+++ plugins/language-support-js/util.c 2024-01-31 16:31:12.703891242 -0600 -@@ -109,7 +109,7 @@ - JSLang* plugin = (JSLang*)getPlugin (); - - if (!plugin->prefs) -- plugin->prefs = anjuta_shell_get_preferences (ANJUTA_PLUGIN (plugin)->shell, NULL); -+ plugin->prefs = (GSettings *)anjuta_shell_get_preferences (ANJUTA_PLUGIN (plugin)->shell, NULL); - - if (!g_settings_get_boolean (plugin->prefs, HIGHLIGHT_MISSEDSEMICOLON)) - { -@@ -240,7 +240,7 @@ - JSLang* plugin = (JSLang*)getPlugin (); - - if (!plugin->prefs) -- plugin->prefs = anjuta_shell_get_preferences (ANJUTA_PLUGIN (plugin)->shell, NULL); -+ plugin->prefs = (GSettings *)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) ---- plugins/project-manager/tree-data.c~ 2018-10-22 14:25:43.000000000 -0500 -+++ plugins/project-manager/tree-data.c 2024-02-01 09:44:25.469897292 -0600 -@@ -63,7 +63,7 @@ - { - if (data->source != NULL) - { -- return g_object_ref (g_file_get_uri (data->source)); -+ return (GFile *)(g_object_ref (g_file_get_uri (data->source))); - } - else if (data->target != NULL) - { -@@ -75,7 +75,7 @@ - } - else if (data->group != NULL) - { -- return g_object_ref (g_file_get_uri (data->group)); -+ return (GFile *)(g_object_ref (g_file_get_uri (data->group))); - } - - return NULL; ---- plugins/python-loader/plugin.c~ 2018-10-22 14:25:43.000000000 -0500 -+++ plugins/python-loader/plugin.c 2024-02-01 16:19:19.527835521 -0600 -@@ -112,7 +112,7 @@ - return FALSE; - } - -- PySys_SetArgv (1, argv); -+ PySys_SetArgv (1, (wchar_t **)argv); - - /* Retrieve the Python type for anjuta plugin */ - m = PyImport_ImportModule ("gi.repository.Anjuta"); ---- plugins/starter/plugin.c~ 2018-10-22 14:25:43.000000000 -0500 -+++ plugins/starter/plugin.c 2024-02-05 10:58:43.132304066 -0600 -@@ -153,7 +153,7 @@ - - if (row != NULL) - { -- name = gtk_widget_get_name (row); -+ name = gtk_widget_get_name ((GtkWidget *)row); - if (name != NULL) { - if (g_strcmp0 (name, CREATE_ROW) == 0) - on_new_project_activated (row, user_data); -@@ -189,13 +189,13 @@ - } - else - { -- file = g_file_new_for_uri (gtk_recent_info_get_uri (recent_project)); -+ file = g_file_new_for_uri (gtk_recent_info_get_uri ((GtkRecentInfo *)recent_project)); - 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)); -- gtk_label_set_text (project_label, gtk_recent_info_get_display_name(recent_project)); -+ project_label = (GtkLabel *)(GTK_WIDGET (gtk_builder_get_object (builder, PROJECT_LABEL))); -+ path_label = (GtkLabel *)(GTK_WIDGET (gtk_builder_get_object (builder, PATH_LABEL))); -+ gtk_label_set_text (project_label, gtk_recent_info_get_display_name((GtkRecentInfo *)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); - gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (recent_row)), recent_row); -@@ -252,9 +252,9 @@ - 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 ((GObject *)row, URI_KEY), &error)) - { -- gtk_container_remove (GTK_CONTAINER (recent_list_box), row); -+ gtk_container_remove (GTK_CONTAINER (recent_list_box), (GtkWidget *)row); - } - else - { -@@ -316,16 +316,16 @@ - /* 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 ((GtkStackSwitcher *)switcher, (GtkStack *)stack); -+ gtk_stack_set_transition_type ((GtkStack *)stack, GTK_STACK_TRANSITION_TYPE_CROSSFADE); -+ gtk_stack_set_transition_duration ((GtkStack *)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 ((GtkBox *)switcher_box, switcher, FALSE, FALSE, 0); -+ gtk_box_pack_start ((GtkBox *)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 @@ - 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 ((GtkStack *)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 @@ - 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 ((GtkStack *)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", ---- plugins/symbol-db/plugin.c~ 2018-10-22 14:25:43.000000000 -0500 -+++ plugins/symbol-db/plugin.c 2024-02-05 13:30:00.779663162 -0600 -@@ -584,11 +584,11 @@ - 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 = (IAnjutaEditor *)(sdb_plugin->current_editor); -+ sdb_plugin->current_editor = (GObject *)editor; - sdb_plugin->need_symbols_update = TRUE; - editor_buffer_symbols_update (editor, sdb_plugin); -- sdb_plugin->current_editor = old_editor; -+ sdb_plugin->current_editor = (GObject *)old_editor; - } - - static void diff --git a/webkit-4.1.patch b/webkit-4.1.patch deleted file mode 100644 index 6b270d7..0000000 --- a/webkit-4.1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Jeremy Bicha -Date: Wed, 31 Aug 2022 22:09:45 -0400 -Subject: devhelp: switch to webkit 4.1 - -https://src.fedoraproject.org/rpms/anjuta/blob/rawhide/f/webkit.patch ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 94e3a1c..6794ad5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -246,7 +246,7 @@ if test "x$devhelp_enabled" = "xyes"; then - *webkit2gtk-3.0*) - AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2]) - ;; -- *webkit2gtk-4.0*) -+ *webkit2gtk-4.1*) - AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2]) - ;; - esac diff --git a/webkit.patch b/webkit.patch deleted file mode 100644 index 8244086..0000000 --- a/webkit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/devhelp/plugin.c.orig 2018-10-22 14:25:43.000000000 -0500 -+++ plugins/devhelp/plugin.c 2022-08-02 10:10:03.489808458 -0500 -@@ -37,7 +37,7 @@ - #ifdef HAVE_WEBKIT2 - #include - #else --#include -+#include - #endif - - #define ONLINE_API_DOCS "http://library.gnome.org/devel"