diff --git a/_service b/_service index 5368ee8..c4888eb 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git - https://gitlab.gnome.org/GNOME/gedit.git - 46.2 + https://gitlab.gnome.org/World/gedit/gedit.git + 48.0 @PARENT_TAG@+@TAG_OFFSET@ v?(.*)\+0 \1 diff --git a/gedit-46.2.obscpio b/gedit-46.2.obscpio deleted file mode 100644 index f2571c8..0000000 --- a/gedit-46.2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18f0970db58e579ca03e8d4ef6fe886d9de00748373a607950ae218714f77c01 -size 24259597 diff --git a/gedit-48.0.obscpio b/gedit-48.0.obscpio new file mode 100644 index 0000000..a85ddbf --- /dev/null +++ b/gedit-48.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d054a5dc177381506944befde85e2b6c1534b2280ff641235815b266bc1287ec +size 24294925 diff --git a/gedit-quickhighlight-gtksourcestyle-api.patch b/gedit-quickhighlight-gtksourcestyle-api.patch deleted file mode 100644 index e81f3cb..0000000 --- a/gedit-quickhighlight-gtksourcestyle-api.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 6fa2371e5d9f5e9ef5403e78271cdfd9c4055e9a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= -Date: Tue, 8 Aug 2023 16:00:00 +0200 -Subject: [PATCH] quickhighlight plugin: adapt code for GtkSourceStyle API - break - ---- - plugins/quickhighlight/gedit-quick-highlight-plugin.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/plugins/quickhighlight/gedit-quick-highlight-plugin.c b/plugins/quickhighlight/gedit-quick-highlight-plugin.c -index 7b4289dc7..ee40bcc84 100644 ---- a/plugins/quickhighlight/gedit-quick-highlight-plugin.c -+++ b/plugins/quickhighlight/gedit-quick-highlight-plugin.c -@@ -83,7 +83,7 @@ gedit_quick_highlight_plugin_load_style (GeditQuickHighlightPlugin *plugin) - - gedit_debug (DEBUG_PLUGINS); - -- g_clear_object (&plugin->priv->style); -+ g_clear_pointer (&plugin->priv->style, gtk_source_style_unref); - - style_scheme = gtk_source_buffer_get_style_scheme (GTK_SOURCE_BUFFER (plugin->priv->buffer)); - -@@ -93,7 +93,7 @@ gedit_quick_highlight_plugin_load_style (GeditQuickHighlightPlugin *plugin) - - if (style != NULL) - { -- plugin->priv->style = gtk_source_style_copy (style); -+ plugin->priv->style = gtk_source_style_ref (style); - } - } - } -@@ -336,7 +336,7 @@ gedit_quick_highlight_plugin_finalize (GObject *object) - { - GeditQuickHighlightPlugin *plugin = GEDIT_QUICK_HIGHLIGHT_PLUGIN (object); - -- g_clear_object (&plugin->priv->style); -+ g_clear_pointer (&plugin->priv->style, gtk_source_style_unref); - - G_OBJECT_CLASS (gedit_quick_highlight_plugin_parent_class)->finalize (object); - } -@@ -435,7 +435,7 @@ gedit_quick_highlight_plugin_deactivate (GeditViewActivatable *activatable) - - plugin = GEDIT_QUICK_HIGHLIGHT_PLUGIN (activatable); - -- g_clear_object (&plugin->priv->style); -+ g_clear_pointer (&plugin->priv->style, gtk_source_style_unref); - g_clear_object (&plugin->priv->search_context); - - gedit_quick_highlight_plugin_unref_weak_buffer (plugin); --- -2.44.0 - diff --git a/gedit.changes b/gedit.changes index 5028004..8073eec 100644 --- a/gedit.changes +++ b/gedit.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Wed Oct 2 14:51:01 UTC 2024 - Dominique Leuenberger + +- Update to version 48.0: + + New features: + - Full support of light/dark GTK theme variants. Configuration + is done in the Preferences dialog -> Font & Colors. + + Visible changes: + - Add missing tooltips to some buttons. + - The Text Size plugin has been moved from gedit-plugins to + this repository, and is now enabled by default. + - Remove Quick Open plugin. + - Mark some plugins as "buggy plugins": External Tools and + Snippets. + + Bug fixes: + - Fix some warning messages that appeared at runtime. + - Fix a crash. + +------------------------------------------------------------------- +Wed Oct 2 13:45:58 UTC 2024 - Dominique Leuenberger + +- Update to version 47.0: + + Branding: Restore the previous app icons and logo. + + New features: + - Experimental: add light/dark GTK theme variant configuration + (as a hidden GSettings key for now). + + Removed features: + - Localization (l10n): all the translations are disabled, gedit + is available in English only because some underlying modules + are not on l10n.gnome.org or equivalent. + - In the preferences dialog, remove the toolbar to + install/uninstall color schemes. Third-party color schemes + are still supported, but the XML file(s) need to be copied + into the right directory by another means + + Under-the-hood changes: + - Adapt the code for libgedit-gtksourceview API changes. + - Adapt the code for the Tepl -> libgedit-tepl module rename. + - Code refactorings, various improvements and bug fixes. + - Continue to reduce usage of *.ui files, write code instead. + - Use newer GLib API at some places. + - Add -Wshadow to the CFLAGS and fix the corresponding warnings. + + For plugins: + - Some API changes (see the page documenting the API breaks). + - Improve the API documentation. + + Misc: + - Rename *.appdata.xml to *.metainfo.xml and do some updates to + that file. + - Update documentation for contributors. + - Links to some third-party plugins. +- Drop gedit-quickhighlight-gtksourcestyle-api.patch: fixed + upstream. + ------------------------------------------------------------------- Sat Apr 20 00:10:05 UTC 2024 - Michael Gorse diff --git a/gedit.obsinfo b/gedit.obsinfo index 98e2f65..8346890 100644 --- a/gedit.obsinfo +++ b/gedit.obsinfo @@ -1,4 +1,4 @@ name: gedit -version: 46.2 -mtime: 1708281007 -commit: da63f4c642c8ffabb0773f1ef2c2a0edadfdc3e9 +version: 48.0 +mtime: 1726291114 +commit: 74f29fefb86f550d85f5c8f40e81559cd143606d diff --git a/gedit.spec b/gedit.spec index 7948afe..e88f46a 100644 --- a/gedit.spec +++ b/gedit.spec @@ -17,10 +17,10 @@ %bcond_without python_bindings -%define api_ver 46 +%define api_ver 48 Name: gedit -Version: 46.2 +Version: 48.0 Release: 0 Summary: UTF-8 text editor License: GPL-2.0-or-later @@ -31,8 +31,6 @@ Source0: %{name}-%{version}.tar.zst Patch0: gedit-desktop.patch # PATCH-FIX-OPENSUSE gedit-plugins-python-env.patch bjorn.lie@gmail.com -- Fix python env Patch1: gedit-plugins-python-env.patch -# PATCH-FIX-UPSTREAM gedit-quickhighlight-gtksourcestyle-api.patch mgorse@suse.com -- adapt quickhighlight plugin for new libgedit-gtksourceview API. -Patch2: gedit-quickhighlight-gtksourcestyle-api.patch BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -44,7 +42,7 @@ BuildRequires: meson >= 0.53 BuildRequires: pkgconfig BuildRequires: python3-base >= 3.2.3 BuildRequires: yelp-tools -BuildRequires: pkgconfig(gio-2.0) >= 2.64 +BuildRequires: pkgconfig(gio-2.0) >= 2.76 BuildRequires: pkgconfig(glib-2.0) >= 2.64 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) @@ -52,10 +50,10 @@ BuildRequires: pkgconfig(gspell-1) >= 1.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 BuildRequires: pkgconfig(gtksourceview-4) >= 4.0.2 BuildRequires: pkgconfig(libgedit-amtk-5) +BuildRequires: pkgconfig(libgedit-tepl-6) >= 6.11 BuildRequires: pkgconfig(libpeas-1.0) >= 1.14.1 BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 1.14.1 BuildRequires: pkgconfig(pygobject-3.0) >= 3.0.0 -BuildRequires: pkgconfig(tepl-6) >= 6.5.1 BuildRequires: pkgconfig(vapigen) >= 0.25.1 BuildRequires: pkgconfig(x11) Requires: python3-cairo @@ -138,7 +136,6 @@ This subpackage contains the header files for creating gedit plugins. %{_datadir}/gedit/ %{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml -%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.externaltools.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml @@ -146,7 +143,7 @@ This subpackage contains the header files for creating gedit plugins. %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml %{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/metainfo/org.gnome.gedit.appdata.xml +%{_datadir}/metainfo/org.gnome.gedit.metainfo.xml %dir %{_libdir}/gedit/ %{_libdir}/gedit/libgedit-%{api_ver}.so %{_libdir}/gedit/girepository-1.0/ @@ -154,18 +151,14 @@ This subpackage contains the header files for creating gedit plugins. # Explicitly list plugins so we know when we miss one %{_libdir}/gedit/plugins/docinfo.plugin %{_libdir}/gedit/plugins/libdocinfo.so -%{_libdir}/gedit/plugins/externaltools/ -%{_libdir}/gedit/plugins/externaltools.plugin %{_libdir}/gedit/plugins/filebrowser.plugin %{_libdir}/gedit/plugins/libfilebrowser.so %{_libdir}/gedit/plugins/modelines.plugin %{_libdir}/gedit/plugins/libmodelines.so %{_libdir}/gedit/plugins/pythonconsole/ %{_libdir}/gedit/plugins/pythonconsole.plugin -%{_libdir}/gedit/plugins/quickopen/ -%{_libdir}/gedit/plugins/quickopen.plugin -%{_libdir}/gedit/plugins/snippets/ -%{_libdir}/gedit/plugins/snippets.plugin +%{_libdir}/gedit/plugins/textsize/ +%{_libdir}/gedit/plugins/textsize.plugin %{_libdir}/gedit/plugins/sort.plugin %{_libdir}/gedit/plugins/libsort.so %{_libdir}/gedit/plugins/spell.plugin @@ -173,6 +166,7 @@ This subpackage contains the header files for creating gedit plugins. %{_libdir}/gedit/plugins/time.plugin %{_libdir}/gedit/plugins/libtime.so %{_libdir}/gedit/plugins/quickhighlight.plugin + %{_libdir}/gedit/plugins/libquickhighlight.so %{_mandir}/man1/gedit.1%{?ext_man}