debian/changelog

@@ -1,15 +1,3 @@
-calamares (3.3.9-0ubuntu2) plucky; urgency=medium
-
-  * Do not build with QtWebEngines on architectures that do not support it.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 29 Oct 2024 19:01:21 -0500
-
-calamares (3.3.9-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 15 Oct 2024 20:44:54 -0500
-
 calamares (3.3.8-0ubuntu1) oracular; urgency=medium
 
   * New upstream release.

debian/control

@@ -6,43 +6,43 @@ XSBC-Original-Maintainer: Jonathan Carter <jcc@debian.org>
 Build-Depends: cmake,
                cryptsetup <!nocheck>,
                debhelper-compat (= 13),
-               gettext,
-               libappstreamqt-dev,
-               libatasmart-dev,
-               libboost-python-dev,
-               libicu-dev,
                extra-cmake-modules,
-               libkf6config-dev,
+               gettext,
-               libkf6coreaddons-dev,
+               libappstreamqt5-dev (>= 1.0.0~),
-               libkf6crash-dev,
+               libkf5config-dev,
-               libkf6dbusaddons-dev,
+               libkf5coreaddons-dev,
-               libkf6i18n-dev,
+               libkf5crash-dev,
-               libkf6iconthemes-dev,
+               libkf5i18n-dev,
-               libkf6kio-dev,
+               libkf5iconthemes-dev,
-               libkf6package-dev,
+               libkf5kio-dev,
-               libkf6parts-dev,
+               libkf5parts-dev,
-               libkf6service-dev,
+               libkf5plasma-dev,
-               libkf6solid-dev,
+               libkf5service-dev,
-               libkpmcore-dev (>= 24.08),
+               libkf5solid-dev,
+               libkpmcore-dev,
                libparted-dev,
-               libplasma-dev,
+               libpolkit-qt5-1-dev,
-               libpolkit-qt6-1-dev,
                libpwquality-dev,
+               libqt5svg5-dev,
+               libqt5webkit5-dev,
                libyaml-cpp-dev,
-               os-prober,
+               os-prober <!nocheck>,
-               pkgconf,
+               pkg-config,
                pkg-kde-tools,
-               pkexec,
+               polkitd,
-               python3-all-dev,
+               python3-dev,
-               python3-yaml,
                python3-jsonschema,
-               qt6-base-dev,
+               python3-yaml,
-               qt6-declarative-dev,
+               qml-module-qtquick-layouts,
-               qt6-location-dev,
+               qml-module-qtquick-privatewidgets,
-               qt6-svg-dev,
+               qml-module-qtquick-window2,
-               qt6-tools-dev,
+               qml-module-qtquick2,
-               qt6-webengine-dev <amd64 arm64 armhf>
+               qtbase5-dev,
-Standards-Version: 4.7.0
+               qtdeclarative5-dev,
+               qtlocation5-dev,
+               qttools5-dev,
+               qttools5-dev-tools
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://github.com/calamares/calamares
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/calamares-packaging/

debian/copyright

@@ -71,6 +71,7 @@ Files: AUTHORS
        data/config-appimage/settings.conf
        data/config-appimage/modules/*
        data/example-root/*
+       lang/calamares_i18n.qrc.in
        src/libcalamares/CalamaresVersion.h.in
        src/libcalamares/locale/CountryData_p.cpp
        src/libcalamares/CalamaresVersionX.h.in
@@ -229,7 +230,7 @@ Copyright: 2014-2016 Teo Mrnjavac <teo@kde.org>
            2017-2023 Adriaan de Groot <groot@kde.org>
 License: BSD-2-Clause
 
-Files: 3rdparty/kdsingleapplication/*
+Files: 3rdparty/kdsingleapplicationguard/*
 Copyright: 2019-2021 Klaralvdalens Datakonsult AB. <info@kdab.com>
 License: MIT
 
@@ -266,6 +267,7 @@ Copyright: 2014 Uri Herrera <uri_herrera@nitrux.in> and others
 License: LGPL-3+
 
 Files: src/modules/finishedq/seedling.svg
+       src/modules/localeq/img/chevron-left-solid.svg
 Copyright: 2020-2021 FontAwesome <hello@fontawesome.com>
 License: CC-BY-4.0
 

debian/patches/enable-only-present-with-encryption-partitions.patch

@@ -94,7 +94,7 @@ Last-Update: 2024-02-26
                          const QString& minSize = QString(),
 --- a/src/modules/partition/partition.conf
 +++ b/src/modules/partition/partition.conf
-@@ -266,6 +266,7 @@ defaultFileSystemType:  "ext4"
+@@ -259,6 +259,7 @@ defaultFileSystemType:  "ext4"
  #       type: "4f68bce3-e8cd-4db1-96e7-fbcaf984b709"
  #       filesystem: "ext4"
  #       noEncrypt: false
@@ -102,7 +102,7 @@ Last-Update: 2024-02-26
  #       mountPoint: "/"
  #       size: 20%
  #       minSize: 500M
-@@ -275,6 +276,7 @@ defaultFileSystemType:  "ext4"
+@@ -268,6 +269,7 @@ defaultFileSystemType:  "ext4"
  #       type: "933ac7e1-2eb4-4f13-b844-0e14e2aef915"
  #       filesystem: "ext4"
  #       noEncrypt: false
@@ -110,7 +110,7 @@ Last-Update: 2024-02-26
  #       mountPoint: "/home"
  #       size: 3G
  #       minSize: 1.5G
-@@ -303,6 +305,7 @@ defaultFileSystemType:  "ext4"
+@@ -296,6 +298,7 @@ defaultFileSystemType:  "ext4"
  #         default filesystem type, or the user's choice, will be applied instead
  #         of "unknown" (e.g. the user might pick ext4, or xfs).
  #   - noEncrypt: whether this partition is exempt from encryption if enabled (optional parameter; default is false)

debian/patches/fix-presentation-qml-syntax.patch

@@ -1,22 +0,0 @@
-Description: Fix a syntax error in Presentation.qml which prevents the slideshow from displaying
-Author: Simon Quigley <tsimonq2@lubuntu.me>
-Origin: vendor
-Last-Update: 2024-10-15
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/qml/calamares-qt6/slideshow/Presentation.qml
-+++ b/src/qml/calamares-qt6/slideshow/Presentation.qml
-@@ -196,12 +196,7 @@ Item {
-                 Text {
-                     id: notesText
- 
--                    property real padding: 16;
--
--                    x: padding
--                    y: padding
--                    width: parent.width - 2 * padding
--
-+                    anchors.margins: 16
- 
-                     font.pixelSize: 16
-                     wrapMode: Text.WordWrap

debian/patches/grub-debconf-config.patch

@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  import libcalamares
  
-@@ -586,6 +587,46 @@ def get_grub_efi_parameters():
+@@ -581,6 +582,46 @@ def get_grub_efi_parameters():
      return None
  
  
@@ -62,7 +62,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  def run_grub_mkconfig(partitions, output_file):
      """
      Runs grub-mkconfig in the target environment
-@@ -636,6 +677,8 @@ def run_grub_install(fw_type, partitions
+@@ -631,6 +672,8 @@ def run_grub_install(fw_type, partitions
                                     "--efi-directory=" + efi_directory,
                                     "--bootloader-id=" + efi_bootloader_id,
                                     "--force"])
@@ -71,7 +71,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      else:
          assert efi_directory is None
          if libcalamares.globalstorage.value("bootLoader") is None:
-@@ -657,6 +700,8 @@ def run_grub_install(fw_type, partitions
+@@ -652,6 +695,8 @@ def run_grub_install(fw_type, partitions
                                     "--force",
                                     boot_loader["installPath"]])
  

debian/patches/series

@@ -2,4 +2,3 @@
 apport-package-hook.patch
 enable-only-present-with-encryption-partitions.patch
 grub-debconf-config.patch
-fix-presentation-qml-syntax.patch

debian/rules

@@ -7,10 +7,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 export DEB_BUILD_MAINT_OPTIONS=buildinfo=+path
 
 %:
-	dh $@ --with kf6 --buildsystem kf6
+	dh $@ --with kf5
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_APPDATA=ON -DBUILD_APPSTREAM=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=ON
+	dh_auto_configure -- -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_APPDATA=ON -DBUILD_APPSTREAM=ON
 
 # Some test don't work well, we don't need to run them at package build time.
 override_dh_auto_test: