Fix qt6 release

pbek · Aug 3, 2024 · 8158ad0 · 8158ad0
1 parent 0bfbc37
commit 8158ad0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/build-release-qt6.yml b/.github/workflows/build-release-qt6.yml
@@ -278,7 +278,6 @@ jobs:
           # https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt6_650/qt.qt6.650.win64_mingw/
           # https://aqtinstall.readthedocs.io/en/latest/getting_started.html
           # https://ddalcino.github.io/aqt-list-server/
-          arch: win64_mingw
           modules: ${{env.QT_MODULES}}
           cache: true
 
@@ -288,6 +287,9 @@ jobs:
           export VERSION=$(cat version.h | sed 's/[^0-9,.]//g')
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
 
+      - name: Make sure MSVC is found
+        uses: ilammy/msvc-dev-cmd@v1
+
       - name: '⚙️ Printenv'
         shell: bash
         run: |

diff --git a/build-systems/github/snap.qt6/snapcraft.yaml b/build-systems/github/snap.qt6/snapcraft.yaml
@@ -1,6 +1,5 @@
 name: qownnotes
 version: git
-version-script: cat src/version.h | sed "s/[^0-9,.]//g"
 summary: Plain-text file markdown note taking with Nextcloud/ownCloud integration
 grade: stable
 confinement: strict
@@ -62,10 +61,8 @@ parts:
 #    source: https://github.com/pbek/qownnotes.git
     # see https://snapcraft.io/docs/qmake-plugin
     plugin: qmake
-    qt-version: qt6
-#    qmake-parameters:
-    options:
-      - ./src
+    qmake-project-file: ./src/QOwnNotes.pro
+    qmake-parameters:
       - CONFIG+=release
       - CONFIG+=snapcraft
     override-build: |
@@ -112,7 +109,7 @@ parts:
       make-parameters: ["FLAVOR=qt6"]
       build-packages:
         - build-essential
-        - qtbase6-dev
+        - qt6-base-dev
         - dpkg-dev
       stage-packages:
         - libxkbcommon0

diff --git a/src/libraries/botan/botan.pri b/src/libraries/botan/botan.pri
@@ -30,11 +30,11 @@ macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN \
 *icc*:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL
 
 #CONFIG(x86_64):DEFINES += BOTAN_TARGET_ARCH_IS_X86_64
-contains(QT_ARCH, i386):DEFINES += BOTAN_TARGET_ARCH_IS_X86_32 \
-                                   BOTAN_TARGET_CPU_IS_X86_FAMILY
-else: contains(QT_ARCH, x86_64): DEFINES += BOTAN_TARGET_ARCH_IS_X86_64 \
-                                    BOTAN_TARGET_CPU_HAS_NATIVE_64BIT \
-                                    BOTAN_TARGET_CPU_IS_X86_FAMILY
+# contains(QT_ARCH, i386):DEFINES += BOTAN_TARGET_ARCH_IS_X86_32 \
+#                                    BOTAN_TARGET_CPU_IS_X86_FAMILY
+# else: contains(QT_ARCH, x86_64): DEFINES += BOTAN_TARGET_ARCH_IS_X86_64 \
+#                                     BOTAN_TARGET_CPU_HAS_NATIVE_64BIT \
+#                                     BOTAN_TARGET_CPU_IS_X86_FAMILY
 
 win32 {
     DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \