From de7e6066ff8e430195948a7daad1263cc6f017ce Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Mon, 12 Sep 2005 17:27:24 +0000
Subject: * Add ${X11BASE}/bin to the list of allowed paths * Only process .xml
 screensaver config files

Requested by:	mux


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4828 df743ca5-7f9a-e211-a948-0013205c9059
---
 x11/gnome-screensaver/Makefile                 |  4 ++--
 x11/gnome-screensaver/files/patch-src_gs-job.c | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'x11/gnome-screensaver')

diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index c37c79b98..0a1c5e4f3 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.12 2005/09/09 21:18:36 ahze Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.13 2005/09/10 00:25:02 marcus Exp $
 #
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	0.0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.0
diff --git a/x11/gnome-screensaver/files/patch-src_gs-job.c b/x11/gnome-screensaver/files/patch-src_gs-job.c
index 484c46ef8..a14163913 100644
--- a/x11/gnome-screensaver/files/patch-src_gs-job.c
+++ b/x11/gnome-screensaver/files/patch-src_gs-job.c
@@ -1,5 +1,5 @@
 --- src/gs-job.c.orig	Wed Sep  7 09:23:59 2005
-+++ src/gs-job.c	Fri Sep  9 20:21:31 2005
++++ src/gs-job.c	Mon Sep 12 13:24:11 2005
 @@ -29,7 +29,8 @@
  #include <sys/wait.h>
  #include <errno.h>
@@ -10,7 +10,17 @@
  #include <sys/resource.h>
  #endif
  
-@@ -655,9 +656,10 @@ gs_job_set_widget  (GSJob     *job,
+@@ -375,6 +376,9 @@ load_themes (GSJob *job)
+                         char           *title;
+                         char          **argv;
+ 
++                        if (!g_str_has_suffix (file, ".xml"))
++                                continue;
++
+                         path = g_build_filename (dir, file, NULL);
+ 
+                         if (! parse_theme (path,
+@@ -655,9 +659,11 @@ gs_job_set_widget  (GSJob     *job,
  static const char *known_locations [] = {
          SAVERDIR,
          LIBEXECDIR "/xscreensaver",
@@ -18,7 +28,8 @@
 +        "%%X11BASE%%/lib/xscreensaver",
          "/usr/libexec/xscreensaver",
          "/usr/lib/xscreensaver",
-+	"%%X11BASE%%/bin/xscreensaver-hacks",
++        "%%X11BASE%%/bin/xscreensaver-hacks",
++        "%%X11BASE%%/bin",
          NULL
  };
  
-- 
cgit v1.2.3