Merge remote-tracking branch 'origin/dev'

Author: sanny32

.github/workflows/build-deb-qt5-amd64.yml

@@ -13,6 +13,9 @@ on:
         description: 'Checkout tag'
         required: false
 
+permissions:
+  contents: write
+
 jobs:
   build-omodsim:
     name: Build OpenModSim deb package version '${{ github.event.inputs.tag || github.event.inputs.branch || github.ref_name }}' with Qt5
@@ -184,6 +187,7 @@ jobs:
       - name: Create Debian rules file
         run: |
           sed -e "s|@QT_LIB_PATH@|${{ env.QT_INSTALL_DIR }}/${{ env.QT_VERSION }}/${{ env.CMAKE_COMPILER }}/lib|g" \
+              -e "s|@PACKAGE_NAME@|${{ env.DEB_PACKAGE_NAME }}|g" \
               ${{ env.DEB_SRC_DIR }}/debian/rules.in > ${{ env.DEB_SRC_DIR }}/debian/rules
           rm ${{ env.DEB_SRC_DIR }}/debian/rules.in
           cat -n ${{ env.DEB_SRC_DIR }}/debian/rules
@@ -201,3 +205,16 @@ jobs:
         with:
           name: ${{ env.DEB_PACKAGE_NAME }}_${{ env.APP_VERSION }}-${{ env.DEB_REVISION }}_${{ env.DEB_ARCH }}
           path: ${{ env.BUILD_DEB_DIR }}/${{ env.DEB_PACKAGE_NAME }}_${{ env.APP_VERSION }}-${{ env.DEB_REVISION }}_${{ env.DEB_ARCH }}.deb
+
+      - name: Create or update GitHub Release and upload DEB
+        if: success() && github.event_name == 'push' && github.ref_type == 'tag'
+        uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          tag_name: ${{ github.ref_name }}
+          name: Open ModSim ${{ env.APP_VERSION }}
+          files: |
+            ${{ env.BUILD_DEB_DIR }}/${{ env.DEB_PACKAGE_NAME }}_${{ env.APP_VERSION }}-${{ env.DEB_REVISION }}_${{ env.DEB_ARCH }}.deb
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

.github/workflows/build-deb-qt6-amd64.yml

@@ -13,6 +13,9 @@ on:
         description: 'Checkout tag'
         required: false
 
+permissions:
+  contents: write
+
 jobs:
   build-omodsim:
     name: Build OpenModSim deb package version '${{ github.event.inputs.tag || github.event.inputs.branch || github.ref_name }}' with Qt6
@@ -26,6 +29,7 @@ jobs:
       QT_TARGET: "desktop"
       QT_ARCH: "linux_gcc_64"
       QT_INSTALL_DIR: "/opt/Qt"
+      QT_QPA_PLATFORM: "xcb"
       CMAKE_COMPILER: "gcc_64"
       CMAKE_GENERATOR: "Ninja"
       BUILD_TYPE: "Release"
@@ -90,8 +94,7 @@ jobs:
       - name: Set Python 3.12 as default
         run: |
           update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.12 2
-          update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
-          update-alternatives --auto python3
+          update-alternatives --set python3 /usr/local/bin/python3.12
 
       - name: Upgrade pip
         run: |
@@ -157,6 +160,7 @@ jobs:
           git clone https://github.com/QuasarApp/CQtDeployer.git
           cd CQtDeployer
           git checkout v1.6.2365
+          wget -qO- https://github.com/QuasarApp/CQtDeployer/pull/846.patch | git apply
           git submodule update --init --recursive
           cmake -B build -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_PREFIX_PATH=${{ env.QT_INSTALL_DIR }}/${{ env.QT_VERSION }}/${{ env.CMAKE_COMPILER }} \
@@ -173,8 +177,9 @@ jobs:
           CQtDeployer -bin ${{ env.BUILD_DIR }}/omodsim \
             -targetDir ${{ env.DEB_SRC_DIR }}/opt/OpenModSim \
             -libDir ${{ env.QT_INSTALL_DIR }}/${{ env.QT_VERSION }}/${{ env.CMAKE_COMPILER }}/lib \
-            -ignore libcrypto.so.3,libmysqlclient.so.21,libpq.so.5,libssl.so.3,libqsqlmimer.so,libqsqlmysql.so,libqsqlodbc.so,libqsqlpsql.so \
-            -extraLibs icudata,icui18n,icuuc,libxcb-util
+            -ignore libcrypto.so.3,libmysqlclient.so.21,libpq.so.5,libssl.so.3,libqsqlmimer.so,libqsqlmysql.so,libqsqlodbc.so,libqsqlpsql.so,libqsqlibase.so,libqsqloci.so \
+            -extraLibs icudata,icui18n,icuuc,libxcb-util  \
+            -customScript 'export QT_QPA_PLATFORM=${{ env.QT_QPA_PLATFORM }}'
 
       - name: Copy OpenModsim docs
         run: rsync -a "${{ env.BUILD_DIR }}/docs/" "${{ env.DEB_SRC_DIR }}/opt/OpenModSim/docs/"
@@ -208,6 +213,7 @@ jobs:
       - name: Create Debian rules file
         run: |
           sed -e "s|@QT_LIB_PATH@|${{ env.QT_INSTALL_DIR }}/${{ env.QT_VERSION }}/${{ env.CMAKE_COMPILER }}/lib|g" \
+              -e "s|@PACKAGE_NAME@|${{ env.DEB_PACKAGE_NAME }}|g" \
               ${{ env.DEB_SRC_DIR }}/debian/rules.in > ${{ env.DEB_SRC_DIR }}/debian/rules
           rm ${{ env.DEB_SRC_DIR }}/debian/rules.in
           cat -n ${{ env.DEB_SRC_DIR }}/debian/rules
@@ -225,3 +231,15 @@ jobs:
         with:
           name: ${{ env.DEB_PACKAGE_NAME }}_${{ env.APP_VERSION }}-${{ env.DEB_REVISION }}_${{ env.DEB_ARCH }}
           path: ${{ env.BUILD_DEB_DIR }}/${{ env.DEB_PACKAGE_NAME }}_${{ env.APP_VERSION }}-${{ env.DEB_REVISION }}_${{ env.DEB_ARCH }}.deb
+
+      - name: Create or update GitHub Release and upload DEB
+        if: success() && github.event_name == 'push' && github.ref_type == 'tag'
+        uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          tag_name: ${{ github.ref_name }}
+          name: Open ModSim ${{ env.APP_VERSION }}
+          files: |
+            ${{ env.BUILD_DEB_DIR }}/${{ env.DEB_PACKAGE_NAME }}_${{ env.APP_VERSION }}-${{ env.DEB_REVISION }}_${{ env.DEB_ARCH }}.deb
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-installer-qt5-win32.yml

@@ -13,6 +13,9 @@ on:
         description: 'Checkout tag'
         required: false
 
+permissions:
+  contents: write
+
 env:
   QT_VERSION: 5.15.2
   QT_ARCH: win32_msvc2019
@@ -123,4 +126,16 @@ jobs:
         if: success()
         with:
           name: qt5-omodsim-${{ env.APP_VERSION }}_${{ env.ARCH }}
-          path: qt5-omodsim-${{ env.APP_VERSION }}_${{ env.ARCH }}.exe
+          path: qt5-omodsim-${{ env.APP_VERSION }}_${{ env.ARCH }}.exe
+
+      - name: Create or update GitHub Release and upload EXE
+        if: success() && github.event_name == 'push' && github.ref_type == 'tag'
+        uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          tag_name: ${{ github.ref_name }}
+          name: Open ModSim ${{ env.APP_VERSION }}
+          files: |
+            qt5-omodsim-${{ env.APP_VERSION }}_${{ env.ARCH }}.exe
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-installer-qt5-win64.yml

@@ -13,6 +13,9 @@ on:
         description: 'Checkout tag'
         required: false
 
+permissions:
+  contents: write
+
 env:
   QT_VERSION: 5.15.2
   QT_ARCH: win64_msvc2019_64
@@ -122,4 +125,16 @@ jobs:
         if: success()
         with:
           name: qt5-omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}
-          path: qt5-omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}.exe
+          path: qt5-omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}.exe
+
+      - name: Create or update GitHub Release and upload EXE
+        if: success() && github.event_name == 'push' && github.ref_type == 'tag'
+        uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          tag_name: ${{ github.ref_name }}
+          name: Open ModSim ${{ env.APP_VERSION }}
+          files: |
+            qt5-omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}.exe
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-installer-qt6-win64.yml

@@ -12,7 +12,10 @@ on:
       tag:
         description: 'Checkout tag'
         required: false
-      
+
+permissions:
+  contents: write
+
 env:
   QT_VERSION: 6.9.3
   QT_ARCH: win64_msvc2022_64
@@ -118,4 +121,16 @@ jobs:
         if: success()
         with:
           name: qt6-omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}
-          path: qt6-omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}.exe
+          path: qt6-omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}.exe
+
+      - name: Create or update GitHub Release and upload EXE
+        if: success() && github.event_name == 'push' && github.ref_type == 'tag'
+        uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          tag_name: ${{ github.ref_name }}
+          name: Open ModSim ${{ env.APP_VERSION }}
+          files: |
+            qt6-omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}.exe
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-rpm-qt6-x86_64.yml

@@ -13,6 +13,9 @@ on:
         description: 'Checkout tag'
         required: false
 
+permissions:
+  contents: write
+
 jobs:
   build-omodsim:
     name: Build OpenModSim rpm package version '${{ github.event.inputs.tag || github.event.inputs.branch || github.ref_name }}' with Qt6
@@ -26,6 +29,7 @@ jobs:
       QT_TARGET: "desktop"
       QT_ARCH: "linux_gcc_64"
       QT_INSTALL_DIR: "/opt/Qt"
+      QT_QPA_PLATFORM: "xcb"
       CMAKE_COMPILER: "gcc_64"
       CMAKE_GENERATOR: "Ninja"
       BUILD_TYPE: "Release"
@@ -60,7 +64,7 @@ jobs:
           apt-get update
           apt-get install -y \
             git build-essential ninja-build cmake patchelf rsync \
-            rpm gpg \
+            rpm gnupg2 \
             libglu1-mesa libgl1-mesa-dev libxkbcommon0 libxkbcommon-x11-0 \
             libxcb1 libxcb-xinerama0 libxcb-cursor0 libxcb-keysyms1 libxcb-xfixes0 \
             libxcb-shape0 libxcb-render-util0 libxcb-icccm4 libxcb-image0 \
@@ -90,8 +94,7 @@ jobs:
       - name: Set Python 3.12 as default
         run: |
           update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.12 2
-          update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
-          update-alternatives --auto python3
+          update-alternatives --set python3 /usr/local/bin/python3.12
 
       - name: Upgrade pip
         run: |
@@ -157,6 +160,7 @@ jobs:
           git clone https://github.com/QuasarApp/CQtDeployer.git
           cd CQtDeployer
           git checkout v1.6.2365
+          wget -qO- https://github.com/QuasarApp/CQtDeployer/pull/846.patch | git apply
           git submodule update --init --recursive
           cmake -B build -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_PREFIX_PATH=${{ env.QT_INSTALL_DIR }}/${{ env.QT_VERSION }}/${{ env.CMAKE_COMPILER }} \
@@ -173,8 +177,9 @@ jobs:
           CQtDeployer -bin ${{ env.BUILD_DIR }}/omodsim \
             -targetDir ${{ env.BUILD_RPM_DIR }}/SOURCES/omodsim/opt/OpenModSim \
             -libDir ${{ env.QT_INSTALL_DIR }}/${{ env.QT_VERSION }}/${{ env.CMAKE_COMPILER }}/lib \
-            -ignore libcrypto.so.3,libmysqlclient.so.21,libpq.so.5,libssl.so.3,libqsqlmimer.so,libqsqlmysql.so,libqsqlodbc.so,libqsqlpsql.so \
-            -extraLibs icudata,icui18n,icuuc
+            -ignore libcrypto.so.3,libmysqlclient.so.21,libpq.so.5,libssl.so.3,libqsqlmimer.so,libqsqlmysql.so,libqsqlodbc.so,libqsqlpsql.so,libqsqlibase.so,libqsqloci.so \
+            -extraLibs icudata,icui18n,icuuc \
+            -customScript 'export QT_QPA_PLATFORM=${{ env.QT_QPA_PLATFORM }}'
 
       - name: Copy OpenModsim docs
         run: rsync -a "${{ env.BUILD_DIR }}/docs/" "${{ env.BUILD_RPM_DIR }}/SOURCES/omodsim/opt/OpenModSim/docs/"
@@ -232,3 +237,17 @@ jobs:
         with:
           name: ${{ env.RPM_PACKAGE_NAME }}.rpm.pubkey
           path: ${{ env.RPM_PACKAGE_NAME }}.rpm.pubkey
+
+      - name: Create or update GitHub Release and upload RPM
+        if: success() && github.event_name == 'push' && github.ref_type == 'tag'
+        uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          tag_name: ${{ github.ref_name }}
+          name: Open ModSim ${{ env.APP_VERSION }}
+          files: |
+            ${{ env.BUILD_RPM_DIR }}/RPMS/${{ env.RPM_ARCH }}/${{ env.RPM_PACKAGE_NAME }}-${{ env.APP_VERSION }}-${{ env.RPM_REVISION }}.${{ env.RPM_ARCH }}.rpm
+            ${{ env.RPM_PACKAGE_NAME }}.rpm.pubkey
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      

.pkg/deb/control.in

@@ -7,5 +7,5 @@ Standards-Version: 4.6.2
 
 Package: @PACKAGE_NAME@
 Architecture: amd64
-Depends: libatk1.0-0, libatomic1, libc6, libcairo-gobject2, libcairo2, libcups2, libdbus-1-3, libdrm2, libegl1, libfontconfig1, libfreetype6, libgcc1, libgdk-pixbuf-2.0-0, libgl1, libglib2.0-0, libglx0, libgssapi-krb5-2, libgtk-3-0, libopengl0, libpango-1.0-0, libpangocairo-1.0-0, libstdc++6, libwayland-client0, libwayland-cursor0, libwayland-egl1, libx11-6, libx11-xcb1, libxcb-cursor0, libxcb-glx0, libxcb-icccm4, libxcb-image0, libxcb-keysyms1, libxcb-randr0, libxcb-render-util0, libxcb-render0, libxcb-shape0, libxcb-shm0, libxcb-sync1, libxcb-xfixes0, libxcb-xkb1, libxcb1, libxkbcommon-x11-0, libxkbcommon0, libzstd1, zlib1g
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: An Open Source Modbus Slave (Server) Utility.

.pkg/deb/rules.in

@@ -7,13 +7,17 @@ override_dh_builddeb:
 	dh_builddeb -- -Zgzip
 
 override_dh_dwz:
-
+	:
 
 override_dh_shlibdeps:
-	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -l@QT_LIB_PATH@
+	dh_shlibdeps \
+		--dpkg-shlibdeps-params="--ignore-missing-info" \
+		-l@QT_LIB_PATH@
 
-override_dh_strip:
-	dh_strip --no-automatic-dbgsym
+	sed -i 's/, libgcc-s1 (>= [^)]*)//g' debian/@PACKAGE_NAME@.substvars
+	sed -i 's/libgcc-s1 (>= [^)]*), //g' debian/@PACKAGE_NAME@.substvars
 
-override_dh_gencontrol:
-	dh_gencontrol -- -Vshlibs:Depends=
+	cat debian/@PACKAGE_NAME@.substvars || true
+
+override_dh_strip:
+	dh_strip --no-automatic-dbgsym

README.md

@@ -153,18 +153,18 @@ Below are the methods for installing the OpenModSim for different OS
 ## Microsoft Windows
 Run the installer:
 
-- For 32-bit Windows: `qt5-omodsim_1.11.0_x86.exe`
-- For 64-bit Windows: `qt5-omodsim_1.11.0_x64.exe` or `qt6-omodsim_1.11.0_x64.exe`
+- For 32-bit Windows: `qt5-omodsim_1.11.1_x86.exe`
+- For 64-bit Windows: `qt5-omodsim_1.11.1_x64.exe` or `qt6-omodsim_1.11.1_x64.exe`
 
 ## Debian/Ubintu/Mint/Astra Linux
 ### Install
 Install the DEB package from the command line:
 ```bash
-sudo apt install ./qt6-omodsim_1.11.0-1_amd64.deb
+sudo apt install ./qt6-omodsim_1.11.1-1_amd64.deb
 ```
 or if you want to use Qt5 libraries:
 ```bash
-sudo apt install ./qt5-omodsim_1.11.0-1_amd64.deb
+sudo apt install ./qt5-omodsim_1.11.1-1_amd64.deb
 ```
 
 ### Remove
@@ -181,7 +181,7 @@ sudo apt remove qt5-omodsim
 ### Install
 Install the RPM package from the command line:
 ```bash
-sudo dnf install ./qt6-omodsim-1.11.0-1.x86_64.rpm
+sudo dnf install ./qt6-omodsim-1.11.1-1.x86_64.rpm
 ```
 
 ### Remove
@@ -194,7 +194,7 @@ sudo dnf remove qt6-omodsim
 ### Install
 Install the RPM package from the command line as root user:
 ```bash
-apt-get install ./qt6-omodsim-1.11.0-1.x86_64.rpm
+apt-get install ./qt6-omodsim-1.11.1-1.x86_64.rpm
 ```
 
 ### Remove
@@ -211,7 +211,7 @@ sudo rpm --import qt6-omodsim.rpm.pubkey
 ```
 Install the RPM package using Zypper:
 ```bash
-sudo zypper install ./qt6-omodsim-1.11.0-1.x86_64.rpm
+sudo zypper install ./qt6-omodsim-1.11.1-1.x86_64.rpm
 ```
 
 ### Remove