From nobody Fri Mar 18 03:19:11 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 76DED1A316CF; Fri, 18 Mar 2022 03:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KKTkl2vrBz3pjL; Fri, 18 Mar 2022 03:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647573551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S0CjWJDeS40sBnet82HhOcytvIGSmSahOeMsXXBBb+Y=; b=w+zafnrdQic9JKz5LgeqZQifWQd6pNhc6wpxog3De+r/axbUCrmbqztm0tRA10MUqqF+4j NdPYlqSjGq/iuJLK3oIc0S3WpCAOcgxoThYxxrcuP9E/Q0Pkp1zaOYUZWputB5JFUFhVVk AMZIp/ngBoYKFekbX+1MkBmhEH+z/lFWtP+Kdv1eJCEaEsqLuJLojgzZ3Bp2aaKW0EWkx1 eQFejzqh14HWtIZfFyQNXPDFvc92ck69cbPYhgkj5UZk1sYHCMWKrlZsffYtvdfvHeri1o SYRvQjNiXeHpAIGvC5wY3ZnVfT3Q/NFRVw3ToCXlyhedXUTAqCNTfskW5Ubdfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 441BD171C9; Fri, 18 Mar 2022 03:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22I3JB0B083210; Fri, 18 Mar 2022 03:19:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22I3JBYc083209; Fri, 18 Mar 2022 03:19:11 GMT (envelope-from git) Date: Fri, 18 Mar 2022 03:19:11 GMT Message-Id: <202203180319.22I3JBYc083209@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: b35438a24b0a - main - editors/gedit: Fix segfault on launch List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b35438a24b0ab26e9d2251296bb3a079d6433319 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647573551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S0CjWJDeS40sBnet82HhOcytvIGSmSahOeMsXXBBb+Y=; b=qCfcHq/hpGlM5eM9iyI/72QXCSTWAMZpPQVd0Rlh2HcBZe2PU/hjjffyn1N5tnapmCWvxm ghilO17qm8cUWC8A1DwJZU7iBAvKeY29pYiyRc8//YwFnceD0zH4B76O4bzk2VLd+1zGiY ngLi+kMsYX9VhzOQbMVfL9MpGEasINY3/koylkRJxVkIBw9sBwdDGuzvYOjzpsY04N1UX+ i9KzswtwW0JeCXQimTj1evxsc0gu9n9a2V2cyjMQWzXRSL+fNrqbEjvWgZcGJjryzy44Dr TP1318UXsOVirsMUASWkd9hpF1xXqZ2wat7iIyRgviL/RJ6DH4mKZL/NimBjag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647573551; a=rsa-sha256; cv=none; b=bhbu5BTf0Ngc/swOLcSU9YJwVy8KSET5ooHXea7Srp1M7XQOcwyl8MshyJ+d5UjU9zl+dK Amd4fBmwRpaUYSmFblGV4XTlrgOCcJxHyKAm1uP5VmKk7HSB9L9IMU+cBO6lMkrZVwS4NL iSqAkS2hhib0f3JzcDdaydeO2hHI6cLy1YZfA2kn88CePSjPVtWUqXoLXjwefH86gh+vsj h/Y/z0D3+x9m0UtQ0CPVwSGF0QJ+nUhz02xRlBiS6WP67BuS0ySMJz811aEMYSDcB3ZOXw KpQiLkDuB5zYm26siDtWEuTqtAguMPKsiQcmFYzo5oVmycNWDuCaN5FHV61bmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=b35438a24b0ab26e9d2251296bb3a079d6433319 commit b35438a24b0ab26e9d2251296bb3a079d6433319 Author: Neel Chauhan AuthorDate: 2022-03-18 03:19:07 +0000 Commit: Neel Chauhan CommitDate: 2022-03-18 03:19:07 +0000 editors/gedit: Fix segfault on launch --- editors/gedit/Makefile | 1 + editors/gedit/files/patch-gedit_gedit-app.c | 16 -------- editors/gedit/files/patch-gedit_gedit-dirs_c | 58 ++++++++++++++++++++++++++++ editors/gedit/files/patch-gedit_gedit-dirs_h | 28 ++++++++++++++ 4 files changed, 87 insertions(+), 16 deletions(-) diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 3df8edb67ff0..66101b59501e 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -2,6 +2,7 @@ PORTNAME= gedit PORTVERSION= 41.0 +PORTREVISION= 1 CATEGORIES= editors gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome 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);