From 815f25f31b82a5ca43cc3e4728320debfd1fef13 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 24 May 2017 01:26:43 +0200 Subject: [PATCH] darwin-CF: 855.17 -> 1153.18 --- .../CF/add-cf-initialize.patch | 18 ------------------ .../apple-source-releases/CF/default.nix | 7 +++---- .../apple-source-releases/CF/remove-xpc.patch | 17 +++++++++++++++++ .../darwin/apple-source-releases/default.nix | 4 ++-- 4 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch create mode 100644 pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch deleted file mode 100644 index 46c230cfd1de..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- CF-855.17/CFRuntime.c 2014-11-26 21:29:48.000000000 -0800 -+++ CF-855.17/CFRuntime.c.new 2014-11-26 21:30:01.000000000 -0800 -@@ -756,6 +756,7 @@ - extern void __CFErrorInitialize(void); - extern void __CFTreeInitialize(void); - extern void __CFURLInitialize(void); -+extern void __CFPreferencesDomainInitialize(void); - #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI - extern void __CFMachPortInitialize(void); - #endif -@@ -1015,6 +1016,7 @@ - __CFErrorInitialize(); - __CFTreeInitialize(); - __CFURLInitialize(); -+ __CFPreferencesDomainInitialize(); - - #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS - __CFBundleInitialize(); diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix index 3993a360156a..e44966aa84d6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix @@ -1,12 +1,12 @@ -{ stdenv, appleDerivation, icu, dyld, libdispatch, launchd, libclosure }: +{ stdenv, appleDerivation, ICU, dyld, libdispatch, libplatform, launchd, libclosure }: # this project uses blocks, a clang-only extension assert stdenv.cc.isClang; appleDerivation { - buildInputs = [ dyld icu libdispatch launchd libclosure ]; + buildInputs = [ dyld ICU libdispatch libplatform launchd libclosure ]; - patches = [ ./add-cf-initialize.patch ./add-cfmachport.patch ./cf-bridging.patch ]; + patches = [ ./add-cfmachport.patch ./cf-bridging.patch ./remove-xpc.patch ]; __propagatedImpureHostDeps = [ "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation" ]; @@ -19,7 +19,6 @@ appleDerivation { --replace "/bin/" "" \ --replace "INSTALLNAME=/System" "INSTALLNAME=$out" \ --replace "install_name_tool -id /System" "install_name_tool -id $out" \ - --replace "-licucore.A" "-licui18n -licuuc" \ --replace 'chown -RH -f root:wheel $(DSTBASE)/CoreFoundation.framework' "" \ --replace 'chmod -RH' 'chmod -R' diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch new file mode 100644 index 000000000000..a7b9fe486434 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch @@ -0,0 +1,17 @@ +diff --git a/CFBundlePriv.h b/CFBundlePriv.h +index d4feb5f..e7b52e8 100644 +--- a/CFBundlePriv.h ++++ b/CFBundlePriv.h +@@ -254,12 +254,6 @@ Boolean _CFBundleGetStringsFilesShared(CFBundleRef bundle); + CF_EXPORT + CFURLRef _CFBundleCopyFrameworkURLForExecutablePath(CFStringRef executablePath); + +-#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) || (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE) +-#include +-CF_EXPORT +-void _CFBundleSetupXPCBootstrap(xpc_object_t bootstrap) CF_AVAILABLE(10_10, 8_0); +-#endif +- + /* Functions deprecated as SPI */ + + CF_EXPORT diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 2182528e74dd..a8509d1f0095 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -48,6 +48,7 @@ let }; "osx-10.10.5" = { adv_cmds = "158"; + CF = "1153.18"; ICU = "531.48"; libdispatch = "442.1.4"; Security = "57031.40.6"; @@ -69,7 +70,6 @@ let IOKitUser = "1050.20.2"; }; "osx-10.9.5" = { - CF = "855.17"; launchd = "842.92.1"; libauto = "185.5"; Libc = "997.90.3"; # We use this, but not from here @@ -191,7 +191,7 @@ let bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {}; bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {}; - CF = applePackage "CF" "osx-10.9.5" "1sadmxi9fsvsmdyxvg2133sdzvkzwil5fvyyidxsyk1iyfzqsvln" {}; + CF = applePackage "CF" "osx-10.10.5" "07f5psjxi7wyd13ci4x83ya5hy6p69sjfqcpp2mmxdlhd8yzkf74" {}; CommonCrypto = applePackage "CommonCrypto" "osx-10.11.6" "0vllfpb8f4f97wj2vpdd7w5k9ibnsbr6ff1zslpp6q323h01n25y" {}; configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {}; copyfile = applePackage "copyfile" "osx-10.11.6" "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {};