ls -ldhgF "$$DMG" ; \
$(MAKE) notarize ; \
-dmg2:: staple updates.xml
-
# To set up notarization:
# - Log in on https://appleid.apple.com/
# 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 ; \
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::
@ \
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 <UUID> ...' ; \
+ xcrun altool --notarization-history 0 $(NOTARGS)
+ @echo 'now do: xcrun altool $(NOTARGS) --notarization-info <UUID>' ; \
echo 'and wget the LogFileURL'
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>CFBundleIconFile</key>
<string>SaverRunner</string>
<key>CFBundleIdentifier</key>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>NSMainNibFile</key>
<string>SaverRunner</string>
<key>NSPrincipalClass</key>
-/* xscreensaver, Copyright (c) 2013 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2013-2018 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* implied warranty.
*/
-#ifndef USE_IPHONE
-#import <Cocoa/Cocoa.h>
-@interface XScreenSaverUpdater : NSObject <NSApplicationDelegate>
+#ifdef IN_UPDATER
+# import <Cocoa/Cocoa.h>
+# import <Sparkle/SUUpdaterDelegate.h>
+
+@interface XScreenSaverUpdater : NSObject <NSApplicationDelegate,
+ SUUpdaterDelegate>
{
NSTimer *timer;
}
@end
-#endif // !USE_IPHONE
+#endif // IN_UPDATER
#define UPDATER_DOMAIN "org.jwz.xscreensaver.updater"
-/* xscreensaver, Copyright (c) 2013 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2013-2018 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* version 4-Dec-2013 or later.
*/
+#define IN_UPDATER
#import "Updater.h"
#import "Sparkle/SUUpdater.h"
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>CFBundleIconFile</key>
<string>SaverRunner</string>
<key>CFBundleIdentifier</key>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>LSUIElement</key>
<true/>
<key>NSHumanReadableCopyright</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>NSMainNibFile</key>
<string>Updater</string>
<key>NSPrincipalClass</key>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>LSMinimumSystemVersion</key>
<string>10.8</string>
<key>NSMainNibFile</key>
\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
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>CFBundleIcons</key>
<dict/>
<key>CFBundleIcons~ipad</key>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSHumanReadableCopyright</key>
- <string>5.41</string>
+ <string>5.42</string>
<key>NSMainNibFile</key>
<string>iSaverRunner</string>
<key>UIAppFonts</key>
<link>https://www.jwz.org/xscreensaver/updates.xml</link>
<description>Updates to xscreensaver.</description>
<language>en</language>
+ <item>
+ <title>Version 5.42</title>
+ <link>https://www.jwz.org/xscreensaver/xscreensaver-5.42.dmg</link>
+ <description><![CDATA[• macOS: Fixed Sparkle auto-updater.]]></description>
+ <pubDate>Fri, 28 Dec 2018 16:20:28 -0800</pubDate>
+ <enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.42.dmg"
+ sparkle:version="5.42"
+ sparkle:dsaSignature="MC0CFQC1IPDQbZA8nlNOy66NB/EpedRH6QIUSezxMtsmla56Axi6QpMzIKYaFAI="
+ sparkle:edSignature="TlJojJAVzOQvQ5rUkHPvTpKtePMGKErePVI8nRvTnZjgaLR5YvxAiZAykdYeA1fip81jwzMXnOA14DxfumscAQ=="
+ length="36576409"
+ type="application/octet-stream" />
+ </item>
+ <item>
+ <title>Version 5.41</title>
+ <link>https://www.jwz.org/xscreensaver/xscreensaver-5.41.dmg</link>
+ <description><![CDATA[• X11: Those new font-loading fallback heuristics work again. Oops. <BR>• iOS, Android: Plugged many memory leaks at exit. <BR>• New hack, `handsy'. <BR>• Fixed `noof' from displaying minimalistically. <BR>• Rewrote `unknownpleasures' to be faster, and a true waterfall graph. <BR>• BSOD Solaris improved. DVD added. <BR>• 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. <BR>• macOS: Upgraded Sparkle (the "Check for Updates" library). <BR>• macOS: Screen saver settings work again on 10.14.]]></description>
+ <pubDate>Wed, 26 Dec 2018 23:00:51 -0800</pubDate>
+ <enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.41.dmg"
+ sparkle:version="5.41"
+ sparkle:dsaSignature="MC0CFEH7e4ONZ1wfijWGBMEHwLESwKS3AhUAuhLIv/AsPsE60Jcmgm0eJDU0BRA="
+ sparkle:edSignature="2hXB1NVm+HZsj3aMCgOmdwX1zHT+dJ95v5aI2Cyn6vEReOUs+NSxqpoWEWQgH/AIMYhr9I3b4c5e/MceOdK7Bg=="
+ length="35542175"
+ type="application/octet-stream" />
+ </item>
<item>
<title>Version 5.40</title>
<link>https://www.jwz.org/xscreensaver/xscreensaver-5.40.dmg</link>
- <description><![CDATA[• New hacks, 'filmleader', 'vfeedback'. <BR>• New hack, 'glitchpeg' (X11 and macOS only). <BR>• GLPlanet blends between day and night maps at the dusk terminator. <BR>• DymaxionMap can display arbitrary map images, and animate sunlight across the flattened globe. <BR>• Tessellimage can draw either Delaunay or Voronoi tilings. <BR>• XAnalogTV includes test cards. <BR>• Android: These hacks work now: 'blitspin', 'bumps', 'cityflow', 'endgame', 'esper', 'flipscreen3d', 'gleidescope', 'glslideshow', 'jigglypuff', 'queens', 'tessellimage', 'xanalogtv', 'xmatrix', 'zoom'.]]></description>
+ <description><![CDATA[• New hacks, `filmleader', `vfeedback'. <BR>• New hack, `glitchpeg' (X11 and macOS only). <BR>• GLPlanet blends between day and night maps at the dusk terminator. <BR>• DymaxionMap can display arbitrary map images, and animate sunlight across the flattened globe. <BR>• Tessellimage can draw either Delaunay or Voronoi tilings. <BR>• XAnalogTV includes test cards. <BR>• Android: These hacks work now: `blitspin', `bumps', `cityflow', `endgame', `esper', `flipscreen3d', `gleidescope', `glslideshow', `jigglypuff', `queens', `tessellimage', `xanalogtv', `xmatrix', `zoom'.]]></description>
<pubDate>Sun, 12 Aug 2018 16:39:18 -0700</pubDate>
<enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.40.dmg"
sparkle:version="5.40"
sparkle:dsaSignature="MCwCFBVb+Vyo39OOfiuqm9K3zmrahnGIAhRK6pirSDvI1gT0ddtv+okGTW4NLg=="
+ sparkle:edSignature="R3FTLn+BURQDTK8BORtPeUrLrb2BLyhP2TeEU11Y9oXl2epIJ2owMS2BvsQke+gV/nEyzq34sUnBHnCsKvfgDg=="
length="34297646"
type="application/octet-stream" />
</item>
- <item>
- <title>Version 5.39</title>
- <link>https://www.jwz.org/xscreensaver/xscreensaver-5.39.dmg</link>
- <description><![CDATA[• New hacks, 'razzledazzle', 'peepers', 'crumbler' and `maze3d'. <BR>• More heuristics for using RSS feeds as image sources. <BR>• Android: Image loading works. <BR>• Built-in image assets are now PNG instead of XPM or XBM. <BR>• X11: Better font-loading fallback heuristics on systems with a terrible selection of installed fonts. <BR>• macOS: Retina display-related bug fixes.]]></description>
- <pubDate>Thu, 12 Apr 2018 13:00:37 -0700</pubDate>
- <enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.39.dmg"
- sparkle:version="5.39"
- sparkle:dsaSignature="MC0CFCNqDWYNT+EDQXEpi0SAxySC77A+AhUArqhfa7sp5J8cXq42u5uFmBOQiFA="
- length="32888133"
- type="application/octet-stream" />
- </item>
- <item>
- <title>Version 5.38</title>
- <link>https://www.jwz.org/xscreensaver/xscreensaver-5.38.dmg</link>
- <description><![CDATA[• New hack, 'esper'. <BR>• macOS: Support for Retina displays. <BR>• X11: `webcollage' now works with ImageMagick instead of with pbmtools if `webcollage-helper' is not installed. <BR>• 'bsod' now accepts Dunning-Krugerrands. <BR>• Android: These hacks work now: 'anemone', 'anemotaxis', 'atlantis', 'bouboule', 'celtic', 'compass', 'crackberg', 'epicycle', 'fuzzyflakes', 'goop', 'kumppa' 'munch', 'pacman', 'polyominoes', 'slip'. <BR>• Android: Thick lines work better for: 'anemone', 'anemotaxis', 'celtic', 'compass', 'deluxe', 'epicycle', 'fuzzyflakes', 'pacman' <BR>• Android: Assorted performance improvements, especially for 'kumppa' and 'slip'. <BR>• Android TV: Daydreams work. <BR>• iOS: Tweaks for iPhone X. <BR>• Lots of xlockmore-derived hacks now have animated erase routines. <BR>• 'crystal' works properly on non-X11 systems. <BR>• 'm6502' now includes 'texture.asm'. <BR>• X11: Try harder to find sensible fonts for the password dialog.]]></description>
- <pubDate>Wed, 20 Dec 2017 11:16:13 -0800</pubDate>
- <enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.38.dmg"
- sparkle:version="5.38"
- sparkle:dsaSignature="MCwCFB2O5ykEfT4xCkb/CraguQZPTFJHAhQZde4jxrb5+zc2Haazg10uYLqNRw=="
- length="54125574"
- type="application/octet-stream" />
- </item>
<item>
<title>Version 5.34</title>
<link>https://www.jwz.org/xscreensaver/xscreensaver-5.34.dmg</link>
<enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.34.dmg"
sparkle:version="5.34"
sparkle:dsaSignature="MCwCFAoZpMknlOVF0zFXlzFruzFvRXufAhQVKY0qlzelKcArrlC6k7EbHLTcyg=="
+ sparkle:edSignature="yUaWHZ0W91rhh0jsFUgtdcH17SPq66A4SdLMRqf/AU7cnVwNNBvlEJOKAJGJIMTVPpBMtYgk93YJL3/5R4+1BA=="
length="58850776"
type="application/octet-stream" />
</item>
<enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.14.dmg"
sparkle:version="5.14"
sparkle:dsaSignature="MCwCFHrKuttf1gN27mVG3YL8+ueMJmNaAhR6aSkKQefuNFNp6MinLq2o1nocaA=="
+ sparkle:edSignature="yAg5vrtkqVdOXnloYeZ/XlwNK6VA3yWdKIOvMbpFEEGUfmsRm5/besIJBMjQkZg5BxXG8DTVh9NMHWrzZ9KvCg=="
length="54485615"
type="application/octet-stream" />
</item>
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 */; };
AF1ADA1B18501B3D00932759 /* SaverRunner.icns in Resources */,
AF3633FC18530DD90086A439 /* sparkle_dsa_pub.pem in Resources */,
AF1ADA161850157400932759 /* Updater.xib in Resources */,
+ AF6C07C121D6ECCE00083862 /* Sparkle.framework in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
"$(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)";
"$(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)";
===============================================================================
+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'.
* 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).
! 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/
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/
-# 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
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)";
%define name xscreensaver
-%define version 5.41
+%define version 5.42
Summary: X screen saver and locker
Name: %{name}
projects / xscreensaver / commitdiff