Date: Sat, 16 Apr 2022 17:49:06 GMT From: Neel Chauhan <nc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3da9ffbd90ed - main - editors/gedit: Update to 42.0 Message-ID: <202204161749.23GHn6dm088058@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=3da9ffbd90edabe12b933c2bdc00fb2aeb6fc386 commit 3da9ffbd90edabe12b933c2bdc00fb2aeb6fc386 Author: Neel Chauhan <nc@FreeBSD.org> AuthorDate: 2022-04-16 17:49:04 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2022-04-16 17:49:04 +0000 editors/gedit: Update to 42.0 --- editors/gedit/Makefile | 3 +- editors/gedit/distinfo | 6 +-- editors/gedit/files/patch-gedit_gedit-dirs_c | 58 ---------------------------- editors/gedit/files/patch-gedit_gedit-dirs_h | 28 -------------- 4 files changed, 4 insertions(+), 91 deletions(-) diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index b95bbfcfab93..4c593111d7a1 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -1,8 +1,7 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> PORTNAME= gedit -PORTVERSION= 41.0 -PORTREVISION= 3 +PORTVERSION= 42.0 CATEGORIES= editors gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo index 1947e75cf773..7c89d3508137 100644 --- a/editors/gedit/distinfo +++ b/editors/gedit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646287633 -SHA256 (gnome/gedit-41.0.tar.xz) = 7a9b18b158808d1892989165f3706c4f1a282979079ab7458a79d3c24ad4deb5 -SIZE (gnome/gedit-41.0.tar.xz) = 6889320 +TIMESTAMP = 1650131100 +SHA256 (gnome/gedit-42.0.tar.xz) = a87991f42961eb4f6abcdbaabb784760c23aeaeefae6363d3e21a61e9c458437 +SIZE (gnome/gedit-42.0.tar.xz) = 6923352 diff --git a/editors/gedit/files/patch-gedit_gedit-dirs_c b/editors/gedit/files/patch-gedit_gedit-dirs_c deleted file mode 100644 index d2f8c93f29df..000000000000 --- a/editors/gedit/files/patch-gedit_gedit-dirs_c +++ /dev/null @@ -1,58 +0,0 @@ -$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 <bigon@bigon.be> -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 <gtkosxapplication.h> - #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 deleted file mode 100644 index 44128d418f46..000000000000 --- a/editors/gedit/files/patch-gedit_gedit-dirs_h +++ /dev/null @@ -1,28 +0,0 @@ -$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 <bigon@bigon.be> -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204161749.23GHn6dm088058>