Merge remote-tracking branch 'upstream/master'

2024-02-21 13:39:34 +01:00 · 2024-02-21 13:39:34 +01:00 · bd96be17bc
commit bd96be17bc
parent 337b02e72d dbf46f083a
36 changed files with 4 additions and 39 deletions
--- a/community/awesome/Packages-Desktop
+++ b/community/awesome/Packages-Desktop
@ -247,12 +247,10 @@ xorg-server

 ## Misc
 >extra gtkhash-thunar
-manjaro-hotfixes
 >basic squashfs-tools
 >extra xiccd # enable color profile settings
 ufw  # firewall needs to be in every iso
 >extra mate-polkit
->extra pa-applet
 >extra rofi
 >extra xcape
 >extra qt5ct
--- a/community/bspwm-mate/Packages-Desktop
+++ b/community/bspwm-mate/Packages-Desktop
@ -77,7 +77,6 @@ manjaro-browser-settings-native
 mygtkmenui
 mozo
 network-manager-applet
-pa-applet
 pamac
 pulseaudio-ctl
 rofi-scripts
--- a/community/bspwm-mate/Packages-Mhwd
+++ b/community/bspwm-mate/Packages-Mhwd
@ -43,7 +43,6 @@ xf86-video-dummy
 xf86-video-fbdev
 xf86-video-intel
 xf86-video-nouveau
-xf86-video-openchrome
 xf86-video-sisusb
 xf86-video-vesa
 xf86-video-vmware
--- a/community/budgie/Packages-Desktop
+++ b/community/budgie/Packages-Desktop
@ -61,7 +61,6 @@ mhwd-tui
 manjaro-alsa
 manjaro-artwork
 manjaro-browser-settings
-manjaro-hotfixes
 manjaro-pipewire
 manjaro-settings-manager-notifier
 manjaro-hello
--- a/community/deepin/Packages-Desktop
+++ b/community/deepin/Packages-Desktop
@ -86,7 +86,6 @@ manjaro-browser-settings
 manjaro-application-utility
 >extra manjaro-documentation-en
 manjaro-hello
-manjaro-hotfixes
 >extra manjaro-printer
 manjaro-pulse
 manjaro-settings-manager-notifier
--- a/community/i3/Packages-Desktop
+++ b/community/i3/Packages-Desktop
@ -69,7 +69,6 @@ make
 >extra manjaro-application-utility
 manjaro-browser-settings
 >extra manjaro-hello
-manjaro-hotfixes
 manjaro-i3-settings
 >extra manjaro-printer
 manjaro-ranger-settings
--- a/community/i3/live-overlay/etc/skel/.i3/config
+++ b/community/i3/live-overlay/etc/skel/.i3/config
@ -45,7 +45,6 @@ bindsym $mod+z exec --no-startup-id morc_menu
 exec --no-startup-id volumeicon
 bindsym $mod+Ctrl+m exec terminal -e 'alsamixer'
 #exec --no-startup-id pulseaudio
-#exec --no-startup-id pa-applet
 #bindsym $mod+Ctrl+m exec pavucontrol

 ################################################################################################
--- a/community/mate/Packages-Desktop
+++ b/community/mate/Packages-Desktop
@ -63,7 +63,6 @@ manjaro-alsa
 manjaro-artwork
 manjaro-browser-settings
 manjaro-mate-settings
-manjaro-hotfixes
 manjaro-pulse
 manjaro-settings-manager-notifier
 manjaro-hello
--- a/community/plasma-bigscreen/Packages-Desktop
+++ b/community/plasma-bigscreen/Packages-Desktop
@ -126,4 +126,3 @@ xdg-utils
 zensu

 ## Misc
-manjaro-hotfixes
--- a/community/talking-mate/Packages-Desktop
+++ b/community/talking-mate/Packages-Desktop
@ -63,7 +63,6 @@ manjaro-alsa
 manjaro-artwork
 manjaro-browser-settings
 manjaro-mate-settings
-manjaro-hotfixes
 manjaro-pulse
 manjaro-settings-manager-notifier
 manjaro-hello
--- a/community/ukui/Packages-Desktop
+++ b/community/ukui/Packages-Desktop
@ -39,7 +39,6 @@ libappindicator-gtk3
 manjaro-alsa
 manjaro-artwork
 manjaro-browser-settings
-manjaro-hotfixes
 manjaro-pulse
 manjaro-settings-manager-notifier
 manjaro-hello
--- a/community/unity7/Packages-Desktop
+++ b/community/unity7/Packages-Desktop
@ -146,7 +146,6 @@ xdg-utils
 #>extra kernel-alive

 ## Misc
-manjaro-hotfixes
 >basic squashfs-tools
 xiccd # enable color profile settings
 tlp
--- a/community/webdad/Packages-Desktop
+++ b/community/webdad/Packages-Desktop
@ -70,7 +70,6 @@ openresolv
 #manjaro-settings-manager-notifier
 manjaro-webdad-settings
 gnome-keyring
-manjaro-hotfixes
 #manjaro-hello
 >basic squashfs-tools
 >basic disable-tracker
--- a/manjaro/architect/Packages-Live
+++ b/manjaro/architect/Packages-Live
@ -3,7 +3,6 @@ KERNEL-broadcom-wl
 KERNEL-r8168
 maia-console
 manjaro-architect-launcher
-manjaro-hotfixes
 mkinitcpio-nfs-utils
 nbd
 open-vm-tools
--- a/manjaro/bladebook/Packages-Desktop
+++ b/manjaro/bladebook/Packages-Desktop
@ -296,7 +296,6 @@ xdg-utils
 xdg-su

 ## Misc
-manjaro-hotfixes

 ## Flatpak support
 #>extra flatpak
--- a/manjaro/gnome-next/Packages-Live
+++ b/manjaro/gnome-next/Packages-Live
@ -1,5 +1,5 @@
 btrfs-assistant
-calamares-git
+calamares
 clonezilla
 gparted
 grub-theme-live-manjaro
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@ -36,7 +36,10 @@ manjaro-pipewire
 #adobe-source-han-sans-cn-fonts
 #adobe-source-han-sans-jp-fonts
 #adobe-source-han-sans-hk-fonts
+#adobe-source-han-sans-jp-fonts
 #adobe-source-han-sans-kr-fonts
+#adobe-source-han-sans-otc-fonts
+#adobe-source-han-sans-tw-fonts
 #adobe-source-sans-fonts
 noto-fonts                         # default font
 noto-fonts-cjk                     # Asian fonts, optional for noto-fonts
--- a/manjaro/kde-dev/Packages-Desktop
+++ b/manjaro/kde-dev/Packages-Desktop
@ -267,5 +267,4 @@ xdg-utils
 power-profiles-daemon

 ## Misc
-manjaro-hotfixes
 >basic squashfs-tools
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@ -267,5 +267,4 @@ xdg-utils
 power-profiles-daemon

 ## Misc
-manjaro-hotfixes
 >basic squashfs-tools
--- a/manjaro/netinstall/Packages-Live
+++ b/manjaro/netinstall/Packages-Live
@ -4,7 +4,6 @@ KERNEL-broadcom-wl
 KERNEL-r8168
 #KERNEL-rt3562sta
 KERNEL-virtualbox-guest-modules
-manjaro-hotfixes
 manjaro-live-skel
 mkinitcpio-nfs-utils
 nbd
@ -37,7 +36,6 @@ xf86-video-dummy
 xf86-video-fbdev
 xf86-video-intel
 xf86-video-nouveau
-xf86-video-openchrome
 xf86-video-sisusb
 xf86-video-vesa
 xf86-video-vmware
--- a/manjaro/nxd/Packages-Desktop
+++ b/manjaro/nxd/Packages-Desktop
@ -344,7 +344,6 @@ xdg-utils
 #>extra kernel-alive

 ## Misc
-manjaro-hotfixes
 >basic squashfs-tools

 ## Flatpak support
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@ -240,7 +240,6 @@ xdg-utils

 ## Misc
 gtkhash-thunar
-manjaro-hotfixes
 >basic squashfs-tools
 xiccd # enable color profile settings
 #tlp
--- a/oem/beelink-oem-kde/Packages-Desktop
+++ b/oem/beelink-oem-kde/Packages-Desktop
@ -277,7 +277,6 @@ zensu
 #gnome-firmware

 ## Misc
-manjaro-hotfixes
 >basic squashfs-tools

 ## Flatpak support
--- a/oem/gaming-oem-kde/Packages-Desktop
+++ b/oem/gaming-oem-kde/Packages-Desktop
@ -283,5 +283,4 @@ xdg-utils
 power-profiles-daemon

 ## Misc
-manjaro-hotfixes
 >basic squashfs-tools
--- a/oem/generic-oem-kde/Packages-Desktop
+++ b/oem/generic-oem-kde/Packages-Desktop
@ -264,7 +264,6 @@ xdg-utils
 #>extra kernel-alive

 ## Misc
-manjaro-hotfixes
 >basic squashfs-tools

 ## OEM
--- a/oem/generic-oem-xfce/Packages-Desktop
+++ b/oem/generic-oem-xfce/Packages-Desktop
@ -238,7 +238,6 @@ xdg-utils

 ## Misc
 gtkhash-thunar
-manjaro-hotfixes
 >basic squashfs-tools
 xiccd # enable color profile settings
 tlp
--- a/oem/infinitybookpro-oem-kde/Packages-Desktop
+++ b/oem/infinitybookpro-oem-kde/Packages-Desktop
@ -311,7 +311,6 @@ timeshift
 ## Misc
 bootsplash-theme-manjaro
 bootsplash-systemd
-manjaro-hotfixes
 tlpui
 tuxedo-keyboard-dkms
 KERNEL-headers
--- a/oem/infinitybookpro-oem-xfce/Packages-Desktop
+++ b/oem/infinitybookpro-oem-xfce/Packages-Desktop
@ -248,7 +248,6 @@ xdg-utils
 xdg-su

 ## Misc
-manjaro-hotfixes
 tuxedo-keyboard-dkms
 KERNEL-headers
 timeshift
--- a/oem/minisforum-oem-kde-um350/Packages-Desktop
+++ b/oem/minisforum-oem-kde-um350/Packages-Desktop
@ -300,7 +300,6 @@ zensu
 gnome-firmware

 ## Misc
-manjaro-hotfixes
 >basic squashfs-tools

 ## Flatpak support
--- a/oem/minisforum-oem-kde/Packages-Desktop
+++ b/oem/minisforum-oem-kde/Packages-Desktop
@ -309,7 +309,6 @@ zensu
 gnome-firmware

 ## Misc
-manjaro-hotfixes
 >basic squashfs-tools

 ## Flatpak support
--- a/oem/slimbook-hero/Packages-Desktop
+++ b/oem/slimbook-hero/Packages-Desktop
@ -310,5 +310,4 @@ xdg-utils
 power-profiles-daemon

 ## Misc
-manjaro-hotfixes
 >basic squashfs-tools
--- a/oem/slimbook-titan/Packages-Desktop
+++ b/oem/slimbook-titan/Packages-Desktop
@ -274,7 +274,6 @@ xdg-utils
 #>extra kernel-alive

 ## Misc
-manjaro-hotfixes
 >basic squashfs-tools

 ## OEM
--- a/oem/starlabs-oem-kde/Packages-Desktop
+++ b/oem/starlabs-oem-kde/Packages-Desktop
@ -266,7 +266,6 @@ xdg-utils
 power-profiles-daemon

 ## Misc
-manjaro-hotfixes
 >basic squashfs-tools

 ## OEM
--- a/oem/starlabs-oem-xfce/Packages-Desktop
+++ b/oem/starlabs-oem-xfce/Packages-Desktop
@ -241,7 +241,6 @@ xdg-desktop-portal-gtk

 ## Misc
 gtkhash-thunar
-manjaro-hotfixes
 >basic squashfs-tools
 xiccd # enable color profile settings
 tlp
--- a/shared/Packages-Live-Xorg
+++ b/shared/Packages-Live-Xorg
@ -22,7 +22,6 @@ xf86-video-dummy
 xf86-video-fbdev
 xf86-video-intel
 xf86-video-nouveau
-xf86-video-openchrome
 xf86-video-sisusb
 xf86-video-vesa
 xf86-video-vmware
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@ -39,8 +39,6 @@ mesa-vdpau
 >nonfree_multilib lib32-nvidia-470xx-utils
 >nonfree_multilib lib32-nvidia-390xx-utils
 >nonfree_multilib lib32-nvidia-utils
-opencl-clover-mesa
-opencl-rusticl-mesa
 open-vm-tools
 primus
 qemu-guest-agent
@ -63,7 +61,6 @@ xf86-video-dummy
 xf86-video-fbdev
 xf86-video-intel
 xf86-video-nouveau
-xf86-video-openchrome
 xf86-video-sisusb
 xf86-video-vesa
 xf86-video-vmware