From: Zygo Blaxell Date: Sun, 30 Dec 2018 00:52:57 +0000 (-0500) Subject: From http://www.jwz.org/xscreensaver/xscreensaver-5.42.tar.gz X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a8e4bdfdcae89ba406eb961874e46d7fe9cef83;p=xscreensaver From http://www.jwz.org/xscreensaver/xscreensaver-5.42.tar.gz -rw-rw-r-- 1 zblaxell zblaxell 26903469 Dec 28 19:37 xscreensaver-5.42.tar.gz b8eb08e258a70924aa0e644e4930164baf505ee6 xscreensaver-5.42.tar.gz --- diff --git a/OSX/Makefile b/OSX/Makefile index da34eb43..456c1bd8 100644 --- a/OSX/Makefile +++ b/OSX/Makefile @@ -380,8 +380,6 @@ _dmg:: ls -ldhgF "$$DMG" ; \ $(MAKE) notarize ; \ -dmg2:: staple updates.xml - # To set up notarization: # - Log in on https://appleid.apple.com/ @@ -399,6 +397,8 @@ dmg2:: staple updates.xml # Note that if Sparkle.framework/.../Autoupdate.app is not independently # signed, it won't pass. I had to add a build phase for that. # +NOTARGS=-u "jwz@jwz.org" -p "@keychain:altool-notarizer" + notarize:: @ \ set -e ; \ @@ -409,10 +409,19 @@ notarize:: DMG="$$OUTDIR/$$BASE.dmg" ; \ set -x ; \ xcrun altool --notarize-app --primary-bundle-id "org.jwz.xscreensaver" \ - --file "$$DMG" -u "jwz@jwz.org" -p "@keychain:altool-notarizer" ; \ + --file "$$DMG" $(NOTARGS) ; \ echo "" ; \ - echo "After notarization succeeds, make dmg2" - + sleep 3 ; \ + $(MAKE) notarize_wait staple updates.xml + +notarize_wait:: + @while ( xcrun altool --notarization-history 0 $(NOTARGS) | \ + grep -q 'in progress' ); do \ + echo `date +%I:%M:` "waiting for notarization..." ; \ + sleep 15 ; \ + done ; \ + echo '' ; \ + xcrun altool --notarization-history 0 $(NOTARGS) ; \ staple:: @ \ @@ -423,12 +432,12 @@ staple:: OUTDIR="../archive" ; \ DMG="$$OUTDIR/$$BASE.dmg" ; \ set -x ; \ - xcrun stapler staple "$$DMG" + xcrun stapler staple "$$DMG" ; \ + xcrun stapler validate "$$DMG" notarization_history:: - xcrun altool --notarization-history 0 \ - -u "jwz@jwz.org" -p "@keychain:altool-notarizer" - @echo 'now do: xcrun altool --notarization-info ...' ; \ + xcrun altool --notarization-history 0 $(NOTARGS) + @echo 'now do: xcrun altool $(NOTARGS) --notarization-info ' ; \ echo 'and wget the LogFileURL' diff --git a/OSX/SaverRunner.plist b/OSX/SaverRunner.plist index 38ac3722..1a5f022b 100644 --- a/OSX/SaverRunner.plist +++ b/OSX/SaverRunner.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleGetInfoString - 5.41 + 5.42 CFBundleIconFile SaverRunner CFBundleIdentifier @@ -15,21 +15,21 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 5.41 + 5.42 CFBundleName ${PRODUCT_NAME} CFBundlePackageType APPL CFBundleShortVersionString - 5.41 + 5.42 CFBundleSignature ???? CFBundleVersion - 5.41 + 5.42 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - 5.41 + 5.42 NSMainNibFile SaverRunner NSPrincipalClass diff --git a/OSX/Updater.h b/OSX/Updater.h index 53abbe4d..3b568302 100644 --- a/OSX/Updater.h +++ b/OSX/Updater.h @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2013 Jamie Zawinski +/* xscreensaver, Copyright (c) 2013-2018 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -9,14 +9,17 @@ * implied warranty. */ -#ifndef USE_IPHONE -#import -@interface XScreenSaverUpdater : NSObject +#ifdef IN_UPDATER +# import +# import + +@interface XScreenSaverUpdater : NSObject { NSTimer *timer; } @end -#endif // !USE_IPHONE +#endif // IN_UPDATER #define UPDATER_DOMAIN "org.jwz.xscreensaver.updater" diff --git a/OSX/Updater.m b/OSX/Updater.m index 1bf29fa2..6e0d3c99 100644 --- a/OSX/Updater.m +++ b/OSX/Updater.m @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2013 Jamie Zawinski +/* xscreensaver, Copyright (c) 2013-2018 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -17,6 +17,7 @@ * version 4-Dec-2013 or later. */ +#define IN_UPDATER #import "Updater.h" #import "Sparkle/SUUpdater.h" diff --git a/OSX/Updater.plist b/OSX/Updater.plist index a3de39cf..05befe8e 100644 --- a/OSX/Updater.plist +++ b/OSX/Updater.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleGetInfoString - 5.41 + 5.42 CFBundleIconFile SaverRunner CFBundleIdentifier @@ -17,23 +17,23 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 5.41 + 5.42 CFBundleName ${PRODUCT_NAME} CFBundlePackageType APPL CFBundleShortVersionString - 5.41 + 5.42 CFBundleSignature ???? CFBundleVersion - 5.41 + 5.42 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} LSUIElement NSHumanReadableCopyright - 5.41 + 5.42 NSMainNibFile Updater NSPrincipalClass diff --git a/OSX/XScreenSaver.plist b/OSX/XScreenSaver.plist index aa7eefaa..4d106ada 100644 --- a/OSX/XScreenSaver.plist +++ b/OSX/XScreenSaver.plist @@ -15,11 +15,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 5.41 + 5.42 CFBundleSignature ???? CFBundleVersion - 5.41 + 5.42 LSMinimumSystemVersion 10.8 NSMainNibFile diff --git a/OSX/bindist.rtf b/OSX/bindist.rtf index ab1c0707..251bb11a 100644 --- a/OSX/bindist.rtf +++ b/OSX/bindist.rtf @@ -16,8 +16,8 @@ \b0 by Jamie Zawinski\ and many others\ \ -version 5.41\ -26-Dec-2018\ +version 5.42\ +28-Dec-2018\ \ {\field{\*\fldinst{HYPERLINK "https://www.jwz.org/xscreensaver/"}}{\fldrslt \cf2 \ul \ulc2 https://www.jwz.org/xscreensaver/}}\ \pard\pardeftab720 diff --git a/OSX/iSaverRunner.plist b/OSX/iSaverRunner.plist index 68c574b9..92ca6f08 100644 --- a/OSX/iSaverRunner.plist +++ b/OSX/iSaverRunner.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleGetInfoString - 5.41 + 5.42 CFBundleIcons CFBundleIcons~ipad @@ -19,21 +19,21 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 5.41 + 5.42 CFBundleName ${PRODUCT_NAME} CFBundlePackageType APPL CFBundleShortVersionString - 5.41 + 5.42 CFBundleSignature ???? CFBundleVersion - 5.41 + 5.42 LSRequiresIPhoneOS NSHumanReadableCopyright - 5.41 + 5.42 NSMainNibFile iSaverRunner UIAppFonts diff --git a/OSX/updates.xml b/OSX/updates.xml index 62d3b3d4..e782f726 100644 --- a/OSX/updates.xml +++ b/OSX/updates.xml @@ -7,39 +7,42 @@ https://www.jwz.org/xscreensaver/updates.xml Updates to xscreensaver. en + + Version 5.42 + https://www.jwz.org/xscreensaver/xscreensaver-5.42.dmg + + Fri, 28 Dec 2018 16:20:28 -0800 + + + + Version 5.41 + https://www.jwz.org/xscreensaver/xscreensaver-5.41.dmg + • iOS, Android: Plugged many memory leaks at exit.
• New hack, `handsy'.
• Fixed `noof' from displaying minimalistically.
• Rewrote `unknownpleasures' to be faster, and a true waterfall graph.
• BSOD Solaris improved. DVD added.
• Linux: If the xscreensaver daemon is setuid, then we can implore the kernel's out-of-memory killer to pretty please not unlock the screen.
• macOS: Upgraded Sparkle (the "Check for Updates" library).
• macOS: Screen saver settings work again on 10.14.]]> + Wed, 26 Dec 2018 23:00:51 -0800 + + Version 5.40 https://www.jwz.org/xscreensaver/xscreensaver-5.40.dmg - • New hack, 'glitchpeg' (X11 and macOS only).
• GLPlanet blends between day and night maps at the dusk terminator.
• DymaxionMap can display arbitrary map images, and animate sunlight across the flattened globe.
• Tessellimage can draw either Delaunay or Voronoi tilings.
• XAnalogTV includes test cards.
• Android: These hacks work now: 'blitspin', 'bumps', 'cityflow', 'endgame', 'esper', 'flipscreen3d', 'gleidescope', 'glslideshow', 'jigglypuff', 'queens', 'tessellimage', 'xanalogtv', 'xmatrix', 'zoom'.]]> + • New hack, `glitchpeg' (X11 and macOS only).
• GLPlanet blends between day and night maps at the dusk terminator.
• DymaxionMap can display arbitrary map images, and animate sunlight across the flattened globe.
• Tessellimage can draw either Delaunay or Voronoi tilings.
• XAnalogTV includes test cards.
• Android: These hacks work now: `blitspin', `bumps', `cityflow', `endgame', `esper', `flipscreen3d', `gleidescope', `glslideshow', `jigglypuff', `queens', `tessellimage', `xanalogtv', `xmatrix', `zoom'.]]> Sun, 12 Aug 2018 16:39:18 -0700 - - Version 5.39 - https://www.jwz.org/xscreensaver/xscreensaver-5.39.dmg - • More heuristics for using RSS feeds as image sources.
• Android: Image loading works.
• Built-in image assets are now PNG instead of XPM or XBM.
• X11: Better font-loading fallback heuristics on systems with a terrible selection of installed fonts.
• macOS: Retina display-related bug fixes.]]> - Thu, 12 Apr 2018 13:00:37 -0700 - - - - Version 5.38 - https://www.jwz.org/xscreensaver/xscreensaver-5.38.dmg - • macOS: Support for Retina displays.
• X11: `webcollage' now works with ImageMagick instead of with pbmtools if `webcollage-helper' is not installed.
• 'bsod' now accepts Dunning-Krugerrands.
• Android: These hacks work now: 'anemone', 'anemotaxis', 'atlantis', 'bouboule', 'celtic', 'compass', 'crackberg', 'epicycle', 'fuzzyflakes', 'goop', 'kumppa' 'munch', 'pacman', 'polyominoes', 'slip'.
• Android: Thick lines work better for: 'anemone', 'anemotaxis', 'celtic', 'compass', 'deluxe', 'epicycle', 'fuzzyflakes', 'pacman'
• Android: Assorted performance improvements, especially for 'kumppa' and 'slip'.
• Android TV: Daydreams work.
• iOS: Tweaks for iPhone X.
• Lots of xlockmore-derived hacks now have animated erase routines.
• 'crystal' works properly on non-X11 systems.
• 'm6502' now includes 'texture.asm'.
• X11: Try harder to find sensible fonts for the password dialog.]]> - Wed, 20 Dec 2017 11:16:13 -0800 - - Version 5.34 https://www.jwz.org/xscreensaver/xscreensaver-5.34.dmg @@ -48,6 +51,7 @@ @@ -59,6 +63,7 @@ diff --git a/OSX/xscreensaver.xcodeproj/project.pbxproj b/OSX/xscreensaver.xcodeproj/project.pbxproj index 5d31d7bf..adb9fd1d 100644 --- a/OSX/xscreensaver.xcodeproj/project.pbxproj +++ b/OSX/xscreensaver.xcodeproj/project.pbxproj @@ -2001,6 +2001,7 @@ AF68A49B19196E3E00D41CD1 /* delaunay.c in Sources */ = {isa = PBXBuildFile; fileRef = AF68A49619196E3E00D41CD1 /* delaunay.c */; }; AF68A49C19196E3E00D41CD1 /* delaunay.c in Sources */ = {isa = PBXBuildFile; fileRef = AF68A49619196E3E00D41CD1 /* delaunay.c */; }; AF69640B0E4FE3470085DBCE /* teapot.c in Sources */ = {isa = PBXBuildFile; fileRef = AFC211930E4E30C800D87B6E /* teapot.c */; }; + AF6C07C121D6ECCE00083862 /* Sparkle.framework in Resources */ = {isa = PBXBuildFile; fileRef = AF1ADA171850180E00932759 /* Sparkle.framework */; }; AF73FF211A08AB9400E485E9 /* iSaverRunner57t.png in Resources */ = {isa = PBXBuildFile; fileRef = AF73FF201A08AB9400E485E9 /* iSaverRunner57t.png */; }; AF73FF291A09877F00E485E9 /* XScreenSaverSubclass.m in Sources */ = {isa = PBXBuildFile; fileRef = AF9CC7A0099580E70075E99B /* XScreenSaverSubclass.m */; }; AF73FF2B1A09877F00E485E9 /* libjwxyz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AF4808C1098C3B6C00FB32B8 /* libjwxyz.a */; }; @@ -19972,6 +19973,7 @@ AF1ADA1B18501B3D00932759 /* SaverRunner.icns in Resources */, AF3633FC18530DD90086A439 /* sparkle_dsa_pub.pem in Resources */, AF1ADA161850157400932759 /* Updater.xib in Resources */, + AF6C07C121D6ECCE00083862 /* Sparkle.framework in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -33820,6 +33822,7 @@ "$(SRCROOT)", ); INFOPLIST_FILE = "$(SRCROOT)/Updater.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; "OTHER_CFLAGS[sdk=macosx*]" = "${OBJC_NO_GC_CFLAGS}"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -33836,6 +33839,7 @@ "$(SRCROOT)", ); INFOPLIST_FILE = "$(SRCROOT)/Updater.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; "OTHER_CFLAGS[sdk=macosx*]" = "${OBJC_NO_GC_CFLAGS}"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/README b/README index 288b19f2..9a2a3848 100644 --- a/README +++ b/README @@ -46,6 +46,8 @@ XScreenSaver has an extensive manual -- please read it! =============================================================================== +5.42 * macOS: Fixed Sparkle auto-updater. + 5.41 * X11: Those new font-loading fallback heuristics work again. Oops. * iOS, Android: Plugged many memory leaks at exit. * New hack, `handsy'. @@ -55,6 +57,7 @@ XScreenSaver has an extensive manual -- please read it! * Linux: If the xscreensaver daemon is setuid, then we can implore the kernel's out-of-memory killer to pretty please not unlock the screen. * macOS: Upgraded Sparkle (the "Check for Updates" library). + * macOS: Screen saver settings work again on 10.14. 5.40 * New hacks, `filmleader', `vfeedback'. * New hack, `glitchpeg' (X11 and macOS only). diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in index c6070238..eec998f1 100644 --- a/driver/XScreenSaver.ad.in +++ b/driver/XScreenSaver.ad.in @@ -4,8 +4,8 @@ ! a screen saver and locker for the X window system ! by Jamie Zawinski ! -! version 5.41 -! 26-Dec-2018 +! version 5.42 +! 28-Dec-2018 ! ! See "man xscreensaver" for more info. The latest version is always ! available at https://www.jwz.org/xscreensaver/ diff --git a/hacks/config/README b/hacks/config/README index 93cc819d..59814637 100644 --- a/hacks/config/README +++ b/hacks/config/README @@ -4,8 +4,8 @@ a screen saver and locker for the X window system by Jamie Zawinski - version 5.41 - 26-Dec-2018 + version 5.42 + 28-Dec-2018 https://www.jwz.org/xscreensaver/ diff --git a/po/POTFILES.in b/po/POTFILES.in index 0853105d..628e1378 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,4 @@ -# Auto-generated: Wed Dec 26 22:51:08 PST 2018 +# Auto-generated: Fri Dec 28 16:21:54 PST 2018 driver/demo-Gtk-conf.c driver/demo-Gtk.c driver/screensaver-properties.desktop.in diff --git a/utils/version.h b/utils/version.h index 56ad79a6..7bdae95e 100644 --- a/utils/version.h +++ b/utils/version.h @@ -1,2 +1,2 @@ static const char screensaver_id[] = - "@(#)xscreensaver 5.41 (26-Dec-2018), by Jamie Zawinski (jwz@jwz.org)"; + "@(#)xscreensaver 5.42 (28-Dec-2018), by Jamie Zawinski (jwz@jwz.org)"; diff --git a/xscreensaver.spec b/xscreensaver.spec index 3ad4f40d..da913e63 100644 --- a/xscreensaver.spec +++ b/xscreensaver.spec @@ -1,5 +1,5 @@ %define name xscreensaver -%define version 5.41 +%define version 5.42 Summary: X screen saver and locker Name: %{name}