Lubuntu/calamares-packaging
4
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-qt-code/ubuntu/+source/calamares/+git/calamares synced 2025-07-29 10:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upload to Plucky

Browse Source
This commit is contained in:
Simon Quigley 2024-10-23 20:15:42 -05:00
parent d6c3d46eff
commit 5f7d263806
4 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/patches/enable-only-present-with-encryption-partitions.patch vendored
View File

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

22
debian/patches/fix-presentation-qml-syntax.patch vendored Normal file
View File

@ -0,0 +1,22 @@
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

6
debian/patches/grub-debconf-config.patch vendored
View File

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

1
debian/patches/series vendored
View File

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