From 4f71037be4475b20f8cb5de365ec49bd90e6d5aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Tue, 19 Jul 2022 15:39:37 +0200
Subject: [PATCH] add `tumbleweed-bootstrap.patch`

---
 assets/patches.txt                 |  1 +
 patches/tumbleweed-bootstrap.patch | 57 ++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 patches/tumbleweed-bootstrap.patch

diff --git a/assets/patches.txt b/assets/patches.txt
index 44aad6e..751d725 100644
--- a/assets/patches.txt
+++ b/assets/patches.txt
@@ -12,6 +12,7 @@ patches/sed-patches/allow-searchengines-non-esr.patch
 patches/sed-patches/disable-pocket.patch
 patches/sed-patches/remove-internal-plugin-certs.patch
 patches/sed-patches/stop-undesired-requests.patch
+patches/tumbleweed-bootstrap.patch
 patches/ui-patches/handlers.patch
 patches/ui-patches/hide-default-browser.patch
 patches/ui-patches/lw-logo-devtools.patch
diff --git a/patches/tumbleweed-bootstrap.patch b/patches/tumbleweed-bootstrap.patch
new file mode 100644
index 0000000..bd08dd1
--- /dev/null
+++ b/patches/tumbleweed-bootstrap.patch
@@ -0,0 +1,57 @@
+--- a/python/mozboot/mozboot/opensuse.py
++++ b/python/mozboot/mozboot/opensuse.py
+@@ -16,6 +16,7 @@ class OpenSUSEBootstrapper(LinuxBootstrapper, BaseBootstrapper):
+         "rpmconf",
+         "libcurl-devel",
+         "libpulse-devel",
++        "unzip",
+     ]
+ 
+     BROWSER_PACKAGES = [
+@@ -23,7 +24,6 @@ class OpenSUSEBootstrapper(LinuxBootstrapper, BaseBootstrapper):
+         "gcc-c++",
+         "gtk3-devel",
+         "dbus-1-glib-devel",
+-        "gconf2-devel",
+         "glibc-devel-static",
+         "libstdc++-devel",
+         "libXt-devel",
+@@ -97,29 +97,19 @@ class OpenSUSEBootstrapper(LinuxBootstrapper, BaseBootstrapper):
+         self(["pip3", "install", "--upgrade", "pip", "--user"])
+         self(["pip3", "install", "--upgrade", "Mercurial", "--user"])
+ 
+-    def zypper_install(self, *packages):
+-        command = ["zypper", "install"]
++    def zypper(self, *args):
+         if self.no_interactive:
+-            command.append("-n")
+-
+-        command.extend(packages)
++            command = ["zypper", "-n", *args]
++        else:
++            command = ["zypper", *args]
+ 
+         self.run_as_root(command)
+ 
+-    def zypper_update(self, *packages):
+-        command = ["zypper", "update"]
+-        if self.no_interactive:
+-            command.append("-n")
+-
+-        command.extend(packages)
++    def zypper_install(self, *packages):
++        self.zypper("install", *packages)
+ 
+-        self.run_as_root(command)
++    def zypper_update(self, *packages):
++        self.zypper("update", *packages)
+ 
+     def zypper_patterninstall(self, *packages):
+-        command = ["zypper", "install", "-t", "pattern"]
+-        if self.no_interactive:
+-            command.append("-y")
+-
+-        command.extend(packages)
+-
+-        self.run_as_root(command)
++        self.zypper("install", "-t", "pattern", *packages)