[neon/extras/calamares/Neon/stable] debian/patches: drop upstreamed patch

[Carlos De Maine]

Git commit b1c383f81c71fc6c8222dec58ffd05b540079137 by Carlos De Maine.
Committed on 07/11/2024 at 02:29.
Pushed by carlosdem into branch 'Neon/stable'.

drop upstreamed patch

D  +0    -48   debian/patches/jpetso_fix_2392.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/extras/calamares/-/commit/b1c383f81c71fc6c8222dec58ffd05b540079137

diff --git a/debian/patches/jpetso_fix_2392.diff b/debian/patches/jpetso_fix_2392.diff
deleted file mode 100644
index 91bc72b..0000000
--- a/debian/patches/jpetso_fix_2392.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
-index 4ec9653db8..ddfabaf85d 100644
---- a/src/modules/partition/core/PartitionActions.cpp
-+++ b/src/modules/partition/core/PartitionActions.cpp
-@@ -108,7 +108,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
-         partType = isEfi ? PartitionTable::gpt : PartitionTable::msdos;
-     }
-     // last usable sector possibly allowing for secondary GPT using 66 sectors (256 entries)
--    qint64 lastSectorForRoot = dev->totalLogical() - (partType == PartitionTable::gpt ? 67 : 1);
-+    const qint64 lastUsableSector = dev->totalLogical() - ( partType == PartitionTable::gpt ? 67 : 1 );
- 
-     // Looking up the defaultFsType (which should name a filesystem type)
-     // will log an error and set the type to Unknown if there's something wrong.
-@@ -154,7 +154,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
-     const quint64 sectorSize = quint64( dev->logicalSize() );
-     if ( mayCreateSwap )
-     {
--        quint64 availableSpaceB = quint64( dev->totalLogical() - firstFreeSector ) * sectorSize;
-+        quint64 availableSpaceB = quint64( lastUsableSector - firstFreeSector + 1 ) * sectorSize;
-         suggestedSwapSizeB = swapSuggestion( availableSpaceB, o.swap );
-         // Space required by this installation is what the distro claims is needed
-         // (via global configuration) plus the swap size plus a fudge factor of
-@@ -165,6 +165,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
-         shouldCreateSwap = availableSpaceB > requiredSpaceB;
-     }
- 
-+    qint64 lastSectorForRoot = lastUsableSector;
-     if ( shouldCreateSwap )
-     {
-         lastSectorForRoot -= suggestedSwapSizeB / sectorSize + 1;
-@@ -183,7 +184,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
-                                                             FileSystem::LinuxSwap,
-                                                             QStringLiteral( "swap" ),
-                                                             lastSectorForRoot + 1,
--                                                            dev->totalLogical() - 1,
-+                                                            lastUsableSector,
-                                                             KPM_PARTITION_FLAG( None ) );
-         }
-         else
-@@ -194,7 +195,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
-                                                                      FileSystem::LinuxSwap,
-                                                                      QStringLiteral( "swap" ),
-                                                                      lastSectorForRoot + 1,
--                                                                     dev->totalLogical() - 1,
-+                                                                     lastUsableSector,
-                                                                      o.luksFsType,
-                                                                      o.luksPassphrase,
-                                                                      KPM_PARTITION_FLAG( None ) );
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8a46a0b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-jpetso_fix_2392.diff