diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 3df8edb67ff0..66101b59501e 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -1,55 +1,56 @@ # Created by: Joe Marcus Clarke PORTNAME= gedit PORTVERSION= 41.0 +PORTREVISION= 1 CATEGORIES= editors gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Small but powerful text editor for the GNOME Desktop Environment LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= iso-codes>=0:misc/iso-codes \ vala:lang/vala \ gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ itstool:textproc/itstool LIB_DEPENDS= libenchant.so:textproc/enchant \ libpeas-gtk-1.0.so:devel/libpeas \ libgspell-1.so:textproc/gspell \ libsoup-2.4.so:devel/libsoup \ libtepl-6.so:x11-toolkits/tepl6 \ libamtk-5.so:x11-toolkits/amtk RUN_DEPENDS= iso-codes>=0:misc/iso-codes \ gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} PORTSCOUT= limitw:1,even USES= compiler:c11 cpe desktop-file-utils gettext gnome localbase meson \ pkgconfig python:3.4+ tar:xz xorg USE_CSTD= c11 USE_GNOME= cairo gdkpixbuf2 gtksourceview4 intlhack introspection \ libxml2 pygobject3 USE_XORG= sm x11 USE_LDCONFIG= yes PLIST_SUB= VERSION=41 INSTALL_TARGET= install-strip MESON_ARGS+= --buildtype plain BINARY_ALIAS= python3=${PYTHON_CMD} CPE_VENDOR= gnome GLIB_SCHEMAS= org.gnome.gedit.enums.xml \ org.gnome.gedit.plugins.externaltools.gschema.xml \ org.gnome.gedit.gschema.xml \ org.gnome.gedit.plugins.filebrowser.enums.xml \ org.gnome.gedit.plugins.filebrowser.gschema.xml \ org.gnome.gedit.plugins.pythonconsole.gschema.xml \ org.gnome.gedit.plugins.time.enums.xml \ org.gnome.gedit.plugins.time.gschema.xml \ org.gnome.gedit.plugins.spell.gschema.xml .include diff --git a/editors/gedit/files/patch-gedit_gedit-app.c b/editors/gedit/files/patch-gedit_gedit-app.c deleted file mode 100644 index cd43b7717138..000000000000 --- a/editors/gedit/files/patch-gedit_gedit-app.c +++ /dev/null @@ -1,16 +0,0 @@ ---- gedit/gedit-app.c.orig 2022-03-03 06:07:06 UTC -+++ gedit/gedit-app.c -@@ -671,13 +671,6 @@ gedit_app_startup (GApplication *application) - - setup_theme_extensions (GEDIT_APP (application)); - --#ifndef ENABLE_GVFS_METADATA -- cache_dir = gedit_dirs_get_user_cache_dir (); -- metadata_filename = g_build_filename (cache_dir, "gedit-metadata.xml", NULL); -- priv->metadata_manager = gedit_metadata_manager_new (metadata_filename); -- g_free (metadata_filename); --#endif -- - /* Load/init settings */ - _gedit_settings_get_singleton (); - priv->ui_settings = g_settings_new ("org.gnome.gedit.preferences.ui"); diff --git a/editors/gedit/files/patch-gedit_gedit-dirs_c b/editors/gedit/files/patch-gedit_gedit-dirs_c new file mode 100644 index 000000000000..d2f8c93f29df --- /dev/null +++ b/editors/gedit/files/patch-gedit_gedit-dirs_c @@ -0,0 +1,58 @@ +$OpenBSD: patch-gedit_gedit-dirs_c,v 1.1 2022/02/18 08:33:43 sthen Exp $ + +From ba2662ff9ee99ef0d85023b06053792fd3eb9272 Mon Sep 17 00:00:00 2001 +From: Laurent Bigonville +Date: Mon, 22 Nov 2021 13:03:48 +0100 +Subject: [PATCH] Revert "gedit-dirs: remove get_user_cache_dir() (no longer + used)" + +This also revert the move of the metadata file ("gedit-metadata.xml") +from user_data_dir to user_cache_dir when not using GVFS to store the +metadata + +This reverts commit f641a246fbaff482e216197d21e2e51397b1cb26. + +Fixes: https://gitlab.gnome.org/GNOME/gedit/-/issues/467 + +Index: gedit/gedit-dirs.c +--- gedit/gedit-dirs.c.orig ++++ gedit/gedit-dirs.c +@@ -26,6 +26,7 @@ + #include + #endif + ++static gchar *user_cache_dir = NULL; + static gchar *user_config_dir = NULL; + static gchar *user_data_dir = NULL; + static gchar *user_styles_dir = NULL; +@@ -95,6 +96,9 @@ gedit_dirs_init () + NULL); + } + ++ user_cache_dir = g_build_filename (g_get_user_cache_dir (), ++ "gedit", ++ NULL); + user_config_dir = g_build_filename (g_get_user_config_dir (), + "gedit", + NULL); +@@ -115,6 +119,7 @@ gedit_dirs_init () + void + gedit_dirs_shutdown () + { ++ g_clear_pointer (&user_cache_dir, g_free); + g_clear_pointer (&user_config_dir, g_free); + g_clear_pointer (&user_data_dir, g_free); + g_clear_pointer (&user_styles_dir, g_free); +@@ -123,6 +128,12 @@ gedit_dirs_shutdown () + g_clear_pointer (&gedit_lib_dir, g_free); + g_clear_pointer (&gedit_plugins_dir, g_free); + g_clear_pointer (&gedit_plugins_data_dir, g_free); ++} ++ ++const gchar * ++gedit_dirs_get_user_cache_dir (void) ++{ ++ return user_cache_dir; + } + + const gchar * diff --git a/editors/gedit/files/patch-gedit_gedit-dirs_h b/editors/gedit/files/patch-gedit_gedit-dirs_h new file mode 100644 index 000000000000..44128d418f46 --- /dev/null +++ b/editors/gedit/files/patch-gedit_gedit-dirs_h @@ -0,0 +1,28 @@ +$OpenBSD: patch-gedit_gedit-dirs_h,v 1.1 2022/02/18 08:33:43 sthen Exp $ + +From ba2662ff9ee99ef0d85023b06053792fd3eb9272 Mon Sep 17 00:00:00 2001 +From: Laurent Bigonville +Date: Mon, 22 Nov 2021 13:03:48 +0100 +Subject: [PATCH] Revert "gedit-dirs: remove get_user_cache_dir() (no longer + used)" + +This also revert the move of the metadata file ("gedit-metadata.xml") +from user_data_dir to user_cache_dir when not using GVFS to store the +metadata + +This reverts commit f641a246fbaff482e216197d21e2e51397b1cb26. + +Fixes: https://gitlab.gnome.org/GNOME/gedit/-/issues/467 + +Index: gedit/gedit-dirs.h +--- gedit/gedit-dirs.h.orig ++++ gedit/gedit-dirs.h +@@ -32,6 +32,8 @@ void gedit_dirs_init (void); + void gedit_dirs_shutdown (void); + + ++const gchar *gedit_dirs_get_user_cache_dir (void); ++ + const gchar *gedit_dirs_get_user_config_dir (void); + + const gchar *gedit_dirs_get_user_data_dir (void);