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/2] 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/2] 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? };