From 81a21e6ce040e7740de86340c8ea4dba30e69bc3 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Thu, 16 Jan 2025 01:57:37 -0500
Subject: New upstream version 3.4.13+dfsg.

---
 .github/workflows/mac_release.yml | 56 +++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 14 deletions(-)

(limited to '.github/workflows/mac_release.yml')

diff --git a/.github/workflows/mac_release.yml b/.github/workflows/mac_release.yml
index 3ba4f25..65d9acf 100644
--- a/.github/workflows/mac_release.yml
+++ b/.github/workflows/mac_release.yml
@@ -1,13 +1,13 @@
 env:
     QT_VERSION: '5.15.2'
-    TCL_VERSION: '8.6'
-    SQLITE_VERSION: '3410200'
-    SQLITE_RELEASE_YEAR: '2023'
+    TCL_VERSION: '8.6.16'
+    SQLITE_VERSION: '3470200'
+    SQLITE_RELEASE_YEAR: '2024'
     PYTHON_VERSION: '3.9'
     ICU_VERSION: '72.1'
     PORTABLE_DIR: ${{ github.workspace }}/output/portable/SQLiteStudio
     INSTALLBUILDER_DIR: ../ib
-    INSTALLBUILDER_URL: https://releases.bitrock.com/installbuilder/installbuilder-enterprise-23.1.0-osx-installer.dmg
+    INSTALLBUILDER_URL: https://releases.bitrock.com/installbuilder/installbuilder-enterprise-24.3.0-osx-installer.dmg
 
 name: MacOSX release build
 
@@ -25,17 +25,30 @@ on:
 
 jobs:
     build:
-        runs-on: macos-11
+        runs-on: macos-13
 
         steps:
-            # - name: Debug
-              # run: |
+            #- name: Debug
+              #shell: bash
+              #run: |
+                # brew search tcl-tk
                 # ls -l /usr/local/
                 # ls -l /usr/local/include
                 # ls -l /usr/local/opt/
                 # ls -l /usr/local/opt/openssl/include/
                 # ls -l /usr/local/opt/expat/include
 
+            - name: Install Tcl
+              run: |
+                set -x
+                #brew install tcl-tk@8
+                #brew reinstall tcl-tk@8
+                echo "PATH=/usr/local/Cellar/tcl-tk@8/${{ env.TCL_VERSION }}/bin:$PATH" >> $GITHUB_ENV
+                echo "TCL_CONFIG=/usr/local/Cellar/tcl-tk@8/${{ env.TCL_VERSION }}/lib/tclConfig.sh" >> $GITHUB_ENV
+                
+                find /usr/local -name tclsh
+                find /usr/local -name tclConfig.sh
+
             - name: Qt installation dir
               id: qt-installation-dir
               run: echo "DIR=$(readlink -f ${{ github.workspace }}/..)" >> $GITHUB_OUTPUT
@@ -51,6 +64,13 @@ jobs:
                 py7zrversion: '==0.20.*'
                 setup-python: 'false'
                 extra: '--external 7z'
+                
+            - name: Fix Qt for MacOS 13
+              shell: bash
+              run: |
+                TCFILE=$(find $Qt5_DIR/mkspecs/features -name toolchain.prf -type f -maxdepth 1)
+                echo "Updating file: $TCFILE"
+                sed -i '' 's/if(!darwin:clang)|intel_icc/if(!darwin:clang)|intel_icc|darwin/' $TCFILE
 
             - name: Install the InstalBuilder
               shell: bash
@@ -112,6 +132,7 @@ jobs:
                 brew tap-new $USER/local-tap
                 brew extract --version=$ICU_VERSION icu4c $USER/local-tap
                 brew install icu4c@$ICU_VERSION
+                brew install coreutils
                 echo ICU_FLAGS="$(PKG_CONFIG_PATH="/usr/local/opt/icu4c@$ICU_VERSION/lib/pkgconfig" pkg-config --libs --cflags icu-uc icu-io)" \
                     >> $GITHUB_ENV
 
@@ -131,6 +152,11 @@ jobs:
                     echo "gcc misc/$f.c -Imisc $FLAGS -lz -o ../../ext/$f.dylib"
                     gcc misc/$f.c -Imisc $FLAGS -lz -o ../../ext/$f.dylib
                 done
+                
+                # Bugfix for #5145. The percentile extension was fixed, but the fix is not included in SQLite 3.47.1 source package.
+                rm -f misc/percentile.c
+                curl -L https://sqlite.org/src/raw/82531c62cd015b9cdca95ad6bb10c3a907ceb570d21ebd4fb7d634c809cfb089?at=percentile.c --output misc/percentile.c
+                
                 for f in csv decimal eval ieee754 percentile rot13 series uint uuid zorder; do
                     echo "gcc misc/$f.c -Imisc $FLAGS -o ../../ext/$f.dylib"
                     gcc misc/$f.c -Imisc $FLAGS -o ../../ext/$f.dylib
@@ -141,11 +167,6 @@ jobs:
                 done
                 ls -l ../../ext/
 
-            - name: Install Tcl
-              run: |
-                brew install tcl-tk
-                echo "PATH=/usr/local/opt/tcl-tk/bin:$PATH" >> $GITHUB_ENV
-
             - name: Prepare deps
               run: |
                 mkdir ../lib ../include
@@ -171,6 +192,7 @@ jobs:
                     $([ ${{ inputs.use_ccache || false }} = false ] || echo "CONFIG+=ccache") \
                     CONFIG+=portable \
                     "INCLUDEPATH+=$pythonLocation/include/python$PYTHON_VERSION" "LIBS += -L$pythonLocation/lib" \
+                    "TCL_CONFIG=${{ env.TCL_CONFIG }}" \
                     ../../../Plugins
                 make -j 1
 
@@ -202,14 +224,20 @@ jobs:
                     --setvars project.version=${{ env.SQLITESTUDIO_VERSION }}
                 ls -l
 
+            - name: SHA256 checksums
+              shell: bash
+              run: |
+                sha256sum output/SQLiteStudio/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.dmg
+                sha256sum SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-osx-installer.dmg
+
             - name: Upload package artifact
-              uses: actions/upload-artifact@v1
+              uses: actions/upload-artifact@v4
               with:
                 name: sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.dmg
                 path: output/SQLiteStudio/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.dmg
 
             - name: Upload installer artifact
-              uses: actions/upload-artifact@v1
+              uses: actions/upload-artifact@v4
               with:
                 name: SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-osx-installer.dmg
                 path: SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-osx-installer.dmg
-- 
cgit v1.2.3