Merge branch 'release/v3.49.0' into 'stable'

feat: Prepare release v3.49.0 See merge request rpdev/opentodolist!440
mhoeher · Jan 11, 2025 · b07193f · b07193f
2 parents af14fdf + d6814b7
commit b07193f
Show file tree

Hide file tree

Showing 148 changed files with 25,414 additions and 9,078 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json
 
 variables:
-  QT_VERSION: "6.7.2"
+  QT_VERSION: "6.8.1"
   UBUNTU_IMAGE: registry.gitlab.com/rpdev/docker/qt6-ubuntu:$QT_VERSION
   ANDROID_IMAGE: registry.gitlab.com/rpdev/docker/qt6-android:$QT_VERSION
-  FLATPAK_IMAGE: registry.gitlab.com/rpdev/docker/flatpak-builder-kde-qt6:6.7
-  SNAPCRAFT_IMAGE: registry.gitlab.com/rpdev/docker/snapcraft
+  FLATPAK_IMAGE: registry.gitlab.com/rpdev/docker/flatpak-builder-kde-qt6:6.8
+  DOCKER_IMAGE: docker
+  DOCKER_DIND_IMAGE: docker:dind
+  SNAPCRAFT_IMAGE: ghcr.io/canonical/snapcraft:7_core22
   NEXTCLOUD_IMAGE: nextcloud
   OWNCLOUD_IMAGE: owncloud
   CTEST_OUTPUT_ON_FAILURE: 1
@@ -44,14 +46,15 @@ workflow:
       when: always
     - if: $CI_MERGE_REQUEST_ID
       when: never
+    - when: always
 
 ################################################################################
 # Prepare Stage
 ################################################################################
 
 download_translations:
   stage: prepare
-  image: fedora
+  image: $UBUNTU_IMAGE
   script:
     ./ci/download_translations.sh
   rules:
@@ -258,9 +261,12 @@ flatpak:
 # Build the app as Snap
 snap::build:
     stage: build
-    image: $SNAPCRAFT_IMAGE
+    image: $DOCKER_IMAGE
+    services:
+      - $DOCKER_DIND_IMAGE
     script:
-        - snapcraft snap
+        - docker pull $SNAPCRAFT_IMAGE
+        - docker run --rm -v $PWD:/project $SNAPCRAFT_IMAGE snap
     artifacts:
       paths:
         - opentodolist*.snap
@@ -365,7 +371,7 @@ playstore:
 
 upload_translations:
   stage: deploy
-  image: fedora
+  image: $UBUNTU_IMAGE
   script:
     ./ci/upload_translations.sh
   rules:
@@ -379,9 +385,12 @@ upload_translations:
 # Template to upload snaps:
 .snap::upload:
   stage: deploy
-  image: $SNAPCRAFT_IMAGE
+  image: $DOCKER_IMAGE
+  services:
+    - $DOCKER_DIND_IMAGE
   script:
-      - snapcraft upload opentodolist*.snap --release $SNAPCRAFT_CHANNEL
+      - docker pull $SNAPCRAFT_IMAGE
+      - docker run --rm -v $PWD:/project -e SNAPCRAFT_STORE_CREDENTIALS="$SNAPCRAFT_STORE_CREDENTIALS" $SNAPCRAFT_IMAGE upload opentodolist*.snap --release $SNAPCRAFT_CHANNEL
   needs:
     - snap::build
   allow_failure: true

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -28,16 +28,6 @@ build:
       # Make local files to have the real content on them
       - ./git-lfs checkout
 
-    pre_create_environment:
-      # Install PDM
-      - python -m venv /tmp/pdm
-      - /tmp/pdm/bin/pip install --upgrade pip
-      - /tmp/pdm/bin/pip install pdm
-
-    post_create_environment:
-      # Install development dependencies, including for doc build:
-      - /tmp/pdm/bin/pdm install
-
 mkdocs:
   configuration: doc/user-manual/mkdocs.yml
 

diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -81,6 +81,7 @@ if(NOT OPENTODOLIST_USE_SYSTEM_KF_SYNTAX_HIGHLIGHTING)
     else()
         set(KDE_SH_GENERATOR ${CMAKE_GENERATOR})
     endif()
+
     if(IOS)
         # On iOS, KDE Syntax Highlighting does not build out of the box. This is because the
         # build does not properly detect that we are cross-compiling. For this reason,
@@ -138,9 +139,35 @@ if(NOT OPENTODOLIST_USE_SYSTEM_KF_SYNTAX_HIGHLIGHTING)
             PATCH_COMMAND
                 ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/KDE/syntax-highlighting-ios.patch <SOURCE_DIR> && git checkout <SOURCE_DIR> && git apply <SOURCE_DIR>/syntax-highlighting-ios.patch
         )
-    unset(KF_SYNTAX_HIGHLIGHTING_SOURCE_ARGS)
+        unset(KF_SYNTAX_HIGHLIGHTING_SOURCE_ARGS)
+    endif()
 
+    if(ANDROID)
+        # On Android, we also need to tweak the build and apply a patch. Starting with Qt 6.8.1,
+        # zstd support is not part of the pre-built Qt binaries anymore. However, rcc for Android
+        # (at least on Linux hosts) still generates code assuming its presence! Hence, we
+        # need to tweak the syntax-highlighting build to explicitly turn zstd use off when
+        # building for Android.
+        execute_process(
+            COMMAND
+                git describe --tags
+            WORKING_DIRECTORY
+                ${CMAKE_CURRENT_SOURCE_DIR}/KDE/syntax-highlighting
+            OUTPUT_VARIABLE
+                KF5_SYNTAX_HIGHLIGHTING_VERSION
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+        set(KDE_SH_CROSSCOMPILING_ANDROID_EXTRA_PARAMS
+            GIT_REPOSITORY
+                ${CMAKE_CURRENT_SOURCE_DIR}/KDE/syntax-highlighting
+            GIT_TAG
+                ${KF5_SYNTAX_HIGHLIGHTING_VERSION}
+            PATCH_COMMAND
+                ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/KDE/syntax-highlighting-android.patch <SOURCE_DIR> && git checkout <SOURCE_DIR> && git apply <SOURCE_DIR>/syntax-highlighting-android.patch
+        )
+        unset(KF_SYNTAX_HIGHLIGHTING_SOURCE_ARGS)
     endif()
+
     set(
         KF5_PREFIX_PATHS
         ${OPENTODOLIST_MODULES_INSTALL_DIR}
@@ -166,6 +193,7 @@ if(NOT OPENTODOLIST_USE_SYSTEM_KF_SYNTAX_HIGHLIGHTING)
             -DECM_DIR:STRING=${OPENTODOLIST_MODULES_INSTALL_DIR}/share/ECM/cmake
             ${KDE_SH_CROSSCOMPILING_EXTRA_ARGS}
         ${KDE_SH_CROSSCOMPILING_IOS_EXTRA_PARAMS}
+        ${KDE_SH_CROSSCOMPILING_ANDROID_EXTRA_PARAMS}
     )
     ExternalProject_Add_StepDependencies(build_kf_syntax_highlighting configure build_ecm ${KDE_SH_CROSSCOMPILING_EXTRA_TARGETS})
 

diff --git a/3rdparty/KDE/syntax-highlighting-android.patch b/3rdparty/KDE/syntax-highlighting-android.patch
@@ -0,0 +1,13 @@
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 26a110d3..00f3a11f 100644
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -65,7 +65,7 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/index.katesyntax"
+ if (QRC_SYNTAX)
+     # generate the qrc file manually, to make dependencies on generated files work...
+     add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qrc_syntax-data.cpp"
+-        COMMAND Qt${QT_MAJOR_VERSION}::rcc --name syntax_data -o "${CMAKE_CURRENT_BINARY_DIR}/qrc_syntax-data.cpp" "${CMAKE_CURRENT_BINARY_DIR}/syntax-data.qrc"
++        COMMAND Qt${QT_MAJOR_VERSION}::rcc --name syntax_data -o "${CMAKE_CURRENT_BINARY_DIR}/qrc_syntax-data.cpp" "${CMAKE_CURRENT_BINARY_DIR}/syntax-data.qrc" --no-zstd
+         DEPENDS ${defs} ${CMAKE_CURRENT_BINARY_DIR}/index.katesyntax
+     )
+     set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/qrc_syntax-data.cpp" PROPERTIES SKIP_AUTOMOC ON)
diff --git a/app/appstartup.cpp b/app/appstartup.cpp
@@ -31,6 +31,8 @@
 #    endif
 #endif
 
+#include <cstdio>
+
 static Q_LOGGING_CATEGORY(log, "OpenTodoList.main", QtDebugMsg);
 
 QVector<QtMessageHandler> AppStartup::s_prevMessageHandler;

diff --git a/app/qml/Actions/MoveTask.qml b/app/qml/Actions/MoveTask.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import OpenTodoList 1.0 as OTL
+import "../Components" as Components
+import "../Utils" as Utils
+import OpenTodoList.Style as C
+
+Components.ItemAction {
+    property OTL.Library library: null
+    required property Utils.ItemUtils itemUtils
+
+    symbol: C.Icons.mdiContentCut
+    text: qsTr("Move")
+    onTriggered: itemUtils.moveTask(item, library)
+}
diff --git a/app/qml/Components/ApplicationShortcuts.qml b/app/qml/Components/ApplicationShortcuts.qml
@@ -55,6 +55,13 @@ Item {
         onTriggered: stackView.currentItem.attach()
     }
 
+    property C.Action backup: C.Action {
+        text: qsTr("Backup")
+        symbol: C.Icons.mdiArchive
+        enabled: typeof (stackView?.currentItem?.backup) === "function"
+        onTriggered: stackView.currentItem.backup()
+    }
+
     property C.Action close: C.Action {
         text: qsTr("Close")
         shortcut: StandardKey.Close

diff --git a/app/qml/Components/ApplicationToolBar.qml b/app/qml/Components/ApplicationToolBar.qml
@@ -41,7 +41,7 @@ C.ToolBar {
                 symbol: appShortcuts.leftSidebar.symbol
                 down: appShortcuts.leftSidebar.checked
                 flat: true
-                textColor: headerToolBar.palette.text
+                textColor: palette.text
                 onClicked: appShortcuts.leftSidebar.triggered()
                 Layout.alignment: Qt.AlignVCenter
             }
@@ -50,7 +50,7 @@ C.ToolBar {
                 id: backToolButton
 
                 flat: true
-                textColor: headerToolBar.palette.text
+                textColor: palette.text
                 symbol: {
                     switch (Qt.platform.os) {
                     case "ios":
@@ -102,7 +102,7 @@ C.ToolBar {
                         title: modelData.title
                         modal: true
                         y: applicationToolBar.height
-                        palette: C.ColorTheme.palette
+                        palette: C.ColorTheme.selectedPalette
 
                         Repeater {
                             model: menuFromAppMenu.appMenuEntry.items

diff --git a/app/qml/OpenTodoList/Style/ApplicationWindow.qml b/app/qml/OpenTodoList/Style/ApplicationWindow.qml
@@ -5,7 +5,7 @@ Basic.ApplicationWindow {
     id: appWindow
 
     font.family: Fonts.regularFont
-    palette: ColorTheme.palette
+    palette: ColorTheme.selectedPalette
 
     Overlay.overlay.palette: appWindow.palette
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,8 @@ @@
     #    endif
     #endif
+    #include <cstdio>
     static Q_LOGGING_CATEGORY(log, "OpenTodoList.main", QtDebugMsg);
     QVector<QtMessageHandler> AppStartup::s_prevMessageHandler;
@@ Expand Down @@