From cfec4d76000bb340e700068b4a46bcdb5b969e90 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Ouellet Date: Wed, 22 Apr 2015 20:25:43 -0400 Subject: [PATCH 1/6] Fix MacPorts libX11 path --- ShiftIt/X11WindowDriver.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ShiftIt/X11WindowDriver.m b/ShiftIt/X11WindowDriver.m index d659c7e9..5d84b895 100644 --- a/ShiftIt/X11WindowDriver.m +++ b/ShiftIt/X11WindowDriver.m @@ -38,7 +38,7 @@ "/usr/local/X11/libX11.6.dylib", // anyone? "/opt/X11/lib/libX11.6.dylib", // XQuartz, needs be tried before regular "/usr/X11/lib/libX11.6.dylib", // regular - "/opt/local/X11/lib/libX11.6.dylib", // MacPorts? + "/opt/local/lib/libX11.6.dylib", // MacPorts "/sw/X11/lib/libX11.6.dylib", // Fink? }; @@ -458,4 +458,4 @@ - (void) freeWindow_:(Window *)windowRef { } -@end \ No newline at end of file +@end From 3c8b50ff71d9cf15c54d2a164d2bd222e6eb0cdc Mon Sep 17 00:00:00 2001 From: Jean-Philippe Ouellet Date: Wed, 22 Apr 2015 20:40:54 -0400 Subject: [PATCH 2/6] Build with MacPorts Xlib if present and prefer MacPorts over XQuartz and regular OS X versions which are rather old. (Even older than the latest xorg security errata.) --- ShiftIt/ShiftIt.xcodeproj/project.pbxproj | 12 ++++++++---- ShiftIt/X11WindowDriver.m | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ShiftIt/ShiftIt.xcodeproj/project.pbxproj b/ShiftIt/ShiftIt.xcodeproj/project.pbxproj index 1eefd293..269ecde0 100644 --- a/ShiftIt/ShiftIt.xcodeproj/project.pbxproj +++ b/ShiftIt/ShiftIt.xcodeproj/project.pbxproj @@ -1010,13 +1010,15 @@ GCC_PREFIX_HEADER = ShiftIt_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "_DEBUGPRINTS_=1"; HEADER_SEARCH_PATHS = ( - /usr/X11/include, + /opt/local/include, /opt/X11/include, + /usr/X11/include, ); INFOPLIST_FILE = "ShiftIt-Info.plist"; LIBRARY_SEARCH_PATHS = ( - /usr/X11/lib, + /opt/local/lib, /opt/X11/lib, + /usr/X11/lib, ); OTHER_CFLAGS = ( "-DDEBUG", @@ -1035,13 +1037,15 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ShiftIt_Prefix.pch; HEADER_SEARCH_PATHS = ( - /usr/X11/include, + /opt/local/include, /opt/X11/include, + /usr/X11/include, ); INFOPLIST_FILE = "ShiftIt-Info.plist"; LIBRARY_SEARCH_PATHS = ( - /usr/X11/lib, + /opt/local/lib, /opt/X11/lib, + /usr/X11/lib, ); OTHER_CFLAGS = ( "-DNDEBUG", diff --git a/ShiftIt/X11WindowDriver.m b/ShiftIt/X11WindowDriver.m index 5d84b895..8c4ea6c6 100644 --- a/ShiftIt/X11WindowDriver.m +++ b/ShiftIt/X11WindowDriver.m @@ -35,10 +35,10 @@ // TODO: extract static char *X11Paths_[] = { "libX11.6.dylib", - "/usr/local/X11/libX11.6.dylib", // anyone? - "/opt/X11/lib/libX11.6.dylib", // XQuartz, needs be tried before regular - "/usr/X11/lib/libX11.6.dylib", // regular + "/usr/local/X11/libX11.6.dylib", // anyone? "/opt/local/lib/libX11.6.dylib", // MacPorts + "/opt/X11/lib/libX11.6.dylib", // XQuartz, needs be tried before regular + "/usr/X11/lib/libX11.6.dylib", // regular "/sw/X11/lib/libX11.6.dylib", // Fink? }; From fa9e7beff108ed81d2c37e7662dde4e592579117 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Ouellet Date: Wed, 22 Apr 2015 20:25:43 -0400 Subject: [PATCH 3/6] Fix MacPorts libX11 path --- ShiftIt/X11WindowDriver.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShiftIt/X11WindowDriver.m b/ShiftIt/X11WindowDriver.m index 39fe3567..26973bef 100644 --- a/ShiftIt/X11WindowDriver.m +++ b/ShiftIt/X11WindowDriver.m @@ -37,7 +37,7 @@ "libX11.6.dylib", "/usr/local/X11/libX11.6.dylib", // anyone? "/opt/X11/lib/libX11.6.dylib", // XQuartz - "/opt/local/X11/lib/libX11.6.dylib", // MacPorts? + "/opt/local/lib/libX11.6.dylib", // MacPorts "/sw/X11/lib/libX11.6.dylib", // Fink? }; From 9807e69bcffd493c8d7d12717769deaf91a4a3e8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Ouellet Date: Wed, 22 Apr 2015 20:40:54 -0400 Subject: [PATCH 4/6] Build with MacPorts Xlib if present and prefer MacPorts over XQuartz and regular OS X versions which are rather old. (Even older than the latest xorg security errata.) --- ShiftIt/ShiftIt.xcodeproj/project.pbxproj | 12 ++++++++---- ShiftIt/X11WindowDriver.m | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ShiftIt/ShiftIt.xcodeproj/project.pbxproj b/ShiftIt/ShiftIt.xcodeproj/project.pbxproj index 1eefd293..269ecde0 100644 --- a/ShiftIt/ShiftIt.xcodeproj/project.pbxproj +++ b/ShiftIt/ShiftIt.xcodeproj/project.pbxproj @@ -1010,13 +1010,15 @@ GCC_PREFIX_HEADER = ShiftIt_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "_DEBUGPRINTS_=1"; HEADER_SEARCH_PATHS = ( - /usr/X11/include, + /opt/local/include, /opt/X11/include, + /usr/X11/include, ); INFOPLIST_FILE = "ShiftIt-Info.plist"; LIBRARY_SEARCH_PATHS = ( - /usr/X11/lib, + /opt/local/lib, /opt/X11/lib, + /usr/X11/lib, ); OTHER_CFLAGS = ( "-DDEBUG", @@ -1035,13 +1037,15 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ShiftIt_Prefix.pch; HEADER_SEARCH_PATHS = ( - /usr/X11/include, + /opt/local/include, /opt/X11/include, + /usr/X11/include, ); INFOPLIST_FILE = "ShiftIt-Info.plist"; LIBRARY_SEARCH_PATHS = ( - /usr/X11/lib, + /opt/local/lib, /opt/X11/lib, + /usr/X11/lib, ); OTHER_CFLAGS = ( "-DNDEBUG", diff --git a/ShiftIt/X11WindowDriver.m b/ShiftIt/X11WindowDriver.m index 26973bef..64f5f141 100644 --- a/ShiftIt/X11WindowDriver.m +++ b/ShiftIt/X11WindowDriver.m @@ -210,7 +210,7 @@ - (BOOL)getGeometry:(NSRect *)geometry screen:(SIScreen **)screenRef error:(NSEr *screenRef = screen; } } - + return ret; } @@ -425,7 +425,7 @@ - (BOOL)setGeometry_:(NSRect)geometry ofWindow:(Window *)windowRef error:(NSErro FMTAssertNotNil(windowRef); return execWithDisplay_(^BOOL(Display *dpy, NSError **nestedError) { - // TODO: combine the operations + // TODO: combine the operations XWindowAttributes wa; if(!XGetWindowAttributesRef(dpy, *windowRef, &wa)) { if (nestedError) { @@ -463,4 +463,4 @@ - (void) freeWindow_:(Window *)windowRef { } -@end \ No newline at end of file +@end From 50db434142232a820e8a6aad8f5200a9748631dd Mon Sep 17 00:00:00 2001 From: Filip Krikava Date: Mon, 27 Apr 2015 19:35:58 +0200 Subject: [PATCH 5/6] 1.6.2 release --- ShiftIt/ShiftIt-Info.plist | 4 ++-- release/appcast.xml | 10 +++++----- release/release-notes-1.6.2.html | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 release/release-notes-1.6.2.html diff --git a/ShiftIt/ShiftIt-Info.plist b/ShiftIt/ShiftIt-Info.plist index fbf1c20a..cc073aa5 100644 --- a/ShiftIt/ShiftIt-Info.plist +++ b/ShiftIt/ShiftIt-Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.6.1 + 1.6.2 CFBundleSignature ???? CFBundleVersion - 1.6.1 + 1.6.2 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/release/appcast.xml b/release/appcast.xml index 0146685a..c8232991 100644 --- a/release/appcast.xml +++ b/release/appcast.xml @@ -5,12 +5,12 @@ https://raw.github.com/fikovnik/ShiftIt/master/release/appcast.xml en - ShiftIt version 1.6.1 + ShiftIt version 1.6.2 - http://htmlpreview.github.com/?https://raw.github.com/fikovnik/ShiftIt/master/release/release-notes-1.6.1.html + http://htmlpreview.github.com/?https://raw.github.com/fikovnik/ShiftIt/master/release/release-notes-1.6.2.html - Thu, 09 Apr 2015 12:52:17 - + Mon, 27 Apr 2015 19:33:06 + - + \ No newline at end of file diff --git a/release/release-notes-1.6.2.html b/release/release-notes-1.6.2.html new file mode 100644 index 00000000..c8082b99 --- /dev/null +++ b/release/release-notes-1.6.2.html @@ -0,0 +1,17 @@ + + + +

ShiftIt version 1.6.2

+ +

Issues closed

+
    +
  • #74 - Improve release script
    • +
  • #162 - Fix MacPorts paths
    • +
  • #120 - Remove dependency on X11
    • +
+ + More information about this release can be found on github. +

+ If you find any bugs please report them on github. + + \ No newline at end of file From cac212ce12f474ae96f75924d749954695e4ca5a Mon Sep 17 00:00:00 2001 From: Filip Krikava Date: Mon, 27 Apr 2015 23:49:22 +0200 Subject: [PATCH 6/6] Fixing Xcode project settings There seemed to be wrong settings which prevented to make a stable release (cf. #160) --- ShiftIt/ShiftIt.xcodeproj/project.pbxproj | 13 +++++++------ .../xcshareddata/xcschemes/FMT Tests.xcscheme | 2 +- .../xcshareddata/xcschemes/ShiftIt NoX11.xcscheme | 2 +- .../xcshareddata/xcschemes/ShiftIt.xcscheme | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ShiftIt/ShiftIt.xcodeproj/project.pbxproj b/ShiftIt/ShiftIt.xcodeproj/project.pbxproj index 269ecde0..66908fcd 100644 --- a/ShiftIt/ShiftIt.xcodeproj/project.pbxproj +++ b/ShiftIt/ShiftIt.xcodeproj/project.pbxproj @@ -42,8 +42,8 @@ 27160C6B16C939FF002DA475 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2708222117FCF9400C0A04C /* Sparkle.framework */; }; 27160C6C16C939FF002DA475 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2DC61EE1127C862000E1A5B /* Carbon.framework */; }; 27160C6D16C939FF002DA475 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - 27160C6F16C939FF002DA475 /* ShortcutRecorder.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 27A14D7F1269CCA200E68263 /* ShortcutRecorder.framework */; }; - 27160C7016C939FF002DA475 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F2708222117FCF9400C0A04C /* Sparkle.framework */; }; + 27160C6F16C939FF002DA475 /* ShortcutRecorder.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 27A14D7F1269CCA200E68263 /* ShortcutRecorder.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 27160C7016C939FF002DA475 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F2708222117FCF9400C0A04C /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 2717BDAC1498B7FD0012EF87 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2714C0B21487F9BC00CC951D /* SenTestingKit.framework */; }; 2717BE18149933530012EF87 /* GTMLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 270DACA814098AE30080DFBD /* GTMLogger.m */; }; 2717BE1F149933840012EF87 /* SIAdjacentRectangles.m in Sources */ = {isa = PBXBuildFile; fileRef = F2DC61EF1127C862000E1A5F /* SIAdjacentRectangles.m */; }; @@ -65,7 +65,7 @@ 279AF81019432F6F0048FE5F /* AccessibilitySettingsLion.png in Resources */ = {isa = PBXBuildFile; fileRef = 279AF80E19432F6F0048FE5F /* AccessibilitySettingsLion.png */; }; 279AF8191943675F0048FE5F /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 279AF8181943675F0048FE5F /* ScriptingBridge.framework */; }; 279AF81A194367670048FE5F /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 279AF8181943675F0048FE5F /* ScriptingBridge.framework */; }; - 27A14DB41269CD4200E68263 /* ShortcutRecorder.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 27A14D7F1269CCA200E68263 /* ShortcutRecorder.framework */; }; + 27A14DB41269CD4200E68263 /* ShortcutRecorder.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 27A14D7F1269CCA200E68263 /* ShortcutRecorder.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 27A14DD31269CE5600E68263 /* ShortcutRecorder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A14D7F1269CCA200E68263 /* ShortcutRecorder.framework */; }; 27A14EC01269EC1500E68263 /* ShiftIt-defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 27A14EBF1269EC1500E68263 /* ShiftIt-defaults.plist */; }; 27C072E1140D6B9E00C4E199 /* FMTNSDictionary+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 27C072E0140D6B9E00C4E199 /* FMTNSDictionary+Extras.m */; }; @@ -91,7 +91,7 @@ E4BCFDF71237154D17E7FFBC /* FMTError.m in Sources */ = {isa = PBXBuildFile; fileRef = E4BCF6EB42F45803C08BAC36 /* FMTError.m */; }; F2520B641133874D00DB826F /* PreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F2520B631133874D00DB826F /* PreferencesWindowController.m */; }; F2708252117FCFEA00C0A04C /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2708222117FCF9400C0A04C /* Sparkle.framework */; }; - F2708277117FE51100C0A04C /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F2708222117FCF9400C0A04C /* Sparkle.framework */; }; + F2708277117FE51100C0A04C /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F2708222117FCF9400C0A04C /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; F2DC61251127ACDE000E1A5B /* SIWindowManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F2DC61241127ACDE000E1A5B /* SIWindowManager.m */; }; F2DC61EF1127C862000E1A5B /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2DC61EE1127C862000E1A5B /* Carbon.framework */; }; F2DC61EF1127C862000E1A5D /* SIScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = F2DC61EF1127C862000E1A5C /* SIScreen.m */; }; @@ -650,7 +650,8 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastTestingUpgradeCheck = 0630; + LastUpgradeCheck = 0630; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ShiftIt" */; compatibilityVersion = "Xcode 3.2"; @@ -717,8 +718,8 @@ CA0A5415194C030700AC7F45 /* Localizable.strings in Resources */, 27CD1A3019437FB20063D5AB /* ShiftItMenuIcon.png in Resources */, 279AF80F19432F6F0048FE5F /* AccessibilitySettingsLion.png in Resources */, - 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */, CA0A5412194C02ED00AC7F45 /* PreferencesWindow.xib in Resources */, + 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */, 83E55ED6125A5FCF00FC49BF /* ShiftIt.icns in Resources */, 27A14EC01269EC1500E68263 /* ShiftIt-defaults.plist in Resources */, 271D2EBB12FC6B3A00A4D0BF /* margin-background-image.png in Resources */, diff --git a/ShiftIt/ShiftIt.xcodeproj/xcshareddata/xcschemes/FMT Tests.xcscheme b/ShiftIt/ShiftIt.xcodeproj/xcshareddata/xcschemes/FMT Tests.xcscheme index 7e942b3e..8fd79651 100644 --- a/ShiftIt/ShiftIt.xcodeproj/xcshareddata/xcschemes/FMT Tests.xcscheme +++ b/ShiftIt/ShiftIt.xcodeproj/xcshareddata/xcschemes/FMT Tests.xcscheme @@ -1,6 +1,6 @@