Alpha 6

UInt2048 · Apr 30, 2023 · 1b60690 · 1b60690
1 parent 3743b93
commit 1b60690
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/Source/CyberCore/Configurations/CyberCore.xcconfig b/Source/CyberCore/Configurations/CyberCore.xcconfig
@@ -147,7 +147,7 @@ WK_DEBUG_LDFLAGS[config=Debug] = -Wl,-debug_variant
 // FIXME: Reduce the number of allowable_clients <rdar://problem/31823969>
 OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -weak-lxslt -lsqlite3 -lobjc -allowable_client CyberCoreTestSupport -allowable_client CyberKitLegacy -allowable_client TestIPC -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_ANGLE_LDFLAGS) $(WK_WEBGPU_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_NETWORK_EXTENSION_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_UNIFORM_TYPE_IDENTIFIERS_LDFLAGS) $(WK_SCENEKIT_LDFLAGS) $(SOURCE_VERSION_LDFLAGS) $(PROFILE_GENERATE_OR_USE_LDFLAGS) $(WK_NO_STATIC_INITIALIZERS) $(WK_DEBUG_LDFLAGS);
 
-OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client CyberKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client CyberKitTestRunner -allowable_client TestCyberKitAPI -allowable_client MobileMiniBrowser;
+OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client CyberKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client CyberKitTestRunner -allowable_client TestCyberKitAPI -allowable_client MobileMiniBrowser -allowable_client Client;
 OTHER_LDFLAGS_PLATFORM_macosx = -sub_library libobjc -umbrella CyberKit $(PROFILE_GENERATE_OR_USE_LDFLAGS);
 
 SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));

diff --git a/Source/CyberCore/platform/ios/UserAgentIOS.mm b/Source/CyberCore/platform/ios/UserAgentIOS.mm
@@ -92,7 +92,7 @@ String standardUserAgentWithApplicationName(const String& applicationName, const
 #if 1 || USE(STATIC_IPAD_USER_AGENT_VALUE)
     UNUSED_PARAM(userAgentOSVersion);
     UNUSED_PARAM(separator);
-    return makeString("Mozilla/5.0 (iPad; CPU OS 16_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.3 Mobile/15E148 Safari/604.1");
+    return makeString("Mozilla/5.0 (iPad; CPU OS 16_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Mobile/15E148 Safari/604.1");
 #else
     // FIXME: We should deprecate and remove this override; see https://bugs.webkit.org/show_bug.cgi?id=217927 for details.
     if (auto override = dynamic_cf_cast<CFStringRef>(adoptCF(CFPreferencesCopyAppValue(CFSTR("UserAgent"), CFSTR("com.apple.WebFoundation")))))

diff --git a/Source/CyberKit/CyberKit.xcodeproj/project.pbxproj b/Source/CyberKit/CyberKit.xcodeproj/project.pbxproj
@@ -17688,7 +17688,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = SJ87WGCZM7;
-				PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberKit.WebContent.Development;
+				PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberKit.WebContent;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
 			name = Debug;
@@ -17700,7 +17700,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
-				PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberKit.WebContent.Development;
+				PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberKit.WebContent;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
 			name = Release;

diff --git a/Source/CyberKit/UIProcess/API/ios/WKWebViewIOS.mm b/Source/CyberKit/UIProcess/API/ios/WKWebViewIOS.mm
@@ -1189,7 +1189,7 @@ - (void)_restorePageStateToUnobscuredCenter:(std::optional<CyberCore::FloatPoint
 
 - (RefPtr<CyberKit::ViewSnapshot>)_takeViewSnapshot
 {
-#if HAVE(CORE_ANIMATION_RENDER_SERVER)
+#if HAVE(CORE_ANIMATION_RENDER_SERVER) && 0
     float deviceScale = CyberCore::screenScaleFactor();
     CyberCore::FloatSize snapshotSize(self.bounds.size);
     snapshotSize.scale(deviceScale);

diff --git a/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig b/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig
@@ -3,7 +3,7 @@
 PRODUCT_NAME = ANGLE-shared;
 EXECUTABLE_PREFIX = lib;
 
-ANGLE_OTHER_LDFLAGS = -allowable_client CyberCore -allowable_client CyberCoreTestSupport -allowable_client MobileMiniBrowser -framework QuartzCore -framework CoreGraphics -framework Foundation -framework IOSurface -framework Metal $(ANGLE_OTHER_LDFLAGS_$(WK_PLATFORM_NAME)) -Wl;
+ANGLE_OTHER_LDFLAGS = -allowable_client CyberCore -allowable_client CyberCoreTestSupport -allowable_client MobileMiniBrowser -allowable_client Client -framework QuartzCore -framework CoreGraphics -framework Foundation -framework IOSurface -framework Metal $(ANGLE_OTHER_LDFLAGS_$(WK_PLATFORM_NAME)) -Wl;
 ANGLE_OTHER_LDFLAGS_iphoneos = -lz;
 ANGLE_OTHER_LDFLAGS_iphonesimulator = $(ANGLE_OTHER_LDFLAGS_iphoneos);
 ANGLE_OTHER_LDFLAGS_watchos = $(ANGLE_OTHER_LDFLAGS_iphoneos);

diff --git a/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj b/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj
@@ -563,7 +563,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.MobileMiniBrowser;
+				PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.ios.Fennec;
 				PRODUCT_NAME = MobileMiniBrowser;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -584,7 +584,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.MobileMiniBrowser;
+				PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.ios.Fennec;
 				PRODUCT_NAME = MobileMiniBrowser;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = "1,2";

diff --git a/Tools/MobileMiniBrowser/script_fakesigner.entitlements b/Tools/MobileMiniBrowser/script_fakesigner.entitlements
@@ -144,7 +144,6 @@
 	<key>com.apple.security.exception.files.home-relative-path.read-write</key>
 	<array>
 		<string>/Library/Safari/AutoFillQuirks.plist</string>
-		<string>/Documents/</string>
 	</array>
 	<key>com.apple.security.exception.mach-lookup.global-name</key>
 	<array>

diff --git a/Tools/MobileMiniBrowser/script_fakesigner.sh b/Tools/MobileMiniBrowser/script_fakesigner.sh
@@ -46,6 +46,9 @@ ln -s ../../../../Frameworks $app/Frameworks/CyberKit.framework/XPCServices/com.
 ln -s ../../../../Frameworks $app/Frameworks/CyberKit.framework/XPCServices/com.matthewbenedict.CyberKit.WebContent.xpc
 cp ../adattributiond $app/Frameworks/CyberKit.framework/Daemons
 cp ../webpushd $app/Frameworks/CyberKit.framework/Daemons
+plutil -convert xml1 $app/Info.plist
+gsed -i -e 's/com.matthewbenedict.ios.Fennec/com.matthewbenedict.MobileMiniBrowser/g' $app/Info.plist
+plutil -convert binary1 $app/Info.plist
 else
 echo "[!] No .ipa file supplied!"
 fi
@@ -90,4 +93,4 @@ cd ..
 echo "[*] packaging.."
 rm -f "$ipa.zip" || true
 zip -r -y "$ipa.zip" Payload
-echo "[*] Created $ipa.zip"
+echo "[*] Created $ipa.zip"