File project.diff of Package livecd-openSUSE
--- _constraints.orig
+++ _constraints
@@ -1,7 +1,7 @@
<constraints>
<hardware>
<disk>
- <size unit="G">18</size>
+ <size unit="G">20</size>
</disk>
</hardware>
</constraints>
--- config.sh.orig
+++ config.sh
@@ -35,7 +35,12 @@ rpm -qa | grep "^libisl" | xargs -r rpm
[ "$desktop" = "kde" ] && rpm -e --nodeps adwaita-icon-theme
# Workaround until dropped from xfce4-branding-openSUSE
-[ "$desktop" = "x11" -o "$desktop" = "xfce" ] && rpm -e --nodeps noto-coloremoji-fonts
+if [ "$desktop" = "x11" -o "$desktop" = "xfce" ]; then
+ if rpm -q xorg-x11-server-Xvfb; then
+ rpm -e --nodeps xorg-x11-server-Xvfb
+ fi
+ rpm -e --nodeps noto-coloremoji-fonts || rpm -e --nodeps google-noto-coloremoji-fonts
+fi
#--------------------------------------
# enable and disable services
--- list-common.sh.orig
+++ list-common.sh
@@ -245,7 +245,6 @@ install dmraid
install dosfstools
install e2fsprogs
install exfatprogs
-install fcoe-utils
install jfsutils
install mdadm
install multipath-tools
@@ -299,7 +298,7 @@ install xf86-video-sisusb
install xf86-video-tdfx
install xf86-video-v4l
install xf86-video-vesa
-install xf86-video-voodoo
+#install xf86-video-voodoo
install xz
install yast2-trans-de
if [ "$distro" = "leap" ]; then
--- list-gnome.sh.orig
+++ list-gnome.sh
@@ -13,16 +13,19 @@ install branding-openSUSE
install adobe-sourcecodepro-fonts
buildignore google-carlito-fonts
-buildignore noto-sans-fonts
-buildignore noto-sans-cjk-fonts
-buildignore noto-sans-sc-bold-fonts
-buildignore noto-sans-sc-regular-fonts
-buildignore noto-sans-tc-bold-fonts
-buildignore noto-sans-tc-regular-fonts
-buildignore noto-sans-jp-bold-fonts
-buildignore noto-sans-jp-regular-fonts
-buildignore noto-sans-kr-bold-fonts
-buildignore noto-sans-kr-regular-fonts
+# Was renamed in TW
+for prefix in google- ""; do
+ buildignore ${prefix}noto-sans-fonts
+ buildignore ${prefix}noto-sans-cjk-fonts
+ buildignore ${prefix}noto-sans-sc-bold-fonts
+ buildignore ${prefix}noto-sans-sc-regular-fonts
+ buildignore ${prefix}noto-sans-tc-bold-fonts
+ buildignore ${prefix}noto-sans-tc-regular-fonts
+ buildignore ${prefix}noto-sans-jp-bold-fonts
+ buildignore ${prefix}noto-sans-jp-regular-fonts
+ buildignore ${prefix}noto-sans-kr-bold-fonts
+ buildignore ${prefix}noto-sans-kr-regular-fonts
+done
# Expected by openQA - But no more space on the CD
# install libreoffice-writer
@@ -114,3 +117,6 @@ install quadrapassel
# Pulls in Qt WebEngine, too big
buildignore opensuse-welcome
+
+# Pulls in a different WebKit version on Leap and doesn't offer any useful manuals anyway
+buildignore yelp
--- list-kde.sh.orig
+++ list-kde.sh
@@ -80,3 +80,5 @@ install alsa-firmware
# From x11_enhanced, but that pattern can't be installed
install opensuse-welcome
+
+buildignore bluedevil5
--- list-x11.sh.orig
+++ list-x11.sh
@@ -74,6 +74,11 @@ buildignore groff
buildignore libqt5-qttranslations
buildignore plymouth
buildignore 7zip
+# On Leap it's a hard dep of dhcp-client, needed by NM.
+# On TW, NM uses the builtin DHCP client instead.
+if [ "$distro" = "tumbleweed" ]; then
+ buildignore bind-utils
+fi
# tumbler -> libgepup uses libwebkit2gtk-4_0-37, while epiphany uses libwebkit2gtk-4_1-0.
# We can't have both, too big.
@@ -91,6 +96,9 @@ buildignore deltarpm
buildignore Mesa-dri-nouveau
buildignore libvdpau_nouveau
+# Pulls in a lot of libs, only used by libwebkit2gtk/epiphany anyway
+buildignore gstreamer-plugins-bad
+
# Previously required by rest_cd_x11
install patterns-xfce-xfce_basis
installPattern xfce_basis
@@ -129,3 +137,8 @@ install NetworkManager-applet
install xfce4-panel-plugin-xkb
install xfce4-terminal
install yast2-control-center-qt
+
+buildignore argyllcms
+
+# Pulls in pipewire, ffmpeg, libmfx1, ...
+buildignore xdg-desktop-portal-gtk
--- list-xfce.sh.orig
+++ list-xfce.sh
@@ -28,6 +28,8 @@ buildignore engrampa-lang
# Remove Libreoffice as it's too big
buildignore libreoffice
+# Same for Thunderbird. Unlikely to be used on a Live CD.
+buildignore MozillaThunderbird
# Save a bit of space
buildignore gdb
--- livecd-leap-gnome.kiwi.orig
+++ livecd-leap-gnome.kiwi
@@ -371,7 +371,6 @@
<package name="dosfstools"/>
<package name="e2fsprogs"/>
<package name="exfatprogs"/>
- <package name="fcoe-utils"/>
<package name="jfsutils"/>
<package name="mdadm"/>
<package name="multipath-tools"/>
@@ -423,7 +422,6 @@
<package name="xf86-video-tdfx"/>
<package name="xf86-video-v4l"/>
<package name="xf86-video-vesa"/>
- <package name="xf86-video-voodoo"/>
<package name="xz"/>
<package name="yast2-trans-de"/>
<package name="yast2-trans-cs"/>
@@ -463,6 +461,26 @@
<package name="adobe-sourcecodepro-fonts"/>
<package name="aaa_base" replaces="google-carlito-fonts"/>
<ignore name="google-carlito-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-fonts"/>
+ <ignore name="google-noto-sans-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-cjk-fonts"/>
+ <ignore name="google-noto-sans-cjk-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-sc-bold-fonts"/>
+ <ignore name="google-noto-sans-sc-bold-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-sc-regular-fonts"/>
+ <ignore name="google-noto-sans-sc-regular-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-tc-bold-fonts"/>
+ <ignore name="google-noto-sans-tc-bold-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-tc-regular-fonts"/>
+ <ignore name="google-noto-sans-tc-regular-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-jp-bold-fonts"/>
+ <ignore name="google-noto-sans-jp-bold-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-jp-regular-fonts"/>
+ <ignore name="google-noto-sans-jp-regular-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-kr-bold-fonts"/>
+ <ignore name="google-noto-sans-kr-bold-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-kr-regular-fonts"/>
+ <ignore name="google-noto-sans-kr-regular-fonts"/>
<package name="aaa_base" replaces="noto-sans-fonts"/>
<ignore name="noto-sans-fonts"/>
<package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
@@ -571,6 +589,8 @@
<package name="quadrapassel"/>
<package name="aaa_base" replaces="opensuse-welcome"/>
<ignore name="opensuse-welcome"/>
+ <package name="aaa_base" replaces="yelp"/>
+ <ignore name="yelp"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
--- livecd-leap-kde.kiwi.orig
+++ livecd-leap-kde.kiwi
@@ -371,7 +371,6 @@
<package name="dosfstools"/>
<package name="e2fsprogs"/>
<package name="exfatprogs"/>
- <package name="fcoe-utils"/>
<package name="jfsutils"/>
<package name="mdadm"/>
<package name="multipath-tools"/>
@@ -423,7 +422,6 @@
<package name="xf86-video-tdfx"/>
<package name="xf86-video-v4l"/>
<package name="xf86-video-vesa"/>
- <package name="xf86-video-voodoo"/>
<package name="xz"/>
<package name="yast2-trans-de"/>
<package name="yast2-trans-cs"/>
@@ -540,6 +538,8 @@
<ignore name="cyrus-sasl"/>
<package name="alsa-firmware"/>
<package name="opensuse-welcome"/>
+ <package name="aaa_base" replaces="bluedevil5"/>
+ <ignore name="bluedevil5"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
--- livecd-leap-x11.kiwi.orig
+++ livecd-leap-x11.kiwi
@@ -371,7 +371,6 @@
<package name="dosfstools"/>
<package name="e2fsprogs"/>
<package name="exfatprogs"/>
- <package name="fcoe-utils"/>
<package name="jfsutils"/>
<package name="mdadm"/>
<package name="multipath-tools"/>
@@ -423,7 +422,6 @@
<package name="xf86-video-tdfx"/>
<package name="xf86-video-v4l"/>
<package name="xf86-video-vesa"/>
- <package name="xf86-video-voodoo"/>
<package name="xz"/>
<package name="yast2-trans-de"/>
<package name="yast2-trans-cs"/>
@@ -587,6 +585,8 @@
<ignore name="Mesa-dri-nouveau"/>
<package name="aaa_base" replaces="libvdpau_nouveau"/>
<ignore name="libvdpau_nouveau"/>
+ <package name="aaa_base" replaces="gstreamer-plugins-bad"/>
+ <ignore name="gstreamer-plugins-bad"/>
<package name="patterns-xfce-xfce_basis"/>
<namedCollection name="xfce_basis"/>
<package name="evince"/>
@@ -622,6 +622,10 @@
<package name="xfce4-panel-plugin-xkb"/>
<package name="xfce4-terminal"/>
<package name="yast2-control-center-qt"/>
+ <package name="aaa_base" replaces="argyllcms"/>
+ <ignore name="argyllcms"/>
+ <package name="aaa_base" replaces="xdg-desktop-portal-gtk"/>
+ <ignore name="xdg-desktop-portal-gtk"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
--- livecd-leap-xfce.kiwi.orig
+++ livecd-leap-xfce.kiwi
@@ -371,7 +371,6 @@
<package name="dosfstools"/>
<package name="e2fsprogs"/>
<package name="exfatprogs"/>
- <package name="fcoe-utils"/>
<package name="jfsutils"/>
<package name="mdadm"/>
<package name="multipath-tools"/>
@@ -423,7 +422,6 @@
<package name="xf86-video-tdfx"/>
<package name="xf86-video-v4l"/>
<package name="xf86-video-vesa"/>
- <package name="xf86-video-voodoo"/>
<package name="xz"/>
<package name="yast2-trans-de"/>
<package name="yast2-trans-cs"/>
@@ -489,6 +487,8 @@
<ignore name="engrampa-lang"/>
<package name="aaa_base" replaces="libreoffice"/>
<ignore name="libreoffice"/>
+ <package name="aaa_base" replaces="MozillaThunderbird"/>
+ <ignore name="MozillaThunderbird"/>
<package name="aaa_base" replaces="gdb"/>
<ignore name="gdb"/>
<package name="aaa_base" replaces="gimp"/>
--- livecd-openSUSE.changes.orig
+++ livecd-openSUSE.changes
@@ -1,4 +1,55 @@
-------------------------------------------------------------------
+Fri Aug 25 09:08:19 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- list-x11: Ignore xdg-desktop-portal-gtk
+- list-xfce: Ignore MozillaThunderbird
+
+-------------------------------------------------------------------
+Thu Mar 9 07:50:36 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- list-gnome: Ignore yelp
+
+-------------------------------------------------------------------
+Mon Aug 8 07:51:52 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- Delete xorg-x11-server-Xvfb only if installed
+- Make list-gnome compatible with Leap again
+- Don't ignore alsa-plugins-pulse anymore, no longer needed
+- Raise disk size constraint to 20GiB to fix occasional build failures
+
+-------------------------------------------------------------------
+Wed Aug 3 05:53:28 UTC 2022 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Adjust GNOME ignore list: google-noto- font packages were renamed
+ to include the google- prefix.
+
+-------------------------------------------------------------------
+Wed Jul 27 06:25:00 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- config.sh: Cope with new name of noto-coloremoji-fonts
+
+-------------------------------------------------------------------
+Fri Jul 22 12:14:30 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- list-common: Drop fcoe-utils
+- list-x11: Ignore gstreamer-plugins-bad
+
+-------------------------------------------------------------------
+Wed Jul 20 09:40:43 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- list-x11: Don't block bind-utils on Leap
+
+-------------------------------------------------------------------
+Wed Jul 20 09:13:34 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- list-x11: Ignore bind-utils
+
+-------------------------------------------------------------------
+Thu Jul 7 20:56:36 UTC 2022 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Ignore alsa-plugins-pulse for now: conflicts with pipewire.
+
+-------------------------------------------------------------------
Mon Feb 28 10:20:14 UTC 2022 - Fabian Vogt <fvogt@suse.com>
- list-x11: Drop ristretto (boo#1193538)
--- livecd-tumbleweed-gnome.kiwi.orig
+++ livecd-tumbleweed-gnome.kiwi
@@ -374,7 +374,6 @@
<package name="dosfstools"/>
<package name="e2fsprogs"/>
<package name="exfatprogs"/>
- <package name="fcoe-utils"/>
<package name="jfsutils"/>
<package name="mdadm"/>
<package name="multipath-tools"/>
@@ -426,7 +425,6 @@
<package name="xf86-video-tdfx"/>
<package name="xf86-video-v4l"/>
<package name="xf86-video-vesa"/>
- <package name="xf86-video-voodoo"/>
<package name="xz"/>
<package name="yast2-trans-de"/>
<package name="zd1211-firmware"/>
@@ -457,6 +455,26 @@
<package name="adobe-sourcecodepro-fonts"/>
<package name="aaa_base" replaces="google-carlito-fonts"/>
<ignore name="google-carlito-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-fonts"/>
+ <ignore name="google-noto-sans-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-cjk-fonts"/>
+ <ignore name="google-noto-sans-cjk-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-sc-bold-fonts"/>
+ <ignore name="google-noto-sans-sc-bold-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-sc-regular-fonts"/>
+ <ignore name="google-noto-sans-sc-regular-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-tc-bold-fonts"/>
+ <ignore name="google-noto-sans-tc-bold-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-tc-regular-fonts"/>
+ <ignore name="google-noto-sans-tc-regular-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-jp-bold-fonts"/>
+ <ignore name="google-noto-sans-jp-bold-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-jp-regular-fonts"/>
+ <ignore name="google-noto-sans-jp-regular-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-kr-bold-fonts"/>
+ <ignore name="google-noto-sans-kr-bold-fonts"/>
+ <package name="aaa_base" replaces="google-noto-sans-kr-regular-fonts"/>
+ <ignore name="google-noto-sans-kr-regular-fonts"/>
<package name="aaa_base" replaces="noto-sans-fonts"/>
<ignore name="noto-sans-fonts"/>
<package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
@@ -565,6 +583,8 @@
<package name="quadrapassel"/>
<package name="aaa_base" replaces="opensuse-welcome"/>
<ignore name="opensuse-welcome"/>
+ <package name="aaa_base" replaces="yelp"/>
+ <ignore name="yelp"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
--- livecd-tumbleweed-kde.kiwi.orig
+++ livecd-tumbleweed-kde.kiwi
@@ -374,7 +374,6 @@
<package name="dosfstools"/>
<package name="e2fsprogs"/>
<package name="exfatprogs"/>
- <package name="fcoe-utils"/>
<package name="jfsutils"/>
<package name="mdadm"/>
<package name="multipath-tools"/>
@@ -426,7 +425,6 @@
<package name="xf86-video-tdfx"/>
<package name="xf86-video-v4l"/>
<package name="xf86-video-vesa"/>
- <package name="xf86-video-voodoo"/>
<package name="xz"/>
<package name="yast2-trans-de"/>
<package name="zd1211-firmware"/>
@@ -536,6 +534,8 @@
<ignore name="cyrus-sasl"/>
<package name="alsa-firmware"/>
<package name="opensuse-welcome"/>
+ <package name="aaa_base" replaces="bluedevil5"/>
+ <ignore name="bluedevil5"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
--- livecd-tumbleweed-x11.kiwi.orig
+++ livecd-tumbleweed-x11.kiwi
@@ -374,7 +374,6 @@
<package name="dosfstools"/>
<package name="e2fsprogs"/>
<package name="exfatprogs"/>
- <package name="fcoe-utils"/>
<package name="jfsutils"/>
<package name="mdadm"/>
<package name="multipath-tools"/>
@@ -426,7 +425,6 @@
<package name="xf86-video-tdfx"/>
<package name="xf86-video-v4l"/>
<package name="xf86-video-vesa"/>
- <package name="xf86-video-voodoo"/>
<package name="xz"/>
<package name="yast2-trans-de"/>
<package name="zd1211-firmware"/>
@@ -569,6 +567,8 @@
<ignore name="plymouth"/>
<package name="aaa_base" replaces="7zip"/>
<ignore name="7zip"/>
+ <package name="aaa_base" replaces="bind-utils"/>
+ <ignore name="bind-utils"/>
<package name="aaa_base" replaces="tumbler"/>
<ignore name="tumbler"/>
<package name="aaa_base" replaces="ristretto"/>
@@ -581,6 +581,8 @@
<ignore name="Mesa-dri-nouveau"/>
<package name="aaa_base" replaces="libvdpau_nouveau"/>
<ignore name="libvdpau_nouveau"/>
+ <package name="aaa_base" replaces="gstreamer-plugins-bad"/>
+ <ignore name="gstreamer-plugins-bad"/>
<package name="patterns-xfce-xfce_basis"/>
<namedCollection name="xfce_basis"/>
<package name="evince"/>
@@ -616,6 +618,10 @@
<package name="xfce4-panel-plugin-xkb"/>
<package name="xfce4-terminal"/>
<package name="yast2-control-center-qt"/>
+ <package name="aaa_base" replaces="argyllcms"/>
+ <ignore name="argyllcms"/>
+ <package name="aaa_base" replaces="xdg-desktop-portal-gtk"/>
+ <ignore name="xdg-desktop-portal-gtk"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
--- livecd-tumbleweed-xfce.kiwi.orig
+++ livecd-tumbleweed-xfce.kiwi
@@ -374,7 +374,6 @@
<package name="dosfstools"/>
<package name="e2fsprogs"/>
<package name="exfatprogs"/>
- <package name="fcoe-utils"/>
<package name="jfsutils"/>
<package name="mdadm"/>
<package name="multipath-tools"/>
@@ -426,7 +425,6 @@
<package name="xf86-video-tdfx"/>
<package name="xf86-video-v4l"/>
<package name="xf86-video-vesa"/>
- <package name="xf86-video-voodoo"/>
<package name="xz"/>
<package name="yast2-trans-de"/>
<package name="zd1211-firmware"/>
@@ -483,6 +481,8 @@
<ignore name="engrampa-lang"/>
<package name="aaa_base" replaces="libreoffice"/>
<ignore name="libreoffice"/>
+ <package name="aaa_base" replaces="MozillaThunderbird"/>
+ <ignore name="MozillaThunderbird"/>
<package name="aaa_base" replaces="gdb"/>
<ignore name="gdb"/>
<package name="aaa_base" replaces="gimp"/>
