From cdc1954bf2b65b545e90bc12cbaf5a0cb677bec8 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 12 Dec 2025 07:15:26 +0000 Subject: [PATCH] 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