svn commit: r561081 - in head/sysutils/xfce4-settings: . files

[Guido Falsi]

Author: madpilot
Date: Sun Jan 10 15:33:03 2021
New Revision: 561081
URL: https://svnweb.freebsd.org/changeset/ports/561081

Log:
  - Fix script used to extract themes to fallback to /tmp when both
    TMPDIR and XDG_CACHE_HOME environment variables are not defined [1]
  - Fix crash caused by null terminated list missing the terminating
    null element due to no allocating enough elements [2]
  
  Reported by:		Andrea Venturoli <ml at netfence.it> [1] [2]
  Patch submitted by:	Andrea Venturoli <ml at netfence.it> [2]
  MFH:			2021Q1

Added:
  head/sysutils/xfce4-settings/files/
  head/sysutils/xfce4-settings/files/patch-dialogs_appearance-settings_appearance-install-theme   (contents, props changed)
  head/sysutils/xfce4-settings/files/patch-dialogs_appearance-settings_main.c   (contents, props changed)
Modified:
  head/sysutils/xfce4-settings/Makefile

Modified: head/sysutils/xfce4-settings/Makefile
==============================================================================
--- head/sysutils/xfce4-settings/Makefile	Sun Jan 10 15:03:59 2021	(r561080)
+++ head/sysutils/xfce4-settings/Makefile	Sun Jan 10 15:33:03 2021	(r561081)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-settings
 PORTVERSION=	4.16.0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4

Added: head/sysutils/xfce4-settings/files/patch-dialogs_appearance-settings_appearance-install-theme
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/xfce4-settings/files/patch-dialogs_appearance-settings_appearance-install-theme	Sun Jan 10 15:33:03 2021	(r561081)
@@ -0,0 +1,10 @@
+--- dialogs/appearance-settings/appearance-install-theme.orig	2015-08-01 08:43:16 UTC
++++ dialogs/appearance-settings/appearance-install-theme
+@@ -104,6 +104,7 @@ fi
+ # we try $XDG_CACHE_HOME because it is more likely this is on the
+ # same partition, so moving the theme after extract is faster
+ if test x"`which mktemp 2>/dev/null`" != x""; then
++    TMPDIR="${TMPDIR:-/tmp}"
+     tmpdir=`TMPDIR="${XDG_CACHE_HOME:-$TMPDIR}" mktemp -d`
+ else
+     tmpdir="/tmp/tmp.$$.$RANDOM"

Added: head/sysutils/xfce4-settings/files/patch-dialogs_appearance-settings_main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/xfce4-settings/files/patch-dialogs_appearance-settings_main.c	Sun Jan 10 15:33:03 2021	(r561081)
@@ -0,0 +1,11 @@
+--- dialogs/appearance-settings/main.c.orig	2020-12-16 10:44:46 UTC
++++ dialogs/appearance-settings/main.c
+@@ -994,7 +994,7 @@ appearance_settings_install_theme_cb (GtkButton *widge
+         gchar **uris;
+         GtkFileChooser *chooser = GTK_FILE_CHOOSER (dialog);
+ 
+-        uris = g_new0 (gchar *, 1);
++        uris = g_new0 (gchar *, 2);
+         filename = gtk_file_chooser_get_filename (chooser);
+         uris[0] = g_filename_to_uri (filename, NULL, NULL);
+         install_theme (window, uris, builder);