[neon/extras/calamares/Neon/stable] debian/patches: Revert "Merging remotes/origin/Neon/release into Neon/stable."

Carlos De Maine null at kde.org
Fri Feb 20 13:07:00 GMT 2026


Git commit c9a3e2885f47edc087055d86412c2bd25f91d849 by Carlos De Maine.
Committed on 20/02/2026 at 13:06.
Pushed by carlosdem into branch 'Neon/stable'.

Revert "Merging remotes/origin/Neon/release into Neon/stable."

This reverts commit 329778b10c90068ba84735bae2a9c3cbefd70a58

D  +0    -22   debian/patches/c9e49988651a1c7c2881810ec465446a1f96d822.diff
D  +0    -1    debian/patches/series

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

diff --git a/debian/patches/c9e49988651a1c7c2881810ec465446a1f96d822.diff b/debian/patches/c9e49988651a1c7c2881810ec465446a1f96d822.diff
deleted file mode 100644
index 505c992..0000000
--- a/debian/patches/c9e49988651a1c7c2881810ec465446a1f96d822.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp
-index e602b87ea..b6867bfa9 100644
---- a/src/modules/users/UsersPage.cpp
-+++ b/src/modules/users/UsersPage.cpp
-@@ -38,7 +38,7 @@ static inline void
- labelError( QLabel* pix, QLabel* label, Calamares::ImageType icon, const QString& message )
- {
-     label->setText( message );
--    pix->setPixmap( Calamares::defaultPixmap( icon, Calamares::Original, label->size() ) );
-+    pix->setPixmap( Calamares::defaultPixmap( icon, Calamares::Original, pix->size() ) );
- }
- 
- /** @brief Clear error, set happy pixmap on a label to indicate "ok". */
-@@ -46,7 +46,7 @@ static inline void
- labelOk( QLabel* pix, QLabel* label )
- {
-     label->clear();
--    pix->setPixmap( Calamares::defaultPixmap( Calamares::StatusOk, Calamares::Original, label->size() ) );
-+    pix->setPixmap( Calamares::defaultPixmap( Calamares::StatusOk, Calamares::Original, pix->size() ) );
- }
- 
- /** @brief Sets error or ok on a label depending on @p status and @p value
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7114382..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-c9e49988651a1c7c2881810ec465446a1f96d822.diff


More information about the Neon-commits mailing list