commit b475c480cab939271232e926b99e13882dce4ed3 · pyrox.dev/nixpkgs

+3 -3

pkgs/by-name/bo/bottles-unwrapped/package.nix

···

       31
       31
        
       

     

       32
       32
        
       python3Packages.buildPythonApplication rec {

     

       33
       33
        
         pname = "bottles-unwrapped";

     

       34
       34
       -
         version = "51.17";

     

       34
       34
       +
         version = "51.21";

     

       35
       35
        
       

     

       36
       36
        
         src = fetchFromGitHub {

     

       37
       37
        
           owner = "bottlesdevs";

     

       38
       38
        
           repo = "bottles";

     

       39
       39
        
           tag = version;

     

       40
       40
       -
           hash = "sha256-m4ATWpAZxIBp1X0cNeyNGmt6aIBo/cHH+DpOMkLia0E=";

     

       40
       40
       +
           hash = "sha256-rUS2LRr7NqTvNd706AC/U/QUDcF8tzwkHDuS3R0O1KY=";

     

       41
       41
        
         };

     

       42
       42
        
       

     

       43
       43
        
         patches =

     
···

       45
       45
        
             ./vulkan_icd.patch

     

       46
       46
        
             ./redirect-bugtracker.patch

     

       47
       47
        
             ./remove-flatpak-check.patch

     

       48
       48
       -
             ./remove-core-tab.patch

     

       49
       48
        
           ]

     

       50
       49
        
           ++ (

     

       51
       50
        
             if removeWarningPopup then

     
···

       132
       131
        
             psydvl

     

       133
       132
        
             shamilton

     

       134
       133
        
             Gliczy

     

       134
       134
       +
             XBagon

     

       135
       135
        
           ];

     

       136
       136
        
           platforms = lib.platforms.linux;

     

       137
       137
        
           mainProgram = "bottles";

-76

pkgs/by-name/bo/bottles-unwrapped/remove-core-tab.patch

···

       1
       1
       -
       diff --git a/bottles/frontend/ui/preferences.blp b/bottles/frontend/ui/preferences.blp

     

       2
       2
       -
       index 9dd12a16..c1fcf649 100644

     

       3
       3
       -
       --- a/bottles/frontend/ui/preferences.blp

     

       4
       4
       -
       +++ b/bottles/frontend/ui/preferences.blp

     

       5
       5
       -
       @@ -284,20 +284,6 @@ template $PreferencesWindow: Adw.PreferencesWindow {

     

       6
       6
       -
            }

     

       7
       7
       -
          }

     

       8
       8
       -
        

     

       9
       9
       -
       -  Adw.PreferencesPage pref_core {

     

       10
       10
       -
       -    icon-name: "application-x-addon-symbolic";

     

       11
       11
       -
       -    title: _("Core");

     

       12
       12
       -
       -    visible: false;

     

       13
       13
       -
       -

     

       14
       14
       -
       -    Adw.PreferencesGroup list_runtimes {

     

       15
       15
       -
       -      title: _("Runtime");

     

       16
       16
       -
       -    }

     

       17
       17
       -
       -

     

       18
       18
       -
       -    Adw.PreferencesGroup list_winebridge {

     

       19
       19
       -
       -      title: _("WineBridge");

     

       20
       20
       -
       -    }

     

       21
       21
       -
       -  }

     

       22
       22
       -
       -

     

       23
       23
       -
          Adw.PreferencesPage {

     

       24
       24
       -
            icon-name: "applications-science-symbolic";

     

       25
       25
       -
            title: _("Experiments");

     

       26
       26
       -
       diff --git a/bottles/frontend/views/preferences.py b/bottles/frontend/views/preferences.py

     

       27
       27
       -
       index ce7ec958..f46c6e5b 100644

     

       28
       28
       -
       --- a/bottles/frontend/views/preferences.py

     

       29
       29
       -
       +++ b/bottles/frontend/views/preferences.py

     

       30
       30
       -
       @@ -53,8 +53,6 @@ class PreferencesWindow(Adw.PreferencesWindow):

     

       31
       31
       -
            switch_steam_programs = Gtk.Template.Child()

     

       32
       32
       -
            switch_epic_games = Gtk.Template.Child()

     

       33
       33
       -
            switch_ubisoft_connect = Gtk.Template.Child()

     

       34
       34
       -
       -    list_winebridge = Gtk.Template.Child()

     

       35
       35
       -
       -    list_runtimes = Gtk.Template.Child()

     

       36
       36
       -
            list_runners = Gtk.Template.Child()

     

       37
       37
       -
            list_dxvk = Gtk.Template.Child()

     

       38
       38
       -
            list_vkd3d = Gtk.Template.Child()

     

       39
       39
       -
       @@ -66,7 +64,6 @@ class PreferencesWindow(Adw.PreferencesWindow):

     

       40
       40
       -
            btn_bottles_path_reset = Gtk.Template.Child()

     

       41
       41
       -
            label_bottles_path = Gtk.Template.Child()

     

       42
       42
       -
            btn_steam_proton_doc = Gtk.Template.Child()

     

       43
       43
       -
       -    pref_core = Gtk.Template.Child()

     

       44
       44
       -
        

     

       45
       45
       -
            # endregion

     

       46
       46
       -
        

     

       47
       47
       -
       @@ -170,10 +167,6 @@ class PreferencesWindow(Adw.PreferencesWindow):

     

       48
       48
       -
                    self.installers_stack.set_visible_child_name("installers_offline")

     

       49
       49
       -
                    self.dlls_stack.set_visible_child_name("dlls_offline")

     

       50
       50
       -
        

     

       51
       51
       -
       -        # populate components lists

     

       52
       52
       -
       -        self.populate_runtimes_list()

     

       53
       53
       -
       -        self.populate_winebridge_list()

     

       54
       54
       -
       -

     

       55
       55
       -
                RunAsync(self.ui_update)

     

       56
       56
       -
        

     

       57
       57
       -
                # connect signals

     

       58
       58
       -
       @@ -319,18 +312,6 @@ class PreferencesWindow(Adw.PreferencesWindow):

     

       59
       59
       -
                    list_component.add(_entry)

     

       60
       60
       -
                    self.__registry.append(_entry)

     

       61
       61
       -
        

     

       62
       62
       -
       -    def populate_runtimes_list(self):

     

       63
       63
       -
       -        for runtime in self.manager.supported_runtimes.items():

     

       64
       64
       -
       -            self.list_runtimes.add(

     

       65
       65
       -
       -                ComponentEntry(self.window, runtime, "runtime", is_upgradable=True)

     

       66
       66
       -
       -            )

     

       67
       67
       -
       -

     

       68
       68
       -
       -    def populate_winebridge_list(self):

     

       69
       69
       -
       -        for bridge in self.manager.supported_winebridge.items():

     

       70
       70
       -
       -            self.list_winebridge.add(

     

       71
       71
       -
       -                ComponentEntry(self.window, bridge, "winebridge", is_upgradable=True)

     

       72
       72
       -
       -            )

     

       73
       73
       -
       -

     

       74
       74
       -
            def populate_dxvk_list(self):

     

       75
       75
       -
                self.__populate_component_list(

     

       76
       76
       -
                    "dxvk", self.manager.supported_dxvk, self.list_dxvk

+77

pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch

···

       15
       15
        
        bottles_sources = [

     

       16
       16
        
          '__init__.py',

     

       17
       17
        
          'main.py',

     

       18
       18
       +
       diff --git a/bottles/frontend/views/bottle_details.py b/bottles/frontend/views/bottle_details.py

     

       19
       19
       +
       index 65667ea9..7ae1eb19 100644

     

       20
       20
       +
       --- a/bottles/frontend/views/bottle_details.py

     

       21
       21
       +
       +++ b/bottles/frontend/views/bottle_details.py

     

       22
       22
       +
       @@ -436,20 +436,19 @@ class BottleView(Adw.PreferencesPage):

     

       23
       23
       +
                    dialog.connect("response", execute)

     

       24
       24
       +
                    dialog.show()

     

       25
       25
       +
        

     

       26
       26
       +
       -        if Xdp.Portal.running_under_sandbox():

     

       27
       27
       +
       -            if self.window.settings.get_boolean("show-sandbox-warning"):

     

       28
       28
       +
       -                dialog = Adw.MessageDialog.new(

     

       29
       29
       +
       -                    self.window,

     

       30
       30
       +
       -                    _("Be Aware of Sandbox"),

     

       31
       31
       +
       -                    _(

     

       32
       32
       +
       -                        "Bottles is running in a sandbox, a restricted permission environment needed to keep you safe. If the program won't run, consider moving inside the bottle (3 dots icon on the top), then launch from there."

     

       33
       33
       +
       -                    ),

     

       34
       34
       +
       -                )

     

       35
       35
       +
       -                dialog.add_response("dismiss", _("_Dismiss"))

     

       36
       36
       +
       -                dialog.connect("response", show_chooser)

     

       37
       37
       +
       -                dialog.present()

     

       38
       38
       +
       -            else:

     

       39
       39
       +
       -                show_chooser()

     

       40
       40
       +
       +        if self.window.settings.get_boolean("show-sandbox-warning"):

     

       41
       41
       +
       +            dialog = Adw.MessageDialog.new(

     

       42
       42
       +
       +                self.window,

     

       43
       43
       +
       +                _("Be Aware of Sandbox"),

     

       44
       44
       +
       +                _(

     

       45
       45
       +
       +                    "Bottles is running in a sandbox, a restricted permission environment needed to keep you safe. If the program won't run, consider moving inside the bottle (3 dots icon on the top), then launch from there."

     

       46
       46
       +
       +                ),

     

       47
       47
       +
       +            )

     

       48
       48
       +
       +            dialog.add_response("dismiss", _("_Dismiss"))

     

       49
       49
       +
       +            dialog.connect("response", show_chooser)

     

       50
       50
       +
       +            dialog.present()

     

       51
       51
       +
       +        else:

     

       52
       52
       +
       +            show_chooser()

     

       53
       53
       +
        

     

       54
       54
       +
            def __backup(self, widget, backup_type):

     

       55
       55
       +
                """

     

       56
       56
       +
       diff --git a/bottles/frontend/views/bottle_preferences.py b/bottles/frontend/views/bottle_preferences.py

     

       57
       57
       +
       index 288e693b..b8b57618 100644

     

       58
       58
       +
       --- a/bottles/frontend/views/bottle_preferences.py

     

       59
       59
       +
       +++ b/bottles/frontend/views/bottle_preferences.py

     

       60
       60
       +
       @@ -139,7 +139,7 @@ class PreferencesView(Adw.PreferencesPage):

     

       61
       61
       +
                self.queue = details.queue

     

       62
       62
       +
                self.details = details

     

       63
       63
       +
        

     

       64
       64
       +
       -        if not gamemode_available or not Xdp.Portal.running_under_sandbox():

     

       65
       65
       +
       +        if not gamemode_available:

     

       66
       66
       +
                    return

     

       67
       67
       +
        

     

       68
       68
       +
                _not_available = _("This feature is unavailable on your system.")

     

       69
       69
       +
       diff --git a/bottles/frontend/views/list.py b/bottles/frontend/views/list.py

     

       70
       70
       +
       index 43ab9c22..a283b178 100644

     

       71
       71
       +
       --- a/bottles/frontend/views/list.py

     

       72
       72
       +
       +++ b/bottles/frontend/views/list.py

     

       73
       73
       +
       @@ -82,8 +82,6 @@ class BottlesBottleRow(Adw.ActionRow):

     

       74
       74
       +
        

     

       75
       75
       +
            def run_executable(self, *_args):

     

       76
       76
       +
                """Display file dialog for executable"""

     

       77
       77
       +
       -        if not Xdp.Portal.running_under_sandbox():

     

       78
       78
       +
       -            return

     

       79
       79
       +
        

     

       80
       80
       +
                def set_path(_dialog, response):

     

       81
       81
       +
                    if response != Gtk.ResponseType.ACCEPT:

     

       82
       82
       +
       diff --git a/bottles/frontend/views/new_bottle_dialog.py b/bottles/frontend/views/new_bottle_dialog.py

     

       83
       83
       +
       index a8b007d4..c6f0a156 100644

     

       84
       84
       +
       --- a/bottles/frontend/views/new_bottle_dialog.py

     

       85
       85
       +
       +++ b/bottles/frontend/views/new_bottle_dialog.py

     

       86
       86
       +
       @@ -80,7 +80,7 @@ class BottlesNewBottleDialog(Adw.Dialog):

     

       87
       87
       +
                super().__init__(**kwargs)

     

       88
       88
       +
                # common variables and references

     

       89
       89
       +
                self.window = GtkUtils.get_parent_window()

     

       90
       90
       +
       -        if not self.window or not Xdp.Portal.running_under_sandbox():

     

       91
       91
       +
       +        if not self.window:

     

       92
       92
       +
                    return

     

       93
       93
       +
        

     

       94
       94
       +
                self.app = self.window.get_application()

+3 -3

pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch

···

       1
       1
       -
       diff --git a/bottles/frontend/windows/main_window.py b/bottles/frontend/windows/main_window.py

     

       1
       1
       +
       diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py

     

       2
       2
        
       index 79bf0d72..e3a15cb5 100644

     

       3
       3
       -
       --- a/bottles/frontend/windows/main_window.py

     

       4
       4
       -
       +++ b/bottles/frontend/windows/main_window.py

     

       3
       3
       +
       --- a/bottles/frontend/windows/window.py

     

       4
       4
       +
       +++ b/bottles/frontend/windows/window.py

     

       5
       5
        
       @@ -104,29 +104,29 @@ class MainWindow(Adw.ApplicationWindow):

     

       6
       6
        
        

     

       7
       7
        
                    def response(dialog, response, *args):