From owner-freebsd-ports Sat Aug 17 22:40:15 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A0B9037B401 for ; Sat, 17 Aug 2002 22:40:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCBC443E4A for ; Sat, 17 Aug 2002 22:40:04 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7I5e4JU020936 for ; Sat, 17 Aug 2002 22:40:04 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7I5e4o7020934; Sat, 17 Aug 2002 22:40:04 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2566237B400 for ; Sat, 17 Aug 2002 22:36:54 -0700 (PDT) Received: from charter.net (dhcp-220-8.slidell.charter-ala.com [24.158.214.244]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A1F143E81 for ; Sat, 17 Aug 2002 22:36:53 -0700 (PDT) (envelope-from glennpj@charter.net) Received: from gforce.johnson.home (localhost [127.0.0.1]) by charter.net (8.12.5/8.12.5) with ESMTP id g7I5al6x046126 for ; Sun, 18 Aug 2002 00:36:47 -0500 (CDT) (envelope-from glenn@gforce.johnson.home) Received: (from glenn@localhost) by gforce.johnson.home (8.12.5/8.12.5/Submit) id g7I5alcG046125; Sun, 18 Aug 2002 00:36:47 -0500 (CDT) (envelope-from glenn) Message-Id: <200208180536.g7I5alcG046125@gforce.johnson.home> Date: Sun, 18 Aug 2002 00:36:47 -0500 (CDT) From: Glenn Johnson Reply-To: Glenn Johnson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/41754: Patch XFCE for GNOME apps in menu and fix xscreensaver launch Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 41754 >Category: ports >Synopsis: Patch XFCE for GNOME apps in menu and fix xscreensaver launch >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Aug 17 22:40:03 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Glenn Johnson >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD gforce.johnson.home 4.6-STABLE FreeBSD 4.6-STABLE #0: Sat Aug 17 20:58:06 CDT 2002 root@gforce.johnson.home:/usr/obj/usr/src/sys/GFORCE i386 >Description: This PR supersedes ports/41753. I negelected to mention XFCE in the subject line of that one and that seems like an important detail. Add a patch to the XFCE port (x11-wm/xfce) to have GNOME applications show up in the User menu if they exist on the system. Add a patch to have the XFCE startup file use the proper arguments for xscreensaver. Also, test if xscreensaver is present. >How-To-Repeat: >Fix: --- xfce.patch begins here --- diff -ruN xfce.old/Makefile xfce/Makefile --- xfce.old/Makefile Sat Aug 3 06:35:44 2002 +++ xfce/Makefile Sat Aug 17 23:30:07 2002 @@ -7,6 +7,7 @@ PORTNAME= xfce PORTVERSION= 3.8.16 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.xfce.org/archive/ diff -ruN xfce.old/files/patch-other_xinitrc.in xfce/files/patch-other_xinitrc.in --- xfce.old/files/patch-other_xinitrc.in Wed Dec 31 18:00:00 1969 +++ xfce/files/patch-other_xinitrc.in Sat Aug 17 23:30:07 2002 @@ -0,0 +1,16 @@ + +$FreeBSD$ + +--- other/xinitrc.in.orig Sat Aug 17 22:58:13 2002 ++++ other/xinitrc.in Sat Aug 17 23:01:46 2002 +@@ -41,7 +41,9 @@ + # fi + + # Launch xscreensaver (if available) +-xscreensaver -no-splash -lock-mode & ++if [ -x /usr/X11R6/bin/xscreensaver ]; then ++ xscreensaver -nosplash & ++fi + + # Finally, launch XFce window manager + exec xfwm diff -ruN xfce.old/files/patch-xfmenu_xfmenu.c xfce/files/patch-xfmenu_xfmenu.c --- xfce.old/files/patch-xfmenu_xfmenu.c Wed Dec 31 18:00:00 1969 +++ xfce/files/patch-xfmenu_xfmenu.c Sat Aug 17 23:30:07 2002 @@ -0,0 +1,17 @@ + +$FreeBSD$ + +--- xfmenu/xfmenu.c.orig Sat Aug 17 22:36:16 2002 ++++ xfmenu/xfmenu.c Sat Aug 17 22:40:44 2002 +@@ -483,6 +483,11 @@ + menupath = g_strconcat ("/opt/gnome", GMENUPATH, NULL); + gnomedirs = g_list_append (gnomedirs, menupath); + } ++ if (!(gnomedir) || (strcmp ("/usr/X11R6", gnomedir) != 0)) ++ { ++ menupath = g_strconcat ("/usr/X11R6", GMENUPATH, NULL); ++ gnomedirs = g_list_append (gnomedirs, menupath); ++ } + if (home) + { + menupath = g_strconcat (home, "/.gnome/apps", NULL); --- xfce.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message