From 257b296d922502ac4c7fd4bf20e716418a39f29a Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 8 Jun 2024 17:27:11 +0200
Subject: [PATCH] mambabase: remove widevine, add wine@i586 to extra packages
 installation

---
 mambabase/SelectExtraPage.ui | 22 +++++++++++-----------
 mambabase/mambabase.py       | 10 ++++++++--
 mambabase/mambabase_it.ts    |  4 ++--
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/mambabase/SelectExtraPage.ui b/mambabase/SelectExtraPage.ui
index a40ec37..874adc7 100644
--- a/mambabase/SelectExtraPage.ui
+++ b/mambabase/SelectExtraPage.ui
@@ -38,10 +38,10 @@
        </sizepolicy>
       </property>
       <property name="frameShape">
-       <enum>QFrame::StyledPanel</enum>
+       <enum>QFrame::Shape::StyledPanel</enum>
       </property>
       <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
+       <enum>QFrame::Shadow::Raised</enum>
       </property>
       <widget class="QLabel" name="label_4">
        <property name="geometry">
@@ -69,13 +69,13 @@
         </rect>
        </property>
        <property name="title">
-        <string>Proprietary software installations/updates</string>
+        <string>Extra software installations/updates</string>
        </property>
        <widget class="QCheckBox" name="inst_nvidia">
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>140</y>
+          <y>30</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -91,7 +91,7 @@
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>190</y>
+          <y>180</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -104,7 +104,7 @@
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>240</y>
+          <y>230</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -117,7 +117,7 @@
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>290</y>
+          <y>280</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -130,7 +130,7 @@
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>90</y>
+          <y>80</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -139,17 +139,17 @@
          <string>VirtualBox extension pack from virtualbox.org</string>
         </property>
        </widget>
-       <widget class="QCheckBox" name="inst_widevine">
+       <widget class="QCheckBox" name="inst_wine">
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>40</y>
+          <y>130</y>
           <width>491</width>
           <height>21</height>
          </rect>
         </property>
         <property name="text">
-         <string>Widevine extension from google.com</string>
+         <string>Wine (32 bit) from openmamba.org</string>
         </property>
        </widget>
       </widget>
diff --git a/mambabase/mambabase.py b/mambabase/mambabase.py
index c926d44..4376760 100755
--- a/mambabase/mambabase.py
+++ b/mambabase/mambabase.py
@@ -191,6 +191,10 @@ class InstallThread(QtCore.QThread):
                         '/usr/share/mambabase/nvidia-autoselect-driver',
                         '-i'],
                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                elif extra == 'wine':
+                    result = subprocess.run([
+                        '/usr/bin/pkcon', 'install', 'wine-common.i586'],
+                        stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 else:
                     result = subprocess.run(['/usr/bin/netsrpms', extra],
                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -326,13 +330,15 @@ class SelectExtraPage(QtWidgets.QWizardPage):
     def setExtras(self):
         self.extra_checkboxes = {
             'nvidia': self.inst_nvidia,
+            'wine': self.inst_wine,
             'broadcom_sta': self.inst_broadcom_sta,
             'b43-firmware': self.inst_b43,
             'msttcorefonts': self.inst_msttcf,
-            'virtualbox-extension-pack': self.inst_virtualbox,
-            'chromium-widevine': self.inst_widevine
+            'virtualbox-extension-pack': self.inst_virtualbox
         }
         for extra in self.extra_checkboxes:
+            if extra in ["nvidia", "wine"]:
+                continue
             result = subprocess.run(['/usr/bin/netsrpms', '-c', extra],
                 stdout=subprocess.PIPE)
             if result.returncode < 2:
diff --git a/mambabase/mambabase_it.ts b/mambabase/mambabase_it.ts
index cb6048a..48774ad 100644
--- a/mambabase/mambabase_it.ts
+++ b/mambabase/mambabase_it.ts
@@ -40,8 +40,8 @@
     </message>
     <message>
         <location filename="SelectExtraPage.ui" line="79"/>
-        <source>Proprietary software installations/updates</source>
-        <translation>Installazione/aggiornamento di componenti software proprietari</translation>
+        <source>Extra software installations/updates</source>
+        <translation>Installazione/aggiornamento di componenti aggiuntivi</translation>
     </message>
     <message>
         <location filename="SelectExtraPage.ui" line="91"/>