openmamba/mambabase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mambabase: remove widevine, add wine@i586 to extra packages installation

Browse Source
This commit is contained in:
Silvan Calarco 2024-06-08 17:27:11 +02:00
parent 5d69c45a7e
commit 257b296d92
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mambabase/SelectExtraPage.ui
View File

@ -38,10 +38,10 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::Shape::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Shadow::Raised</enum>
</property> </property>
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="geometry"> <property name="geometry">
@ -69,13 +69,13 @@
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">
<string>Proprietary software installations/updates</string> <string>Extra software installations/updates</string>
</property> </property>
<widget class="QCheckBox" name="inst_nvidia"> <widget class="QCheckBox" name="inst_nvidia">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>140</y> <y>30</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -91,7 +91,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>190</y> <y>180</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -104,7 +104,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>240</y> <y>230</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -117,7 +117,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>290</y> <y>280</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -130,7 +130,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>90</y> <y>80</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -139,17 +139,17 @@
<string>VirtualBox extension pack from virtualbox.org</string> <string>VirtualBox extension pack from virtualbox.org</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="inst_widevine"> <widget class="QCheckBox" name="inst_wine">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>40</y> <y>130</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>Widevine extension from google.com</string> <string>Wine (32 bit) from openmamba.org</string>
</property> </property>
</widget> </widget>
</widget> </widget>

10
mambabase/mambabase.py
View File

@ -191,6 +191,10 @@ class InstallThread(QtCore.QThread):
'/usr/share/mambabase/nvidia-autoselect-driver', '/usr/share/mambabase/nvidia-autoselect-driver',
'-i'], '-i'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE) 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: else:
result = subprocess.run(['/usr/bin/netsrpms', extra], result = subprocess.run(['/usr/bin/netsrpms', extra],
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@ -326,13 +330,15 @@ class SelectExtraPage(QtWidgets.QWizardPage):
def setExtras(self): def setExtras(self):
self.extra_checkboxes = { self.extra_checkboxes = {
'nvidia': self.inst_nvidia, 'nvidia': self.inst_nvidia,
'wine': self.inst_wine,
'broadcom_sta': self.inst_broadcom_sta, 'broadcom_sta': self.inst_broadcom_sta,
'b43-firmware': self.inst_b43, 'b43-firmware': self.inst_b43,
'msttcorefonts': self.inst_msttcf, 'msttcorefonts': self.inst_msttcf,
'virtualbox-extension-pack': self.inst_virtualbox, 'virtualbox-extension-pack': self.inst_virtualbox
'chromium-widevine': self.inst_widevine
} }
for extra in self.extra_checkboxes: for extra in self.extra_checkboxes:
if extra in ["nvidia", "wine"]:
continue
result = subprocess.run(['/usr/bin/netsrpms', '-c', extra], result = subprocess.run(['/usr/bin/netsrpms', '-c', extra],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
if result.returncode < 2: if result.returncode < 2:

4
mambabase/mambabase_it.ts
View File

@ -40,8 +40,8 @@
</message> </message>
<message> <message>
<location filename="SelectExtraPage.ui" line="79"/> <location filename="SelectExtraPage.ui" line="79"/>
<source>Proprietary software installations/updates</source> <source>Extra software installations/updates</source>
<translation>Installazione/aggiornamento di componenti software proprietari</translation> <translation>Installazione/aggiornamento di componenti aggiuntivi</translation>
</message> </message>
<message> <message>
<location filename="SelectExtraPage.ui" line="91"/> <location filename="SelectExtraPage.ui" line="91"/>