From d77009abaa95ddaa1bc6b70f4f5c7c2cc9d8ad2c Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 26 Aug 2024 22:32:09 +0100 Subject: [PATCH 01/22] Rebuild against gspell --- xed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xed.spec b/xed.spec index da9feb1..5ec02bb 100644 --- a/xed.spec +++ b/xed.spec @@ -4,7 +4,7 @@ Name: xed Version: 3.6.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -130,6 +130,9 @@ This package contains the documentation files for %{name}. %changelog +* Mon Aug 26 2024 David King - 3.6.6-2 +- Rebuild against gspell + * Tue Aug 20 2024 Leigh Scott - 3.6.6-1 - Update to 3.6.6 From cf01a2d4d9c637291e2d4b9a4287334ab37481f5 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 26 Aug 2024 23:41:18 +0100 Subject: [PATCH 02/22] Rebuild against gspell --- xed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xed.spec b/xed.spec index 5ec02bb..c6bcc0d 100644 --- a/xed.spec +++ b/xed.spec @@ -4,7 +4,7 @@ Name: xed Version: 3.6.6 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -130,6 +130,9 @@ This package contains the documentation files for %{name}. %changelog +* Mon Aug 26 2024 David King - 3.6.6-2.1 +- Rebuilds against gspell + * Mon Aug 26 2024 David King - 3.6.6-2 - Rebuild against gspell From 66da5cb769d0c7daac3f71d409cc8c0c4bf982b1 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 25 Nov 2024 15:05:52 +0000 Subject: [PATCH 03/22] Update to 3.6.7 --- sources | 2 +- xed.spec | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 1c48524..118a463 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xed-3.6.6.tar.gz) = 67798391c9aee262705129e6718db3c5e59481edf3881ab6e19930e17fd98dfee1688fd3e4fd075a9856e2cba111e0abb2adf2139ec46e9a5683c26d3301c9c9 +SHA512 (xed-3.6.7.tar.gz) = 7ae1a5bfa2845d2d0a5701e169c123b4fa89dc9acac366cd4f76f7bba5cc8647a42f153c96a836778f69a081a0d4711bfd83d7169a3972cc3e1f2aafdb31b78d diff --git a/xed.spec b/xed.spec index 5ec02bb..298af80 100644 --- a/xed.spec +++ b/xed.spec @@ -3,8 +3,8 @@ Name: xed -Version: 3.6.6 -Release: 2%{?dist} +Version: 3.6.7 +Release: 1%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -21,7 +21,6 @@ BuildRequires: gnome-common BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libappstream-glib -BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gspell-1) BuildRequires: pkgconfig(gtk+-3.0) @@ -130,6 +129,9 @@ This package contains the documentation files for %{name}. %changelog +* Mon Nov 25 2024 Leigh Scott - 3.6.7-1 +- Update to 3.6.7 + * Mon Aug 26 2024 David King - 3.6.6-2 - Rebuild against gspell From 0ea73aa514300a0b6beefc02e2c64db17971ca03 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 2 Dec 2024 14:45:36 +0000 Subject: [PATCH 04/22] Update to 3.6.9 --- sources | 2 +- xed.spec | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sources b/sources index 118a463..5ff871c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xed-3.6.7.tar.gz) = 7ae1a5bfa2845d2d0a5701e169c123b4fa89dc9acac366cd4f76f7bba5cc8647a42f153c96a836778f69a081a0d4711bfd83d7169a3972cc3e1f2aafdb31b78d +SHA512 (xed-3.6.9.tar.gz) = 825d49ee40f021136576647836b0de909e094fe8073a470c7b71cdd33fea47a6479eb01a80144153cc8ddbe1eee382d5a75ffe66655e4c12d544629931ce2db1 diff --git a/xed.spec b/xed.spec index 298af80..17addf0 100644 --- a/xed.spec +++ b/xed.spec @@ -3,7 +3,7 @@ Name: xed -Version: 3.6.7 +Version: 3.6.9 Release: 1%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) @@ -85,7 +85,7 @@ This package contains the documentation files for %{name}. %install %meson_install %{__sed} -i -e '/.*.*/d' \ - %{buildroot}%{_metainfodir}/%{name}.appdata.xml + %{buildroot}%{_metainfodir}/org.x.editor.metainfo.xml %find_lang %{name} --with-gnome @@ -93,11 +93,11 @@ This package contains the documentation files for %{name}. %check # Validate desktop-files. %{_bindir}/desktop-file-validate \ - %{buildroot}%{_datadir}/applications/%{name}.desktop + %{buildroot}%{_datadir}/applications/org.x.editor.desktop # Validate AppData-files. %{_bindir}/appstream-util validate-relax --nonet \ - %{buildroot}%{_metainfodir}/%{name}.appdata.xml + %{buildroot}%{_metainfodir}/org.x.editor.metainfo.xml %files -f %{name}.lang @@ -106,8 +106,8 @@ This package contains the documentation files for %{name}. %exclude %{_datadir}/%{name}/gir-1.0 %exclude %{_datadir}/%{name}/gir-1.0/* %{_bindir}/%{name} -%{_metainfodir}/%{name}.appdata.xml -%{_datadir}/applications/%{name}.desktop +%{_metainfodir}/org.x.editor.metainfo.xml +%{_datadir}/applications/org.x.editor.desktop %{_datadir}/dbus-1/services/org.x.editor.*service %{_datadir}/glib-2.0/schemas/org.x.editor.*gschema.xml %{_datadir}/gtksourceview-4/styles/xed.xml @@ -129,6 +129,9 @@ This package contains the documentation files for %{name}. %changelog +* Mon Dec 02 2024 Leigh Scott - 3.6.9-1 +- Update to 3.6.9 + * Mon Nov 25 2024 Leigh Scott - 3.6.7-1 - Update to 3.6.7 From 0e3f0e6ceac7c67be8eea96582bba6df8e9346ae Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 6 Dec 2024 13:10:18 +0000 Subject: [PATCH 05/22] Update to 3.8.0 --- sources | 2 +- xed.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5ff871c..442682d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xed-3.6.9.tar.gz) = 825d49ee40f021136576647836b0de909e094fe8073a470c7b71cdd33fea47a6479eb01a80144153cc8ddbe1eee382d5a75ffe66655e4c12d544629931ce2db1 +SHA512 (xed-3.8.0.tar.gz) = eda9574b9c0c1ca701aec4babd4e239414a35293d1bfe758ce28d26abe41abc7cb14e40084c040a759630962dc9dcf46e3923f238a1b944a550df9a21e037cf3 diff --git a/xed.spec b/xed.spec index 17addf0..72eff04 100644 --- a/xed.spec +++ b/xed.spec @@ -3,7 +3,7 @@ Name: xed -Version: 3.6.9 +Version: 3.8.0 Release: 1%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) @@ -129,6 +129,9 @@ This package contains the documentation files for %{name}. %changelog +* Fri Dec 06 2024 Leigh Scott - 3.8.0-1 +- Update to 3.8.0 + * Mon Dec 02 2024 Leigh Scott - 3.6.9-1 - Update to 3.6.9 From de827bd1c98025e32aa429a483bcad933e6a7c9c Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 20 Dec 2024 12:23:19 +0000 Subject: [PATCH 06/22] Update to 3.8.1 --- sources | 2 +- xed.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 442682d..4997410 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xed-3.8.0.tar.gz) = eda9574b9c0c1ca701aec4babd4e239414a35293d1bfe758ce28d26abe41abc7cb14e40084c040a759630962dc9dcf46e3923f238a1b944a550df9a21e037cf3 +SHA512 (xed-3.8.1.tar.gz) = 0a506b61f89d919eae178c87d9f39c4f6933dd516fe3ec81d35cb6567e205e11c2db9f8f84dc1bd656281061a6f377bcff26606626c07d06c19366a39f982f42 diff --git a/xed.spec b/xed.spec index 72eff04..444fd21 100644 --- a/xed.spec +++ b/xed.spec @@ -3,7 +3,7 @@ Name: xed -Version: 3.8.0 +Version: 3.8.1 Release: 1%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) @@ -129,6 +129,9 @@ This package contains the documentation files for %{name}. %changelog +* Fri Dec 20 2024 Leigh Scott - 3.8.1-1 +- Update to 3.8.1 + * Fri Dec 06 2024 Leigh Scott - 3.8.0-1 - Update to 3.8.0 From 6fc119e1bdb2e37481dd06b8076533be19e4c814 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 6 Jan 2025 15:19:13 +0000 Subject: [PATCH 07/22] Update to 3.8.2 --- sources | 2 +- xed.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4997410..822f87c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xed-3.8.1.tar.gz) = 0a506b61f89d919eae178c87d9f39c4f6933dd516fe3ec81d35cb6567e205e11c2db9f8f84dc1bd656281061a6f377bcff26606626c07d06c19366a39f982f42 +SHA512 (xed-3.8.2.tar.gz) = 4fdcb07c0c363ac95014e028ea9bb506bb3d4abdbde14cacf14f442a219d242c514a67f26b24687ea5f52c8fc5d6c7d12f1cc51ce766ab658ffdf1a177487ac2 diff --git a/xed.spec b/xed.spec index 444fd21..1e886fc 100644 --- a/xed.spec +++ b/xed.spec @@ -3,7 +3,7 @@ Name: xed -Version: 3.8.1 +Version: 3.8.2 Release: 1%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) @@ -129,6 +129,9 @@ This package contains the documentation files for %{name}. %changelog +* Mon Jan 06 2025 Leigh Scott - 3.8.2-1 +- Update to 3.8.2 + * Fri Dec 20 2024 Leigh Scott - 3.8.1-1 - Update to 3.8.1 From 674d1ac2232f547f45ae3860197a10b022eca6f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:38:24 +0000 Subject: [PATCH 08/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xed.spec b/xed.spec index 1e886fc..4ce92f1 100644 --- a/xed.spec +++ b/xed.spec @@ -4,7 +4,7 @@ Name: xed Version: 3.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -129,6 +129,9 @@ This package contains the documentation files for %{name}. %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jan 06 2025 Leigh Scott - 3.8.2-1 - Update to 3.8.2 From 63443b2f57460c24791ed1ad6d61ab44c66580fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:44:09 +0000 Subject: [PATCH 09/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xed.spec b/xed.spec index 4ce92f1..146cf40 100644 --- a/xed.spec +++ b/xed.spec @@ -4,7 +4,7 @@ Name: xed Version: 3.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -129,6 +129,9 @@ This package contains the documentation files for %{name}. %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 3.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 5ac34c5568112e7f33f2515ae69ba56c1e8e410e Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 6 Sep 2025 10:26:24 +0100 Subject: [PATCH 10/22] Update to 3.8.4 --- sources | 2 +- xed.spec | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 822f87c..d393c21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xed-3.8.2.tar.gz) = 4fdcb07c0c363ac95014e028ea9bb506bb3d4abdbde14cacf14f442a219d242c514a67f26b24687ea5f52c8fc5d6c7d12f1cc51ce766ab658ffdf1a177487ac2 +SHA512 (xed-3.8.4.tar.gz) = f443803ea07f5d35f9c1925dac76037750df9b9135c32746b8e0ef175c6b75ebcd92f5853bc94ced1f52a01d0a1f3c57a3ae1a58cb45a8ca98464459dbca8b2b diff --git a/xed.spec b/xed.spec index 146cf40..175303e 100644 --- a/xed.spec +++ b/xed.spec @@ -3,8 +3,8 @@ Name: xed -Version: 3.8.2 -Release: 3%{?dist} +Version: 3.8.4 +Release: 1%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -87,6 +87,11 @@ This package contains the documentation files for %{name}. %{__sed} -i -e '/.*.*/d' \ %{buildroot}%{_metainfodir}/org.x.editor.metainfo.xml +%if 0%{?fedora} > 42 +# libpeas is broken +rm -rf %{buildroot}%{_libdir}/%{name}/plugins/{bracket-complete,joinlines*,open-uri-context-menu,textsize*} +%endif + %find_lang %{name} --with-gnome @@ -129,6 +134,9 @@ This package contains the documentation files for %{name}. %changelog +* Sat Sep 06 2025 Leigh Scott - 3.8.4-1 +- Update to 3.8.4 + * Fri Jul 25 2025 Fedora Release Engineering - 3.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 6c1a775158f166a3bc5759a6c7bd57bab8f2771a Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 10 Sep 2025 07:46:44 +0100 Subject: [PATCH 11/22] Rebuild for libpeas1 changes --- libpeas_libgirepository2.patch | 59 ++++++++++++++++++++++++++++++++++ xed.spec | 14 ++++++-- 2 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 libpeas_libgirepository2.patch diff --git a/libpeas_libgirepository2.patch b/libpeas_libgirepository2.patch new file mode 100644 index 0000000..591979b --- /dev/null +++ b/libpeas_libgirepository2.patch @@ -0,0 +1,59 @@ +diff -uNrp a/xed/xed-app.c b/xed/xed-app.c +--- a/xed/xed-app.c 2025-08-26 17:05:48.000000000 +0100 ++++ b/xed/xed-app.c 2025-09-09 01:03:41.042962295 +0100 +@@ -38,7 +38,7 @@ + #include + + #ifdef ENABLE_INTROSPECTION +-#include ++#include + #endif + + #include "xed-app.h" +@@ -991,7 +991,7 @@ xed_app_init (XedApp *app) + g_application_add_main_option_entries (G_APPLICATION (app), options); + + #ifdef ENABLE_INTROSPECTION +- g_application_add_option_group (G_APPLICATION (app), g_irepository_get_option_group ()); ++ g_application_add_option_group (G_APPLICATION (app), gi_repository_get_option_group ()); + #endif + + load_accels (); +diff -uNrp a/xed/xed-plugins-engine.c b/xed/xed-plugins-engine.c +--- a/xed/xed-plugins-engine.c 2025-08-26 17:05:48.000000000 +0100 ++++ b/xed/xed-plugins-engine.c 2025-09-09 01:06:40.371484541 +0100 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + + #include "xed-plugins-engine.h" + #include "xed-debug.h" +@@ -66,7 +66,7 @@ xed_plugins_engine_init (XedPluginsEngin + + typelib_dir = g_build_filename (xed_dirs_get_xed_lib_dir (), "girepository-1.0", NULL); + +- if (!g_irepository_require_private (g_irepository_get_default (), typelib_dir, "Xed", "1.0", 0, &error)) ++ if (!gi_repository_require_private (gi_repository_dup_default (), typelib_dir, "Xed", "1.0", 0, &error)) + { + g_warning ("Could not load Xed repository: %s", error->message); + g_error_free (error); +@@ -76,14 +76,14 @@ xed_plugins_engine_init (XedPluginsEngin + g_free (typelib_dir); + + /* This should be moved to libpeas */ +- if (!g_irepository_require (g_irepository_get_default (), "Peas", "1.0", 0, &error)) ++ if (!gi_repository_require (gi_repository_dup_default (), "Peas", "1.0", 0, &error)) + { + g_warning ("Could not load Peas repository: %s", error->message); + g_error_free (error); + error = NULL; + } + +- if (!g_irepository_require (g_irepository_get_default (), "PeasGtk", "1.0", 0, &error)) ++ if (!gi_repository_require (gi_repository_dup_default (), "PeasGtk", "1.0", 0, &error)) + { + g_warning ("Could not load PeasGtk repository: %s", error->message); + g_error_free (error); diff --git a/xed.spec b/xed.spec index 175303e..1954f57 100644 --- a/xed.spec +++ b/xed.spec @@ -4,13 +4,14 @@ Name: xed Version: 3.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://github.com/linuxmint/%{name} Source0: %url/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: libpeas_libgirepository2.patch ExcludeArch: %{ix86} @@ -34,6 +35,7 @@ BuildRequires: pkgconfig(xapp) >= 1.4.0 BuildRequires: python%{python3_pkgversion}-devel Requires: iso-codes +Requires: libpeas1-loader-python3%{?_isa} Requires: python%{python3_pkgversion}-gobject%{?_isa} Requires: xapps%{?_isa} Suggests: hunspell-en @@ -66,7 +68,10 @@ This package contains the documentation files for %{name}. %prep -%autosetup -p 1 +%setup -q +%if 0%{?fedora} > 42 +%patch -P0 -p1 +%endif # Use 'classic'-theme by default. %{__sed} -i -e 's!xed!classic!g' data/org.x.editor.gschema.xml.in @@ -89,7 +94,7 @@ This package contains the documentation files for %{name}. %if 0%{?fedora} > 42 # libpeas is broken -rm -rf %{buildroot}%{_libdir}/%{name}/plugins/{bracket-complete,joinlines*,open-uri-context-menu,textsize*} +#rm -rf %{buildroot}%{_libdir}/%{name}/plugins/{bracket-complete,joinlines*,open-uri-context-menu,textsize*} %endif %find_lang %{name} --with-gnome @@ -134,6 +139,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/plugins/{bracket-complete,joinlines*,open- %changelog +* Wed Sep 10 2025 Leigh Scott - 3.8.4-2 +- Rebuild for libpeas1 changes + * Sat Sep 06 2025 Leigh Scott - 3.8.4-1 - Update to 3.8.4 From df79673c8b539ef13abdaf750ed6d7ad24c16069 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 10 Sep 2025 12:21:37 +0100 Subject: [PATCH 12/22] Add requires for meson gnome.generate_gir --- xed.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xed.spec b/xed.spec index 1954f57..0816e41 100644 --- a/xed.spec +++ b/xed.spec @@ -19,6 +19,8 @@ BuildRequires: meson BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gnome-common +# Required for meson's gnome.generate_gir +BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libappstream-glib From 39d852f03a23ac05b052235f96a835d17e8bee3e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 29 Oct 2025 18:52:25 -0400 Subject: [PATCH 13/22] Apply girepository2 patch on EPEL 11 --- xed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xed.spec b/xed.spec index 0816e41..a570b15 100644 --- a/xed.spec +++ b/xed.spec @@ -71,7 +71,7 @@ This package contains the documentation files for %{name}. %prep %setup -q -%if 0%{?fedora} > 42 +%if 0%{?fedora} > 42 || 0%{?rhel} > 10 %patch -P0 -p1 %endif From 5af5ad483ef972db2debd80f74bcb8e82a5ae5fe Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 13 Dec 2025 11:58:42 +0000 Subject: [PATCH 14/22] Revert "Apply girepository2 patch on EPEL 11" This reverts commit 39d852f03a23ac05b052235f96a835d17e8bee3e. --- xed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xed.spec b/xed.spec index a570b15..0816e41 100644 --- a/xed.spec +++ b/xed.spec @@ -71,7 +71,7 @@ This package contains the documentation files for %{name}. %prep %setup -q -%if 0%{?fedora} > 42 || 0%{?rhel} > 10 +%if 0%{?fedora} > 42 %patch -P0 -p1 %endif From cdc1954bf2b65b545e90bc12cbaf5a0cb677bec8 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 12 Dec 2025 07:15:26 +0000 Subject: [PATCH 15/22] Update to 3.8.6 --- libpeas_libgirepository2.patch | 59 ---------------------------------- sources | 2 +- xed.spec | 21 ++++-------- 3 files changed, 7 insertions(+), 75 deletions(-) delete mode 100644 libpeas_libgirepository2.patch diff --git a/libpeas_libgirepository2.patch b/libpeas_libgirepository2.patch deleted file mode 100644 index 591979b..0000000 --- a/libpeas_libgirepository2.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -uNrp a/xed/xed-app.c b/xed/xed-app.c ---- a/xed/xed-app.c 2025-08-26 17:05:48.000000000 +0100 -+++ b/xed/xed-app.c 2025-09-09 01:03:41.042962295 +0100 -@@ -38,7 +38,7 @@ - #include - - #ifdef ENABLE_INTROSPECTION --#include -+#include - #endif - - #include "xed-app.h" -@@ -991,7 +991,7 @@ xed_app_init (XedApp *app) - g_application_add_main_option_entries (G_APPLICATION (app), options); - - #ifdef ENABLE_INTROSPECTION -- g_application_add_option_group (G_APPLICATION (app), g_irepository_get_option_group ()); -+ g_application_add_option_group (G_APPLICATION (app), gi_repository_get_option_group ()); - #endif - - load_accels (); -diff -uNrp a/xed/xed-plugins-engine.c b/xed/xed-plugins-engine.c ---- a/xed/xed-plugins-engine.c 2025-08-26 17:05:48.000000000 +0100 -+++ b/xed/xed-plugins-engine.c 2025-09-09 01:06:40.371484541 +0100 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - - #include "xed-plugins-engine.h" - #include "xed-debug.h" -@@ -66,7 +66,7 @@ xed_plugins_engine_init (XedPluginsEngin - - typelib_dir = g_build_filename (xed_dirs_get_xed_lib_dir (), "girepository-1.0", NULL); - -- if (!g_irepository_require_private (g_irepository_get_default (), typelib_dir, "Xed", "1.0", 0, &error)) -+ if (!gi_repository_require_private (gi_repository_dup_default (), typelib_dir, "Xed", "1.0", 0, &error)) - { - g_warning ("Could not load Xed repository: %s", error->message); - g_error_free (error); -@@ -76,14 +76,14 @@ xed_plugins_engine_init (XedPluginsEngin - g_free (typelib_dir); - - /* This should be moved to libpeas */ -- if (!g_irepository_require (g_irepository_get_default (), "Peas", "1.0", 0, &error)) -+ if (!gi_repository_require (gi_repository_dup_default (), "Peas", "1.0", 0, &error)) - { - g_warning ("Could not load Peas repository: %s", error->message); - g_error_free (error); - error = NULL; - } - -- if (!g_irepository_require (g_irepository_get_default (), "PeasGtk", "1.0", 0, &error)) -+ if (!gi_repository_require (gi_repository_dup_default (), "PeasGtk", "1.0", 0, &error)) - { - g_warning ("Could not load PeasGtk repository: %s", error->message); - g_error_free (error); diff --git a/sources b/sources index d393c21..069995a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xed-3.8.4.tar.gz) = f443803ea07f5d35f9c1925dac76037750df9b9135c32746b8e0ef175c6b75ebcd92f5853bc94ced1f52a01d0a1f3c57a3ae1a58cb45a8ca98464459dbca8b2b +SHA512 (xed-3.8.6.tar.gz) = c3c6bff0e2a5f3b173268bc5350d055603e7522256cdf0ffed7fe418b957ac74830a552e32a2b8b0fe351bf772bf8373e4621c659542f9822497c8371b864b5d diff --git a/xed.spec b/xed.spec index 0816e41..a2f398c 100644 --- a/xed.spec +++ b/xed.spec @@ -1,17 +1,15 @@ # Filter provides from plugins. %global __provides_exclude_from ^%{_libdir}/%{name}/plugins/.*$ - Name: xed -Version: 3.8.4 -Release: 2%{?dist} +Version: 3.8.6 +Release: 1%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://github.com/linuxmint/%{name} Source0: %url/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: libpeas_libgirepository2.patch ExcludeArch: %{ix86} @@ -31,6 +29,7 @@ BuildRequires: pkgconfig(gtksourceview-4) BuildRequires: pkgconfig(libpeas-gtk-1.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(iso-codes) +BuildRequires: python3-gobject-devel BuildRequires: python3-gobject-base BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(xapp) >= 1.4.0 @@ -52,7 +51,6 @@ Xed is extensible through a plugin system, which currently includes support for spell checking, comparing files, viewing CVS ChangeLogs, and adjusting indentation levels. - %package devel Summary: Files needed to develop plugins for %{name} Requires: %{name}%{?_isa} == %{version}-%{release} @@ -60,7 +58,6 @@ Requires: %{name}%{?_isa} == %{version}-%{release} %description devel This package contains files needed to develop plugins for %{name}. - %package doc Summary: Documentation files for %{name} BuildArch: noarch @@ -68,12 +65,9 @@ BuildArch: noarch %description doc This package contains the documentation files for %{name}. - %prep %setup -q -%if 0%{?fedora} > 42 %patch -P0 -p1 -%endif # Use 'classic'-theme by default. %{__sed} -i -e 's!xed!classic!g' data/org.x.editor.gschema.xml.in @@ -88,7 +82,6 @@ This package contains the documentation files for %{name}. -Ddeprecated_warnings=false %meson_build - %install %meson_install %{__sed} -i -e '/.*.*/d' \ @@ -101,7 +94,6 @@ This package contains the documentation files for %{name}. %find_lang %{name} --with-gnome - %check # Validate desktop-files. %{_bindir}/desktop-file-validate \ @@ -111,7 +103,6 @@ This package contains the documentation files for %{name}. %{_bindir}/appstream-util validate-relax --nonet \ %{buildroot}%{_metainfodir}/org.x.editor.metainfo.xml - %files -f %{name}.lang %license AUTHORS COPYING debian/copyright %doc ChangeLog README.md debian/changelog @@ -127,20 +118,20 @@ This package contains the documentation files for %{name}. %{_libdir}/%{name}/ %{_mandir}/man1/%{name}.1* - %files devel %{_datadir}/%{name}/gir-1.0 %{_includedir}/%{name}/ %{_libdir}/pkgconfig/%{name}.pc - %files doc %license %{_datadir}/licenses/%{name}* %doc %{_datadir}/doc/%{name}* %doc %{_datadir}/gtk-doc/* - %changelog +* Fri Dec 12 2025 Leigh Scott - 3.8.6-1 +- Update to 3.8.6 + * Wed Sep 10 2025 Leigh Scott - 3.8.4-2 - Rebuild for libpeas1 changes From 117e847311acb3012d5aab6fa11dbe0c304ec58f Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 13 Dec 2025 11:53:20 +0000 Subject: [PATCH 16/22] Update to 3.8.7 --- sources | 2 +- xed.spec | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 069995a..469a08f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xed-3.8.6.tar.gz) = c3c6bff0e2a5f3b173268bc5350d055603e7522256cdf0ffed7fe418b957ac74830a552e32a2b8b0fe351bf772bf8373e4621c659542f9822497c8371b864b5d +SHA512 (xed-3.8.7.tar.gz) = 668ca54207ca56f8e707c15eb97ef83f302758012486c33090bd078ef83b22db813ea8c4c891e97e515af252b73439decc9f8ddd6487db4993c8b4fcac50b4ee diff --git a/xed.spec b/xed.spec index a2f398c..1d82880 100644 --- a/xed.spec +++ b/xed.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/plugins/.*$ Name: xed -Version: 3.8.6 +Version: 3.8.7 Release: 1%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) @@ -67,7 +67,6 @@ This package contains the documentation files for %{name}. %prep %setup -q -%patch -P0 -p1 # Use 'classic'-theme by default. %{__sed} -i -e 's!xed!classic!g' data/org.x.editor.gschema.xml.in @@ -129,6 +128,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/gtk-doc/* %changelog +* Sat Dec 13 2025 Leigh Scott - 3.8.7-1 +- Update to 3.8.7 + * Fri Dec 12 2025 Leigh Scott - 3.8.6-1 - Update to 3.8.6 From bbd3307700a296f5574b83fad0e9ded29ac40f18 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 9 Jan 2026 13:45:08 +0000 Subject: [PATCH 17/22] Update to 3.8.9 --- sources | 2 +- xed.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 469a08f..fcd6af0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xed-3.8.7.tar.gz) = 668ca54207ca56f8e707c15eb97ef83f302758012486c33090bd078ef83b22db813ea8c4c891e97e515af252b73439decc9f8ddd6487db4993c8b4fcac50b4ee +SHA512 (xed-3.8.9.tar.gz) = bd72b1b4f41ecd352366cf193ebfbdd49f6bcdd8f0b347adc91c25ad1cc315cff8b13956dee51a43754cd81e508f06b2a592da2276bdb8f2ef43a12c516ea76d diff --git a/xed.spec b/xed.spec index 1d82880..2028910 100644 --- a/xed.spec +++ b/xed.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/plugins/.*$ Name: xed -Version: 3.8.7 +Version: 3.8.9 Release: 1%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) @@ -128,6 +128,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/gtk-doc/* %changelog +* Fri Jan 09 2026 Leigh Scott - 3.8.9-1 +- Update to 3.8.9 + * Sat Dec 13 2025 Leigh Scott - 3.8.7-1 - Update to 3.8.7 From 8ef6a2791e2c652b395d09e7e0292f7964419082 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:34:02 +0000 Subject: [PATCH 18/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xed.spec b/xed.spec index 2028910..842d0fd 100644 --- a/xed.spec +++ b/xed.spec @@ -3,7 +3,7 @@ Name: xed Version: 3.8.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -128,6 +128,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/gtk-doc/* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 3.8.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jan 09 2026 Leigh Scott - 3.8.9-1 - Update to 3.8.9 From 9d49480031dabc122c8761fa03e6b14e84d3aa3b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 3 Jun 2026 12:01:57 +0100 Subject: [PATCH 19/22] Drop unused build deps --- xed.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xed.spec b/xed.spec index 842d0fd..4b8626e 100644 --- a/xed.spec +++ b/xed.spec @@ -28,7 +28,6 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtksourceview-4) BuildRequires: pkgconfig(libpeas-gtk-1.0) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(iso-codes) BuildRequires: python3-gobject-devel BuildRequires: python3-gobject-base BuildRequires: pkgconfig(sm) From b9ab9da73b14b3966b9d2c6664f62c1230c4a828 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:07:19 +0000 Subject: [PATCH 20/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xed.spec b/xed.spec index 4b8626e..a6dd212 100644 --- a/xed.spec +++ b/xed.spec @@ -3,7 +3,7 @@ Name: xed Version: 3.8.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -127,6 +127,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/gtk-doc/* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.8.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 3.8.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 700dc85968479fd980dcd8ff7c68d72bbe440fb6 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 2 Aug 2026 10:49:27 +0100 Subject: [PATCH 21/22] Add requires xapp-symbolic-icons --- xed.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xed.spec b/xed.spec index a6dd212..a1a0701 100644 --- a/xed.spec +++ b/xed.spec @@ -38,6 +38,7 @@ Requires: iso-codes Requires: libpeas1-loader-python3%{?_isa} Requires: python%{python3_pkgversion}-gobject%{?_isa} Requires: xapps%{?_isa} +Requires: xapp-symbolic-icons Suggests: hunspell-en %description From 754bdafbf4ddfb2d42ed1b6570832eaab0c86563 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 26 Aug 2026 11:09:31 +0100 Subject: [PATCH 22/22] Add requires xapp-symbolic-icons --- xed.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xed.spec b/xed.spec index a1a0701..15e9997 100644 --- a/xed.spec +++ b/xed.spec @@ -3,7 +3,7 @@ Name: xed Version: 3.8.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -91,7 +91,7 @@ This package contains the documentation files for %{name}. #rm -rf %{buildroot}%{_libdir}/%{name}/plugins/{bracket-complete,joinlines*,open-uri-context-menu,textsize*} %endif -%find_lang %{name} --with-gnome +%find_lang %{name} --with-gnome %check # Validate desktop-files. @@ -128,6 +128,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/gtk-doc/* %changelog +* Wed Aug 26 2026 Leigh Scott - 3.8.9-4 +- Add requires xapp-symbolic-icons + * Fri Jul 17 2026 Fedora Release Engineering - 3.8.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild