From 6596625ca933b0091a020ad9f13c85048cf97f2e Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 13 Jun 2006 19:28:55 +0000 Subject: Fix a crash in gnome-screensaver-dialog that prevented unlocking. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6437 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gnome-screensaver/Makefile | 3 ++- x11/gnome-screensaver/files/patch-src_gs-debug.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 x11/gnome-screensaver/files/patch-src_gs-debug.c (limited to 'x11/gnome-screensaver') diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index f0299eeee..21289663a 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.43 2006/05/16 04:00:30 marcus Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.44 2006/06/13 00:18:06 ahze Exp $ # PORTNAME= gnome-screensaver PORTVERSION= 2.15.3 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/gnome-screensaver/files/patch-src_gs-debug.c b/x11/gnome-screensaver/files/patch-src_gs-debug.c new file mode 100644 index 000000000..30fd7cd65 --- /dev/null +++ b/x11/gnome-screensaver/files/patch-src_gs-debug.c @@ -0,0 +1,19 @@ +--- gs-debug.c.orig Tue Jun 13 15:18:14 2006 ++++ gs-debug.c Tue Jun 13 15:21:32 2006 +@@ -132,9 +132,13 @@ _gs_profile_log (const char *func, + char *str; + char *formatted; + +- va_start (args, format); +- formatted = g_strdup_vprintf (format, args); +- va_end (args); ++ if (format == NULL) ++ formatted = g_strdup (""); ++ else { ++ va_start (args, format); ++ formatted = g_strdup_vprintf (format, args); ++ va_end (args); ++ } + + if (func != NULL) { + str = g_strdup_printf ("MARK: %s %s: %s %s", g_get_prgname(), func, note ? note : "", formatted); -- cgit v1.2.3