[packages/gedit] - updated to 48.2 (huh, 48.1.1 tag was newer)

qboosh qboosh at pld-linux.org
Mon Mar 30 17:59:39 CEST 2026 

commit dff4cb5e428a50eff4fee4a15adafff7f4f1eba5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Mar 30 17:59:48 2026 +0200

    - updated to 48.2 (huh, 48.1.1 tag was newer)

 gedit-girepository2.patch | 77 -----------------------------------------------
 gedit.spec                | 41 ++++++++++---------------
 2 files changed, 16 insertions(+), 102 deletions(-)
---
diff --git a/gedit.spec b/gedit.spec
index b88ccf8..dfdd16d 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -5,33 +5,31 @@
 Summary:	gedit - small but powerful text editor for X Window
 Summary(pl.UTF-8):	gedit - mały ale potężny edytor tekstu dla X Window
 Name:		gedit
-Version:	48.1.2
+Version:	48.2
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Editors
 #Source0Download: https://gitlab.gnome.org/World/gedit/gedit/-/tags
 Source0:	https://gitlab.gnome.org/World/gedit/gedit/-/archive/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	1a232788927062e0174f8ea957cf64cf
+# Source0-md5:	dc404f85ba40a7c3a96b6eb2766f0d95
 # older versions
 #Source0:	https://download.gnome.org/sources/gedit/48/%{name}-%{version}.tar.xz
 # see subprojects/libgd in repo
 %define	libgd_ver	c7c7ff4e05d3fe82854219091cf116cce6b19de0
 Source1:	https://gitlab.gnome.org/GNOME/libgd/-/archive/%{libgd_ver}/libgd-%{libgd_ver}.tar.bz2
 # Source1-md5:	9629a717f99c4ee2d221732e92c2ce1c
-Patch0:		%{name}-girepository2.patch
 URL:		https://gedit-text-editor.org/
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-tools >= 0.18
 BuildRequires:	glib2-devel >= 1:2.76
-BuildRequires:	gobject-introspection-devel >= 0.10.0
 BuildRequires:	gspell-devel >= 1.0
 BuildRequires:	gtk+3-devel >= 3.22.0
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
 BuildRequires:	libgedit-amtk-devel >= 5.8
 BuildRequires:	libgedit-gtksourceview-devel >= 299
-BuildRequires:	libgedit-tepl-devel >= 6.12
-BuildRequires:	libpeas-devel >= 1.38.0
-BuildRequires:	libpeas-gtk-devel >= 1.38.0
+BuildRequires:	libgedit-tepl-devel >= 6.13
+BuildRequires:	libpeas-devel >= 1.14.1
+BuildRequires:	libpeas-gtk-devel >= 1.14.1
 BuildRequires:	meson >= 0.59
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
@@ -54,17 +52,16 @@ Requires:	gsettings-desktop-schemas >= 3.2.0
 Requires:	gtk+3 >= 3.22.0
 Requires:	hicolor-icon-theme
 Requires:	iso-codes >= 0.35
-Requires:	libpeas-loader-python3 >= 1.38.0
 Requires:	python3-libs >= 1:3.2.3
 Requires:	python3-pycairo
 Requires:	python3-pygobject3 >= 3.0.0
+# plugins in Python (present in gedit-plugins <= 48.1) no longer supported
+Conflicts:	gedit-plugins < 48.2
 Obsoletes:	gedit-plugins < 2.3.3-2
 Obsoletes:	gedit2 < 3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		api_ver		48.1
-
-%define		py3_gi_overridesdir	%{py3_sitescriptdir}/gi/overrides
+%define		api_ver		48.2
 
 %description
 gedit is a small but powerful text editor for GTK+ and/or GNOME. It
@@ -86,9 +83,9 @@ Group:		Libraries
 Requires:	glib2 >= 1:2.76
 Requires:	gtk+3 >= 3.22.0
 Requires:	libgedit-amtk >= 5.8
-Requires:	libgedit-tepl >= 6.12
-Requires:	libpeas >= 1.38.0
-Requires:	libpeas-gtk >= 1.38.0
+Requires:	libgedit-tepl >= 6.13
+Requires:	libpeas >= 1.14.1
+Requires:	libpeas-gtk >= 1.14.1
 
 %description libs
 gedit shared library.
@@ -104,9 +101,9 @@ Requires:	%{name}-libs = %{version}-%{release}
 Requires:	glib2-devel >= 1:2.76
 Requires:	gtk+3-devel >= 3.22.0
 Requires:	libgedit-amtk-devel >= 5.8
-Requires:	libgedit-tepl-devel >= 6.12
-Requires:	libpeas-devel >= 1.38.0
-Requires:	libpeas-gtk-devel >= 1.38.0
+Requires:	libgedit-tepl-devel >= 6.13
+Requires:	libpeas-devel >= 1.14.1
+Requires:	libpeas-gtk-devel >= 1.14.1
 Obsoletes:	gedit2-devel < 3
 Obsoletes:	vala-gedit < 45
 
@@ -132,7 +129,6 @@ Dokumentacja API gedit.
 
 %prep
 %setup -q -a1
-%patch -P0 -p1
 
 rmdir subprojects/libgd
 %{__mv} libgd-%{libgd_ver} subprojects/libgd
@@ -148,9 +144,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %meson_install
 
-%py3_comp $RPM_BUILD_ROOT%{py3_gi_overridesdir}
-%py3_ocomp $RPM_BUILD_ROOT%{py3_gi_overridesdir}
-
 # not supported by glibc (as of 2.37)
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
 
@@ -174,10 +167,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS README.md
 %attr(755,root,root) %{_bindir}/gedit
 %dir %{_libdir}/gedit/plugins
-%attr(755,root,root) %{_libdir}/gedit/plugins/*.so
+%{_libdir}/gedit/plugins/*.so
 %{_libdir}/gedit/plugins/*.plugin
-%{py3_gi_overridesdir}/Gedit.py
-%{py3_gi_overridesdir}/__pycache__/Gedit.cpython-*.py[co]
 %{_datadir}/dbus-1/services/org.gnome.gedit.service
 %{_datadir}/gedit/plugins
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
@@ -196,7 +187,7 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %dir %{_libdir}/gedit
-%attr(755,root,root) %{_libdir}/gedit/libgedit-%{api_ver}.so
+%{_libdir}/gedit/libgedit-%{api_ver}.so
 %dir %{_libdir}/gedit/girepository-1.0
 %{_libdir}/gedit/girepository-1.0/Gedit-3.0.typelib
 %dir %{_datadir}/gedit
diff --git a/gedit-girepository2.patch b/gedit-girepository2.patch
deleted file mode 100644
index 51d6dfb..0000000
--- a/gedit-girepository2.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- gedit-48.1.2/gedit/gedit-plugins-engine.c.orig	2025-11-29 19:07:49.000000000 +0100
-+++ gedit-48.1.2/gedit/gedit-plugins-engine.c	2026-03-29 14:54:17.497258530 +0200
-@@ -25,7 +25,7 @@
- 
- #include <string.h>
- #include <glib/gi18n.h>
--#include <girepository.h>
-+#include <girepository/girepository.h>
- #include "gedit-debug.h"
- #include "gedit-dirs.h"
- #include "gedit-settings.h"
-@@ -44,6 +44,7 @@ static GeditPluginsEngine *default_engin
- static void
- gedit_plugins_engine_init (GeditPluginsEngine *engine)
- {
-+	GIRepository *repo;
- 	gchar *typelib_dir;
- 	GError *error = NULL;
- 
-@@ -53,12 +54,19 @@ gedit_plugins_engine_init (GeditPluginsE
- 
- 	engine->plugin_settings = g_settings_new ("org.gnome.gedit.plugins");
- 
-+	repo = gi_repository_dup_default ();
-+	if (repo == NULL)
-+	{
-+		g_warning ("Could not get GI repository");
-+		return;
-+	}
-+
- 	/* Require gedit's typelib. */
- 	typelib_dir = g_build_filename (gedit_dirs_get_gedit_lib_dir (),
- 	                                "girepository-1.0",
- 	                                NULL);
- 
--	if (!g_irepository_require_private (g_irepository_get_default (),
-+	if (!gi_repository_require_private (repo,
- 	                                    typelib_dir, "Gedit", "3.0", 0, &error))
- 	{
- 		g_warning ("Could not load Gedit repository: %s", error->message);
-@@ -69,7 +77,7 @@ gedit_plugins_engine_init (GeditPluginsE
- 	g_free (typelib_dir);
- 
- 	/* This should be moved to libpeas */
--	if (!g_irepository_require (g_irepository_get_default (),
-+	if (!gi_repository_require (repo,
- 	                            "Peas", "1.0", 0, &error))
- 	{
- 		g_warning ("Could not load Peas repository: %s", error->message);
-@@ -77,7 +85,7 @@ gedit_plugins_engine_init (GeditPluginsE
- 		error = NULL;
- 	}
- 
--	if (!g_irepository_require (g_irepository_get_default (),
-+	if (!gi_repository_require (repo,
- 	                            "PeasGtk", "1.0", 0, &error))
- 	{
- 		g_warning ("Could not load PeasGtk repository: %s", error->message);
-@@ -98,6 +106,7 @@ gedit_plugins_engine_init (GeditPluginsE
- 	                 engine,
- 	                 "loaded-plugins",
- 	                 G_SETTINGS_BIND_DEFAULT);
-+        g_clear_object (&repo);
- }
- 
- static void
---- gedit-48.1.2/meson.build.orig	2025-11-29 19:07:49.000000000 +0100
-+++ gedit-48.1.2/meson.build	2026-03-29 15:37:13.483303215 +0200
-@@ -111,7 +111,7 @@ libgedit_public_deps = [
- 
- deps_basic_list = [
-   libgedit_public_deps,
--  dependency('gobject-introspection-1.0'),
-+  dependency('girepository-2.0'),
- ]
- 
- gspell_dep = dependency('gspell-1', version: '>= 1.0')
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gedit.git/commitdiff/dff4cb5e428a50eff4fee4a15adafff7f4f1eba5

More information about the pld-cvs-commit mailing list