From 0fd468fb55a1f7eb99a686770130ded6cfa1b020 Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 3 Oct 2024 17:49:45 +0200 Subject: [PATCH 1/5] ci: print deps --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aecc10f45c2..4cbdc5a11d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -329,6 +329,7 @@ jobs: install_name_tool -id @executable_path/../Frameworks/libssl.3.dylib chatterino.app/Contents/Frameworks/libssl.3.dylib install_name_tool -id @executable_path/../Frameworks/libcrypto.3.dylib chatterino.app/Contents/Frameworks/libcrypto.3.dylib + otool -L chatterino.app/Contents/Frameworks/libssl.3.dylib # Fix the search path for libcrypto in libssl otool -L chatterino.app/Contents/Frameworks/libssl.3.dylib \ | grep libcrypto.3.dylib \ From 52d40385ad695a1d303934f1ef1cac9fd6629d1a Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 3 Oct 2024 18:10:39 +0200 Subject: [PATCH 2/5] ssh --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4cbdc5a11d1..81213190f28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -344,6 +344,9 @@ jobs: ./../.CI/CreateDMG.sh shell: bash + - name: Setup tmate session + if: startsWith(matrix.os, 'macos') + uses: mxschmitt/action-tmate@v3 - name: Upload artifact (MacOS) if: startsWith(matrix.os, 'macos') From bb4dfc7f17fd0d4b0fa3a0afcf7e63499dea8006 Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 3 Oct 2024 19:11:58 +0200 Subject: [PATCH 3/5] more mac --- .github/workflows/build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81213190f28..d38b78d3f14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -341,6 +341,18 @@ jobs: @executable_path/../Frameworks/libcrypto.3.dylib \ chatterino.app/Contents/Frameworks/libssl.3.dylib; \ done + # Fix the search path for lib{crypto,ssl} in chatterino + otool -L chatterino.app/Contents/MacOS/chatterino \ + | grep /opt \ + | cut -d" " -f1 \ + | cut -f2 \ + | while read og_entry; do \ + echo $og_entry; \ + install_name_tool -change \ + "$og_entry" \ + @executable_path/../Frameworks/$(echo $og_entry | sed -E 's/.*lib(ssl|crypto)/\1/') \ + chatterino.app/Contents/MacOS/chatterino; \ + done ./../.CI/CreateDMG.sh shell: bash From f0f88953c545715b3fa9539323ec6388a68671f3 Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 3 Oct 2024 19:35:58 +0200 Subject: [PATCH 4/5] fix: +lib --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d38b78d3f14..ddbcabb8d6e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -350,15 +350,12 @@ jobs: echo $og_entry; \ install_name_tool -change \ "$og_entry" \ - @executable_path/../Frameworks/$(echo $og_entry | sed -E 's/.*lib(ssl|crypto)/\1/') \ + @executable_path/../Frameworks/$(echo $og_entry | sed -E 's/.*(libssl|libcrypto)/\1/') \ chatterino.app/Contents/MacOS/chatterino; \ done ./../.CI/CreateDMG.sh shell: bash - - name: Setup tmate session - if: startsWith(matrix.os, 'macos') - uses: mxschmitt/action-tmate@v3 - name: Upload artifact (MacOS) if: startsWith(matrix.os, 'macos') From aefcf5afb755bf6704e1a65feeb2e649daed1cd3 Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 3 Oct 2024 20:37:35 +0200 Subject: [PATCH 5/5] changelog --- CHANGELOG.c7.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.c7.md b/CHANGELOG.c7.md index 9b9a2eb7285..29aa0475cdc 100644 --- a/CHANGELOG.c7.md +++ b/CHANGELOG.c7.md @@ -6,5 +6,5 @@ - Dev(macOS): Changed CFBundleIdentifier from `com.chatterino` to `app.7tv.chatterino7` (fec0dbdf558b1e6e358971a256f5540d34bb6a8d) - Dev: Updated Conan version used in CI to 2.4 (330d05d50ffd296b34744dbcc97290534e8cf704) - Dev(Windows): Updated `libavif` to 1.0.4, `boost` to 1.85, and `openssl` to 3.2.2 (330d05d50ffd296b34744dbcc97290534e8cf704) -- Dev(macOS): A single universal app is now released for macOS (#274) +- Dev(macOS): A single universal app is now released for macOS (#274, #279) - Dev: Refactored paints to avoid creation of intermediate widgets (#277)