From ae69a754244c4e475c8d2591772ca8e005071d83 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 18 Feb 2019 11:55:41 +0100 Subject: Update to 5.42 --- OSX/LaunchScreen.xib | 12 +- OSX/Makefile | 81 +- .../LaunchImage.launchimage/Contents.json | 38 +- OSX/README | 5 +- OSX/SaverListController.m | 4 +- OSX/SaverRunner.h | 2 +- OSX/SaverRunner.m | 11 +- OSX/SaverRunner.plist | 10 +- OSX/Sparkle.framework/Modules | 1 + OSX/Sparkle.framework/PrivateHeaders | 1 + .../Versions/A/Headers/SPUDownloadData.h | 43 + .../Versions/A/Headers/SPUDownloader.h | 25 + .../Versions/A/Headers/SPUDownloaderDelegate.h | 38 + .../Versions/A/Headers/SPUDownloaderDeprecated.h | 13 + .../Versions/A/Headers/SPUDownloaderProtocol.h | 34 + .../Versions/A/Headers/SPUDownloaderSession.h | 20 + .../Versions/A/Headers/SPUURLRequest.h | 35 + .../Versions/A/Headers/SUAppcast.h | 37 +- .../Versions/A/Headers/SUAppcastItem.h | 72 +- .../Versions/A/Headers/SUCodeSigningVerifier.h | 22 + .../Versions/A/Headers/SUErrors.h | 56 + .../Versions/A/Headers/SUExport.h | 18 + .../A/Headers/SUStandardVersionComparator.h | 52 + .../Versions/A/Headers/SUUpdater.h | 272 +- .../Versions/A/Headers/SUUpdaterDelegate.h | 301 + .../A/Headers/SUVersionComparisonProtocol.h | 22 +- .../Versions/A/Headers/SUVersionDisplayProtocol.h | 22 +- OSX/Sparkle.framework/Versions/A/Headers/Sparkle.h | 20 +- .../Versions/A/Modules/module.modulemap | 6 + .../Versions/A/PrivateHeaders/SUUnarchiver.h | 21 + .../A/Resources/Autoupdate.app/Contents/Info.plist | 54 + .../Autoupdate.app/Contents/MacOS/Autoupdate | Bin 0 -> 193884 bytes .../Resources/Autoupdate.app/Contents/MacOS/fileop | Bin 0 -> 89836 bytes .../A/Resources/Autoupdate.app/Contents/PkgInfo | 1 + .../Autoupdate.app/Contents/Resources/AppIcon.icns | Bin 0 -> 37132 bytes .../Autoupdate.app/Contents/Resources/SUStatus.nib | Bin 0 -> 11698 bytes .../Contents/Resources/ar.lproj/Sparkle.strings | Bin 0 -> 8070 bytes .../Contents/Resources/ca.lproj/Sparkle.strings | Bin 0 -> 6310 bytes .../Contents/Resources/cs.lproj/Sparkle.strings | Bin 0 -> 7434 bytes .../Contents/Resources/da.lproj/Sparkle.strings | Bin 0 -> 7990 bytes .../Contents/Resources/de.lproj/Sparkle.strings | Bin 0 -> 8874 bytes .../Contents/Resources/el.lproj/Sparkle.strings | Bin 0 -> 7332 bytes .../Contents/Resources/en.lproj/Sparkle.strings | Bin 0 -> 9096 bytes .../Contents/Resources/es.lproj/Sparkle.strings | Bin 0 -> 9640 bytes .../Contents/Resources/fi.lproj/Sparkle.strings | Bin 0 -> 5814 bytes .../Contents/Resources/fr.lproj/Sparkle.strings | Bin 0 -> 8964 bytes .../Contents/Resources/he.lproj/Sparkle.strings | Bin 0 -> 4936 bytes .../Contents/Resources/hr.lproj/Sparkle.strings | Bin 0 -> 9352 bytes .../Contents/Resources/hu.lproj/Sparkle.strings | Bin 0 -> 9600 bytes .../Contents/Resources/is.lproj/Sparkle.strings | Bin 0 -> 5478 bytes .../Contents/Resources/it.lproj/Sparkle.strings | Bin 0 -> 7920 bytes .../Contents/Resources/ja.lproj/Sparkle.strings | Bin 0 -> 7718 bytes .../Contents/Resources/ko.lproj/Sparkle.strings | Bin 0 -> 5868 bytes .../Contents/Resources/nb.lproj/Sparkle.strings | Bin 0 -> 8998 bytes .../Contents/Resources/nl.lproj/Sparkle.strings | Bin 0 -> 8466 bytes .../Contents/Resources/pl.lproj/Sparkle.strings | Bin 0 -> 8140 bytes .../Contents/Resources/pt_BR.lproj/Sparkle.strings | Bin 0 -> 9280 bytes .../Contents/Resources/pt_PT.lproj/Sparkle.strings | Bin 0 -> 7434 bytes .../Contents/Resources/ro.lproj/Sparkle.strings | Bin 0 -> 9412 bytes .../Contents/Resources/ru.lproj/Sparkle.strings | Bin 0 -> 7446 bytes .../Contents/Resources/sk.lproj/Sparkle.strings | Bin 0 -> 7168 bytes .../Contents/Resources/sl.lproj/Sparkle.strings | Bin 0 -> 7562 bytes .../Contents/Resources/sv.lproj/Sparkle.strings | Bin 0 -> 7406 bytes .../Contents/Resources/th.lproj/Sparkle.strings | Bin 0 -> 8118 bytes .../Contents/Resources/tr.lproj/Sparkle.strings | Bin 0 -> 9246 bytes .../Contents/Resources/uk.lproj/Sparkle.strings | Bin 0 -> 7466 bytes .../Contents/Resources/zh_CN.lproj/Sparkle.strings | Bin 0 -> 5484 bytes .../Contents/Resources/zh_TW.lproj/Sparkle.strings | Bin 0 -> 5410 bytes .../Versions/A/Resources/DarkAqua.css | 9 + .../Versions/A/Resources/Info.plist | 22 +- .../Versions/A/Resources/SUModelTranslation.plist | 160 +- .../Versions/A/Resources/SUStatus.nib | Bin 6565 -> 11698 bytes .../Resources/ar.lproj/SUAutomaticUpdateAlert.nib | Bin 7118 -> 12411 bytes .../A/Resources/ar.lproj/SUUpdateAlert.nib | Bin 10445 -> 21763 bytes .../ar.lproj/SUUpdatePermissionPrompt.nib | Bin 12737 -> 18515 bytes .../Versions/A/Resources/ar.lproj/Sparkle.strings | Bin 8896 -> 8070 bytes .../Versions/A/Resources/ca.lproj/Sparkle.strings | Bin 0 -> 6310 bytes .../Resources/cs.lproj/SUAutomaticUpdateAlert.nib | Bin 7039 -> 12399 bytes .../A/Resources/cs.lproj/SUUpdateAlert.nib | Bin 10241 -> 21789 bytes .../cs.lproj/SUUpdatePermissionPrompt.nib | Bin 12782 -> 18613 bytes .../Versions/A/Resources/cs.lproj/Sparkle.strings | Bin 8642 -> 7434 bytes .../Resources/da.lproj/SUAutomaticUpdateAlert.nib | Bin 7018 -> 12308 bytes .../A/Resources/da.lproj/SUUpdateAlert.nib | Bin 10347 -> 21668 bytes .../da.lproj/SUUpdatePermissionPrompt.nib | Bin 12635 -> 18402 bytes .../Versions/A/Resources/da.lproj/Sparkle.strings | Bin 8818 -> 7990 bytes .../Resources/de.lproj/SUAutomaticUpdateAlert.nib | Bin 7109 -> 12327 bytes .../A/Resources/de.lproj/SUUpdateAlert.nib | Bin 10386 -> 21705 bytes .../de.lproj/SUUpdatePermissionPrompt.nib | Bin 12699 -> 18555 bytes .../Versions/A/Resources/de.lproj/Sparkle.strings | Bin 9246 -> 8874 bytes .../Resources/el.lproj/SUAutomaticUpdateAlert.nib | Bin 0 -> 12451 bytes .../A/Resources/el.lproj/SUUpdateAlert.nib | Bin 0 -> 21804 bytes .../el.lproj/SUUpdatePermissionPrompt.nib | Bin 0 -> 18645 bytes .../Versions/A/Resources/el.lproj/Sparkle.strings | Bin 0 -> 7332 bytes .../Resources/en.lproj/SUAutomaticUpdateAlert.nib | Bin 7015 -> 12305 bytes .../A/Resources/en.lproj/SUUpdateAlert.nib | Bin 10258 -> 21657 bytes .../en.lproj/SUUpdatePermissionPrompt.nib | Bin 12566 -> 18344 bytes .../Versions/A/Resources/en.lproj/Sparkle.strings | Bin 9042 -> 9096 bytes .../Resources/es.lproj/SUAutomaticUpdateAlert.nib | Bin 7052 -> 12361 bytes .../A/Resources/es.lproj/SUUpdateAlert.nib | Bin 10492 -> 21839 bytes .../es.lproj/SUUpdatePermissionPrompt.nib | Bin 12872 -> 18737 bytes .../Versions/A/Resources/es.lproj/Sparkle.strings | Bin 8956 -> 9640 bytes .../Resources/fi.lproj/SUAutomaticUpdateAlert.nib | Bin 0 -> 12451 bytes .../A/Resources/fi.lproj/SUUpdateAlert.nib | Bin 0 -> 21812 bytes .../fi.lproj/SUUpdatePermissionPrompt.nib | Bin 0 -> 18453 bytes .../Versions/A/Resources/fi.lproj/Sparkle.strings | Bin 0 -> 5814 bytes .../Resources/fr.lproj/SUAutomaticUpdateAlert.nib | Bin 7076 -> 12364 bytes .../A/Resources/fr.lproj/SUUpdateAlert.nib | Bin 10436 -> 21761 bytes .../fr.lproj/SUUpdatePermissionPrompt.nib | Bin 12914 -> 18723 bytes .../Versions/A/Resources/fr.lproj/Sparkle.strings | Bin 9204 -> 8964 bytes .../Versions/A/Resources/he.lproj/Sparkle.strings | Bin 0 -> 4936 bytes .../Resources/hr.lproj/SUAutomaticUpdateAlert.nib | Bin 0 -> 12406 bytes .../A/Resources/hr.lproj/SUUpdateAlert.nib | Bin 0 -> 21814 bytes .../hr.lproj/SUUpdatePermissionPrompt.nib | Bin 0 -> 18454 bytes .../Versions/A/Resources/hr.lproj/Sparkle.strings | Bin 0 -> 9352 bytes .../Resources/hu.lproj/SUAutomaticUpdateAlert.nib | Bin 0 -> 12453 bytes .../A/Resources/hu.lproj/SUUpdateAlert.nib | Bin 0 -> 21867 bytes .../hu.lproj/SUUpdatePermissionPrompt.nib | Bin 0 -> 18453 bytes .../Versions/A/Resources/hu.lproj/Sparkle.strings | Bin 0 -> 9600 bytes .../Resources/is.lproj/SUAutomaticUpdateAlert.nib | Bin 7013 -> 12375 bytes .../A/Resources/is.lproj/SUUpdateAlert.nib | Bin 10221 -> 21774 bytes .../is.lproj/SUUpdatePermissionPrompt.nib | Bin 12780 -> 18643 bytes .../Versions/A/Resources/is.lproj/Sparkle.strings | Bin 6772 -> 5478 bytes .../Resources/it.lproj/SUAutomaticUpdateAlert.nib | Bin 7002 -> 12311 bytes .../A/Resources/it.lproj/SUUpdateAlert.nib | Bin 10353 -> 21699 bytes .../it.lproj/SUUpdatePermissionPrompt.nib | Bin 12716 -> 18580 bytes .../Versions/A/Resources/it.lproj/Sparkle.strings | Bin 9136 -> 7920 bytes .../Resources/ja.lproj/SUAutomaticUpdateAlert.nib | Bin 7103 -> 12315 bytes .../A/Resources/ja.lproj/SUUpdateAlert.nib | Bin 10436 -> 21679 bytes .../ja.lproj/SUUpdatePermissionPrompt.nib | Bin 12524 -> 18273 bytes .../Versions/A/Resources/ja.lproj/Sparkle.strings | Bin 7518 -> 7718 bytes .../Resources/ko.lproj/SUAutomaticUpdateAlert.nib | Bin 6919 -> 12283 bytes .../A/Resources/ko.lproj/SUUpdateAlert.nib | Bin 10079 -> 21633 bytes .../ko.lproj/SUUpdatePermissionPrompt.nib | Bin 12417 -> 18280 bytes .../Versions/A/Resources/ko.lproj/Sparkle.strings | Bin 0 -> 5868 bytes .../Resources/nb.lproj/SUAutomaticUpdateAlert.nib | Bin 0 -> 12327 bytes .../A/Resources/nb.lproj/SUUpdateAlert.nib | Bin 0 -> 21628 bytes .../nb.lproj/SUUpdatePermissionPrompt.nib | Bin 0 -> 18536 bytes .../Versions/A/Resources/nb.lproj/Sparkle.strings | Bin 0 -> 8998 bytes .../Resources/nl.lproj/SUAutomaticUpdateAlert.nib | Bin 7007 -> 12323 bytes .../A/Resources/nl.lproj/SUUpdateAlert.nib | Bin 10333 -> 21672 bytes .../nl.lproj/SUUpdatePermissionPrompt.nib | Bin 12515 -> 18360 bytes .../Versions/A/Resources/nl.lproj/Sparkle.strings | Bin 9374 -> 8466 bytes .../Resources/pl.lproj/SUAutomaticUpdateAlert.nib | Bin 7039 -> 12402 bytes .../A/Resources/pl.lproj/SUUpdateAlert.nib | Bin 10223 -> 21778 bytes .../pl.lproj/SUUpdatePermissionPrompt.nib | Bin 12564 -> 18427 bytes .../Versions/A/Resources/pl.lproj/Sparkle.strings | Bin 9532 -> 8140 bytes .../pt_BR.lproj/SUAutomaticUpdateAlert.nib | Bin 7080 -> 12379 bytes .../A/Resources/pt_BR.lproj/SUUpdateAlert.nib | Bin 10328 -> 21819 bytes .../pt_BR.lproj/SUUpdatePermissionPrompt.nib | Bin 12785 -> 18655 bytes .../A/Resources/pt_BR.lproj/Sparkle.strings | Bin 8330 -> 9280 bytes .../pt_PT.lproj/SUAutomaticUpdateAlert.nib | Bin 7094 -> 12385 bytes .../A/Resources/pt_PT.lproj/SUUpdateAlert.nib | Bin 10513 -> 21839 bytes .../pt_PT.lproj/SUUpdatePermissionPrompt.nib | Bin 12886 -> 18695 bytes .../A/Resources/pt_PT.lproj/Sparkle.strings | Bin 8652 -> 7434 bytes .../Resources/ro.lproj/SUAutomaticUpdateAlert.nib | Bin 7117 -> 12413 bytes .../A/Resources/ro.lproj/SUUpdateAlert.nib | Bin 10466 -> 21823 bytes .../ro.lproj/SUUpdatePermissionPrompt.nib | Bin 12592 -> 18413 bytes .../Versions/A/Resources/ro.lproj/Sparkle.strings | Bin 9386 -> 9412 bytes .../Resources/ru.lproj/SUAutomaticUpdateAlert.nib | Bin 7143 -> 12453 bytes .../A/Resources/ru.lproj/SUUpdateAlert.nib | Bin 10524 -> 21873 bytes .../ru.lproj/SUUpdatePermissionPrompt.nib | Bin 12864 -> 18729 bytes .../Versions/A/Resources/ru.lproj/Sparkle.strings | Bin 8662 -> 7446 bytes .../Resources/sk.lproj/SUAutomaticUpdateAlert.nib | Bin 7068 -> 12431 bytes .../A/Resources/sk.lproj/SUUpdateAlert.nib | Bin 10270 -> 21825 bytes .../sk.lproj/SUUpdatePermissionPrompt.nib | Bin 12778 -> 18641 bytes .../Versions/A/Resources/sk.lproj/Sparkle.strings | Bin 0 -> 7168 bytes .../Resources/sl.lproj/SUAutomaticUpdateAlert.nib | Bin 7103 -> 12341 bytes .../A/Resources/sl.lproj/SUUpdateAlert.nib | Bin 10232 -> 21737 bytes .../sl.lproj/SUUpdatePermissionPrompt.nib | Bin 12751 -> 18560 bytes .../Versions/A/Resources/sl.lproj/Sparkle.strings | Bin 8778 -> 7562 bytes .../Resources/sv.lproj/SUAutomaticUpdateAlert.nib | Bin 7022 -> 12390 bytes .../A/Resources/sv.lproj/SUUpdateAlert.nib | Bin 10385 -> 21799 bytes .../sv.lproj/SUUpdatePermissionPrompt.nib | Bin 12727 -> 18556 bytes .../Versions/A/Resources/sv.lproj/Sparkle.strings | Bin 8600 -> 7406 bytes .../Resources/th.lproj/SUAutomaticUpdateAlert.nib | Bin 7087 -> 12377 bytes .../A/Resources/th.lproj/SUUpdateAlert.nib | Bin 10342 -> 21742 bytes .../th.lproj/SUUpdatePermissionPrompt.nib | Bin 12658 -> 18475 bytes .../Versions/A/Resources/th.lproj/Sparkle.strings | Bin 8946 -> 8118 bytes .../Resources/tr.lproj/SUAutomaticUpdateAlert.nib | Bin 7179 -> 12415 bytes .../A/Resources/tr.lproj/SUUpdateAlert.nib | Bin 10477 -> 21747 bytes .../tr.lproj/SUUpdatePermissionPrompt.nib | Bin 12731 -> 18600 bytes .../Versions/A/Resources/tr.lproj/Sparkle.strings | Bin 9284 -> 9246 bytes .../Resources/uk.lproj/SUAutomaticUpdateAlert.nib | Bin 7233 -> 12471 bytes .../A/Resources/uk.lproj/SUUpdateAlert.nib | Bin 10624 -> 21893 bytes .../uk.lproj/SUUpdatePermissionPrompt.nib | Bin 12774 -> 18638 bytes .../Versions/A/Resources/uk.lproj/Sparkle.strings | Bin 8644 -> 7466 bytes .../zh_CN.lproj/SUAutomaticUpdateAlert.nib | Bin 6938 -> 12249 bytes .../A/Resources/zh_CN.lproj/SUUpdateAlert.nib | Bin 10244 -> 21577 bytes .../zh_CN.lproj/SUUpdatePermissionPrompt.nib | Bin 12334 -> 18199 bytes .../A/Resources/zh_CN.lproj/Sparkle.strings | Bin 6908 -> 5484 bytes .../zh_TW.lproj/SUAutomaticUpdateAlert.nib | Bin 6891 -> 12255 bytes .../A/Resources/zh_TW.lproj/SUUpdateAlert.nib | Bin 10040 -> 21594 bytes .../zh_TW.lproj/SUUpdatePermissionPrompt.nib | Bin 12315 -> 18209 bytes .../A/Resources/zh_TW.lproj/Sparkle.strings | Bin 6642 -> 5410 bytes OSX/Sparkle.framework/Versions/A/Sparkle | Bin 403600 -> 625620 bytes OSX/Updater.h | 13 +- OSX/Updater.m | 3 +- OSX/Updater.plist | 10 +- OSX/XScreenSaver.plist | 4 +- OSX/XScreenSaverConfigSheet.h | 4 +- OSX/XScreenSaverView.m | 4 +- OSX/bindist.rtf | 4 +- OSX/bindist2.webloc | 2 +- OSX/fuzztest.sh | 2 + OSX/iSaverRunner.plist | 10 +- OSX/ios-function-table.m | 4 +- OSX/seticon.pl | 7 +- OSX/sparkle-bin/BinaryDelta | Bin 0 -> 173948 bytes .../BinaryDelta.dSYM/Contents/Info.plist | 20 + .../Contents/Resources/DWARF/BinaryDelta | Bin 0 -> 2245543 bytes OSX/sparkle-bin/generate_appcast | Bin 0 -> 9904192 bytes .../generate_appcast.dSYM/Contents/Info.plist | 20 + .../Contents/Resources/DWARF/generate_appcast | Bin 0 -> 5953211 bytes OSX/sparkle-bin/generate_keys | Bin 0 -> 9556400 bytes .../generate_keys.dSYM/Contents/Info.plist | 20 + .../Contents/Resources/DWARF/generate_keys | Bin 0 -> 5388236 bytes .../generate_dsa_keys_macos_10.12_only | 24 + OSX/sparkle-bin/old_dsa_scripts/sign_update | 18 + OSX/sparkle-bin/sign_update | Bin 0 -> 9785400 bytes .../sign_update.dSYM/Contents/Info.plist | 20 + .../Contents/Resources/DWARF/sign_update | Bin 0 -> 3891842 bytes OSX/updates.pl | 62 +- OSX/updates.xml | 53 +- OSX/xscreensaver.xcodeproj/project.pbxproj | 195 +- README | 51 +- README.hacking | 6 + aclocal.m4 | 5 +- android/Makefile | 1 + android/build.gradle | 4 +- .../.idea/caches/build_file_checksums.ser | Bin 521 -> 521 bytes android/xscreensaver/.idea/misc.xml | 2 +- android/xscreensaver/.idea/workspace.xml | 236 +- android/xscreensaver/build.gradle | 8 +- android/xscreensaver/jni/Android.mk | 1 + android/xscreensaver/jni/Application.mk | 4 +- android/xscreensaver/xscreensaver.iml | 16 + config.h.in | 4 + configure | 61 +- configure.in | 48 + driver/Makefile.in | 11 +- driver/XScreenSaver.ad.in | 5 +- driver/XScreenSaver_ad.h | 1 + driver/demo-Gtk.c | 5 + driver/passwd.c | 46 +- driver/test-yarandom.c | 66 + driver/xscreensaver.c | 12 +- hacks/Makefile.in | 227 +- hacks/abstractile.c | 9 + hacks/analogtv-cli.c | 967 + hacks/analogtv.c | 26 +- hacks/analogtv.h | 18 +- hacks/anemone.c | 3 + hacks/anemotaxis.c | 3 + hacks/apple2-main.c | 13 +- hacks/attraction.c | 5 + hacks/barcode.c | 12 +- hacks/binaryring.c | 10 +- hacks/blaster.c | 2 + hacks/blitspin.c | 21 +- hacks/boxfit.c | 6 + hacks/bsod.c | 600 +- hacks/bubbles.c | 36 +- hacks/bumps.c | 6 + hacks/ccurve.c | 5 + hacks/celtic.c | 11 +- hacks/check-configs.pl | 26 +- hacks/cloudlife.c | 11 + hacks/compass.c | 12 + hacks/compile_axp.com | 1 + hacks/compile_decc.com | 1 + hacks/config/README | 4 +- hacks/config/bsod.xml | 2 + hacks/config/handsy.xml | 58 + hacks/config/ripples.xml | 3 +- hacks/config/unknownpleasures.xml | 19 +- hacks/coral.c | 4 + hacks/critical.c | 9 +- hacks/cwaves.c | 5 + hacks/cynosure.c | 5 + hacks/decayscreen.c | 2 + hacks/deco.c | 2 + hacks/deluxe.c | 14 + hacks/distort.c | 37 +- hacks/epicycle.c | 4 + hacks/eruption.c | 17 +- hacks/filmleader.c | 31 +- hacks/fireworkx.c | 12 +- hacks/flag.c | 46 +- hacks/flame.c | 2 + hacks/fluidballs.c | 11 + hacks/fontglide.c | 31 +- hacks/fuzzyflakes.c | 5 + hacks/glx/Makefile.in | 125 +- hacks/glx/antinspect.c | 12 +- hacks/glx/antmaze.c | 16 +- hacks/glx/antspotlight.c | 15 +- hacks/glx/atlantis.c | 19 +- hacks/glx/atunnel.c | 10 +- hacks/glx/b_draw.c | 4 +- hacks/glx/b_lockglue.c | 7 +- hacks/glx/b_sphere.c | 4 +- hacks/glx/blinkbox.c | 17 +- hacks/glx/blocktube.c | 19 +- hacks/glx/boing.c | 13 +- hacks/glx/bouncingcow.c | 22 +- hacks/glx/boxed.c | 30 +- hacks/glx/bubble3d.c | 22 +- hacks/glx/cage.c | 11 +- hacks/glx/carousel.c | 27 +- hacks/glx/circuit.c | 10 +- hacks/glx/cityflow.c | 21 +- hacks/glx/companion.c | 20 +- hacks/glx/crackberg.c | 43 +- hacks/glx/crumbler.c | 12 +- hacks/glx/cube21.c | 12 +- hacks/glx/cubenetic.c | 24 +- hacks/glx/cubestack.c | 15 +- hacks/glx/cubestorm.c | 22 +- hacks/glx/cubetwist.c | 6 +- hacks/glx/cubicgrid.c | 14 +- hacks/glx/dangerball.c | 18 +- hacks/glx/discoball.c | 8 +- hacks/glx/dnalogo.c | 35 +- hacks/glx/dxf2gl.pl | 51 +- hacks/glx/dymaxionmap.c | 28 +- hacks/glx/endgame.c | 19 +- hacks/glx/energystream.c | 19 +- hacks/glx/engine.c | 17 +- hacks/glx/esper.c | 29 +- hacks/glx/extrusion.c | 14 +- hacks/glx/flipflop.c | 6 +- hacks/glx/flipscreen3d.c | 13 +- hacks/glx/fliptext.c | 22 +- hacks/glx/flurry-texture.c | 5 +- hacks/glx/flurry.c | 18 +- hacks/glx/flurry.h | 3 +- hacks/glx/flyingtoasters.c | 24 +- hacks/glx/fps-gl.c | 15 +- hacks/glx/gears.c | 21 +- hacks/glx/geodesic.c | 15 +- hacks/glx/geodesicgears.c | 14 +- hacks/glx/gflux.c | 12 +- hacks/glx/glblur.c | 26 +- hacks/glx/glcells.c | 34 +- hacks/glx/gleidescope.c | 19 +- hacks/glx/glforestfire.c | 15 +- hacks/glx/glhanoi.c | 47 +- hacks/glx/glknots.c | 16 +- hacks/glx/glmatrix.c | 14 +- hacks/glx/glplanet.c | 23 +- hacks/glx/glschool.c | 21 +- hacks/glx/glslideshow.c | 26 +- hacks/glx/glsnake.c | 17 +- hacks/glx/gltext.c | 12 +- hacks/glx/gltrackball.c | 7 + hacks/glx/gltrackball.h | 1 + hacks/glx/handsy.c | 1175 + hacks/glx/handsy.dxf | 67706 +++++++++++++++++++ hacks/glx/handsy.man | 76 + hacks/glx/handsy_anim.h | 805 + hacks/glx/handsy_model.c | 6684 ++ hacks/glx/hexstrut.c | 9 +- hacks/glx/hilbert.c | 27 +- hacks/glx/hydrostat.c | 22 +- hacks/glx/hypertorus.c | 14 +- hacks/glx/hypnowheel.c | 19 +- hacks/glx/jigglypuff.c | 148 +- hacks/glx/jigsaw.c | 19 +- hacks/glx/juggler3d.c | 14 +- hacks/glx/kaleidocycle.c | 16 +- hacks/glx/klein.c | 15 +- hacks/glx/lament.c | 20 +- hacks/glx/lavalite.c | 18 +- hacks/glx/lockward.c | 12 +- hacks/glx/maze3d.c | 12 +- hacks/glx/maze3d.man | 0 hacks/glx/menger.c | 18 +- hacks/glx/mirrorblob.c | 12 +- hacks/glx/moebius.c | 14 +- hacks/glx/moebiusgears.c | 15 +- hacks/glx/molecule.c | 56 +- hacks/glx/morph3d.c | 9 +- hacks/glx/noof.c | 14 +- hacks/glx/peepers.c | 22 +- hacks/glx/photopile.c | 22 +- hacks/glx/pinion.c | 22 +- hacks/glx/pipes.c | 77 +- hacks/glx/polyhedra-gl.c | 24 +- hacks/glx/polyhedra.c | 1 + hacks/glx/polytopes.c | 14 +- hacks/glx/projectiveplane.c | 15 +- hacks/glx/providence.c | 17 +- hacks/glx/pulsar.c | 5 +- hacks/glx/quasicrystal.c | 21 +- hacks/glx/queens.c | 17 +- hacks/glx/quickhull.h | 11 +- hacks/glx/raverhoop.c | 28 +- hacks/glx/razzledazzle.c | 6 +- hacks/glx/romanboy.c | 21 +- hacks/glx/rubik.c | 21 +- hacks/glx/rubikblocks.c | 16 +- hacks/glx/sballs.c | 34 +- hacks/glx/sierpinski3d.c | 21 +- hacks/glx/skytentacles.c | 28 +- hacks/glx/sonar-icmp.c | 8 + hacks/glx/sonar.c | 35 +- hacks/glx/spheremonics.c | 18 +- hacks/glx/splitflap.c | 28 +- hacks/glx/splodesic.c | 9 +- hacks/glx/sproingies.c | 2 +- hacks/glx/sproingiewrap.c | 11 +- hacks/glx/stairs.c | 11 +- hacks/glx/starwars.c | 18 +- hacks/glx/stonerview.c | 5 +- hacks/glx/superquadrics.c | 9 +- hacks/glx/surfaces.c | 15 +- hacks/glx/tangram.c | 14 +- hacks/glx/texfont.c | 3 +- hacks/glx/timetunnel.c | 28 +- hacks/glx/topblock.c | 23 +- hacks/glx/tronbit.c | 20 +- hacks/glx/unicrud.c | 16 +- hacks/glx/unknownpleasures.c | 698 +- hacks/glx/unknownpleasures.man | 32 +- hacks/glx/vigilance.c | 30 +- hacks/glx/voronoi.c | 20 +- hacks/glx/winduprobot.c | 30 +- hacks/glx/xlock-gl-utils.c | 1 + hacks/halftone.c | 11 + hacks/halo.c | 11 + hacks/helix.c | 1 + hacks/hexadrop.c | 4 +- hacks/hyperball.c | 5 + hacks/hypercube.c | 6 + hacks/ifs.c | 1 + hacks/images/dvd.png | Bin 0 -> 2727 bytes hacks/images/sun.png | Bin 0 -> 415 bytes hacks/imsmap.c | 7 +- hacks/interaggregate.c | 7 + hacks/interference.c | 7 +- hacks/intermomentary.c | 16 + hacks/juggle.c | 1 + hacks/kaleidescope.c | 25 +- hacks/kumppa.c | 2 + hacks/lmorph.c | 13 +- hacks/m6502.c | 2 + hacks/maze.c | 10 + hacks/memscroller.c | 47 +- hacks/metaballs.c | 25 +- hacks/moire.c | 7 + hacks/moire2.c | 6 + hacks/munch.c | 6 + hacks/nerverot.c | 4 + hacks/noseguy.c | 39 +- hacks/pacman.c | 5 + hacks/pedal.c | 3 + hacks/penetrate.c | 5 + hacks/petri.c | 12 +- hacks/phosphor.c | 26 +- hacks/piecewise.c | 39 +- hacks/pong.c | 2 + hacks/popsquares.c | 3 + hacks/pyro.c | 4 + hacks/qix.c | 37 +- hacks/rd-bomb.c | 11 + hacks/recanim.c | 64 +- hacks/ripples.c | 13 + hacks/rocks.c | 11 + hacks/rorschach.c | 1 + hacks/rotzoomer.c | 18 + hacks/screenhack.c | 34 +- hacks/screenhack.h | 5 +- hacks/screenhackI.h | 1 + hacks/shadebobs.c | 4 +- hacks/slidescreen.c | 2 + hacks/speedmine.c | 11 + hacks/squiral.c | 6 + hacks/starfish.c | 4 + hacks/strange.c | 2 +- hacks/substrate.c | 6 + hacks/t3d.c | 10 + hacks/tessellimage.c | 2 + hacks/truchet.c | 4 + hacks/twang.c | 8 + hacks/vermiculate.c | 28 +- hacks/vfeedback.c | 1 + hacks/wander.c | 1 + hacks/whirlwindwarp.c | 2 + hacks/whirlygig.c | 7 + hacks/wormhole.c | 29 +- hacks/xanalogtv.c | 50 +- hacks/xflame.c | 15 +- hacks/ximage-loader.c | 11 +- hacks/xjack.c | 3 + hacks/xlockmore.c | 3 + hacks/xlockmore.h | 6 +- hacks/xlockmoreI.h | 1 + hacks/xlyap.c | 9 + hacks/xmatrix.c | 19 +- hacks/xrayswarm.c | 5 + hacks/xspirograph.c | 1 + jwxyz/jwxyz.h | 1 + po/POTFILES.in | 3 +- utils/Makefile.in | 2 +- utils/colors.c | 15 +- utils/erase.c | 2 +- utils/font-retry.c | 43 +- utils/textclient-mobile.c | 14 +- utils/version.h | 2 +- utils/yarandom.h | 34 +- xscreensaver.spec | 2 +- 511 files changed, 83882 insertions(+), 1761 deletions(-) create mode 120000 OSX/Sparkle.framework/Modules create mode 120000 OSX/Sparkle.framework/PrivateHeaders create mode 100644 OSX/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h create mode 100644 OSX/Sparkle.framework/Versions/A/Headers/SPUDownloader.h create mode 100644 OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h create mode 100644 OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h create mode 100644 OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h create mode 100644 OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h create mode 100644 OSX/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h mode change 100755 => 100644 OSX/Sparkle.framework/Versions/A/Headers/SUAppcast.h mode change 100755 => 100644 OSX/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h create mode 100644 OSX/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h create mode 100644 OSX/Sparkle.framework/Versions/A/Headers/SUErrors.h create mode 100644 OSX/Sparkle.framework/Versions/A/Headers/SUExport.h create mode 100644 OSX/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h mode change 100755 => 100644 OSX/Sparkle.framework/Versions/A/Headers/SUUpdater.h create mode 100644 OSX/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h mode change 100755 => 100644 OSX/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h mode change 100755 => 100644 OSX/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h mode change 100755 => 100644 OSX/Sparkle.framework/Versions/A/Headers/Sparkle.h create mode 100644 OSX/Sparkle.framework/Versions/A/Modules/module.modulemap create mode 100644 OSX/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist create mode 100755 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate create mode 100755 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/DarkAqua.css mode change 100755 => 100644 OSX/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings create mode 100644 OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings create mode 100755 OSX/sparkle-bin/BinaryDelta create mode 100644 OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Info.plist create mode 100644 OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Resources/DWARF/BinaryDelta create mode 100755 OSX/sparkle-bin/generate_appcast create mode 100644 OSX/sparkle-bin/generate_appcast.dSYM/Contents/Info.plist create mode 100644 OSX/sparkle-bin/generate_appcast.dSYM/Contents/Resources/DWARF/generate_appcast create mode 100755 OSX/sparkle-bin/generate_keys create mode 100644 OSX/sparkle-bin/generate_keys.dSYM/Contents/Info.plist create mode 100644 OSX/sparkle-bin/generate_keys.dSYM/Contents/Resources/DWARF/generate_keys create mode 100755 OSX/sparkle-bin/old_dsa_scripts/generate_dsa_keys_macos_10.12_only create mode 100755 OSX/sparkle-bin/old_dsa_scripts/sign_update create mode 100755 OSX/sparkle-bin/sign_update create mode 100644 OSX/sparkle-bin/sign_update.dSYM/Contents/Info.plist create mode 100644 OSX/sparkle-bin/sign_update.dSYM/Contents/Resources/DWARF/sign_update create mode 100644 driver/test-yarandom.c create mode 100644 hacks/analogtv-cli.c create mode 100644 hacks/config/handsy.xml create mode 100644 hacks/glx/handsy.c create mode 100644 hacks/glx/handsy.dxf create mode 100644 hacks/glx/handsy.man create mode 100644 hacks/glx/handsy_anim.h create mode 100644 hacks/glx/handsy_model.c mode change 100755 => 100644 hacks/glx/maze3d.man create mode 100644 hacks/images/dvd.png create mode 100644 hacks/images/sun.png diff --git a/OSX/LaunchScreen.xib b/OSX/LaunchScreen.xib index 731d86e..15cdbc5 100644 --- a/OSX/LaunchScreen.xib +++ b/OSX/LaunchScreen.xib @@ -1,8 +1,12 @@ - - + + + + + - + + @@ -10,7 +14,7 @@ - + diff --git a/OSX/Makefile b/OSX/Makefile index 373df6b..456c1bd 100644 --- a/OSX/Makefile +++ b/OSX/Makefile @@ -43,7 +43,14 @@ release:: distdepend release:: check_versions Sparkle.framework: - unzip ../archive/Sparkle.framework-2013-12-04.zip + rm -rf bin sparkle-bin + tar -vxjf ../archive/Sparkle-1.21.2.tar.bz2 \ + --exclude CHANGELOG \ + --exclude LICENSE \ + --exclude SampleAppcast.xml \ + --exclude Sparkle.framework.dSYM \ + --exclude Sparkle\ Test\ App\* + mv bin sparkle-bin # Download and resize images from jwz.org. # This saves us having to include 4MB of images in the tar file @@ -54,7 +61,7 @@ Sparkle.framework: BASE = xscreensaver/screenshots/ URL = https://www.jwz.org/$(BASE) -WGET = wget -q -U xscreensaver-build-osx +WGET = wget -q -U xscreensaver-build-osx --content-on-error=0 CVT = -thumbnail '200x150^' -gravity center -extent 200x150 \ \( +clone -alpha extract \ -draw 'fill black polygon 0,0 0,6 6,0 fill white circle 6,6 6,0' \ @@ -280,11 +287,12 @@ build/Release/installer.pkg: installer.rtf installer.xml installer.sh installer. # -format UDBZ saves 4% (~1.2 MB) over UDZO. -dmg:: distdepend -dmg:: check_versions check_coretext +dmg:: distdepend check_versions check_coretext #dmg:: check_gc dmg:: build/Release/installer.pkg -dmg:: +dmg:: _dmg notarize + +_dmg:: @ \ set -e ; \ SRC=../utils/version.h ; \ @@ -369,7 +377,68 @@ dmg:: "$$TMPDMG" -o "$$DMG" ; \ xattr -w com.apple.quarantine "0000;00000000;;" "$$DMG" ; \ rm -f "$$TMPDMG" ; \ - ls -ldhgF "$$DMG" + ls -ldhgF "$$DMG" ; \ + $(MAKE) notarize ; \ + + +# To set up notarization: +# - Log in on https://appleid.apple.com/ +# - Generate App-Specific Password, "altool-notarizer" +# - Keychain Access / New +# - Name: "altool-notarizer", Account: "jwz@jwz.org", +# Pass: the one you just generated. +# +# "make notarize", which will upload the DMG (slow). +# A response will be emailed back in about an hour. +# When that arrives, "make staple". +# +# https://developer.apple.com/documentation/security/notarizing_your_app_before_distribution/customizing_the_notarization_workflow?language=objc +# +# 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 ; \ + SRC=../utils/version.h ; \ + V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ; \ + BASE="xscreensaver-$$V" ; \ + OUTDIR="../archive" ; \ + DMG="$$OUTDIR/$$BASE.dmg" ; \ + set -x ; \ + xcrun altool --notarize-app --primary-bundle-id "org.jwz.xscreensaver" \ + --file "$$DMG" $(NOTARGS) ; \ + echo "" ; \ + 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:: + @ \ + set -e ; \ + SRC=../utils/version.h ; \ + V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ; \ + BASE="xscreensaver-$$V" ; \ + OUTDIR="../archive" ; \ + DMG="$$OUTDIR/$$BASE.dmg" ; \ + set -x ; \ + xcrun stapler staple "$$DMG" ; \ + xcrun stapler validate "$$DMG" + +notarization_history:: + xcrun altool --notarization-history 0 $(NOTARGS) + @echo 'now do: xcrun altool $(NOTARGS) --notarization-info ' ; \ + echo 'and wget the LogFileURL' # When debugging, sometimes I have to reset the preferences for all diff --git a/OSX/Media-iOS.xcassets/LaunchImage.launchimage/Contents.json b/OSX/Media-iOS.xcassets/LaunchImage.launchimage/Contents.json index 5dd89e0..bc0812f 100644 --- a/OSX/Media-iOS.xcassets/LaunchImage.launchimage/Contents.json +++ b/OSX/Media-iOS.xcassets/LaunchImage.launchimage/Contents.json @@ -1,5 +1,23 @@ { "images" : [ + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "736h", + "filename" : "1242x2208.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "667h", + "filename" : "750x1334.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "2x" + }, { "orientation" : "portrait", "idiom" : "iphone", @@ -24,25 +42,7 @@ "extent" : "full-screen", "subtype" : "retina4", "scale" : "2x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "667h", - "filename" : "750x1334.png", - "minimum-system-version" : "8.0", - "orientation" : "portrait", - "scale" : "2x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "736h", - "filename" : "1242x2208.png", - "minimum-system-version" : "8.0", - "orientation" : "portrait", - "scale" : "3x" - }, + } ], "info" : { "version" : 1, diff --git a/OSX/README b/OSX/README index 0799995..e57d5a7 100644 --- a/OSX/README +++ b/OSX/README @@ -20,7 +20,8 @@ ridiculously long list of steps! 5: Delete the "DangerBall copy-Info.plist" from the Build Settings too. 6: Manage Schemes, rename "DangerBall Copy". 7: Move to the right place in the list. - 8: Scheme / Run / Info: Executable: SaverTester.app. + 8. Scheme / Profile / Info: Executable: SaverTester.app. + Scheme / Run / Info: Executable: SaverTester.app. 9: Scheme / Run / Arguments: set SELECTED_SAVER environment variable. 10: File / Add Files / the new .c and .xml. 11: Re-order them in the file list. This will bring up an Options dialog. @@ -38,5 +39,5 @@ ridiculously long list of steps! 18: git add xscreensaver.xcodeproj/xcuserdata/*/xcschemes/*.xcscheme 19: Don't forget to create a man page from the XML with xml2man.pl, and update Makefile.in. - 20: Make a video: -record-animation 3600 -delay 1 -geom 1920x1080+128+64 + 20: Make a video: -record-animation 3600 -geom 1920x1080+128+64 ./upload-video.pl NAME diff --git a/OSX/SaverListController.m b/OSX/SaverListController.m index 9377275..e68387c 100644 --- a/OSX/SaverListController.m +++ b/OSX/SaverListController.m @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2012-2014 Jamie Zawinski +/* xscreensaver, Copyright (c) 2012-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 @@ -225,6 +225,8 @@ for (int i = 0; i < n; i++) { if ([list_by_letter[i] count] > 0) { active_section_count++; + [list_by_letter[i] sortUsingSelector: + @selector(localizedCaseInsensitiveCompare:)]; [letter_sections addObject: list_by_letter[i]]; if (i <= 'Z'-'A') [section_titles addObject: [NSString stringWithFormat: @"%c", i+'A']]; diff --git a/OSX/SaverRunner.h b/OSX/SaverRunner.h index 073a87e..399eec0 100644 --- a/OSX/SaverRunner.h +++ b/OSX/SaverRunner.h @@ -31,7 +31,7 @@ # import #endif -#import +#import "XScreenSaverView.h" #ifdef USE_IPHONE diff --git a/OSX/SaverRunner.m b/OSX/SaverRunner.m index f358fb7..8ab45c1 100644 --- a/OSX/SaverRunner.m +++ b/OSX/SaverRunner.m @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2006-2017 Jamie Zawinski +/* xscreensaver, Copyright (c) 2006-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 @@ -1035,10 +1035,11 @@ relabel_menus (NSObject *v, NSString *old_str, NSString *new_str) if (name) [result addObject: name]; } - if (! [result count]) - result = 0; - - return result; + if (result && [result count]) + return [result sortedArrayUsingSelector: + @selector(localizedCaseInsensitiveCompare:)]; + else + return 0; } diff --git a/OSX/SaverRunner.plist b/OSX/SaverRunner.plist index 3ad0ce7..1a5f022 100644 --- a/OSX/SaverRunner.plist +++ b/OSX/SaverRunner.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleGetInfoString - 5.40 + 5.42 CFBundleIconFile SaverRunner CFBundleIdentifier @@ -15,21 +15,21 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 5.40 + 5.42 CFBundleName ${PRODUCT_NAME} CFBundlePackageType APPL CFBundleShortVersionString - 5.40 + 5.42 CFBundleSignature ???? CFBundleVersion - 5.40 + 5.42 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - 5.40 + 5.42 NSMainNibFile SaverRunner NSPrincipalClass diff --git a/OSX/Sparkle.framework/Modules b/OSX/Sparkle.framework/Modules new file mode 120000 index 0000000..5736f31 --- /dev/null +++ b/OSX/Sparkle.framework/Modules @@ -0,0 +1 @@ +Versions/Current/Modules \ No newline at end of file diff --git a/OSX/Sparkle.framework/PrivateHeaders b/OSX/Sparkle.framework/PrivateHeaders new file mode 120000 index 0000000..d8e5645 --- /dev/null +++ b/OSX/Sparkle.framework/PrivateHeaders @@ -0,0 +1 @@ +Versions/Current/PrivateHeaders \ No newline at end of file diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h new file mode 100644 index 0000000..41cd574 --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h @@ -0,0 +1,43 @@ +// +// SPUDownloadData.h +// Sparkle +// +// Created by Mayur Pawashe on 8/10/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif + +#import "SUExport.h" + +NS_ASSUME_NONNULL_BEGIN + +/*! + * A class for containing downloaded data along with some information about it. + */ +SU_EXPORT @interface SPUDownloadData : NSObject + +- (instancetype)initWithData:(NSData *)data textEncodingName:(NSString * _Nullable)textEncodingName MIMEType:(NSString * _Nullable)MIMEType; + +/*! + * The raw data that was downloaded. + */ +@property (nonatomic, readonly) NSData *data; + +/*! + * The IANA charset encoding name if available. Eg: "utf-8" + */ +@property (nonatomic, readonly, nullable, copy) NSString *textEncodingName; + +/*! + * The MIME type if available. Eg: "text/plain" + */ +@property (nonatomic, readonly, nullable, copy) NSString *MIMEType; + +@end + +NS_ASSUME_NONNULL_END diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloader.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloader.h new file mode 100644 index 0000000..5eee9bd --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloader.h @@ -0,0 +1,25 @@ +// +// SPUDownloader.h +// Downloader +// +// Created by Mayur Pawashe on 4/1/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif +#import "SPUDownloaderProtocol.h" + +@protocol SPUDownloaderDelegate; + +// This object implements the protocol which we have defined. It provides the actual behavior for the service. It is 'exported' by the service to make it available to the process hosting the service over an NSXPCConnection. +@interface SPUDownloader : NSObject + +// Due to XPC remote object reasons, this delegate is strongly referenced +// Invoke cleanup when done with this instance +- (instancetype)initWithDelegate:(id )delegate; + +@end diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h new file mode 100644 index 0000000..76e7e75 --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h @@ -0,0 +1,38 @@ +// +// SPUDownloaderDelegate.h +// Sparkle +// +// Created by Mayur Pawashe on 4/1/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif + +NS_ASSUME_NONNULL_BEGIN + +@class SPUDownloadData; + +@protocol SPUDownloaderDelegate + +// This is only invoked for persistent downloads +- (void)downloaderDidSetDestinationName:(NSString *)destinationName temporaryDirectory:(NSString *)temporaryDirectory; + +// Under rare cases, this may be called more than once, in which case the current progress should be reset back to 0 +// This is only invoked for persistent downloads +- (void)downloaderDidReceiveExpectedContentLength:(int64_t)expectedContentLength; + +// This is only invoked for persistent downloads +- (void)downloaderDidReceiveDataOfLength:(uint64_t)length; + +// downloadData is nil if this is a persisent download, otherwise it's non-nil if it's a temporary download +- (void)downloaderDidFinishWithTemporaryDownloadData:(SPUDownloadData * _Nullable)downloadData; + +- (void)downloaderDidFailWithError:(NSError *)error; + +@end + +NS_ASSUME_NONNULL_END diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h new file mode 100644 index 0000000..36302df --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h @@ -0,0 +1,13 @@ +// +// SPUDownloaderDeprecated.h +// Sparkle +// +// Created by Deadpikle on 12/20/17. +// Copyright © 2017 Sparkle Project. All rights reserved. +// + +#import "SPUDownloader.h" + +@interface SPUDownloaderDeprecated : SPUDownloader + +@end diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h new file mode 100644 index 0000000..ebe477f --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h @@ -0,0 +1,34 @@ +// +// SPUDownloaderProtocol.h +// PersistentDownloader +// +// Created by Mayur Pawashe on 4/1/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif + +NS_ASSUME_NONNULL_BEGIN + +@class SPUURLRequest; + +// The protocol that this service will vend as its API. This header file will also need to be visible to the process hosting the service. +@protocol SPUDownloaderProtocol + +- (void)startPersistentDownloadWithRequest:(SPUURLRequest *)request bundleIdentifier:(NSString *)bundleIdentifier desiredFilename:(NSString *)desiredFilename; + +- (void)startTemporaryDownloadWithRequest:(SPUURLRequest *)request; + +- (void)downloadDidFinish; + +- (void)cleanup; + +- (void)cancel; + +@end + +NS_ASSUME_NONNULL_END diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h new file mode 100644 index 0000000..4bde75a --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h @@ -0,0 +1,20 @@ +// +// SPUDownloaderSession.h +// Sparkle +// +// Created by Deadpikle on 12/20/17. +// Copyright © 2017 Sparkle Project. All rights reserved. +// + +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif +#import "SPUDownloader.h" +#import "SPUDownloaderProtocol.h" + +NS_CLASS_AVAILABLE(NSURLSESSION_AVAILABLE, 7_0) +@interface SPUDownloaderSession : SPUDownloader + +@end diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h new file mode 100644 index 0000000..6949614 --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h @@ -0,0 +1,35 @@ +// +// SPUURLRequest.h +// Sparkle +// +// Created by Mayur Pawashe on 5/19/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif + +NS_ASSUME_NONNULL_BEGIN + +// A class that wraps NSURLRequest and implements NSSecureCoding +// This class exists because NSURLRequest did not support NSSecureCoding in macOS 10.8 +// I have not verified if NSURLRequest in 10.9 implements NSSecureCoding or not +@interface SPUURLRequest : NSObject + +// Creates a new URL request +// Only these properties are currently tracked: +// * URL +// * Cache policy +// * Timeout interval +// * HTTP header fields +// * networkServiceType ++ (instancetype)URLRequestWithRequest:(NSURLRequest *)request; + +@property (nonatomic, readonly) NSURLRequest *request; + +@end + +NS_ASSUME_NONNULL_END diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/OSX/Sparkle.framework/Versions/A/Headers/SUAppcast.h old mode 100755 new mode 100644 index 5a60d2f..34276b7 --- a/OSX/Sparkle.framework/Versions/A/Headers/SUAppcast.h +++ b/OSX/Sparkle.framework/Versions/A/Headers/SUAppcast.h @@ -9,28 +9,27 @@ #ifndef SUAPPCAST_H #define SUAPPCAST_H +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif +#import "SUExport.h" + +NS_ASSUME_NONNULL_BEGIN + @class SUAppcastItem; -@interface SUAppcast : NSObject -{ -@private - NSArray *items; - NSString *userAgentString; - id delegate; - NSString *downloadFilename; - NSURLDownload *download; -} - -- (void)fetchAppcastFromURL:(NSURL *)url; -- (void)setDelegate:delegate; -- (void)setUserAgentString:(NSString *)userAgentString; - -- (NSArray *)items; +SU_EXPORT @interface SUAppcast : NSObject -@end +@property (copy, nullable) NSString *userAgentString; +@property (copy, nullable) NSDictionary *httpHeaders; + +- (void)fetchAppcastFromURL:(NSURL *)url inBackground:(BOOL)bg completionBlock:(void (^)(NSError *_Nullable))err; +- (SUAppcast *)copyWithoutDeltaUpdates; -@interface NSObject (SUAppcastDelegate) -- (void)appcastDidFinishLoading:(SUAppcast *)appcast; -- (void)appcast:(SUAppcast *)appcast failedToLoadWithError:(NSError *)error; +@property (readonly, copy, nullable) NSArray *items; @end +NS_ASSUME_NONNULL_END + #endif diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/OSX/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h old mode 100755 new mode 100644 index d6f9c64..c0380dd --- a/OSX/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h +++ b/OSX/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h @@ -9,51 +9,43 @@ #ifndef SUAPPCASTITEM_H #define SUAPPCASTITEM_H -@interface SUAppcastItem : NSObject -{ -@private - NSString *title; - NSDate *date; - NSString *itemDescription; - - NSURL *releaseNotesURL; - - NSString *DSASignature; - NSString *minimumSystemVersion; - NSString *maximumSystemVersion; - - NSURL *fileURL; - NSString *versionString; - NSString *displayVersionString; - - NSDictionary *deltaUpdates; - - NSDictionary *propertiesDictionary; - - NSURL *infoURL; // UK 2007-08-31 -} +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif +#import "SUExport.h" +@class SUSignatures; + +SU_EXPORT @interface SUAppcastItem : NSObject +@property (copy, readonly) NSString *title; +@property (copy, readonly) NSString *dateString; +@property (copy, readonly) NSString *itemDescription; +@property (strong, readonly) NSURL *releaseNotesURL; +@property (strong, readonly) SUSignatures *signatures; +@property (copy, readonly) NSString *minimumSystemVersion; +@property (copy, readonly) NSString *maximumSystemVersion; +@property (strong, readonly) NSURL *fileURL; +@property (nonatomic, readonly) uint64_t contentLength; +@property (copy, readonly) NSString *versionString; +@property (copy, readonly) NSString *osString; +@property (copy, readonly) NSString *displayVersionString; +@property (copy, readonly) NSDictionary *deltaUpdates; +@property (strong, readonly) NSURL *infoURL; // Initializes with data from a dictionary provided by the RSS class. -- initWithDictionary:(NSDictionary *)dict; -- initWithDictionary:(NSDictionary *)dict failureReason:(NSString**)error; - -- (NSString *)title; -- (NSString *)versionString; -- (NSString *)displayVersionString; -- (NSDate *)date; -- (NSString *)itemDescription; -- (NSURL *)releaseNotesURL; -- (NSURL *)fileURL; -- (NSString *)DSASignature; -- (NSString *)minimumSystemVersion; -- (NSString *)maximumSystemVersion; -- (NSDictionary *)deltaUpdates; -- (BOOL)isDeltaUpdate; +- (instancetype)initWithDictionary:(NSDictionary *)dict; +- (instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString **)error; + +@property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate; +@property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate; +@property (getter=isMacOsUpdate, readonly) BOOL macOsUpdate; +@property (getter=isInformationOnlyUpdate, readonly) BOOL informationOnlyUpdate; // Returns the dictionary provided in initWithDictionary; this might be useful later for extensions. -- (NSDictionary *)propertiesDictionary; +@property (readonly, copy) NSDictionary *propertiesDictionary; -- (NSURL *)infoURL; // UK 2007-08-31 +- (NSURL *)infoURL; @end diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h b/OSX/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h new file mode 100644 index 0000000..f034cd2 --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h @@ -0,0 +1,22 @@ +// +// SUCodeSigningVerifier.h +// Sparkle +// +// Created by Andy Matuschak on 7/5/12. +// +// + +#ifndef SUCODESIGNINGVERIFIER_H +#define SUCODESIGNINGVERIFIER_H + +#import +#import "SUExport.h" + +SU_EXPORT @interface SUCodeSigningVerifier : NSObject ++ (BOOL)codeSignatureAtBundleURL:(NSURL *)oldBundlePath matchesSignatureAtBundleURL:(NSURL *)newBundlePath error:(NSError **)error; ++ (BOOL)codeSignatureIsValidAtBundleURL:(NSURL *)bundlePath error:(NSError **)error; ++ (BOOL)bundleAtURLIsCodeSigned:(NSURL *)bundlePath; ++ (NSDictionary *)codeSignatureInfoAtBundleURL:(NSURL *)bundlePath; +@end + +#endif diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUErrors.h b/OSX/Sparkle.framework/Versions/A/Headers/SUErrors.h new file mode 100644 index 0000000..7d2e73a --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Headers/SUErrors.h @@ -0,0 +1,56 @@ +// +// SUErrors.h +// Sparkle +// +// Created by C.W. Betts on 10/13/14. +// Copyright (c) 2014 Sparkle Project. All rights reserved. +// + +#ifndef SUERRORS_H +#define SUERRORS_H + +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif +#import "SUExport.h" + +/** + * Error domain used by Sparkle + */ +SU_EXPORT extern NSString *const SUSparkleErrorDomain; + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wc++98-compat" +typedef NS_ENUM(OSStatus, SUError) { + // Appcast phase errors. + SUAppcastParseError = 1000, + SUNoUpdateError = 1001, + SUAppcastError = 1002, + SURunningFromDiskImageError = 1003, + + // Download phase errors. + SUTemporaryDirectoryError = 2000, + SUDownloadError = 2001, + + // Extraction phase errors. + SUUnarchivingError = 3000, + SUSignatureError = 3001, + + // Installation phase errors. + SUFileCopyFailure = 4000, + SUAuthenticationFailure = 4001, + SUMissingUpdateError = 4002, + SUMissingInstallerToolError = 4003, + SURelaunchError = 4004, + SUInstallationError = 4005, + SUDowngradeError = 4006, + SUInstallationCancelledError = 4007, + + // System phase errors + SUSystemPowerOffError = 5000 +}; +#pragma clang diagnostic pop + +#endif diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUExport.h b/OSX/Sparkle.framework/Versions/A/Headers/SUExport.h new file mode 100644 index 0000000..3e3f8a1 --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Headers/SUExport.h @@ -0,0 +1,18 @@ +// +// SUExport.h +// Sparkle +// +// Created by Jake Petroules on 2014-08-23. +// Copyright (c) 2014 Sparkle Project. All rights reserved. +// + +#ifndef SUEXPORT_H +#define SUEXPORT_H + +#ifdef BUILDING_SPARKLE +#define SU_EXPORT __attribute__((visibility("default"))) +#else +#define SU_EXPORT +#endif + +#endif diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h b/OSX/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h new file mode 100644 index 0000000..ed11921 --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h @@ -0,0 +1,52 @@ +// +// SUStandardVersionComparator.h +// Sparkle +// +// Created by Andy Matuschak on 12/21/07. +// Copyright 2007 Andy Matuschak. All rights reserved. +// + +#ifndef SUSTANDARDVERSIONCOMPARATOR_H +#define SUSTANDARDVERSIONCOMPARATOR_H + +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif +#import "SUExport.h" +#import "SUVersionComparisonProtocol.h" + +NS_ASSUME_NONNULL_BEGIN + +/*! + Sparkle's default version comparator. + + This comparator is adapted from MacPAD, by Kevin Ballard. + It's "dumb" in that it does essentially string comparison, + in components split by character type. +*/ +SU_EXPORT @interface SUStandardVersionComparator : NSObject + +/*! + Initializes a new instance of the standard version comparator. + */ +- (instancetype)init; + +/*! + Returns a singleton instance of the comparator. + + It is usually preferred to alloc/init new a comparator instead. +*/ ++ (SUStandardVersionComparator *)defaultComparator; + +/*! + Compares version strings through textual analysis. + + See the implementation for more details. +*/ +- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; +@end + +NS_ASSUME_NONNULL_END +#endif diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/OSX/Sparkle.framework/Versions/A/Headers/SUUpdater.h old mode 100755 new mode 100644 index cd79566..bc1d491 --- a/OSX/Sparkle.framework/Versions/A/Headers/SUUpdater.h +++ b/OSX/Sparkle.framework/Versions/A/Headers/SUUpdater.h @@ -9,153 +9,223 @@ #ifndef SUUPDATER_H #define SUUPDATER_H +#if __has_feature(modules) +@import Cocoa; +#else +#import +#endif +#import "SUExport.h" #import "SUVersionComparisonProtocol.h" #import "SUVersionDisplayProtocol.h" -@class SUUpdateDriver, SUAppcastItem, SUHost, SUAppcast; +@class SUAppcastItem, SUAppcast; + +@protocol SUUpdaterDelegate; + +/*! + The main API in Sparkle for controlling the update mechanism. -@interface SUUpdater : NSObject -{ -@private - NSTimer *checkTimer; - SUUpdateDriver *driver; + This class is used to configure the update paramters as well as manually + and automatically schedule and control checks for updates. + */ +SU_EXPORT @interface SUUpdater : NSObject - NSString *customUserAgentString; - SUHost *host; - IBOutlet id delegate; -} +@property (unsafe_unretained) IBOutlet id delegate; +/*! + The shared updater for the main bundle. + + This is equivalent to passing [NSBundle mainBundle] to SUUpdater::updaterForBundle: + */ + (SUUpdater *)sharedUpdater; -+ (SUUpdater *)updaterForBundle:(NSBundle *)bundle; -- (id)initForBundle:(NSBundle *)bundle; -- (NSBundle *)hostBundle; +/*! + The shared updater for a specified bundle. + + If an updater has already been initialized for the provided bundle, that shared instance will be returned. + */ ++ (SUUpdater *)updaterForBundle:(NSBundle *)bundle; -- (void)setDelegate:(id)delegate; -- (id)delegate; +/*! + Designated initializer for SUUpdater. + + If an updater has already been initialized for the provided bundle, that shared instance will be returned. + */ +- (instancetype)initForBundle:(NSBundle *)bundle; -- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks; -- (BOOL)automaticallyChecksForUpdates; +/*! + Explicitly checks for updates and displays a progress dialog while doing so. -- (void)setUpdateCheckInterval:(NSTimeInterval)interval; -- (NSTimeInterval)updateCheckInterval; + This method is meant for a main menu item. + Connect any menu item to this action in Interface Builder, + and Sparkle will check for updates and report back its findings verbosely + when it is invoked. -- (void)setFeedURL:(NSURL *)feedURL; -- (NSURL *)feedURL; // *** MUST BE CALLED ON MAIN THREAD *** + This will find updates that the user has opted into skipping. + */ +- (IBAction)checkForUpdates:(id)sender; -- (void)setUserAgentString:(NSString *)userAgent; -- (NSString *)userAgentString; +/*! + The menu item validation used for the -checkForUpdates: action + */ +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem; -- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile; -- (BOOL)sendsSystemProfile; +/*! + Checks for updates, but does not display any UI unless an update is found. -- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates; -- (BOOL)automaticallyDownloadsUpdates; + This is meant for programmatically initating a check for updates. That is, + it will display no UI unless it actually finds an update, in which case it + proceeds as usual. -// This IBAction is meant for a main menu item. Hook up any menu item to this action, -// and Sparkle will check for updates and report back its findings verbosely. -- (IBAction)checkForUpdates:(id)sender; + If automatic downloading of updates it turned on and allowed, however, + this will invoke that behavior, and if an update is found, it will be downloaded + in the background silently and will be prepped for installation. -// This kicks off an update meant to be programmatically initiated. That is, it will display no UI unless it actually finds an update, -// in which case it proceeds as usual. If the fully automated updating is turned on, however, this will invoke that behavior, and if an -// update is found, it will be downloaded and prepped for installation. + This will not find updates that the user has opted into skipping. + */ - (void)checkForUpdatesInBackground; -// Date of last update check. Returns nil if no check has been performed. -- (NSDate*)lastUpdateCheckDate; +/*! + A property indicating whether or not to check for updates automatically. -// This begins a "probing" check for updates which will not actually offer to update to that version. The delegate methods, though, -// (up to updater:didFindValidUpdate: and updaterDidNotFindUpdate:), are called, so you can use that information in your UI. -- (void)checkForUpdateInformation; + Setting this property will persist in the host bundle's user defaults. + The update schedule cycle will be reset in a short delay after the property's new value is set. + This is to allow reverting this property without kicking off a schedule change immediately + */ +@property BOOL automaticallyChecksForUpdates; -// Call this to appropriately schedule or cancel the update checking timer according to the preferences for time interval and automatic checks. This call does not change the date of the next check, but only the internal NSTimer. -- (void)resetUpdateCycle; +/*! + A property indicating whether or not updates can be automatically downloaded in the background. -- (BOOL)updateInProgress; + Note that automatic downloading of updates can be disallowed by the developer + or by the user's system if silent updates cannot be done (eg: if they require authentication). + In this case, -automaticallyDownloadsUpdates will return NO regardless of how this property is set. -@end + Setting this property will persist in the host bundle's user defaults. + */ +@property BOOL automaticallyDownloadsUpdates; +/*! + A property indicating the current automatic update check interval. -// ----------------------------------------------------------------------------- -// SUUpdater Delegate: -// ----------------------------------------------------------------------------- + Setting this property will persist in the host bundle's user defaults. + The update schedule cycle will be reset in a short delay after the property's new value is set. + This is to allow reverting this property without kicking off a schedule change immediately + */ +@property NSTimeInterval updateCheckInterval; -@interface NSObject (SUUpdaterDelegateInformalProtocol) +/*! + Begins a "probing" check for updates which will not actually offer to + update to that version. -// Use this to keep Sparkle from popping up e.g. while your setup assistant is showing: -- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle; + However, the delegate methods + SUUpdaterDelegate::updater:didFindValidUpdate: and + SUUpdaterDelegate::updaterDidNotFindUpdate: will be called, + so you can use that information in your UI. -// This method allows you to add extra parameters to the appcast URL, potentially based on whether or not Sparkle will also be sending along the system profile. This method should return an array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user. -- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; + Updates that have been skipped by the user will not be found. + */ +- (void)checkForUpdateInformation; -// Override this to dynamically specify the entire URL. -- (NSString*)feedURLStringForUpdater:(SUUpdater*)updater; +/*! + The URL of the appcast used to download update information. -// Use this to override the default behavior for Sparkle prompting the user about automatic update checks. -- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)bundle; + Setting this property will persist in the host bundle's user defaults. + If you don't want persistence, you may want to consider instead implementing + SUUpdaterDelegate::feedURLStringForUpdater: or SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile: -// Implement this if you want to do some special handling with the appcast once it finishes loading. -- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast; + This property must be called on the main thread. + */ +@property (copy) NSURL *feedURL; -// If you're using special logic or extensions in your appcast, implement this to use your own logic for finding -// a valid update, if any, in the given appcast. -- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)bundle; +/*! + The host bundle that is being updated. + */ +@property (readonly, strong) NSBundle *hostBundle; -// Sent when a valid update is found by the update driver. -- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update; +/*! + The bundle this class (SUUpdater) is loaded into. + */ +@property (strong, readonly) NSBundle *sparkleBundle; -// Sent when a valid update is not found. -- (void)updaterDidNotFindUpdate:(SUUpdater *)update; +/*! + The user agent used when checking for updates. -// Sent immediately before installing the specified update. -- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update; + The default implementation can be overrided. + */ +@property (nonatomic, copy) NSString *userAgentString; -// Return YES to delay the relaunch until you do some processing; invoke the given NSInvocation to continue. -// This is not called if the user didn't relaunch on the previous update, in that case it will immediately -// restart. -- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation; +/*! + The HTTP headers used when checking for updates. -// Some apps *can not* be relaunched in certain circumstances. They can use this method -// to prevent a relaunch "hard": -- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater; + The keys of this dictionary are HTTP header fields (NSString) and values are corresponding values (NSString) + */ +@property (copy) NSDictionary *httpHeaders; -// Called immediately before relaunching. -- (void)updaterWillRelaunchApplication:(SUUpdater *)updater; +/*! + A property indicating whether or not the user's system profile information is sent when checking for updates. -// This method allows you to provide a custom version comparator. -// If you don't implement this method or return nil, the standard version comparator will be used. -- (id )versionComparatorForUpdater:(SUUpdater *)updater; + Setting this property will persist in the host bundle's user defaults. + */ +@property BOOL sendsSystemProfile; -// This method allows you to provide a custom version comparator. -// If you don't implement this method or return nil, the standard version displayer will be used. -- (id )versionDisplayerForUpdater:(SUUpdater *)updater; +/*! + A property indicating the decryption password used for extracting updates shipped as Apple Disk Images (dmg) + */ +@property (nonatomic, copy) NSString *decryptionPassword; -// Returns the path which is used to relaunch the client after the update is installed. By default, the path of the host bundle. -- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater; +/*! + This function ignores normal update schedule, ignores user preferences, + and interrupts users with an unwanted immediate app update. -// Called before and after, respectively, an updater shows a modal alert window, to give the host -// the opportunity to hide attached windows etc. that may get in the way: --(void) updaterWillShowModalAlert:(SUUpdater *)updater; --(void) updaterDidShowModalAlert:(SUUpdater *)updater; + WARNING: this function should not be used in regular apps. This function + is a user-unfriendly hack only for very special cases, like unstable + rapidly-changing beta builds that would not run correctly if they were + even one day out of date. -@end + Instead of this function you should set `SUAutomaticallyUpdate` to `YES`, + which will gracefully install updates when the app quits. + For UI-less/daemon apps that aren't usually quit, instead of this function, + you can use the delegate method + SUUpdaterDelegate::updater:willInstallUpdateOnQuit:immediateInstallationInvocation: + to immediately start installation when an update was found. -// ----------------------------------------------------------------------------- -// Constants: -// ----------------------------------------------------------------------------- + A progress dialog is shown but the user will never be prompted to read the + release notes. -// Define some minimum intervals to avoid DOS-like checking attacks. These are in seconds. -#if defined(DEBUG) && DEBUG && 0 -#define SU_MIN_CHECK_INTERVAL 60 -#else -#define SU_MIN_CHECK_INTERVAL 60*60 -#endif + This function will cause update to be downloaded twice if automatic updates are + enabled. -#if defined(DEBUG) && DEBUG && 0 -#define SU_DEFAULT_CHECK_INTERVAL 60 -#else -#define SU_DEFAULT_CHECK_INTERVAL 60*60*24 -#endif + You may want to respond to the userDidCancelDownload delegate method in case + the user clicks the "Cancel" button while the update is downloading. + */ +- (void)installUpdatesIfAvailable; + +/*! + Returns the date of last update check. + + \returns \c nil if no check has been performed. + */ +@property (readonly, copy) NSDate *lastUpdateCheckDate; + +/*! + Appropriately schedules or cancels the update checking timer according to + the preferences for time interval and automatic checks. + + This call does not change the date of the next check, + but only the internal NSTimer. + */ +- (void)resetUpdateCycle; + +/*! + A property indicating whether or not an update is in progress. + + Note this property is not indicative of whether or not user initiated updates can be performed. + Use SUUpdater::validateMenuItem: for that instead. + */ +@property (readonly) BOOL updateInProgress; + +@end #endif diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h b/OSX/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h new file mode 100644 index 0000000..86d1eb9 --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h @@ -0,0 +1,301 @@ +// +// SUUpdaterDelegate.h +// Sparkle +// +// Created by Mayur Pawashe on 12/25/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif + +#import "SUExport.h" + +@protocol SUVersionComparison, SUVersionDisplay; +@class SUUpdater, SUAppcast, SUAppcastItem; + +NS_ASSUME_NONNULL_BEGIN + +// ----------------------------------------------------------------------------- +// SUUpdater Notifications for events that might be interesting to more than just the delegate +// The updater will be the notification object +// ----------------------------------------------------------------------------- +SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification; +SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification; +SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification; +SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification; +#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification; +#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification; + +// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo +SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey; +// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo +SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey; + +// ----------------------------------------------------------------------------- +// SUUpdater Delegate: +// ----------------------------------------------------------------------------- + +/*! + Provides methods to control the behavior of an SUUpdater object. + */ +@protocol SUUpdaterDelegate +@optional + +/*! + Returns whether to allow Sparkle to pop up. + + For example, this may be used to prevent Sparkle from interrupting a setup assistant. + + \param updater The SUUpdater instance. + */ +- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater; + +/*! + Returns additional parameters to append to the appcast URL's query string. + + This is potentially based on whether or not Sparkle will also be sending along the system profile. + + \param updater The SUUpdater instance. + \param sendingProfile Whether the system profile will also be sent. + + \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user. + */ +- (NSArray *> *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; + +/*! + Returns a custom appcast URL. + + Override this to dynamically specify the entire URL. + + An alternative may be to use SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile: + and let the server handle what kind of feed to provide. + + \param updater The SUUpdater instance. + */ +- (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater; + +/*! + Returns whether Sparkle should prompt the user about automatic update checks. + + Use this to override the default behavior. + + \param updater The SUUpdater instance. + */ +- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater; + +/*! + Called after Sparkle has downloaded the appcast from the remote server. + + Implement this if you want to do some special handling with the appcast once it finishes loading. + + \param updater The SUUpdater instance. + \param appcast The appcast that was downloaded from the remote server. + */ +- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast; + +/*! + Returns the item in the appcast corresponding to the update that should be installed. + + If you're using special logic or extensions in your appcast, + implement this to use your own logic for finding a valid update, if any, + in the given appcast. + + \param appcast The appcast that was downloaded from the remote server. + \param updater The SUUpdater instance. + */ +- (nullable SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater; + +/*! + Called when a valid update is found by the update driver. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + */ +- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item; + +/*! + Called when a valid update is not found. + + \param updater The SUUpdater instance. + */ +- (void)updaterDidNotFindUpdate:(SUUpdater *)updater; + +/*! + Called immediately before downloading the specified update. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be downloaded. + \param request The mutable URL request that will be used to download the update. + */ +- (void)updater:(SUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request; + +/*! + Called immediately after succesfull download of the specified update. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that has been downloaded. + */ +- (void)updater:(SUUpdater *)updater didDownloadUpdate:(SUAppcastItem *)item; + +/*! + Called after the specified update failed to download. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that failed to download. + \param error The error generated by the failed download. + */ +- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error; + +/*! + Called when the user clicks the cancel button while and update is being downloaded. + + \param updater The SUUpdater instance. + */ +- (void)userDidCancelDownload:(SUUpdater *)updater; + +/*! + Called immediately before extracting the specified downloaded update. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be extracted. + */ +- (void)updater:(SUUpdater *)updater willExtractUpdate:(SUAppcastItem *)item; + +/*! + Called immediately after extracting the specified downloaded update. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that has been extracted. + */ +- (void)updater:(SUUpdater *)updater didExtractUpdate:(SUAppcastItem *)item; + +/*! + Called immediately before installing the specified update. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + */ +- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item; + +/*! + Returns whether the relaunch should be delayed in order to perform other tasks. + + This is not called if the user didn't relaunch on the previous update, + in that case it will immediately restart. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + \param invocation The invocation that must be completed with `[invocation invoke]` before continuing with the relaunch. + + \return \c YES to delay the relaunch until \p invocation is invoked. + */ +- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation; + +/*! + Returns whether the application should be relaunched at all. + + Some apps \b cannot be relaunched under certain circumstances. + This method can be used to explicitly prevent a relaunch. + + \param updater The SUUpdater instance. + */ +- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater; + +/*! + Called immediately before relaunching. + + \param updater The SUUpdater instance. + */ +- (void)updaterWillRelaunchApplication:(SUUpdater *)updater; + +/*! + Called immediately after relaunching. SUUpdater delegate must be set before applicationDidFinishLaunching: to catch this event. + + \param updater The SUUpdater instance. + */ +- (void)updaterDidRelaunchApplication:(SUUpdater *)updater; + +/*! + Returns an object that compares version numbers to determine their arithmetic relation to each other. + + This method allows you to provide a custom version comparator. + If you don't implement this method or return \c nil, + the standard version comparator will be used. + + \sa SUStandardVersionComparator + + \param updater The SUUpdater instance. + */ +- (nullable id)versionComparatorForUpdater:(SUUpdater *)updater; + +/*! + Returns an object that formats version numbers for display to the user. + + If you don't implement this method or return \c nil, + the standard version formatter will be used. + + \sa SUUpdateAlert + + \param updater The SUUpdater instance. + */ +- (nullable id)versionDisplayerForUpdater:(SUUpdater *)updater; + +/*! + Returns the path which is used to relaunch the client after the update is installed. + + The default is the path of the host bundle. + + \param updater The SUUpdater instance. + */ +- (nullable NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater; + +/*! + Called before an updater shows a modal alert window, + to give the host the opportunity to hide attached windows that may get in the way. + + \param updater The SUUpdater instance. + */ +- (void)updaterWillShowModalAlert:(SUUpdater *)updater; + +/*! + Called after an updater shows a modal alert window, + to give the host the opportunity to hide attached windows that may get in the way. + + \param updater The SUUpdater instance. + */ +- (void)updaterDidShowModalAlert:(SUUpdater *)updater; + +/*! + Called when an update is scheduled to be silently installed on quit. + This is after an update has been automatically downloaded in the background. + (i.e. SUUpdater::automaticallyDownloadsUpdates is YES) + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + \param invocation Can be used to trigger an immediate silent install and relaunch. + */ +- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation; + +/*! + Calls after an update that was scheduled to be silently installed on quit has been canceled. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that was proposed to be installed. + */ +- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item; + +/*! + Called after an update is aborted due to an error. + + \param updater The SUUpdater instance. + \param error The error that caused the abort + */ +- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error; + +@end + +NS_ASSUME_NONNULL_END diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h b/OSX/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h old mode 100755 new mode 100644 index 6c65ea4..c654fc4 --- a/OSX/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h +++ b/OSX/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h @@ -9,21 +9,29 @@ #ifndef SUVERSIONCOMPARISONPROTOCOL_H #define SUVERSIONCOMPARISONPROTOCOL_H -#import +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif +#import "SUExport.h" + +NS_ASSUME_NONNULL_BEGIN /*! - @protocol - @abstract Implement this protocol to provide version comparison facilities for Sparkle. + Provides version comparison facilities for Sparkle. */ @protocol SUVersionComparison /*! - @method - @abstract An abstract method to compare two version strings. - @discussion Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, and NSOrderedSame if they are equivalent. + An abstract method to compare two version strings. + + Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, + and NSOrderedSame if they are equivalent. */ -- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; // *** MAY BE CALLED ON NON-MAIN THREAD! +- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; // *** MAY BE CALLED ON NON-MAIN THREAD! @end +NS_ASSUME_NONNULL_END #endif diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h b/OSX/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h old mode 100755 new mode 100644 index 368b9c9..980efb3 --- a/OSX/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h +++ b/OSX/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h @@ -6,22 +6,24 @@ // Copyright 2009 Elgato Systems GmbH. All rights reserved. // -#import - +#if __has_feature(modules) +@import Foundation; +#else +#import +#endif +#import "SUExport.h" /*! - @protocol - @abstract Implement this protocol to apply special formatting to the two - version numbers. + Applies special display formatting to version numbers. */ @protocol SUVersionDisplay /*! - @method - @abstract An abstract method to format two version strings. - @discussion You get both so you can display important distinguishing - information, but leave out unnecessary/confusing parts. + Formats two version strings. + + Both versions are provided so that important distinguishing information + can be displayed while also leaving out unnecessary/confusing parts. */ --(void) formatVersion: (NSString**)inOutVersionA andVersion: (NSString**)inOutVersionB; +- (void)formatVersion:(NSString *_Nonnull*_Nonnull)inOutVersionA andVersion:(NSString *_Nonnull*_Nonnull)inOutVersionB; @end diff --git a/OSX/Sparkle.framework/Versions/A/Headers/Sparkle.h b/OSX/Sparkle.framework/Versions/A/Headers/Sparkle.h old mode 100755 new mode 100644 index 08dd577..5ae2e6a --- a/OSX/Sparkle.framework/Versions/A/Headers/Sparkle.h +++ b/OSX/Sparkle.framework/Versions/A/Headers/Sparkle.h @@ -12,10 +12,22 @@ // This list should include the shared headers. It doesn't matter if some of them aren't shared (unless // there are name-space collisions) so we can list all of them to start with: -#import +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUStandardVersionComparator.h" +#import "SUUpdater.h" +#import "SUUpdaterDelegate.h" +#import "SUVersionComparisonProtocol.h" +#import "SUVersionDisplayProtocol.h" +#import "SUErrors.h" -#import -#import -#import +#import "SPUDownloader.h" +#import "SPUDownloaderDelegate.h" +#import "SPUDownloaderDeprecated.h" +#import "SPUDownloadData.h" +#import "SPUDownloaderProtocol.h" +#import "SPUDownloaderSession.h" +#import "SPUURLRequest.h" +#import "SUCodeSigningVerifier.h" #endif diff --git a/OSX/Sparkle.framework/Versions/A/Modules/module.modulemap b/OSX/Sparkle.framework/Versions/A/Modules/module.modulemap new file mode 100644 index 0000000..af3fe6d --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module Sparkle { + umbrella header "Sparkle.h" + + export * + module * { export * } +} diff --git a/OSX/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h b/OSX/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h new file mode 100644 index 0000000..a52bf5a --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h @@ -0,0 +1,21 @@ +// +// SUUnarchiver.h +// Sparkle +// +// Created by Andy Matuschak on 3/16/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@protocol SUUnarchiverProtocol; + +@interface SUUnarchiver : NSObject + ++ (nullable id )unarchiverForPath:(NSString *)path updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword; + +@end + +NS_ASSUME_NONNULL_END diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist new file mode 100644 index 0000000..2bda3e9 --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist @@ -0,0 +1,54 @@ + + + + + BuildMachineOSBuild + 18C54 + CFBundleDevelopmentRegion + English + CFBundleExecutable + Autoupdate + CFBundleIconFile + AppIcon.icns + CFBundleIdentifier + org.sparkle-project.Sparkle.Autoupdate + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.21.2 12-ga5b23cdbe + CFBundleSignature + ???? + CFBundleSupportedPlatforms + + MacOSX + + CFBundleVersion + 1.21.2 + DTCompiler + com.apple.compilers.llvm.clang.1_0 + DTPlatformBuild + 10B61 + DTPlatformVersion + GM + DTSDKBuild + 18B71 + DTSDKName + macosx10.14 + DTXcode + 1010 + DTXcodeBuild + 10B61 + LSBackgroundOnly + 1 + LSMinimumSystemVersion + 10.7 + LSUIElement + 1 + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate new file mode 100755 index 0000000..ee27325 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop new file mode 100755 index 0000000..561ff48 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo new file mode 100644 index 0000000..bd04210 --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPL???? \ No newline at end of file diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns new file mode 100644 index 0000000..7f2a571 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib new file mode 100644 index 0000000..da18126 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings new file mode 100644 index 0000000..4cd92c0 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings new file mode 100644 index 0000000..cc238f6 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings new file mode 100644 index 0000000..c93688a Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings new file mode 100644 index 0000000..10e3c5a Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings new file mode 100644 index 0000000..698dc67 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings new file mode 100644 index 0000000..deed9ef Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings new file mode 100644 index 0000000..8c38dc6 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings new file mode 100644 index 0000000..4f2015f Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings new file mode 100644 index 0000000..dab921c Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings new file mode 100644 index 0000000..c7a5571 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings new file mode 100644 index 0000000..fec4d0d Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings new file mode 100644 index 0000000..2a727d3 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings new file mode 100644 index 0000000..9cd6bff Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings new file mode 100644 index 0000000..74ae728 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings new file mode 100644 index 0000000..68b6d36 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings new file mode 100644 index 0000000..f5e9c6d Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings new file mode 100644 index 0000000..92c18ee Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings new file mode 100644 index 0000000..ec2561b Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings new file mode 100644 index 0000000..58be0e8 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings new file mode 100644 index 0000000..2b9c461 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings new file mode 100644 index 0000000..e55c6fd Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings new file mode 100644 index 0000000..00df86f Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings new file mode 100644 index 0000000..318baa9 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings new file mode 100644 index 0000000..c33086d Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings new file mode 100644 index 0000000..a7d2ebc Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings new file mode 100644 index 0000000..1be2a80 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings new file mode 100644 index 0000000..738c900 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings new file mode 100644 index 0000000..eca2570 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings new file mode 100644 index 0000000..4def140 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings new file mode 100644 index 0000000..f7eb257 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings new file mode 100644 index 0000000..214331c Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings new file mode 100644 index 0000000..533e208 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/DarkAqua.css b/OSX/Sparkle.framework/Versions/A/Resources/DarkAqua.css new file mode 100644 index 0000000..a41e0f2 --- /dev/null +++ b/OSX/Sparkle.framework/Versions/A/Resources/DarkAqua.css @@ -0,0 +1,9 @@ +html { + color: #FFFFFFD8; +} +:link { + color: #419CFF; +} +:link:active { + color: #FF1919; +} diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Info.plist b/OSX/Sparkle.framework/Versions/A/Resources/Info.plist index 1e79abe..0d62b6c 100644 --- a/OSX/Sparkle.framework/Versions/A/Resources/Info.plist +++ b/OSX/Sparkle.framework/Versions/A/Resources/Info.plist @@ -3,13 +3,13 @@ BuildMachineOSBuild - 13A603 + 18C54 CFBundleDevelopmentRegion en CFBundleExecutable Sparkle CFBundleIdentifier - org.andymatuschak.Sparkle + org.sparkle-project.Sparkle CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -17,24 +17,28 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.5 Beta (git) + 1.21.2 12-ga5b23cdbe CFBundleSignature ???? + CFBundleSupportedPlatforms + + MacOSX + CFBundleVersion - 1.5 + 1.21.2 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 5A3005 + 10B61 DTPlatformVersion GM DTSDKBuild - 13A595 + 18B71 DTSDKName - macosx10.9 + macosx10.14 DTXcode - 0502 + 1010 DTXcodeBuild - 5A3005 + 10B61 diff --git a/OSX/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist b/OSX/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist old mode 100755 new mode 100644 index 63644f0..1f75b24 --- a/OSX/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist +++ b/OSX/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist @@ -9,27 +9,91 @@ iMac4,1 iMac (Core Duo) iMac4,2 - iMac for Education (17-inch, Core Duo) + iMac for Education (17 inch, Core Duo) iMac5,1 iMac (Core 2 Duo, 17 or 20 inch, SuperDrive) iMac5,2 iMac (Core 2 Duo, 17 inch, Combo Drive) iMac6,1 iMac (Core 2 Duo, 24 inch, SuperDrive) + iMac7,1 + iMac Intel Core 2 Duo (aluminum enclosure) iMac8,1 - iMac (April 2008) + iMac (Core 2 Duo, 20 or 24 inch, Early 2008 ) + iMac9,1 + iMac (Core 2 Duo, 20 or 24 inch, Early or Mid 2009 ) + iMac10,1 + iMac (Core 2 Duo, 21.5 or 27 inch, Late 2009 ) + iMac11,1 + iMac (Core i5 or i7, 27 inch Late 2009) + iMac11,2 + 21.5" iMac (mid 2010) + iMac11,3 + iMac (Core i5 or i7, 27 inch Mid 2010) + iMac12,1 + iMac (Core i3 or i5 or i7, 21.5 inch Mid 2010 or Late 2011) + iMac12,2 + iMac (Core i5 or i7, 27 inch Mid 2011) + iMac13,1 + iMac (Core i3 or i5 or i7, 21.5 inch Late 2012 or Early 2013) + iMac13,2 + iMac (Core i5 or i7, 27 inch Late 2012) + iMac14,1 + iMac (Core i5, 21.5 inch Late 2013) + iMac14,2 + iMac (Core i5 or i7, 27 inch Late 2013) + iMac14,3 + iMac (Core i5 or i7, 21.5 inch Late 2013) + iMac14,4 + iMac (Core i5, 21.5 inch Mid 2014) + iMac15,1 + iMac (Retina 5K Core i5 or i7, 27 inch Late 2014 or Mid 2015) + iMac16,1 + iMac (Core i5, 21,5 inch Late 2015) + iMac16,2 + iMac (Retina 4K Core i5 or i7, 21.5 inch Late 2015) + iMac17,1 + iMac (Retina 5K Core i5 or i7, 27 inch Late 2015) MacBook1,1 MacBook (Core Duo) MacBook2,1 MacBook (Core 2 Duo) MacBook4,1 MacBook (Core 2 Duo Feb 2008) + MacBook5,1 + MacBook (Core 2 Duo, Late 2008, Unibody) + MacBook5,2 + MacBook (Core 2 Duo, Early 2009, White) + MacBook6,1 + MacBook (Core 2 Duo, Late 2009, Unibody) + MacBook7,1 + MacBook (Core 2 Duo, Mid 2010, White) + MacBook8,1 + MacBook (Core M, 12 inch, Early 2015) MacBookAir1,1 - MacBook Air (January 2008) + MacBook Air (Core 2 Duo, 13 inch, Early 2008) MacBookAir2,1 - MacBook Air (June 2009) + MacBook Air (Core 2 Duo, 13 inch, Mid 2009) MacBookAir3,1 - MacBook Air (October 2010) + MacBook Air (Core 2 Duo, 11 inch, Late 2010) + MacBookAir3,2 + MacBook Air (Core 2 Duo, 13 inch, Late 2010) + MacBookAir4,1 + MacBook Air (Core i5 or i7, 11 inch, Mid 2011) + MacBookAir4,2 + MacBook Air (Core i5 or i7, 13 inch, Mid 2011) + MacBookAir5,1 + MacBook Air (Core i5 or i7, 11 inch, Mid 2012) + MacBookAir5,2 + MacBook Air (Core i5 or i7, 13 inch, Mid 2012) + MacBookAir6,1 + MacBook Air (Core i5 or i7, 11 inch, Mid 2013 or Early 2014) + MacBookAir6,2 + MacBook Air (Core i5 or i7, 13 inch, Mid 2013 or Early 2014) + MacBookAir7,1 + MacBook Air (Core i5 or i7, 11 inch, Early 2015) + MacBookAir7,2 + MacBook Air (Core i5 or i7, 13 inch, Early 2015) MacBookPro1,1 MacBook Pro Core Duo (15-inch) MacBookPro1,2 @@ -44,8 +108,70 @@ MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo) MacBookPro4,1 MacBook Pro (Core 2 Duo Feb 2008) + MacBookPro5,1 + MacBook Pro Intel Core 2 Duo (aluminum unibody) + MacBookPro5,2 + MacBook Pro Intel Core 2 Duo (aluminum unibody) + MacBookPro5,3 + MacBook Pro Intel Core 2 Duo (aluminum unibody) + MacBookPro5,4 + MacBook Pro Intel Core 2 Duo (aluminum unibody) + MacBookPro5,5 + MacBook Pro Intel Core 2 Duo (aluminum unibody) + MacBookPro6,1 + MacBook Pro Intel Core i5, Intel Core i7 (mid 2010) + MacBookPro6,2 + MacBook Pro Intel Core i5, Intel Core i7 (mid 2010) + MacBookPro7,1 + MacBook Pro Intel Core 2 Duo (mid 2010) + MacBookPro8,1 + MacBook Pro Intel Core i5, Intel Core i7, 13" (early 2011) + MacBookPro8,2 + MacBook Pro Intel Core i7, 15" (early 2011) + MacBookPro8,3 + MacBook Pro Intel Core i7, 17" (early 2011) + MacBookPro9,1 + MacBook Pro (15-inch, Mid 2012) + MacBookPro9,2 + MacBook Pro (13-inch, Mid 2012) + MacBookPro10,1 + MacBook Pro (Retina, Mid 2012) + MacBookPro10,2 + MacBook Pro (Retina, 13-inch, Late 2012) + MacBookPro11,1 + MacBook Pro (Retina, 13-inch, Late 2013) + MacBookPro11,2 + MacBook Pro (Retina, 15-inch, Late 2013) + MacBookPro11,3 + MacBook Pro (Retina, 15-inch, Late 2013) + MacbookPro11,4 + MacBook Pro (Retina, 15-inch, Mid 2015) + MacbookPro11,5 + MacBook Pro (Retina, 15-inch, Mid 2015) + MacbookPro12,1  + MacBook Pro (Retina, 13-inch, Early 2015) Macmini1,1 Mac Mini (Core Solo/Duo) + Macmini2,1 + Mac mini Intel Core + Macmini3,1 + Mac mini Intel Core + Macmini4,1 + Mac mini Intel Core (Mid 2010) + Macmini5,1 + Mac mini (Core i5, Mid 2011) + Macmini5,2 + Mac mini (Core i5 or Core i7, Mid 2011) + Macmini5,3 + Mac mini (Core i7, Server, Mid 2011) + Macmini6,1 + Mac mini (Core i5, Late 2012) + Macmini6,2 + Mac mini (Core i7, Normal or Server, Late 2012) + Macmini7,1 + Mac mini (Core i5 or Core i7, Late 2014) + MacPro1,1,Quad + Mac Pro MacPro1,1 Mac Pro (four-core) MacPro2,1 @@ -55,7 +181,9 @@ MacPro4,1 Mac Pro (March 2009) MacPro5,1 - Mac Pro (August 2010) + Mac Pro (2010 or 2012) + MacPro6,1 + Mac Pro (Late 2013) PowerBook1,1 PowerBook G3 PowerBook2,1 @@ -118,14 +246,6 @@ Power Macintosh G3 (Blue & White) PowerMac1,2 Power Macintosh G4 (PCI Graphics) - PowerMac10,1 - Mac Mini G4 - PowerMac10,2 - Mac Mini (Late 2005) - PowerMac11,2 - Power Macintosh G5 (Late 2005) - PowerMac12,1 - iMac G5 (iSight) PowerMac2,1 iMac G3 (Slot-loading CD-ROM) PowerMac2,2 @@ -152,6 +272,8 @@ iMac G4 (17-inch Flat Panel) PowerMac5,1 Power Macintosh G4 Cube + PowerMac5,2 + Power Mac G4 Cube PowerMac6,1 iMac G4 (USB 2.0) PowerMac6,3 @@ -168,6 +290,14 @@ iMac G5 (Ambient Light Sensor) PowerMac9,1 Power Macintosh G5 (Late 2005) + PowerMac10,1 + Mac Mini G4 + PowerMac10,2 + Mac Mini (Late 2005) + PowerMac11,2 + Power Macintosh G5 (Late 2005) + PowerMac12,1 + iMac G5 (iSight) RackMac1,1 Xserve G4 RackMac1,2 @@ -178,5 +308,7 @@ Xserve (Intel Xeon) Xserve2,1 Xserve (January 2008 quad-core) + Xserve3,1 + Xserve (early 2009) diff --git a/OSX/Sparkle.framework/Versions/A/Resources/SUStatus.nib b/OSX/Sparkle.framework/Versions/A/Resources/SUStatus.nib index 356987e..da18126 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/SUStatus.nib and b/OSX/Sparkle.framework/Versions/A/Resources/SUStatus.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib index 2d1b77b..29127f1 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib index b8925e7..c619e69 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib index 006d6aa..5773517 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings index 858a71f..4cd92c0 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings new file mode 100644 index 0000000..cc238f6 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib index 335264f..b3d57f6 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib index fe70bf2..30a49ec 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib index 9dcd944..f4c8532 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings index 9bbb996..c93688a 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib index 211e718..ef46cca 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib index 42395b2..778a468 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib index 58af832..e435904 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings index bcf691d..10e3c5a 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib index 19970aa..7540fa1 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib index 69fccfc..fed8b25 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib index c59bf3c..6ecec45 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings index 664946d..698dc67 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib new file mode 100644 index 0000000..6e803a7 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib new file mode 100644 index 0000000..8ca181c Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib new file mode 100644 index 0000000..353156a Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings new file mode 100644 index 0000000..deed9ef Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib index 512c1c5..15f157f 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib index e856f9d..29d60da 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib index 4f0c0a3..72f172e 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings index f9c15d8..8c38dc6 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib index 8d657a7..9b3f723 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib index d28a4f8..265bacc 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib index f927ba6..009394d 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings index 8e4ab94..4f2015f 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib new file mode 100644 index 0000000..a882db0 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib new file mode 100644 index 0000000..c7a3311 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib new file mode 100644 index 0000000..60cd954 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings new file mode 100644 index 0000000..dab921c Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib index 59b199b..5112924 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib index a084b19..e24e3fd 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib index 808db82..88598eb 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings index 236f807..c7a5571 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings new file mode 100644 index 0000000..fec4d0d Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib new file mode 100644 index 0000000..75761ac Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib new file mode 100644 index 0000000..867b7c0 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib new file mode 100644 index 0000000..f1090d7 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings new file mode 100644 index 0000000..2a727d3 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib new file mode 100644 index 0000000..4d7e8a9 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib new file mode 100644 index 0000000..40571fd Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib new file mode 100644 index 0000000..ff2e24f Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings new file mode 100644 index 0000000..9cd6bff Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib index 89825fb..e27ca6d 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib index 2172c0d..3e2d8ef 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib index 9a4cca0..0dceed4 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings index 665e273..74ae728 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib index c3d7a42..c0522dc 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib index 7cc884b..5013418 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib index 285596b..cc82821 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings index 4ccd7af..68b6d36 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib index 61d2a29..27f5abf 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib index ee41cad..86798fe 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib index ebd5759..57fcc83 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings index b21ea04..f5e9c6d 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib index e7a8d46..977dc0a 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib index 89f887e..d52bd5d 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib index 5da11e0..7880aef 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings new file mode 100644 index 0000000..92c18ee Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib new file mode 100644 index 0000000..fd5b851 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib new file mode 100644 index 0000000..6b05c1f Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib new file mode 100644 index 0000000..b1474d1 Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings new file mode 100644 index 0000000..ec2561b Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib index 35a8de2..19e19ff 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib index eec88ff..13a6ea6 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib index ab2c86f..690b23a 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings index 023c473..58be0e8 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib index 0646f3f..3de644f 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib index 1b4d495..b05aea7 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib index 8ea95e8..fc42fa2 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings index 9a0bc8b..2b9c461 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib index e8a824a..c43d996 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib index 03500fa..bf5e54d 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib index dc92de6..0773eee 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings index 7a11a9e..e55c6fd 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib index c3603d5..f787d8c 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib index 2d371c4..a0ea252 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib index 7b6d719..8df1dbb 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings index 497cd83..00df86f 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib index d669654..b4068e8 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib index 6a75e5e..998781b 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib index 2e5802c..011aaf5 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings index e90bdf5..318baa9 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib index 8022f52..09fb088 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib index 9466dc3..423b2ce 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib index 3b26a5b..19e13ec 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings index 7afef95..c33086d 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib index 3afea8d..cf9cb70 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib index 15e760d..0413025 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib index e7d67a2..ea04cc1 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings new file mode 100644 index 0000000..a7d2ebc Binary files /dev/null and b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib index 60cfe74..ac4ded9 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib index c3bd698..fc1c757 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib index 1ff5bc3..913fb3b 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings index 7ec0bc2..1be2a80 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib index 8df1ba0..5c5774c 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib index 9ab3288..bff9b7f 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib index 0337c2a..00410e3 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings index 16c3fb8..738c900 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib index e1377a4..9126de5 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib index 239b8f7..867b481 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib index 143ff91..25e48c8 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings index 0468c97..eca2570 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib index 263e74a..6526d27 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib index ca40c57..4e7b748 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib index 22a8f46..21bed5f 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings index cabc211..4def140 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib index 83dbcbf..5d2dda5 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib index 939e0cb..94c9dc7 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib index 8e2bf73..ac62cbf 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings index 6f0e4db..f7eb257 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib index 65cc3d2..789fbdb 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib index a453dfc..9ea3f4d 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib index 9f85d65..aec87f2 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings index b741758..214331c 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib index c4b9e9b..c5f6ea8 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib index 6e98d7e..1b4b140 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib and b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib index 935b007..1a642e8 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib and b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib differ diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings index c1f7e85..533e208 100644 Binary files a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings and b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings differ diff --git a/OSX/Sparkle.framework/Versions/A/Sparkle b/OSX/Sparkle.framework/Versions/A/Sparkle index 64eefd0..dcba851 100755 Binary files a/OSX/Sparkle.framework/Versions/A/Sparkle and b/OSX/Sparkle.framework/Versions/A/Sparkle differ diff --git a/OSX/Updater.h b/OSX/Updater.h index 53abbe4..3b56830 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 1bf29fa..6e0d3c9 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 fd3b176..05befe8 100644 --- a/OSX/Updater.plist +++ b/OSX/Updater.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleGetInfoString - 5.40 + 5.42 CFBundleIconFile SaverRunner CFBundleIdentifier @@ -17,23 +17,23 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 5.40 + 5.42 CFBundleName ${PRODUCT_NAME} CFBundlePackageType APPL CFBundleShortVersionString - 5.40 + 5.42 CFBundleSignature ???? CFBundleVersion - 5.40 + 5.42 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} LSUIElement NSHumanReadableCopyright - 5.40 + 5.42 NSMainNibFile Updater NSPrincipalClass diff --git a/OSX/XScreenSaver.plist b/OSX/XScreenSaver.plist index 3417295..4d106ad 100644 --- a/OSX/XScreenSaver.plist +++ b/OSX/XScreenSaver.plist @@ -15,11 +15,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 5.40 + 5.42 CFBundleSignature ???? CFBundleVersion - 5.40 + 5.42 LSMinimumSystemVersion 10.8 NSMainNibFile diff --git a/OSX/XScreenSaverConfigSheet.h b/OSX/XScreenSaverConfigSheet.h index b2fd489..8e40dde 100644 --- a/OSX/XScreenSaverConfigSheet.h +++ b/OSX/XScreenSaverConfigSheet.h @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2006-2013 Jamie Zawinski +/* xscreensaver, Copyright (c) 2006-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 @@ -48,7 +48,7 @@ # endif > # else - NSWindow + NSPanel # endif { NSString *saver_name; diff --git a/OSX/XScreenSaverView.m b/OSX/XScreenSaverView.m index cb7d45b..371cf17 100644 --- a/OSX/XScreenSaverView.m +++ b/OSX/XScreenSaverView.m @@ -2059,10 +2059,10 @@ gl_check_ver (const struct gl_version *caps, if (!initted_p || ![self isAnimating]) // no event handling unless running. return NO; - [self lockFocus]; +// [self lockFocus]; // As of 10.14 this causes flicker on mouse motion [self prepareContext]; BOOL result = xsft->event_cb (xdpy, xwindow, xdata, e); - [self unlockFocus]; +// [self unlockFocus];cp -Rf ${CONFIGURATION_BUILD_DIR}/BuildOutputPrefPane.prefPane ~/Library/PreferencePanes return result; } diff --git a/OSX/bindist.rtf b/OSX/bindist.rtf index 9d82431..251bb11 100644 --- a/OSX/bindist.rtf +++ b/OSX/bindist.rtf @@ -16,8 +16,8 @@ \b0 by Jamie Zawinski\ and many others\ \ -version 5.40\ -12-Aug-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/bindist2.webloc b/OSX/bindist2.webloc index 0ebfa91..4b87f8c 100644 --- a/OSX/bindist2.webloc +++ b/OSX/bindist2.webloc @@ -3,6 +3,6 @@ URL - https://www.jwz.org/xscreensaver/download.html + https://play.google.com/store/apps/details?id=org.jwz.android.xscreensaver diff --git a/OSX/fuzztest.sh b/OSX/fuzztest.sh index 20d596a..870d12c 100755 --- a/OSX/fuzztest.sh +++ b/OSX/fuzztest.sh @@ -33,6 +33,8 @@ function menu() { end tell end tell end tell" + + open -a XEmacs # switch focus back to somewhere sane } menu 'Shake Gesture' diff --git a/OSX/iSaverRunner.plist b/OSX/iSaverRunner.plist index 4604e9d..92ca6f0 100644 --- a/OSX/iSaverRunner.plist +++ b/OSX/iSaverRunner.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleGetInfoString - 5.40 + 5.42 CFBundleIcons CFBundleIcons~ipad @@ -19,21 +19,21 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 5.40 + 5.42 CFBundleName ${PRODUCT_NAME} CFBundlePackageType APPL CFBundleShortVersionString - 5.40 + 5.42 CFBundleSignature ???? CFBundleVersion - 5.40 + 5.42 LSRequiresIPhoneOS NSHumanReadableCopyright - 5.40 + 5.42 NSMainNibFile iSaverRunner UIAppFonts diff --git a/OSX/ios-function-table.m b/OSX/ios-function-table.m index fcb2808..c2e5b88 100644 --- a/OSX/ios-function-table.m +++ b/OSX/ios-function-table.m @@ -1,5 +1,5 @@ /* Generated file, do not edit. - Created: Sat Aug 4 21:35:23 2018 by build-fntable.pl 1.6. + Created: Tue Oct 23 19:02:07 2018 by build-fntable.pl 1.6. */ #import @@ -107,6 +107,7 @@ extern struct xscreensaver_function_table greynetic_xscreensaver_function_table, halftone_xscreensaver_function_table, halo_xscreensaver_function_table, + handsy_xscreensaver_function_table, helix_xscreensaver_function_table, hexadrop_xscreensaver_function_table, hexstrut_xscreensaver_function_table, @@ -346,6 +347,7 @@ NSDictionary *make_function_table_dict(void) [NSValue valueWithPointer:&greynetic_xscreensaver_function_table], @"greynetic", [NSValue valueWithPointer:&halftone_xscreensaver_function_table], @"halftone", [NSValue valueWithPointer:&halo_xscreensaver_function_table], @"halo", + [NSValue valueWithPointer:&handsy_xscreensaver_function_table], @"handsy", [NSValue valueWithPointer:&helix_xscreensaver_function_table], @"helix", [NSValue valueWithPointer:&hexadrop_xscreensaver_function_table], @"hexadrop", [NSValue valueWithPointer:&hexstrut_xscreensaver_function_table], @"hexstrut", diff --git a/OSX/seticon.pl b/OSX/seticon.pl index fb5dc71..a4f8c2c 100755 --- a/OSX/seticon.pl +++ b/OSX/seticon.pl @@ -18,7 +18,7 @@ use strict; use File::Temp; my $progname = $0; $progname =~ s@.*/@@g; -my ($version) = ('$Revision: 1.6 $' =~ m/\s(\d[.\d]+)\s/s); +my ($version) = ('$Revision: 1.7 $' =~ m/\s(\d[.\d]+)\s/s); my $verbose = 0; @@ -52,6 +52,11 @@ sub set_icon ($$) { close $rez_fh; my @cmd = ('Rez', + + '-isysroot', + '/Applications/Xcode.app/Contents/Developer/Platforms' . + '/MacOSX.platform/Developer/SDKs/MacOSX.sdk', + 'CoreServices.r', $rez_filename, '-o', $target_res); diff --git a/OSX/sparkle-bin/BinaryDelta b/OSX/sparkle-bin/BinaryDelta new file mode 100755 index 0000000..de7acd7 Binary files /dev/null and b/OSX/sparkle-bin/BinaryDelta differ diff --git a/OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Info.plist b/OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Info.plist new file mode 100644 index 0000000..325809b --- /dev/null +++ b/OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.BinaryDelta + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Resources/DWARF/BinaryDelta b/OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Resources/DWARF/BinaryDelta new file mode 100644 index 0000000..302129c Binary files /dev/null and b/OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Resources/DWARF/BinaryDelta differ diff --git a/OSX/sparkle-bin/generate_appcast b/OSX/sparkle-bin/generate_appcast new file mode 100755 index 0000000..cffaded Binary files /dev/null and b/OSX/sparkle-bin/generate_appcast differ diff --git a/OSX/sparkle-bin/generate_appcast.dSYM/Contents/Info.plist b/OSX/sparkle-bin/generate_appcast.dSYM/Contents/Info.plist new file mode 100644 index 0000000..85e4783 --- /dev/null +++ b/OSX/sparkle-bin/generate_appcast.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.generate_appcast + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/OSX/sparkle-bin/generate_appcast.dSYM/Contents/Resources/DWARF/generate_appcast b/OSX/sparkle-bin/generate_appcast.dSYM/Contents/Resources/DWARF/generate_appcast new file mode 100644 index 0000000..da66605 Binary files /dev/null and b/OSX/sparkle-bin/generate_appcast.dSYM/Contents/Resources/DWARF/generate_appcast differ diff --git a/OSX/sparkle-bin/generate_keys b/OSX/sparkle-bin/generate_keys new file mode 100755 index 0000000..9b4bf11 Binary files /dev/null and b/OSX/sparkle-bin/generate_keys differ diff --git a/OSX/sparkle-bin/generate_keys.dSYM/Contents/Info.plist b/OSX/sparkle-bin/generate_keys.dSYM/Contents/Info.plist new file mode 100644 index 0000000..3caf890 --- /dev/null +++ b/OSX/sparkle-bin/generate_keys.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.generate_keys + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/OSX/sparkle-bin/generate_keys.dSYM/Contents/Resources/DWARF/generate_keys b/OSX/sparkle-bin/generate_keys.dSYM/Contents/Resources/DWARF/generate_keys new file mode 100644 index 0000000..ff7be52 Binary files /dev/null and b/OSX/sparkle-bin/generate_keys.dSYM/Contents/Resources/DWARF/generate_keys differ diff --git a/OSX/sparkle-bin/old_dsa_scripts/generate_dsa_keys_macos_10.12_only b/OSX/sparkle-bin/old_dsa_scripts/generate_dsa_keys_macos_10.12_only new file mode 100755 index 0000000..56f195f --- /dev/null +++ b/OSX/sparkle-bin/old_dsa_scripts/generate_dsa_keys_macos_10.12_only @@ -0,0 +1,24 @@ +#!/bin/bash +set -e +for file in "dsaparam.pem" "dsa_priv.pem" "dsa_pub.pem"; do + if [ -e "$file" ]; then + echo "There's already a $file here! Move it aside or be more careful!" + exit 1 + fi +done + +openssl="/usr/bin/openssl" +$openssl gendsa <($openssl dsaparam 2047) -out dsa_priv.pem +chmod 0400 dsa_priv.pem +$openssl dsa -in dsa_priv.pem -pubout -out dsa_pub.pem + +echo " +Generated two files: +dsa_priv.pem: your private key. Keep it secret and don't share it! +dsa_pub.pem: public counterpart to include in the app bundle. + +BACK UP YOUR PRIVATE KEY AND KEEP IT SAFE! +If you lose it, your users will be unable to upgrade! +" + +open -R dsa_priv.pem diff --git a/OSX/sparkle-bin/old_dsa_scripts/sign_update b/OSX/sparkle-bin/old_dsa_scripts/sign_update new file mode 100755 index 0000000..fddaae8 --- /dev/null +++ b/OSX/sparkle-bin/old_dsa_scripts/sign_update @@ -0,0 +1,18 @@ +#!/bin/bash +set -e +set -o pipefail +if [ "$#" -ne 2 ]; then + echo "Usage: $0 update_archive_file dsa_priv.pem" + echo "This is an old DSA signing script for deprecated DSA keys." + echo "Do not use this for new applications." + exit 1 +fi +openssl=/usr/bin/openssl +version=`$openssl version` +if [[ $version =~ "OpenSSL 0.9" ]]; then + # pre-10.13 system: Fall back to OpenSSL DSS1 digest because it does not like the -sha1 option + $openssl dgst -sha1 -binary < "$1" | $openssl dgst -dss1 -sign "$2" | $openssl enc -base64 +else + # 10.13 and later: Use LibreSSL SHA1 digest + $openssl dgst -sha1 -binary < "$1" | $openssl dgst -sha1 -sign "$2" | $openssl enc -base64 +fi diff --git a/OSX/sparkle-bin/sign_update b/OSX/sparkle-bin/sign_update new file mode 100755 index 0000000..b97e4bd Binary files /dev/null and b/OSX/sparkle-bin/sign_update differ diff --git a/OSX/sparkle-bin/sign_update.dSYM/Contents/Info.plist b/OSX/sparkle-bin/sign_update.dSYM/Contents/Info.plist new file mode 100644 index 0000000..0739389 --- /dev/null +++ b/OSX/sparkle-bin/sign_update.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.sign_update + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/OSX/sparkle-bin/sign_update.dSYM/Contents/Resources/DWARF/sign_update b/OSX/sparkle-bin/sign_update.dSYM/Contents/Resources/DWARF/sign_update new file mode 100644 index 0000000..67f19b4 Binary files /dev/null and b/OSX/sparkle-bin/sign_update.dSYM/Contents/Resources/DWARF/sign_update differ diff --git a/OSX/updates.pl b/OSX/updates.pl index 5938a4a..9249154 100755 --- a/OSX/updates.pl +++ b/OSX/updates.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -w -# Copyright © 2013 Jamie Zawinski +# Copyright © 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 @@ -21,14 +21,15 @@ use open ":encoding(utf8)"; use POSIX; my $progname = $0; $progname =~ s@.*/@@g; -my ($version) = ('$Revision: 1.2 $' =~ m/\s(\d[.\d]+)\s/s); +my ($version) = ('$Revision: 1.5 $' =~ m/\s(\d[.\d]+)\s/s); my $verbose = 0; my $debug_p = 0; my $base_url = "https://www.jwz.org/"; -my $priv_key_file = "$ENV{HOME}/.ssh/sparkle_dsa_priv.pem"; -my $sign_update = "./sign_update.rb"; +my $dsa_priv_key_file = "$ENV{HOME}/.ssh/sparkle_dsa_priv.pem"; +my $dsa_sign_update = "sparkle-bin/old_dsa_scripts/sign_update"; +my $edddsa_sign_update = "sparkle-bin/sign_update"; sub generate_xml($$$$) { @@ -37,21 +38,26 @@ sub generate_xml($$$$) { my $outfile = "updates.xml"; my $obody = ''; - my %sigs; + my %sig1s; + my %sig2s; my %dates; if (open (my $in, '<', $outfile)) { print STDERR "$progname: reading $outfile\n" if $verbose; local $/ = undef; # read entire file $obody = <$in>; close $in; - foreach my $item (split (/(.*?) 1); } } @@ -82,7 +88,8 @@ sub generate_xml($$$$) { my $v2 = $v1; $v2 =~ s/\.//gs; my $zip = undef; DONE: - foreach my $ext ('zip', 'dmg', 'tar.gz', 'tar.Z') { + #foreach my $ext ('zip', 'dmg', 'tar.gz', 'tar.Z') { + foreach my $ext ('dmg') { foreach my $v ($v1, $v2) { foreach my $name ($app_name, "x" . lc($app_name)) { my $f = "$name-$v.$ext"; @@ -97,36 +104,51 @@ sub generate_xml($$$$) { my $publishedp = ($zip && -f "$www_dir/$zip"); $publishedp = 1 if ($count == 0); - my $url = ("${base_url}$app_name/" . ($publishedp ? $zip : "")); + my $url = ("${base_url}$app_name/" . ($publishedp && $zip ? $zip : "")); $url =~ s@DaliClock/@xdaliclock/@gs if $url; # Kludge my @st = stat("$archive_dir/$zip") if $zip; my $size = $st[7]; my $date = $st[9]; - $date = ($zip ? + $date = ($date ? strftime ("%a, %d %b %Y %T %z", localtime($date)) : ""); my $odate = $dates{$v1}; - my $sig = $sigs{$v1}; + my $sig1 = $sig1s{$v1}; + my $sig2 = $sig2s{$v1}; # Re-generate the sig if the file date changed. - $sig = undef if ($odate && $odate ne $date); + $sig1 = undef if ($odate && $odate ne $date); + $sig2 = undef if ($odate && $odate ne $date); - print STDERR "$progname: $v1: $date " . ($sig ? "Y" : "N") . "\n" + print STDERR "$progname: $v1: $date " . + ($sig1 ? "Y" : "N") . ($sig2 ? "Y" : "N") . "\n" if ($verbose > 1); - if (!$sig && $zip) { + if (!$sig1 && $zip) { # Old-style sigs local %ENV = %ENV; $ENV{PATH} = "/usr/bin:$ENV{PATH}"; - $sig = `$sign_update "$archive_dir/$zip" "$priv_key_file"`; - $sig =~ s/\s+//gs; + $sig1 = `$dsa_sign_update "$archive_dir/$zip" "$dsa_priv_key_file"`; + $sig1 =~ s/\s+//gs; } + if (!$sig2 && $zip) { # New-style sigs + local %ENV = %ENV; + $ENV{PATH} = "/usr/bin:$ENV{PATH}"; + my $xml = `$edddsa_sign_update "$archive_dir/$zip"`; + ($sig2) = ($xml =~ m/sparkle:edSignature=\"([^\"<>\s]+)\"/si); + error ("unparsable: $edddsa_sign_update: $xml") unless $sig2; + } + + $sig1 = 'ERROR' unless defined($sig1); + $sig2 = 'ERROR' unless defined($sig2); + $size = -1 unless defined($size); my $enc = ($publishedp ? ("\n") : "$v1\n"); @@ -196,6 +218,8 @@ sub usage() { } sub main() { + binmode (STDOUT, ':utf8'); + binmode (STDERR, ':utf8'); my ($app_name, $changelog, $archive_dir, $www_dir); while ($#ARGV >= 0) { $_ = shift @ARGV; diff --git a/OSX/updates.xml b/OSX/updates.xml index a4733a6..e782f72 100644 --- a/OSX/updates.xml +++ b/OSX/updates.xml @@ -8,36 +8,39 @@ Updates to xscreensaver. en - 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.42 + https://www.jwz.org/xscreensaver/xscreensaver-5.42.dmg + + Fri, 28 Dec 2018 16:20:28 -0800 + - 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.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.37 - https://www.jwz.org/xscreensaver/xscreensaver-5.37.dmg - • Added Mac Software Update and VMware to `bsod'.
• macOS: Grabbing the desktop works again.
• macOS: Pinch to zoom.
• Android: Both Daydreams and Live Wallpapers are implemented.
• Updated `webcollage' for recent changes.
• Various bug fixes.]]> - Wed, 05 Jul 2017 10:55:51 -0700 - 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'.]]> + Sun, 12 Aug 2018 16:39:18 -0700 + @@ -48,6 +51,7 @@ @@ -59,6 +63,7 @@ diff --git a/OSX/xscreensaver.xcodeproj/project.pbxproj b/OSX/xscreensaver.xcodeproj/project.pbxproj index f5e98b8..adb9fd1 100644 --- a/OSX/xscreensaver.xcodeproj/project.pbxproj +++ b/OSX/xscreensaver.xcodeproj/project.pbxproj @@ -239,6 +239,7 @@ AF777A1D09B660B300EA3033 /* PBXTargetDependency */, AF777A1B09B660B300EA3033 /* PBXTargetDependency */, AF777A1909B660B300EA3033 /* PBXTargetDependency */, + AF62D6392180087500C57C42 /* PBXTargetDependency */, AF1B0FC51D7AB5740011DBE4 /* PBXTargetDependency */, AF4F10F0143450C300E34F3F /* PBXTargetDependency */, AFC0E8C91CDC6125008CAFAC /* PBXTargetDependency */, @@ -400,7 +401,7 @@ AF1ADA141850132600932759 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; AF1ADA161850157400932759 /* Updater.xib in Resources */ = {isa = PBXBuildFile; fileRef = AF1ADA151850157400932759 /* Updater.xib */; }; AF1ADA181850180E00932759 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF1ADA171850180E00932759 /* Sparkle.framework */; }; - AF1ADA1A1850186B00932759 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF1ADA171850180E00932759 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + AF1ADA1A1850186B00932759 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF1ADA171850180E00932759 /* Sparkle.framework */; }; AF1ADA1B18501B3D00932759 /* SaverRunner.icns in Resources */ = {isa = PBXBuildFile; fileRef = AF2D522513E954A0002AA818 /* SaverRunner.icns */; }; AF1ADA1F18504A4F00932759 /* ScreenSaver.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF976ED30989BF59001F8B92 /* ScreenSaver.framework */; }; AF1B0FAE1D7AB4740011DBE4 /* XScreenSaverSubclass.m in Sources */ = {isa = PBXBuildFile; fileRef = AF9CC7A0099580E70075E99B /* XScreenSaverSubclass.m */; }; @@ -1849,6 +1850,20 @@ AF6048FB157C07C600CA21E4 /* jwzgles.c in Sources */ = {isa = PBXBuildFile; fileRef = AF6048F8157C07C600CA21E4 /* jwzgles.c */; }; AF6048FC157C07C600CA21E4 /* jwzgles.h in Headers */ = {isa = PBXBuildFile; fileRef = AF6048F9157C07C600CA21E4 /* jwzgles.h */; }; AF6048FD157C07C600CA21E4 /* jwzglesI.h in Headers */ = {isa = PBXBuildFile; fileRef = AF6048FA157C07C600CA21E4 /* jwzglesI.h */; }; + AF62D61F2180070600C57C42 /* XScreenSaverSubclass.m in Sources */ = {isa = PBXBuildFile; fileRef = AF9CC7A0099580E70075E99B /* XScreenSaverSubclass.m */; }; + AF62D6212180070600C57C42 /* libjwxyz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AF4808C1098C3B6C00FB32B8 /* libjwxyz.a */; }; + AF62D6222180070600C57C42 /* ScreenSaver.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF976ED30989BF59001F8B92 /* ScreenSaver.framework */; }; + AF62D6232180070600C57C42 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF2C31E515C0F7FE007A6896 /* QuartzCore.framework */; }; + AF62D6242180070600C57C42 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; + AF62D6252180070600C57C42 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF48112B0990A2C700FB32B8 /* Carbon.framework */; }; + AF62D6262180070600C57C42 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEE0BC611A6B0D6200C098BF /* OpenGL.framework */; }; + AF62D6272180070600C57C42 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AF78369617DB9F25003B9FC0 /* libz.dylib */; }; + AF62D6312180082100C57C42 /* handsy_model.c in Sources */ = {isa = PBXBuildFile; fileRef = AF62D62F2180082100C57C42 /* handsy_model.c */; }; + AF62D6322180082100C57C42 /* handsy_model.c in Sources */ = {isa = PBXBuildFile; fileRef = AF62D62F2180082100C57C42 /* handsy_model.c */; settings = {COMPILER_FLAGS = "-DUSE_GL"; }; }; + AF62D6332180082100C57C42 /* handsy.c in Sources */ = {isa = PBXBuildFile; fileRef = AF62D6302180082100C57C42 /* handsy.c */; }; + AF62D6342180082100C57C42 /* handsy.c in Sources */ = {isa = PBXBuildFile; fileRef = AF62D6302180082100C57C42 /* handsy.c */; settings = {COMPILER_FLAGS = "-DUSE_GL"; }; }; + AF62D6362180083E00C57C42 /* handsy.xml in Resources */ = {isa = PBXBuildFile; fileRef = AF62D6352180083D00C57C42 /* handsy.xml */; }; + AF62D6372180083E00C57C42 /* handsy.xml in Resources */ = {isa = PBXBuildFile; fileRef = AF62D6352180083D00C57C42 /* handsy.xml */; }; AF633C081EE0BA6F00AB33BD /* XScreenSaverSubclass.m in Sources */ = {isa = PBXBuildFile; fileRef = AF9CC7A0099580E70075E99B /* XScreenSaverSubclass.m */; }; AF633C0A1EE0BA6F00AB33BD /* libjwxyz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AF4808C1098C3B6C00FB32B8 /* libjwxyz.a */; }; AF633C0B1EE0BA6F00AB33BD /* ScreenSaver.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF976ED30989BF59001F8B92 /* ScreenSaver.framework */; }; @@ -1986,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 */; }; @@ -4606,6 +4622,20 @@ remoteGlobalIDString = AF5ECEA92116B1A400069433; remoteInfo = VFeedback; }; + AF62D61A2180070600C57C42 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = AF4808C0098C3B6C00FB32B8; + remoteInfo = jwxyz; + }; + AF62D6382180087500C57C42 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = AF62D6182180070600C57C42; + remoteInfo = Handsy; + }; AF633C031EE0BA6F00AB33BD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -7781,6 +7811,10 @@ AF6048F8157C07C600CA21E4 /* jwzgles.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jwzgles.c; path = ../jwxyz/jwzgles.c; sourceTree = ""; }; AF6048F9157C07C600CA21E4 /* jwzgles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jwzgles.h; path = ../jwxyz/jwzgles.h; sourceTree = ""; }; AF6048FA157C07C600CA21E4 /* jwzglesI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jwzglesI.h; path = ../jwxyz/jwzglesI.h; sourceTree = ""; }; + AF62D62D2180070600C57C42 /* Handsy.saver */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Handsy.saver; sourceTree = BUILT_PRODUCTS_DIR; }; + AF62D62F2180082100C57C42 /* handsy_model.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = handsy_model.c; path = hacks/glx/handsy_model.c; sourceTree = ""; }; + AF62D6302180082100C57C42 /* handsy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = handsy.c; path = hacks/glx/handsy.c; sourceTree = ""; }; + AF62D6352180083D00C57C42 /* handsy.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = handsy.xml; sourceTree = ""; }; AF633C161EE0BA6F00AB33BD /* Vigilance.saver */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Vigilance.saver; sourceTree = BUILT_PRODUCTS_DIR; }; AF633C181EE0BC4900AB33BD /* vigilance.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = vigilance.xml; sourceTree = ""; }; AF633C191EE0BC4A00AB33BD /* vigilance.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vigilance.c; path = hacks/glx/vigilance.c; sourceTree = ""; }; @@ -9638,6 +9672,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + AF62D6202180070600C57C42 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + AF62D6212180070600C57C42 /* libjwxyz.a in Frameworks */, + AF62D6222180070600C57C42 /* ScreenSaver.framework in Frameworks */, + AF62D6232180070600C57C42 /* QuartzCore.framework in Frameworks */, + AF62D6242180070600C57C42 /* Cocoa.framework in Frameworks */, + AF62D6252180070600C57C42 /* Carbon.framework in Frameworks */, + AF62D6262180070600C57C42 /* OpenGL.framework in Frameworks */, + AF62D6272180070600C57C42 /* libz.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; AF633C091EE0BA6F00AB33BD /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -12529,6 +12577,7 @@ AFA6AB0520999950006D2685 /* GlitchPEG.saver */, AFD77E7020C23F8600A3638D /* FilmLeader.saver */, AF5ECEC02116B1A400069433 /* VFeedback.saver */, + AF62D62D2180070600C57C42 /* Handsy.saver */, ); name = Products; path = ..; @@ -12911,6 +12960,8 @@ AF7777E709B64CF700EA3033 /* glslideshow.c */, AFA55C8C099349EE00F3E977 /* glsnake.c */, AFD56E080996A07A00BA26F7 /* gltext.c */, + AF62D62F2180082100C57C42 /* handsy_model.c */, + AF62D6302180082100C57C42 /* handsy.c */, AF1B0FBE1D7AB5210011DBE4 /* hexstrut.c */, AF78D18A142DD96E002AAF77 /* hilbert.c */, AFC0E8C21CDC60A9008CAFAC /* hydrostat.c */, @@ -13139,6 +13190,7 @@ AFC258C10988A468000655EE /* greynetic.xml */, AFC258C20988A468000655EE /* halftone.xml */, AFC258C30988A468000655EE /* halo.xml */, + AF62D6352180083D00C57C42 /* handsy.xml */, AFC258C40988A468000655EE /* helix.xml */, AFB591BC178B81E600EA4005 /* hexadrop.xml */, AF1B0FBF1D7AB5210011DBE4 /* hexstrut.xml */, @@ -13567,6 +13619,7 @@ AF1AD9DF18500F9F00932759 /* Frameworks */, AF1AD9E018500F9F00932759 /* Resources */, AF1ADA191850185F00932759 /* CopyFiles */, + AF168EA821D240EB00ED6E08 /* Codesign Sparkle */, AF1ADA1E18501DC200932759 /* Run Update Info Plist */, ); buildRules = ( @@ -15017,6 +15070,26 @@ productReference = AF5ECEC02116B1A400069433 /* VFeedback.saver */; productType = "com.apple.product-type.bundle"; }; + AF62D6182180070600C57C42 /* Handsy */ = { + isa = PBXNativeTarget; + buildConfigurationList = AF62D62A2180070600C57C42 /* Build configuration list for PBXNativeTarget "Handsy" */; + buildPhases = ( + AF62D61B2180070600C57C42 /* Resources */, + AF62D61D2180070600C57C42 /* Sources */, + AF62D6202180070600C57C42 /* Frameworks */, + AF62D6282180070600C57C42 /* Rez */, + AF62D6292180070600C57C42 /* Run Update Info Plist */, + ); + buildRules = ( + ); + dependencies = ( + AF62D6192180070600C57C42 /* PBXTargetDependency */, + ); + name = Handsy; + productName = DangerBall; + productReference = AF62D62D2180070600C57C42 /* Handsy.saver */; + productType = "com.apple.product-type.bundle"; + }; AF633C011EE0BA6F00AB33BD /* Vigilance */ = { isa = PBXNativeTarget; buildConfigurationList = AF633C131EE0BA6F00AB33BD /* Build configuration list for PBXNativeTarget "Vigilance" */; @@ -18731,7 +18804,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1010; TargetAttributes = { AF08398F09930B6B00277BE9 = { DevelopmentTeam = 4627ATJELP; @@ -18985,6 +19058,9 @@ AF5ECEA92116B1A400069433 = { DevelopmentTeam = 4627ATJELP; }; + AF62D6182180070600C57C42 = { + DevelopmentTeam = 4627ATJELP; + }; AF633C011EE0BA6F00AB33BD = { DevelopmentTeam = 4627ATJELP; }; @@ -19756,6 +19832,7 @@ AF7777D009B64C6B00EA3033 /* GLSlideshow */, AFA55C77099349A600F3E977 /* GLSnake */, AFD56DF10996A03800BA26F7 /* GLText */, + AF62D6182180070600C57C42 /* Handsy */, AF1B0FA71D7AB4740011DBE4 /* Hexstrut */, AF78D175142DD8F3002AAF77 /* Hilbert */, AFC0E8AB1CDC601A008CAFAC /* Hydrostat */, @@ -19896,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; }; @@ -20477,6 +20555,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + AF62D61B2180070600C57C42 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + AF62D6362180083E00C57C42 /* handsy.xml in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; AF633C041EE0BA6F00AB33BD /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -20900,6 +20986,7 @@ AF918B0F158FC53D002B5D1E /* grav.xml in Resources */, AF918B11158FC53D002B5D1E /* halftone.xml in Resources */, AF918B12158FC53D002B5D1E /* halo.xml in Resources */, + AF62D6372180083E00C57C42 /* handsy.xml in Resources */, AF918B13158FC53D002B5D1E /* helix.xml in Resources */, AFB591BF178B81E600EA4005 /* hexadrop.xml in Resources */, AF1B0FC01D7AB5330011DBE4 /* hexstrut.xml in Resources */, @@ -22771,6 +22858,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + AF62D6282180070600C57C42 /* Rez */ = { + isa = PBXRezBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; AF633C111EE0BA6F00AB33BD /* Rez */ = { isa = PBXRezBuildPhase; buildActionMask = 2147483647; @@ -24036,6 +24130,25 @@ shellScript = "$SOURCE_ROOT/update-info-plist.pl -q $BUILT_PRODUCTS_DIR/$PRODUCT_NAME$WRAPPER_SUFFIX"; showEnvVarsInLog = 0; }; + AF168EA821D240EB00ED6E08 /* Codesign Sparkle */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Codesign Sparkle"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "codesign -v --force --deep -o runtime --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework/Versions/A/Resources/Autoupdate.app\ncodesign -v --force -o runtime --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework/Versions/A\n"; + showEnvVarsInLog = 0; + }; AF1A176F0D6D6EE3008AF328 /* Run Update Info Plist */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -24366,6 +24479,21 @@ shellScript = "$SOURCE_ROOT/update-info-plist.pl -q $BUILT_PRODUCTS_DIR/$PRODUCT_NAME$WRAPPER_SUFFIX"; showEnvVarsInLog = 0; }; + AF62D6292180070600C57C42 /* Run Update Info Plist */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Update Info Plist"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "$SOURCE_ROOT/update-info-plist.pl -q $BUILT_PRODUCTS_DIR/$PRODUCT_NAME$WRAPPER_SUFFIX"; + showEnvVarsInLog = 0; + }; AF633C121EE0BA6F00AB33BD /* Run Update Info Plist */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -28816,6 +28944,16 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + AF62D61D2180070600C57C42 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + AF62D6312180082100C57C42 /* handsy_model.c in Sources */, + AF62D61F2180070600C57C42 /* XScreenSaverSubclass.m in Sources */, + AF62D6332180082100C57C42 /* handsy.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; AF633C061EE0BA6F00AB33BD /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -29364,6 +29502,8 @@ AF918A67158FC3E5002B5D1E /* glslideshow.c in Sources */, AF918A68158FC3E5002B5D1E /* glsnake.c in Sources */, AF918A69158FC3E5002B5D1E /* gltext.c in Sources */, + AF62D6322180082100C57C42 /* handsy_model.c in Sources */, + AF62D6342180082100C57C42 /* handsy.c in Sources */, AF1B0FC31D7AB5500011DBE4 /* hexstrut.c in Sources */, AF918A6A158FC3E5002B5D1E /* hilbert.c in Sources */, AFC0E8C41CDC60B0008CAFAC /* hydrostat.c in Sources */, @@ -31488,6 +31628,16 @@ target = AF5ECEA92116B1A400069433 /* VFeedback */; targetProxy = AF5ECEC82116B31F00069433 /* PBXContainerItemProxy */; }; + AF62D6192180070600C57C42 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = AF4808C0098C3B6C00FB32B8 /* jwxyz */; + targetProxy = AF62D61A2180070600C57C42 /* PBXContainerItemProxy */; + }; + AF62D6392180087500C57C42 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = AF62D6182180070600C57C42 /* Handsy */; + targetProxy = AF62D6382180087500C57C42 /* PBXContainerItemProxy */; + }; AF633C021EE0BA6F00AB33BD /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = AF4808C0098C3B6C00FB32B8 /* jwxyz */; @@ -33672,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)"; @@ -33688,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)"; @@ -34815,6 +34967,28 @@ }; name = Release; }; + AF62D62B2180070600C57C42 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = ( + "USE_GL=1", + "$(GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS)", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + AF62D62C2180070600C57C42 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = ( + "USE_GL=1", + "$(GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS)", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; AF633C141EE0BA6F00AB33BD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -38035,6 +38209,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = AF94E7411A16E93600289B93 /* xscreensaver.xcconfig */; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD)"; BUNDLE_IDENTIFIER = "org.jwz.${PROJECT_NAME:rfc1034identifier}.${PRODUCT_NAME:rfc1034identifier}"; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; @@ -38057,8 +38232,10 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphonesimulator*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application"; + CODE_SIGN_INJECT_BASE_ENTITLEMENTS = YES; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 4627ATJELP; + ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; @@ -38120,6 +38297,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; "OTHER_CFLAGS[sdk=macosx*]" = "$(OBJC_GC_CFLAGS)"; + OTHER_CODE_SIGN_FLAGS = "--timestamp"; "OTHER_LDFLAGS[sdk=macosx*]" = "-headerpad_max_install_names"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -38137,6 +38315,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = AF94E7411A16E93600289B93 /* xscreensaver.xcconfig */; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD)"; BUNDLE_IDENTIFIER = "org.jwz.${PROJECT_NAME:rfc1034identifier}.${PRODUCT_NAME:rfc1034identifier}"; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; @@ -38159,8 +38338,10 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Jamie Zawinski (4627ATJELP)"; "CODE_SIGN_IDENTITY[sdk=iphonesimulator*]" = "iPhone Distribution: Jamie Zawinski (4627ATJELP)"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application: Jamie Zawinski (4627ATJELP)"; + CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 4627ATJELP; + ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -38221,6 +38402,7 @@ "LLVM_LTO[sdk=macosx*]" = NO; OTHER_CFLAGS = ""; "OTHER_CFLAGS[sdk=macosx*]" = "$(OBJC_GC_CFLAGS)"; + OTHER_CODE_SIGN_FLAGS = "--timestamp"; "OTHER_LDFLAGS[sdk=macosx*]" = "-headerpad_max_install_names"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -39006,6 +39188,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + AF62D62A2180070600C57C42 /* Build configuration list for PBXNativeTarget "Handsy" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + AF62D62B2180070600C57C42 /* Debug */, + AF62D62C2180070600C57C42 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; AF633C131EE0BA6F00AB33BD /* Build configuration list for PBXNativeTarget "Vigilance" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/README b/README index af3f949..9a2a384 100644 --- a/README +++ b/README @@ -46,19 +46,32 @@ XScreenSaver has an extensive manual -- please read it! =============================================================================== -5.40 * New hacks, 'filmleader', 'vfeedback'. - * New hack, 'glitchpeg' (X11 and macOS only). +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'. + * 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. + +5.40 * New hacks, `filmleader', `vfeedback'. + * 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'. + * Android: These hacks work now: `blitspin', `bumps', `cityflow', + `endgame', `esper', `flipscreen3d', `gleidescope', `glslideshow', + `jigglypuff', `queens', `tessellimage', `xanalogtv', `xmatrix', + `zoom'. -5.39 * New hacks, 'razzledazzle', 'peepers', 'crumbler' and `maze3d'. +5.39 * New hacks, `razzledazzle', `peepers', `crumbler' and `maze3d'. * 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. @@ -66,24 +79,24 @@ XScreenSaver has an extensive manual -- please read it! terrible selection of installed fonts. * macOS: Retina display-related bug fixes. -5.38 * New hack, 'esper'. +5.38 * New hack, `esper'. * 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'. + * `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'. + * `crystal' works properly on non-X11 systems. + * `m6502' now includes `texture.asm'. * X11: Try harder to find sensible fonts for the password dialog. 5.37 * New hack, `vigilance'. diff --git a/README.hacking b/README.hacking index 6fc2fe5..451aec1 100644 --- a/README.hacking +++ b/README.hacking @@ -178,6 +178,12 @@ Programming Tips - On modern machines, OpenGL will always run faster than Xlib. It's also more portable. Consider writing in OpenGL whenever possible. + - Free any memory you allocate. While screen savers under X11 have + their memory freed automatically when their process is killed by + the XScreenSaver daemon, under iOS and Android screen savers exist + in long-lived processes where no such cleanup takes place. + Consider Valgrind or gcc -fsanitize=leak to find memory leaks. + ========================================================================== macOS, iOS and Android diff --git a/aclocal.m4 b/aclocal.m4 index 37e5872..d25f855 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -39,7 +39,10 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun # # Modified to require ngettext # Matthias Clasen 08/06/2004 -# + +# Increment this whenever this file is changed. +#serial 1 + # We need this here as well, since someone might use autoconf-2.5x # to configure GLib then an older version to configure a package # using AM_GLIB_GNU_GETTEXT diff --git a/android/Makefile b/android/Makefile index f0d5da0..ed65edf 100644 --- a/android/Makefile +++ b/android/Makefile @@ -128,6 +128,7 @@ export ANDROID_HACKS= \ grav \ greynetic \ halo \ + handsy \ helix \ hexadrop \ hexstrut \ diff --git a/android/build.gradle b/android/build.gradle index 648cc32..978b94c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - jcenter() google() + jcenter() } dependencies { classpath 'com.android.tools.build:gradle:3.1.2' @@ -12,9 +12,9 @@ buildscript { allprojects { repositories { + google() maven { url 'https://maven.google.com' } jcenter() - google() } } diff --git a/android/xscreensaver/.idea/caches/build_file_checksums.ser b/android/xscreensaver/.idea/caches/build_file_checksums.ser index bc8f00c..c2ab27f 100644 Binary files a/android/xscreensaver/.idea/caches/build_file_checksums.ser and b/android/xscreensaver/.idea/caches/build_file_checksums.ser differ diff --git a/android/xscreensaver/.idea/misc.xml b/android/xscreensaver/.idea/misc.xml index c0f68ed..99202cc 100644 --- a/android/xscreensaver/.idea/misc.xml +++ b/android/xscreensaver/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/android/xscreensaver/.idea/workspace.xml b/android/xscreensaver/.idea/workspace.xml index 1dedd64..9f2ef73 100644 --- a/android/xscreensaver/.idea/workspace.xml +++ b/android/xscreensaver/.idea/workspace.xml @@ -1,5 +1,10 @@ + + + + + @@ -35,8 +40,7 @@ - - + @@ -1659,7 +1663,7 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/hacks/config/ripples.xml b/hacks/config/ripples.xml index 191e041..8a2e1be 100644 --- a/hacks/config/ripples.xml +++ b/hacks/config/ripples.xml @@ -24,8 +24,7 @@ + low="0" high="16" default="6"/> diff --git a/hacks/config/unknownpleasures.xml b/hacks/config/unknownpleasures.xml index 7ef79ac..0730599 100644 --- a/hacks/config/unknownpleasures.xml +++ b/hacks/config/unknownpleasures.xml @@ -4,7 +4,7 @@ -