10139N/A * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 12198N/A * Permission is hereby granted, free of charge, to any person obtaining a 10139N/A * copy of this software and associated documentation files (the "Software"), 10139N/A * to deal in the Software without restriction, including without limitation 10139N/A * the rights to use, copy, modify, merge, publish, distribute, sublicense, 17596N/A * and/or sell copies of the Software, and to permit persons to whom the 10139N/A * Software is furnished to do so, subject to the following conditions: 17178N/A * The above copyright notice and this permission notice (including the next 17178N/A * paragraph) shall be included in all copies or substantial portions of the 10139N/A * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 10139N/A * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 17977N/A * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 10139N/A * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 10139N/A * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 10139N/A * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 10139N/A instead of opening a web browser to view the man page at jwz.org or 10139N/A opening a gnome-terminal to run the man command. 13269N/ABackport notes: this change relies on the gnome-help version delivered in 15166N/AAlso,
you'll need to fix the package names shown when the hacks are not 10139N/Ainstalled to be the older SUNWxscreensaver-*, and to not use the a href 10139N/Amarkup links added in newer gtk versions, nor link to IPS .p5i files to 10139N/A 8 files changed, 84 insertions(+), 20 deletions(-) 10139N/A@@ -27,7 +27,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ 10139N/A GTK_APPDIR = $(GTK_DATADIR)/applications 10139N/A GTK_ICONDIR = $(GTK_DATADIR)/pixmaps 10139N/A HACK_CONF_DIR = @HACK_CONF_DIR@ 10139N/A@@ -36,8 +36,11 @@ CFLAGS = @CFLAGS@ 10139N/A INTL_DEFS = -DLOCALEDIR=\"$(localedir)\" 10139N/A-SUBP_DEFS = $(DEFS) -DDEFAULT_PATH_PREFIX='"@HACKDIR@"' 10139N/A-GTK_DEFS = $(DEFS) -DDEFAULT_ICONDIR='"$(GTK_GLADEDIR)"' 10139N/A+SUBP_DEFS = $(DEFS) -DHACK_PATH='"@HACKDIR@"' \ 10139N/A+ -DDEFAULT_PATH_PREFIX='"@HACKDIR@:$(libexecdir)"' \ 10139N/A+ -DHELPER_PATH='"$(libexecdir)"' 10139N/A+GTK_DEFS = $(DEFS) -DDEFAULT_ICONDIR='"$(GTK_GLADEDIR)"' \ 10139N/A CONF_DEFS = -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"' 10139N/A@@ -87,18 +87,24 @@ GetViewPortIsFullOfLies: False 10139N/A ! This is the URL loaded by the "Help" button on the splash screen, 11461N/A ! and by the "Documentation" menu item in xscreensaver-demo. 10139N/A ! loadURL -- how the "Help" buttons load the helpURL (/bin/sh syntax.) 13269N/A ! manualCommand -- how the "Documentation" buttons display man pages. 10139N/A ! And there are so very many options to choose from! 10139N/A+
/* mali - security issue do not want to display user's path */ 10139N/A+
"%s: Warning: dir: %s missing. Will not run hacks\n",
16632N/A+
/* We need complete path to hack command else any executable 15621N/A+ * with the same name in the path gets executed. 12078N/A- reformat_html ("$title<P>$body1", 1); 11922N/A+ reformat_html ("$title<BR>$author<P>$body1", 1); 11258N/A@@ -97,9 +97,8 @@ xscreensaver-command -restart 11190N/A If you want to set the system-wide defaults, then make your edits to 11190N/A the xscreensaver app-defaults file, which should have been installed 11070N/A when xscreensaver itself was installed. The app-defaults file will 10979N/A-systems might keep it in a different place (for example, 10911N/A+systems might keep it in a different place. 10811N/A When settings are changed in the Preferences dialog box (see above) 10746N/A the current settings will be written to the \fI.xscreensaver\fP file. 10631N/A@@ -270,7 +270,7 @@ install-program:: $(EXES) 10631N/A # the xscreensaver-gl-helper program, in $bindir 10461N/A- idir="$(install_prefix)$(bindir)" ; \ 10285N/A+ idir="$(install_prefix)$(libexecdir)" ; \ 10139N/A@@ -339,7 +339,7 @@ uninstall-program:: 10139N/A # the xscreensaver-gl-helper program, in $bindir 10139N/A- idir="$(install_prefix)$(bindir)" ; \ 10139N/A+ idir="$(install_prefix)$(libexecdir)" ; \ 10139N/A echo rm -f $$idir/$$program ; \