New upstream version 3.4.13+dfsg.upstream/3.4.13+dfsgupstream

4 files changed, 116 insertions, 39 deletions

diff --git a/.github/workflows/lin_release.yml b/.github/workflows/lin_release.yml
index 2f6145a..d233b2d 100644
--- a/.github/workflows/lin_release.yml
+++ b/.github/workflows/lin_release.yml
@@ -1,12 +1,14 @@
 env:
     QT_VERSION: '5.15.2'
     TCL_VERSION: '8.6'
-    SQLITE_VERSION: '3410200'
-    SQLITE_RELEASE_YEAR: '2023'
+    SQLITE_VERSION: '3470200'
+    SQLITE_RELEASE_YEAR: '2024'
     PYTHON_VERSION: '3.9'
     PORTABLE_DIR: ${{ github.workspace }}/output/portable/SQLiteStudio
     INSTALLBUILDER_DIR: ../ib
-    INSTALLBUILDER_URL: https://releases.bitrock.com/installbuilder/installbuilder-enterprise-23.1.0-linux-x64-installer.run
+    INSTALLBUILDER_URL: https://releases.installbuilder.com/installbuilder/installbuilder-enterprise-24.3.0-linux-x64-installer.run
+    LIBSSL_DIR_URL: http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/
+    LIBSSL_DEB: libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb
 
 name: Linux release build
 
@@ -68,6 +70,13 @@ jobs:
               run: |
                 cd ..
                 curl -L http://sqlite.org/$SQLITE_RELEASE_YEAR/sqlite-src-$SQLITE_VERSION.zip --output sqlite-src-$SQLITE_VERSION.zip
+                mkdir ext
+                unzip sqlite-src-$SQLITE_VERSION.zip
+
+                # Bugfix for #5145. The percentile extension was fixed, but the fix is not included in SQLite 3.47.1 source package.
+                cd sqlite-src-$SQLITE_VERSION/ext
+                rm -f misc/percentile.c
+                curl -L https://sqlite.org/src/raw/82531c62cd015b9cdca95ad6bb10c3a907ceb570d21ebd4fb7d634c809cfb089?at=percentile.c --output misc/percentile.c
 
             - name: Prepare ccache
               if: inputs.use_ccache || false
@@ -83,6 +92,7 @@ jobs:
 
             - name: Install SQLite3
               run: |
+                set -x
                 sudo rm -f /usr/lib/libsqlite* /usr/local/lib/libsqlite* /usr/include/sqlite* /usr/local/include/sqlite* /usr/lib/x86_64-linux-gnu/libsqlite*
                 wget http://sqlite.org/$SQLITE_RELEASE_YEAR/sqlite-amalgamation-$SQLITE_VERSION.zip
                 unzip sqlite-amalgamation-$SQLITE_VERSION.zip
@@ -101,16 +111,16 @@ jobs:
                     -DSQLITE_ENABLE_RTREE \
                     -DSQLITE_ENABLE_MATH_FUNCTIONS
                 strip libsqlite3.so
+                ls -l
                 sudo cp -P libsqlite3.so* /usr/local/lib/
                 sudo cp *.h /usr/local/include/
+                ls -l /usr/local/lib/libsqlite3*
+                ls -l /usr/local/include/sqlite*
 
             - name: Compile additional SQLite3 extensions
               shell: bash
               run: |
-                cd ..
-                mkdir ext
-                unzip sqlite-src-$SQLITE_VERSION.zip
-                cd sqlite-src-$SQLITE_VERSION/ext
+                cd ../sqlite-src-$SQLITE_VERSION/ext
                 FLAGS="-ldl -Os -fpic -shared -Imisc -I/usr/local/include -L/usr/local/lib -lsqlite3"
                 for f in compress; do
                     echo "gcc misc/$f.c $FLAGS -lz -o ../../ext/$f.so"
@@ -180,8 +190,8 @@ jobs:
 
             - name: Copy Qt's libcrypto and libssl to portable dir (#4577)
               run: |
-                wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.17_amd64.deb
-                dpkg-deb -xv libssl1.1_1.1.1f-1ubuntu2.17_amd64.deb .
+                wget ${{ env.LIBSSL_DIR_URL }}${{ env.LIBSSL_DEB }}
+                dpkg-deb -xv ${{ env.LIBSSL_DEB }} .
                 cp ./usr/lib/x86_64-linux-gnu/libssl.so.1.1 ${{ env.PORTABLE_DIR }}/lib/
                 cp ./usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 ${{ env.PORTABLE_DIR }}/lib/
 
@@ -195,6 +205,7 @@ jobs:
                 cp -P ${{ env.Qt5_Dir }}/lib/libQt5Network.so* lib/
                 cp -P ${{ env.Qt5_Dir }}/lib/libQt5PrintSupport.so* lib/
                 cp -P ${{ env.Qt5_Dir }}/lib/libQt5Qml.so* lib/
+                cp -P ${{ env.Qt5_Dir }}/lib/libQt5WaylandClient.so* lib/
                 cp -P ${{ env.Qt5_Dir }}/lib/libQt5Widgets.so* lib/
                 cp -P ${{ env.Qt5_Dir }}/lib/libQt5Xml.so* lib/
                 cp -P ${{ env.Qt5_Dir }}/lib/libQt5Svg.so* lib/
@@ -206,8 +217,9 @@ jobs:
             - name: Copy Qt plugins to portable dir
               working-directory: ${{ env.PORTABLE_DIR }}
               run: |
-                mkdir platforms imageformats iconengines printsupport platformthemes platforminputcontexts
+                mkdir platforms imageformats iconengines printsupport platformthemes platforminputcontexts wayland-decoration-client wayland-graphics-integration-client wayland-shell-integration
                 cp -P ${{ env.Qt5_Dir }}/plugins/platforms/libqxcb.so platforms/libqxcb.so
+                cp -P ${{ env.Qt5_Dir }}/plugins/platforms/libqwayland-*.so platforms/
                 cp -P ${{ env.Qt5_Dir }}/plugins/imageformats/libqgif.so imageformats/libqgif.so
                 cp -P ${{ env.Qt5_Dir }}/plugins/imageformats/libqicns.so imageformats/libqicns.so
                 cp -P ${{ env.Qt5_Dir }}/plugins/imageformats/libqico.so imageformats/libqico.so
@@ -219,15 +231,21 @@ jobs:
                 cp -P ${{ env.Qt5_Dir }}/plugins/printsupport/libcupsprintersupport.so printsupport/libcupsprintersupport.so
                 cp -P ${{ env.Qt5_Dir }}/plugins/platformthemes/libqgtk3.so platformthemes/libqgtk3.so
                 cp -P ${{ env.Qt5_Dir }}/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so platforminputcontexts/libcomposeplatforminputcontextplugin.so
-
+                cp -P ${{ env.Qt5_Dir }}/plugins/wayland-decoration-client/*.so wayland-decoration-client/
+                cp -P ${{ env.Qt5_Dir }}/plugins/wayland-graphics-integration-client/*.so wayland-graphics-integration-client/
+                cp -P ${{ env.Qt5_Dir }}/plugins/wayland-shell-integration/*.so wayland-shell-integration/
+             
             - name: Fix dependency paths
               working-directory: ${{ env.PORTABLE_DIR }}
               run: |
-                chrpath -k -r \$ORIGIN/../lib   platforms/*.so imageformats/*.so iconengines/*.so printsupport/*.so platformthemes/*.so plugins/*.so 2>&1 >/dev/null
+                set -x
+                chrpath -k -r \$ORIGIN/../lib   platforms/*.so imageformats/*.so iconengines/*.so printsupport/*.so platformthemes/*.so plugins/*.so wayland-*/*.so 2>&1 >/dev/null
+                chrpath -k -r \$ORIGIN          lib/libicu*.*.*
                 chrpath -k -r \$ORIGIN          lib/libcoreSQLiteStudio.so lib/libguiSQLiteStudio.so 2>&1 >/dev/null
                 chrpath -k -r \$ORIGIN/lib      sqlitestudio 2>&1 >/dev/null
                 chrpath -k -r \$ORIGIN/lib      sqlitestudiocli 2>&1 >/dev/null
                 chrpath -l platforms/*.so imageformats/*.so iconengines/*.so printsupport/*.so platformthemes/*.so plugins/*.so
+                chrpath -l lib/libicu*.*.*
                 chrpath -l lib/libcoreSQLiteStudio.so lib/libguiSQLiteStudio.so
                 chrpath -l sqlitestudio
                 chrpath -l sqlitestudiocli
@@ -244,7 +262,10 @@ jobs:
                 cp `ldd sqlitestudiocli | grep readline | awk '{print $3}'` lib/
                 cp `ldd lib/libreadline* | grep tinfo | awk '{print $3}'` lib/
                 strip lib/*.so sqlitestudio sqlitestudiocli platforms/*.so imageformats/*.so iconengines/*.so printsupport/*.so platformthemes/*.so plugins/*.so
-                patchelf --set-rpath '$ORIGIN' lib/libreadline*
+                # These may have no initial rpath/runpath so chrpath does not work on them
+                patchelf --set-rpath '$ORIGIN' \
+                  lib/libQt5Core.so.*.*.* \
+                  lib/libreadline*
 
             - name: Determine SQLiteStudio version
               working-directory: ${{ env.PORTABLE_DIR }}
@@ -271,14 +292,20 @@ jobs:
                     --setvars project.version=$SQLITESTUDIO_VERSION
                 ls -l
 
+            - name: SHA256 checksums
+              shell: bash
+              run: |
+                sha256sum output/portable/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.tar.xz
+                sha256sum SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-linux-x64-installer.run
+
             - name: Upload package artifact
-              uses: actions/upload-artifact@v1
+              uses: actions/upload-artifact@v4
               with:
                 name: sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.tar.xz
                 path: output/portable/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.tar.xz
 
             - name: Upload installer artifact
-              uses: actions/upload-artifact@v1
+              uses: actions/upload-artifact@v4
               with:
                 name: SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-linux-x64-installer.run
                 path: SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-linux-x64-installer.run
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
diff --git a/.github/workflows/win32_release.yml b/.github/workflows/win32_release.yml
index a522d3c..cf0f48b 100644
--- a/.github/workflows/win32_release.yml
+++ b/.github/workflows/win32_release.yml
@@ -1,7 +1,7 @@
 env:
     QT_VERSION: '5.15.2'
-    SQLITE_VERSION: '3410200'
-    SQLITE_RELEASE_YEAR: '2023'
+    SQLITE_VERSION: '3470200'
+    SQLITE_RELEASE_YEAR: '2024'
     QT_ARCH: 'win32_mingw81'
     PYTHON_VERSION: '3.9'
     ICU_VER: '72'
@@ -10,7 +10,7 @@ env:
     PORTABLE_DIR: output/portable/SQLiteStudio
     INSTALLBUILDER_DIR: ../ib
     MINGW_URL: https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/tools_mingw/qt.tools.win32_mingw810/8.1.0-1-202004170606i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z
-    INSTALLBUILDER_URL: https://releases.bitrock.com/installbuilder/installbuilder-enterprise-23.1.0-windows-installer.exe
+    INSTALLBUILDER_URL: https://releases.bitrock.com/installbuilder/installbuilder-enterprise-24.3.0-windows-installer.exe
 
 name: Windows 32-bit release build
 
@@ -131,6 +131,11 @@ jobs:
                 #    echo "$GCC_COMMAND misc/$f.c -Imisc $FLAGS -lzlib1 -o ../../ext/$f.dll"
                 #    $GCC_COMMAND misc/$f.c -Imisc $FLAGS -lzlib1 -o ../../ext/$f.dll
                 #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_COMMAND misc/$f.c -Imisc $FLAGS -o ../../ext/$f.dll"
                     $GCC_COMMAND misc/$f.c -Imisc $FLAGS -o ../../ext/$f.dll
@@ -251,14 +256,20 @@ jobs:
                     --setvars project.version=$SQLITESTUDIO_VERSION
                 ls -l
 
+            - name: SHA256 checksums
+              shell: bash
+              run: |
+                sha256sum output/portable/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.zip
+                sha256sum SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-windows-installer.exe
+
             - name: Upload package artifact
-              uses: actions/upload-artifact@v1
+              uses: actions/upload-artifact@v4
               with:
                 name: sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.zip
                 path: output/portable/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.zip
 
             - name: Upload installer artifact
-              uses: actions/upload-artifact@v1
+              uses: actions/upload-artifact@v4
               with:
                 name: SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-windows-installer.exe
                 path: SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-windows-installer.exe
diff --git a/.github/workflows/win64_release.yml b/.github/workflows/win64_release.yml
index 2f44835..c0aa237 100644
--- a/.github/workflows/win64_release.yml
+++ b/.github/workflows/win64_release.yml
@@ -1,7 +1,7 @@
 env:
     QT_VERSION: '5.15.2'
-    SQLITE_VERSION: '3410200'
-    SQLITE_RELEASE_YEAR: '2023'
+    SQLITE_VERSION: '3470200'
+    SQLITE_RELEASE_YEAR: '2024'
     QT_ARCH: 'win64_mingw81'
     PYTHON_VERSION: '3.9'
     ICU_VER: '72'
@@ -11,7 +11,7 @@ env:
     PORTABLE_DIR: output/portable/SQLiteStudio
     INSTALLBUILDER_DIR: ../ib
     MINGW_URL: https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/tools_mingw/qt.tools.win64_mingw810/8.1.0-1-202004170606x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z
-    INSTALLBUILDER_URL: https://releases.bitrock.com/installbuilder/installbuilder-enterprise-23.1.0-windows-x64-installer.exe
+    INSTALLBUILDER_URL: https://releases.bitrock.com/installbuilder/installbuilder-enterprise-24.3.0-windows-x64-installer.exe
 
 name: Windows 64-bit release build
 
@@ -134,6 +134,11 @@ jobs:
                     echo "$GCC_COMMAND misc/$f.c -Imisc $FLAGS -lzlib1 -o ../../ext/$f.dll"
                     $GCC_COMMAND misc/$f.c -Imisc $FLAGS -lzlib1 -o ../../ext/$f.dll
                 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_COMMAND misc/$f.c -Imisc $FLAGS -o ../../ext/$f.dll"
                     $GCC_COMMAND misc/$f.c -Imisc $FLAGS -o ../../ext/$f.dll
@@ -252,14 +257,20 @@ jobs:
                     --setvars project.version=$SQLITESTUDIO_VERSION
                 ls -l
 
+            - name: SHA256 checksums
+              shell: bash
+              run: |
+                sha256sum output/portable/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.zip
+                sha256sum SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-windows-x64-installer.exe
+
             - name: Upload package artifact
-              uses: actions/upload-artifact@v1
+              uses: actions/upload-artifact@v4
               with:
                 name: sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.zip
                 path: output/portable/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.zip
 
             - name: Upload installer artifact
-              uses: actions/upload-artifact@v1
+              uses: actions/upload-artifact@v4
               with:
                 name: SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-windows-x64-installer.exe
                 path: SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-windows-x64-installer.exe