From 5674431193aab8d63dc253f1b2b5793afc5ce780 Mon Sep 17 00:00:00 2001
From: Aaron Rainbolt <arraybolt3@gmail.com>
Date: Fri, 19 Apr 2024 18:37:11 -0500
Subject: [PATCH] Don't show Thunderbird on Kubuntu.

---
 common/modules/pkgselect/PackageSelectViewStep.cpp | 11 +++++++++++
 common/modules/pkgselect/pkgselect.ui              |  2 +-
 debian/changelog                                   |  7 +++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/common/modules/pkgselect/PackageSelectViewStep.cpp b/common/modules/pkgselect/PackageSelectViewStep.cpp
index 1069a6a..c9a3b53 100644
--- a/common/modules/pkgselect/PackageSelectViewStep.cpp
+++ b/common/modules/pkgselect/PackageSelectViewStep.cpp
@@ -1,6 +1,7 @@
 #include "PackageSelectViewStep.h"
 #include "JobQueue.h"
 #include "GlobalStorage.h"
+#include "Branding.h"
 #include "network/Manager.h"
 
 #include <QVariantMap>
@@ -151,6 +152,16 @@ void PackageSelectViewStep::onActivate()
         ui->krita_button->setEnabled(false);
     }
 
+    // Thunderbird exists on Kubuntu already
+    if (Calamares::Branding::instance()->componentName() == "kubuntu") {
+      ui->thunderbird_button->setChecked(false);
+      ui->thunderbird_button->setEnabled(false);
+      ui->thunderbird_button->setVisible(false);
+      ui->thunderbird_text->setVisible(false);
+      ui->thunderbird_spacer->changeSize(0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
+      ui->thunderbird_spacer->invalidate();
+    }
+
     // Connect the storage items
     /// Full/Normal/Minimal
     connect(ui->minimal_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections);
diff --git a/common/modules/pkgselect/pkgselect.ui b/common/modules/pkgselect/pkgselect.ui
index 1864e8f..65215b0 100644
--- a/common/modules/pkgselect/pkgselect.ui
+++ b/common/modules/pkgselect/pkgselect.ui
@@ -407,7 +407,7 @@ QLabel {
         </widget>
        </item>
        <item row="6" column="1">
-        <spacer name="verticalSpacer_9">
+        <spacer name="thunderbird_spacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
diff --git a/debian/changelog b/debian/changelog
index d6ee73f..1db4a9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+calamares-settings-ubuntu (1:24.04.36) noble; urgency=medium
+
+  * Don't show Thunderbird as an installable third-party app on Kubuntu.
+    (LP: #2062438)
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Fri, 19 Apr 2024 17:38:06 -0500
+
 calamares-settings-ubuntu (1:24.04.35) noble; urgency=medium
 
   * Remove timeouts for network-related package commands. (LP: #2062106)