cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gedit: backport upstream fix to unbreak runtime; ok aja@

Browse Source
This commit is contained in:
sthen 2022-02-18 08:33:43 +00:00
parent bd600e9b55
commit 27d00b1ba6
3 changed files with 88 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnome/gedit/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.179 2022/02/14 19:06:30 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.180 2022/02/18 08:33:43 sthen Exp $
COMMENT= lightweight GNOME text editor COMMENT= lightweight GNOME text editor
GNOME_PROJECT= gedit GNOME_PROJECT= gedit
GNOME_VERSION= 41.0 GNOME_VERSION= 41.0
REVISION= 0
CATEGORIES= editors CATEGORIES= editors

58
x11/gnome/gedit/patches/patch-gedit_gedit-dirs_c Normal file
View File

@ -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 <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 *

28
x11/gnome/gedit/patches/patch-gedit_gedit-dirs_h Normal file
View File

@ -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 <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);