Revert changes to packaged libc++ since they didn't work; use older Qt

Author: hsource

Makefile

@@ -9,18 +9,8 @@ export PATH := /usr/local/opt/qt@5/bin:$(PATH)
 #
 # For compatibility, we disable that using the flag from this thread:
 # https://github.com/python/cpython/issues/97524
-export LDFLAGS := -L/usr/local/opt/qt@5/lib -Wl,-no_fixup_chains -L/usr/local/opt/llvm/lib/c++ -Wl,-rpath,/usr/local/opt/llvm/lib/c++
-
-# Some users also reported that they faced this error:
-# dyld: Symbol not found: __ZTVNSt3__13pmr25monotonic_buffer_resourceE
-# Expected in: /usr/lib/libc++.1.dylib
-#
-# Because of that, we use Homebrew's libc++ by adding to LDFLAGS:
-# `-L/usr/local/opt/llvm/lib/c++ -Wl,-rpath,/usr/local/opt/llvm/lib/c++`
-#
-# And adding to CPPFLAGS:
-# `-I/usr/local/opt/llvm/include`
-export CPPFLAGS := -I/usr/local/opt/qt@5/include -I/usr/local/opt/llvm/include
+export LDFLAGS := -L/usr/local/opt/qt@5/lib -Wl,-no_fixup_chains
+export CPPFLAGS := -I/usr/local/opt/qt@5/include
 export PKG_CONFIG_PATH := /usr/local/opt/qt@5/lib/pkgconfig
 
 all: frontend pob
@@ -35,8 +25,9 @@ all: frontend pob
 sign:
 	echo 'Signing with the first available identity'; \
 	rm -rf PathOfBuilding.app/Contents/MacOS/spec/TestBuilds/3.13; \
-    codesign --force --deep --sign $$(security find-identity -v -p codesigning | awk 'FNR == 1 {print $$2}') PathOfBuilding.app/Contents/MacOS/lcurl.so PathOfBuilding.app/Contents/libs/*; \
-	codesign --force --deep --sign $$(security find-identity -v -p codesigning | awk 'FNR == 1 {print $$2}') PathOfBuilding.app; \
+    codesign --force --deep --sign $$(security find-identity -v -p codesigning | grep Distribution | awk 'FNR == 1 {print $$2}') PathOfBuilding.app/Contents/MacOS/lcurl.so PathOfBuilding.app/Contents/libs/*; \
+	codesign --force --deep --sign $$(security find-identity -v -p codesigning | grep Distribution | awk 'FNR == 1 {print $$2}') PathOfBuilding.app/Contents/MacOS/PathOfBuilding; \
+	codesign --force --deep --sign $$(security find-identity -v -p codesigning | grep Distribution | awk 'FNR == 1 {print $$2}') PathOfBuilding.app; \
 	codesign -d -v PathOfBuilding.app
 
 # We remove the `launch.devMode or` to ensure the user's builds are stored not in
@@ -75,9 +66,8 @@ luacurl:
 
 # curl is used since mesonInstaller.sh copies over the shared library dylib
 # dylibbundler is used to copy over dylibs that lcurl.so uses
-# llvm is used so we can bundle a custom libc++ for old Mac compatibility
 tools:
-	arch --x86_64 brew install qt@5 luajit zlib meson curl dylibbundler gcc@12 llvm
+	arch --x86_64 brew install qt@5 luajit zlib meson curl dylibbundler gcc@12
 
 # We don't usually modify the PathOfBuilding directory, so there's rarely a
 # need to delete it. We separate it out to a separate task.

README.md

@@ -19,8 +19,15 @@ Before starting, you need to install Homebrew for x86_64.
    alias brew='arch --x86_64 /usr/local/bin/brew'
    ```
 4. Include it to update your environment variables by running `. ~/.intelbrew`
+5. Edit Homebrew to fetch packages for Ventura (10.13), since the Qt package
+   for Sonoma (10.14) breaks compatibility with libc++: see [this error](https://www.pathofexile.com/forum/view-thread/3009944/page/34#:~:text=__ZTVNSt3__13pmr25monotonic_buffer_resourceE)
 
 ```sh
+vim /usr/local/Homebrew/Library/Homebrew/brew.sh
+# Edit the file to comment out the version and hardcode it:
+# #HOMEBREW_MACOS_VERSION="$(/usr/bin/sw_vers -productVersion)"
+# HOMEBREW_MACOS_VERSION="12.0.0"
+
 # Run this only once after installing Homebrew to install dependencies
 make tools
 
@@ -47,7 +54,7 @@ make sign
 - pkg-config
 - ninja (optional, can tell meson to generate makefiles if you prefer)
 
-### Ensuring old versions of Mac:
+### Ensuring old versions of Mac are compatible:
 
 By default, the built lcurl.so links to the local version of cURL. Old
 versions of cURL on old Macs may be too old to include the relevant functions and run into this error: