From e92af058ef3572ee6a4b168d796dd68b4e30d0f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:16:07 +0000 Subject: [PATCH 01/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anjuta.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index 5179df1..f587206 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPLv2+ @@ -182,6 +182,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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. From 9dac9f5ba62956c8355905c429b8fa1b48e2fd7f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:48:21 +0000 Subject: [PATCH 02/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anjuta.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index f587206..76b4126 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPLv2+ @@ -182,6 +182,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 From eca323c5e83c9ee4b1a0906db68e692f5c604cf7 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 2 Aug 2022 10:48:15 -0500 Subject: [PATCH 03/20] Fix FTBFS --- anjuta.spec | 2 ++ webkit.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 webkit.patch diff --git a/anjuta.spec b/anjuta.spec index 76b4126..168d422 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -17,6 +17,7 @@ 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.patch BuildRequires: autogen BuildRequires: chrpath @@ -86,6 +87,7 @@ This package contains library files for %{name}. %setup -q %patch0 -p0 -b .cpp-java +%patch1 -p0 -b .webkit %build %if 0%{?with_python3} 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" From ed0fc20293ff9194652fd3eaa08377fcaa645f0e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 4 Aug 2022 14:59:29 -0500 Subject: [PATCH 04/20] libgda rebuild --- anjuta.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index 168d422..f15096e 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPLv2+ @@ -184,6 +184,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 From 1185d6507b9209382986f4e2d078fd36c61c95c5 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 4 Aug 2022 15:57:36 -0500 Subject: [PATCH 05/20] Update BR --- anjuta.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index f15096e..3e8a104 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -28,7 +28,7 @@ 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: neon-devel From cc354885c310a0c51e2b313049c0506ab31d9fa0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 1 Sep 2022 11:53:50 -0500 Subject: [PATCH 06/20] Webkit patch --- anjuta.spec | 12 ++++++++---- webkit-4.1.patch | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 webkit-4.1.patch diff --git a/anjuta.spec b/anjuta.spec index 3e8a104..3fd30b4 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,14 +10,14 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) 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.patch +Patch1: webkit-4.1.patch BuildRequires: autogen BuildRequires: chrpath @@ -51,7 +51,8 @@ BuildRequires: bison BuildRequires: itstool BuildRequires: libappstream-glib BuildRequires: gcc-c++ -BuildRequires: make +BuildRequires: make +BuildRequires: gnome-common Requires: autogen Requires: gdb >= 7.0 @@ -87,7 +88,7 @@ This package contains library files for %{name}. %setup -q %patch0 -p0 -b .cpp-java -%patch1 -p0 -b .webkit +%patch1 -p1 -b .webkit %build %if 0%{?with_python3} @@ -184,6 +185,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 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 From f34a6f6048690bf0909250c9a69935d22cc3aefd Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 23 Sep 2022 16:15:47 -0500 Subject: [PATCH 07/20] Fix libgda5 requires. --- anjuta.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/anjuta.spec b/anjuta.spec index 3fd30b4..2a8525b 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPLv2+ @@ -58,7 +58,7 @@ 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 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -185,6 +185,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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. From ab0b78ed95132c2385d045997006de52c87ee184 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 18 Nov 2022 14:56:59 -0600 Subject: [PATCH 08/20] Patch for autoconf 2.72 --- anjuta.spec | 7 ++++- autoconf-2.72.patch | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 autoconf-2.72.patch diff --git a/anjuta.spec b/anjuta.spec index 2a8525b..7ec58f8 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPLv2+ @@ -18,6 +18,7 @@ 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 BuildRequires: autogen BuildRequires: chrpath @@ -89,6 +90,7 @@ This package contains library files for %{name}. %patch0 -p0 -b .cpp-java %patch1 -p1 -b .webkit +%patch2 -p1 -b .autoconf %build %if 0%{?with_python3} @@ -185,6 +187,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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. 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) From af1881e7db69e2860b52aac910d73729913850d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:44:41 +0000 Subject: [PATCH 09/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anjuta.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index 7ec58f8..42727ba 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPLv2+ @@ -187,6 +187,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 From 4e4e0aba4f74388a29dae273b6668e76016d9e7f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 8 Mar 2023 14:43:41 -0600 Subject: [PATCH 10/20] migrated to SPDX license --- anjuta.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/anjuta.spec b/anjuta.spec index 42727ba..9719b56 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,10 +10,10 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 18%{?dist} +Release: 19%{?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.34/%{name}-%{version}.tar.xz Patch0: cpp-java.patch @@ -187,6 +187,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 From 1419e08ba1683fd894be0702990603157e550015 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:17:13 +0000 Subject: [PATCH 11/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anjuta.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index 9719b56..73983e1 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPL-2.0-or-later @@ -187,6 +187,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 From b1e9b5b42591e1b882485f157ae5b79a640c2978 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:56:49 +0000 Subject: [PATCH 12/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- anjuta.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index 73983e1..390f8b4 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPL-2.0-or-later @@ -187,6 +187,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 From 09f7135b4ae619ecb5478c7b5b54e0dcbe6cfe02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:03:10 +0000 Subject: [PATCH 13/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- anjuta.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index 390f8b4..856b48e 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 21%{?dist} +Release: 22%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPL-2.0-or-later @@ -187,6 +187,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 From 672e34e92af803021343570744f206efc05a3b59 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 5 Feb 2024 13:53:42 -0600 Subject: [PATCH 14/20] Fix for modern C --- anjuta.spec | 13 ++- pointer-types.patch | 204 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 213 insertions(+), 4 deletions(-) create mode 100644 pointer-types.patch diff --git a/anjuta.spec b/anjuta.spec index 856b48e..96a097d 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 22%{?dist} +Release: 23%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPL-2.0-or-later @@ -19,6 +19,7 @@ Source0: http://download.gnome.org/sources/anjuta/3.34/%{name}-%{version} Patch0: cpp-java.patch Patch1: webkit-4.1.patch Patch2: autoconf-2.72.patch +Patch3: pointer-types.patch BuildRequires: autogen BuildRequires: chrpath @@ -88,9 +89,10 @@ This package contains library files for %{name}. %prep %setup -q -%patch0 -p0 -b .cpp-java -%patch1 -p1 -b .webkit -%patch2 -p1 -b .autoconf +%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 %if 0%{?with_python3} @@ -187,6 +189,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 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 From d210a8e377b1178e4d0cc7de814a91e98d4301ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:59:54 +0000 Subject: [PATCH 15/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- anjuta.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index 96a097d..dece66a 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 23%{?dist} +Release: 24%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPL-2.0-or-later @@ -189,6 +189,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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. From a6f991c61a7ee5b7b7ca1112cbe9c4875b850244 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 8 Jan 2025 11:01:02 -0600 Subject: [PATCH 16/20] Fix FTBFS --- anjuta.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index dece66a..9c0c939 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 24%{?dist} +Release: 25%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPL-2.0-or-later @@ -55,6 +55,9 @@ BuildRequires: libappstream-glib BuildRequires: gcc-c++ BuildRequires: make BuildRequires: gnome-common +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: gtk-doc Requires: autogen Requires: gdb >= 7.0 @@ -95,6 +98,7 @@ This package contains library files for %{name}. %patch -P 3 -p0 -b .pointer %build +autoreconf -fi %if 0%{?with_python3} export PYTHON=%{__python3} %endif @@ -189,6 +193,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 From 59c272ab9be979bbda84ff02056cc00d7c10599a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:02:53 +0000 Subject: [PATCH 17/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- anjuta.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index 9c0c939..2a1e5a0 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 25%{?dist} +Release: 26%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPL-2.0-or-later @@ -193,6 +193,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 From 1dbebd769f1a4ff45ac5595b61ebe7d4db52ee6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:52:56 +0100 Subject: [PATCH 18/20] Add explicit BR: libxcrypt-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- anjuta.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index 2a1e5a0..4e4aef7 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 26%{?dist} +Release: 27%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPL-2.0-or-later @@ -33,6 +33,7 @@ BuildRequires: intltool 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) @@ -193,6 +194,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 From 74267f05e62a10d47699c57c8451221b8ef9a30b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:59:12 +0000 Subject: [PATCH 19/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- anjuta.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index 4e4aef7..1013ca2 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 27%{?dist} +Release: 28%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPL-2.0-or-later @@ -194,6 +194,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop %{_libdir}/libanjuta-3.so.* %changelog +* 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 From 89cb340d55be51472a115a027048880c90a1a143 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:40:45 +0000 Subject: [PATCH 20/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- anjuta.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index 1013ca2..eb1a284 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -10,7 +10,7 @@ Name: anjuta Epoch: 1 Version: 3.34.0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) License: GPL-2.0-or-later @@ -194,6 +194,9 @@ 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