OSX app: Work around libz/libPng/ImageIO.framework version skew

By not bundling libz, assuming OSX includes a suitable libz.1.dylib.

This commit was supported by the NSF-funded DataLad project.

Build/OSXMkLibs.hs

@@ -78,8 +78,16 @@ otool appbase replacement_libs libmap = do
 	process [] files replacement_libs libmap
   where
 	want s = not ("@executable_path" `isInfixOf` s)
+		-- OSX framekworks such as Cocoa are too tightly tied to
+		-- a specific OSX version, so don't bundle.
 		&& not (".framework" `isInfixOf` s)
+		-- libSystem.B is tightly tied to frameworks.
 		&& not ("libSystem.B" `isInfixOf` s)
+		-- ImageIO.framework uses libPng which is built against a
+		-- specific version of libz; other versions lack the
+		-- _inflateValidate symbol. So, avoid bundling libz unless
+		-- this incompatability is resolved.
+		&& not ("libz." `isInfixOf` s)
 	process c [] rls m = return (nub $ concat c, rls, m)
 	process c (file:rest) rls m = do
 		_ <- boolSystem "chmod" [Param "755", File file]

CHANGELOG

@@ -1,6 +1,8 @@
 git-annex (6.20180317) UNRELEASED; urgency=medium
 
   * Fix calculation of estimated completion for progress meter.
+  * OSX app: Work around libz/libPng/ImageIO.framework version skew
+    by not bundling libz, assuming OSX includes a suitable libz.1.dylib.
 
  -- Joey Hess <id@joeyh.name>  Mon, 19 Mar 2018 23:13:59 -0400
 

doc/bugs/Error_running_git-annex.app_on_OS_X_10.13.1___40__17B1003__41__/comment_3_1346c5aa68b06d512aced0ef72cc92fc._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2018-03-22T15:52:04Z"
+ content="""
+I've excluded  libz.1.dylb from git-annex.apk, on the assumuption that OSX
+always ships with libz, and so git-annex does not need to provide it.
+"""]]