ee76034f50
Most patches merged upstream.
5.37 05-Jul-2017
New hack, vigilance.
Added Mac Software Update and VMware to bsod.
OSX: Grabbing the desktop works again.
OSX: Pinch to zoom.
Android: Both Daydreams and Live Wallpapers are implemented.
Updated webcollage for recent changes.
Various bug fixes.
42 lines
1.8 KiB
Text
42 lines
1.8 KiB
Text
$NetBSD: patch-ad,v 1.24 2017/08/16 07:33:39 wiz Exp $
|
|
|
|
Do not unconditionally install xscreensaver-demo nor GNOME files.
|
|
|
|
--- driver/Makefile.in.orig 2017-07-05 17:52:56.000000000 +0000
|
|
+++ driver/Makefile.in
|
|
@@ -226,7 +226,7 @@ SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@
|
|
HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \
|
|
xscreensaver.h prefs.h remote.h exec.h \
|
|
demo-Gtk-conf.h auth.h mlstring.h types.h
|
|
-MEN_1 = xscreensaver.man xscreensaver-demo.man \
|
|
+MEN_1 = xscreensaver.man \
|
|
xscreensaver-command.man \
|
|
xscreensaver-text.man \
|
|
xscreensaver-getimage.man \
|
|
@@ -257,7 +257,7 @@ all: $(EXES) $(EXES2)
|
|
tests: $(TEST_EXES)
|
|
|
|
install: install-program install-ad install-scripts \
|
|
- install-gnome install-man install-xml install-pam
|
|
+ install-gnome install-man install-xml
|
|
uninstall: uninstall-program uninstall-ad \
|
|
uninstall-gnome uninstall-man uninstall-xml
|
|
|
|
@@ -292,7 +292,7 @@ install-program: $(EXES)
|
|
fi ; \
|
|
echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \
|
|
$$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
|
|
- @for exe in xscreensaver-command xscreensaver-demo \
|
|
+ @for exe in xscreensaver-command \
|
|
xscreensaver-getimage @EXES_OSX@ ; do \
|
|
echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
|
|
$(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
|
|
@@ -491,7 +491,7 @@ install-pam: xscreensaver.pam
|
|
|
|
# screensaver-properties.desktop
|
|
# into /usr/share/applications/
|
|
-install-gnome:: screensaver-properties.desktop
|
|
+xxxinstall-gnome:: screensaver-properties.desktop
|
|
@if [ "$(GTK_DATADIR)" != "" ]; then \
|
|
if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \
|
|
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
|