diff --git a/.gitignore b/.gitignore index d0d5443..c1bd88a 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,5 @@ /anjuta-3.20.0.tar.xz /anjuta-3.22.0.tar.xz /anjuta-3.26.0.tar.xz +/anjuta-3.28.0.tar.xz +/anjuta-3.34.0.tar.xz diff --git a/anjuta.spec b/anjuta.spec index c037f85..eb1a284 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -9,13 +9,17 @@ Name: anjuta Epoch: 1 -Version: 3.26.0 -Release: 1%{?dist} +Version: 3.34.0 +Release: 29%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) -License: GPLv2+ +License: GPL-2.0-or-later URL: http://www.anjuta.org/ -Source0: http://download.gnome.org/sources/anjuta/3.26/%{name}-%{version}.tar.xz +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 @@ -26,9 +30,10 @@ BuildRequires: glade-devel BuildRequires: graphviz-devel BuildRequires: gtksourceview3-devel >= 2.91.8 BuildRequires: intltool -BuildRequires: libgda-devel >= 5.1.0 +BuildRequires: libgda5-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) @@ -48,18 +53,21 @@ BuildRequires: flex BuildRequires: bison BuildRequires: itstool BuildRequires: libappstream-glib +BuildRequires: gcc-c++ +BuildRequires: make +BuildRequires: gnome-common +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: gtk-doc Requires: autogen Requires: gdb >= 7.0 Requires: git Requires: hicolor-icon-theme -Requires: libgda-sqlite >= 5.1.0 +Requires: libgda5-sqlite >= 5.1.0 Requires: automake Requires: autoconf - -# Obsolete the -doc subpackage and instead install the user help in main -# anjuta package so that About->User's Manual could work out of the box. -Obsoletes: anjuta-doc < 1:3.3.92-1 +Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description Anjuta DevStudio is a versatile software development studio featuring @@ -71,17 +79,27 @@ for efficient development. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains development files for %{name}. +%package libs +Summary: Libraries for %{name} + +%description libs +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 %build +autoreconf -fi %if 0%{?with_python3} export PYTHON=%{__python3} %endif @@ -111,7 +129,7 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete # # See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. # -appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/anjuta.appdata.xml \ +appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/anjuta.appdata.xml \ https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/anjuta/a.png \ https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/anjuta/b.png @@ -131,30 +149,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop -%post -/sbin/ldconfig -/bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : -/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : -/usr/bin/update-desktop-database &> /dev/null || : - -%postun -/sbin/ldconfig -/usr/bin/update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : - /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : - /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : - /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : -fi - -%posttrans -/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : -/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : - %files -f %{name}.lang -%license COPYING %doc AUTHORS %doc MAINTAINERS %doc NEWS @@ -162,18 +157,14 @@ fi %{_bindir}/%{name} %{_bindir}/%{name}-launcher %{_bindir}/%{name}-tags -%{_datadir}/appdata/anjuta.appdata.xml %{_datadir}/applications/anjuta.desktop %{_datadir}/icons/hicolor/*/apps/anjuta.png %{_datadir}/icons/hicolor/*/mimetypes/application-x-anjuta.png %{_datadir}/icons/hicolor/scalable/apps/anjuta.svg %{_datadir}/icons/hicolor/scalable/mimetypes/application-x-anjuta.svg %{_datadir}/icons/hicolor/symbolic/apps/anjuta-symbolic.svg +%{_datadir}/metainfo/anjuta.appdata.xml %{_datadir}/mime/packages/%{name}.xml -%{_libdir}/anjuta/ -%{_libdir}/girepository-1.0/Anjuta-3.0.typelib -%{_libdir}/girepository-1.0/IAnjuta-3.0.typelib -%{_libdir}/libanjuta-3.so.* %{_datadir}/anjuta/ %{_datadir}/glib-2.0/schemas/org.gnome.anjuta*.gschema.xml %{_datadir}/pixmaps/anjuta/ @@ -195,8 +186,145 @@ fi %dir %{_includedir}/libanjuta-3.0 %{_includedir}/libanjuta-3.0/libanjuta +%files libs +%license COPYING +%{_libdir}/anjuta/ +%{_libdir}/girepository-1.0/Anjuta-3.0.typelib +%{_libdir}/girepository-1.0/IAnjuta-3.0.typelib +%{_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. + +* Sun Nov 14 2021 Gwyn Ciesla - 1:3.34.0-10 +- Split out libs package to reduce gtkpod footprint. + +* Wed Jul 21 2021 Fedora Release Engineering - 1:3.34.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1:3.34.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Sep 13 2020 Kalev Lember - 1:3.34.0-7 +- Rebuilt for libgladeui soname bump + +* Fri Jul 31 2020 Fedora Release Engineering - 1:3.34.0-6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1:3.34.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 01 2020 Gwyn Ciesla - 1:3.34.0-4 +- Autogen rebuild + +* Fri May 22 2020 Kalev Lember - 1:3.34.0-3 +- Rebuilt for libgladeui soname bump + +* Tue Jan 28 2020 Fedora Release Engineering - 1:3.34.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Sep 08 2019 Gwyn Ciesla - 1:3.34.0-1 +- 3.34 + +* Mon Aug 19 2019 Miro Hrončok - 1:3.28.0-10 +- Rebuilt for Python 3.8 + +* Wed Jul 24 2019 Fedora Release Engineering - 1:3.28.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1:3.28.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Sep 07 2018 Kalev Lember - 1:3.28.0-7 +- Rebuilt against fixed atk (#1626575) + +* Fri Sep 07 2018 Kalev Lember - 1:3.28.0-6 +- Rebuilt for libdevhelp soname bump + +* Mon Aug 06 2018 Kalev Lember - 1:3.28.0-5 +- Rebuilt for vala 0.42 + +* Fri Jul 20 2018 Gwyn Ciesla - 1:3.28.0-4 +- BR fix. + +* Thu Jul 12 2018 Fedora Release Engineering - 1:3.28.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 1:3.28.0-2 +- Rebuilt for Python 3.7 + +* Sun Mar 11 2018 Kalev Lember - 1:3.28.0-1 +- Update to 3.28.0 +- Remove ldconfig scriptlets + +* Fri Feb 09 2018 Igor Gnatenko - 1:3.26.0-5 +- Escape macros in %%changelog + +* Wed Feb 07 2018 Fedora Release Engineering - 1:3.26.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 07 2018 Igor Gnatenko - 1:3.26.0-3 +- Remove obsolete scriptlets + +* Wed Dec 20 2017 Kalev Lember - 1:3.26.0-2 +- Rebuilt for vala 0.40 + * Sun Sep 10 2017 Kalev Lember - 1:3.26.0-1 - Update to 3.26.0 @@ -744,7 +872,7 @@ fi * Language support (C, C++, Java) plugin: + Javascript plugins use incorrect LDFLAGS and end up having versioned shared object files, links, etc.. (GNOME Bugzilla #615341) - + Completion for . and -> does not work with prefixed &, %, etc.. (GNOME + + Completion for . and -> does not work with prefixed &, %%, etc.. (GNOME Bugzilla #615596) * Project manager plugin: + Consider Vala files as sources. (GNOME Bugzilla #616503) diff --git a/autoconf-2.72.patch b/autoconf-2.72.patch new file mode 100644 index 0000000..a148caa --- /dev/null +++ b/autoconf-2.72.patch @@ -0,0 +1,64 @@ +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/cpp-java.patch b/cpp-java.patch new file mode 100644 index 0000000..ab61fa4 --- /dev/null +++ b/cpp-java.patch @@ -0,0 +1,27 @@ +--- plugins/language-support-cpp-java/cpp-packages.c~ 2018-10-22 14:25:43.000000000 -0500 ++++ plugins/language-support-cpp-java/cpp-packages.c 2021-12-15 12:15:03.701576548 -0600 +@@ -139,15 +139,17 @@ + GList* deps = anjuta_pkg_config_list_dependencies (name, NULL); + GList* dep; + PackageData* data = g_new0 (PackageData, 1); +- for (dep = deps; dep != NULL; dep = g_list_next (dep)) +- { +- cpp_packages_activate_package (sm, dep->data, packages_to_add); +- } +- anjuta_util_glist_strings_free (deps); + data->pkg = g_strdup (name); + data->version = g_strdup (version); +- *packages_to_add = g_list_prepend (*packages_to_add, +- data); ++ *packages_to_add = g_list_prepend (*packages_to_add, data); ++ for (dep = deps; dep != NULL; dep = g_list_next (dep)) ++ { ++ /* Only treat this dependency if not already present */ ++ if (!g_list_find_custom (*packages_to_add,dep->data, (GCompareFunc) pkg_data_compare)){ ++ cpp_packages_activate_package (sm, dep->data, packages_to_add); ++ } ++ } ++ anjuta_util_glist_strings_free (deps); + } + g_free (name); + return *packages_to_add; diff --git a/pointer-types.patch b/pointer-types.patch new file mode 100644 index 0000000..3a8f962 --- /dev/null +++ b/pointer-types.patch @@ -0,0 +1,204 @@ +--- 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/sources b/sources index 31f8ec9..649866b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anjuta-3.26.0.tar.xz) = a4923cca1576fd9d42ef2d2dfb66248c09baa927789537dbafbaa8cbb439ff229335d9b7268bb774374655c1fdc734064f1d0f6f14199da09347c88da3e91440 +SHA512 (anjuta-3.34.0.tar.xz) = 9d5a4c23751893ff7e21cd55c1f112f27b53fe2ea5ac645c63e2da627efce202b88696e3e5d860ad75a5c13c88a9082775d74f4482208161b5e63d56c4004d57 diff --git a/webkit-4.1.patch b/webkit-4.1.patch new file mode 100644 index 0000000..6b270d7 --- /dev/null +++ b/webkit-4.1.patch @@ -0,0 +1,22 @@ +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 new file mode 100644 index 0000000..8244086 --- /dev/null +++ b/webkit.patch @@ -0,0 +1,11 @@ +--- 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"