From 5c8492281c0bcfdb045d69e49a1c73c4db94d3e0215270094c81acbe0b744599 Mon Sep 17 00:00:00 2001
From: Yuchen Lin <mlin+factory@suse.de>
Date: Sat, 27 Apr 2019 16:55:33 +0000
Subject: [PATCH] another try

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=47
---
 list-kde.sh                | 7 ++++---
 livecd-leap-kde.kiwi       | 4 ++++
 livecd-tumbleweed-kde.kiwi | 8 ++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/list-kde.sh b/list-kde.sh
index 999973d..bfab2bf 100644
--- a/list-kde.sh
+++ b/list-kde.sh
@@ -25,6 +25,10 @@ buildignore xorg-x11-fonts
 buildignore kdenetwork4-filesharing
 buildignore gnome-keyring
 
+# xdg-desktop-portal-kde build failed
+buildignore xdg-desktop-portal-kde
+buildignore xdg-desktop-portal-kde-lang
+
 # Packages for the installer
 source "$PWD/list-installer.sh"
 
@@ -63,6 +67,3 @@ buildignore cyrus-sasl
 # From rest_cd_core
 install alsa-firmware
 
-# xdg-desktop-portal-kde build failed
-buildignore xdg-desktop-portal-kde
-buildignore xdg-desktop-portal-kde-lang
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 1e3b8c8..1c3817a 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -447,6 +447,10 @@
     <ignore name="kdenetwork4-filesharing"/>
     <package name="aaa_base" replaces="gnome-keyring"/>
     <ignore name="gnome-keyring"/>
+    <package name="aaa_base" replaces="xdg-desktop-portal-kde"/>
+    <ignore name="xdg-desktop-portal-kde"/>
+    <package name="aaa_base" replaces="xdg-desktop-portal-kde-lang"/>
+    <ignore name="xdg-desktop-portal-kde-lang"/>
     <package name="live-net-installer"/>
     <package name="skelcd-openSUSE"/>
     <package name="setxkbmap"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index e2716b8..ff8dabc 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -447,6 +447,10 @@
     <ignore name="kdenetwork4-filesharing"/>
     <package name="aaa_base" replaces="gnome-keyring"/>
     <ignore name="gnome-keyring"/>
+    <package name="aaa_base" replaces="xdg-desktop-portal-kde"/>
+    <ignore name="xdg-desktop-portal-kde"/>
+    <package name="aaa_base" replaces="xdg-desktop-portal-kde-lang"/>
+    <ignore name="xdg-desktop-portal-kde-lang"/>
     <package name="live-net-installer"/>
     <package name="skelcd-openSUSE"/>
     <package name="setxkbmap"/>
@@ -489,10 +493,6 @@
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
     <package name="alsa-firmware"/>
-    <package name="aaa_base" replaces="xdg-desktop-portal-kde"/>
-    <ignore name="xdg-desktop-portal-kde"/>
-    <package name="aaa_base" replaces="xdg-desktop-portal-kde-lang"/>
-    <ignore name="xdg-desktop-portal-kde-lang"/>
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>