From 8512da28e77e5d1be02d27c4b5472fa59637ea10db72a26baa17ec3478a6d7c5 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Thu, 30 Sep 2021 08:16:48 +0000
Subject: [PATCH] Accepting request 922307 from
 home:favogt:branches:openSUSE:Factory:Live

- list-x11: Ignore tumbler, needs additional webkitgtk version now

OBS-URL: https://build.opensuse.org/request/show/922307
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=114
---
 list-x11.sh                | 4 ++++
 livecd-leap-x11.kiwi       | 2 ++
 livecd-openSUSE.changes    | 1 +
 livecd-tumbleweed-x11.kiwi | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/list-x11.sh b/list-x11.sh
index a2a2cc1..05b8192 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -73,6 +73,10 @@ buildignore man
 buildignore groff
 buildignore libqt5-qttranslations
 
+# tumbler -> libgepup uses libwebkit2gtk-4_0-37, while epiphany uses libwebkit2gtk-4_1-0.
+# We can't have both, too big.
+buildignore tumbler
+
 # Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD
 buildignore cyrus-sasl
 
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index fbb457d..63943a5 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -561,6 +561,8 @@
     <ignore name="groff"/>
     <package name="aaa_base" replaces="libqt5-qttranslations"/>
     <ignore name="libqt5-qttranslations"/>
+    <package name="aaa_base" replaces="tumbler"/>
+    <ignore name="tumbler"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
     <package name="aaa_base" replaces="deltarpm"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 9721512..0c85b6d 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -2,6 +2,7 @@
 Thu Sep 30 07:34:07 UTC 2021 - Fabian Vogt <fvogt@suse.com>
 
 - list-xfce: Ignore mugshot, incompatible with GNOME 41
+- list-x11: Ignore tumbler, needs additional webkitgtk version now
 
 -------------------------------------------------------------------
 Tue Aug 24 14:39:26 UTC 2021 - Dominique Leuenberger <dleuenberger@suse.com>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index ee0def7..b6f3413 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -555,6 +555,8 @@
     <ignore name="groff"/>
     <package name="aaa_base" replaces="libqt5-qttranslations"/>
     <ignore name="libqt5-qttranslations"/>
+    <package name="aaa_base" replaces="tumbler"/>
+    <ignore name="tumbler"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
     <package name="aaa_base" replaces="deltarpm"/>