Merge branch 'main' into negativo17-only

ublue-os · Oct 4, 2024 · 6d6d64e · 6d6d64e
2 parents cccffd1 + adf1583
commit 6d6d64e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 112 deletions.
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
@@ -33,12 +33,7 @@ jobs:
           - onyx
           - base
           - lazurite
-          - mate
           - vauxite
-        exclude:
-          # There is currently no Fedora 40 version of mate
-          - image_name: mate
-            fedora_version: 40
 
     steps:
       # Checkout push-to-registry action GitHub repository

diff --git a/install.sh b/install.sh
@@ -32,16 +32,6 @@ else
         /tmp/kernel-rpms/kernel-modules-*.rpm
 fi
 
-# Temporary fix for an upstream issue
-# https://github.com/coreos/rpm-ostree/issues/5048
-if [[ "${FEDORA_MAJOR_VERSION}" -eq 40 ]]; then
-    rpm-ostree override replace \
-    --experimental \
-    --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
-        rpm-ostree \
-        rpm-ostree-libs
-fi
-
 # use negativo17 for 3rd party packages with higher priority than default
 curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo
 sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-multimedia.repo

diff --git a/packages.json b/packages.json
@@ -30,7 +30,7 @@
                 "libheif-tools",
                 "libratbag-ratbagd",
                 "libva-intel-media-driver",
-                "libva-utils",                 
+                "libva-utils",
                 "lshw",
                 "net-tools",
                 "nvme-cli",
@@ -53,6 +53,7 @@
                 "traceroute",
                 "vim",
                 "wireguard-tools",
+                "wl-clipboard",
                 "yubikey-manager",
                 "zstd"
             ],
@@ -69,101 +70,6 @@
                 "kio-admin",
                 "ksshaskpass"
             ],
-            "mate": [
-                "NetworkManager-adsl",
-                "NetworkManager-openconnect-gnome",
-                "NetworkManager-openvpn-gnome",
-                "NetworkManager-ppp",
-                "NetworkManager-pptp-gnome",
-                "NetworkManager-ssh-gnome",
-                "NetworkManager-vpnc-gnome",
-                "NetworkManager-wwan",
-                "atril",
-                "atril-caja",
-                "atril-thumbnailer",
-                "blueman",
-                "caja",
-                "caja-actions",
-                "caja-image-converter",
-                "caja-open-terminal",
-                "caja-sendto",
-                "caja-wallpaper",
-                "caja-xattr-tags",
-                "dconf-editor",
-                "engrampa",
-                "eom",
-                "fedora-release-matecompiz",
-                "firefox",
-                "firewall-config",
-                "gnome-epub-thumbnailer",
-                "gnome-themes-extra",
-                "gstreamer1-plugins-ugly-free",
-                "gtk2-engines",
-                "gucharmap",
-                "gvfs-afc",
-                "gvfs-afp",
-                "gvfs-archive",
-                "gvfs-fuse",
-                "gvfs-gphoto2",
-                "gvfs-mtp",
-                "gvfs-nfs",
-                "gvfs-smb",
-                "initial-setup-gui",
-                "libmatekbd",
-                "libmatemixer",
-                "libmateweather",
-                "libsecret",
-                "lightdm",
-                "lm_sensors",
-                "marco",
-                "mate-applets",
-                "mate-backgrounds",
-                "mate-calc",
-                "mate-control-center",
-                "mate-desktop-configs",
-                "mate-dictionary",
-                "mate-disk-usage-analyzer",
-                "mate-icon-theme",
-                "mate-media",
-                "mate-menus",
-                "mate-menus-preferences-category-menu",
-                "mate-notification-daemon",
-                "mate-panel",
-                "mate-polkit",
-                "mate-power-manager",
-                "mate-screensaver",
-                "mate-screenshot",
-                "mate-search-tool",
-                "mate-session-manager",
-                "mate-settings-daemon",
-                "mate-system-log",
-                "mate-system-monitor",
-                "mate-terminal",
-                "mate-themes",
-                "mate-user-admin",
-                "mate-user-guide",
-                "mozo",
-                "network-manager-applet",
-                "nm-connection-editor",
-                "orca",
-                "parole",
-                "pavucontrol",
-                "pipewire-alsa",
-                "pipewire-pulseaudio",
-                "pluma",
-                "seahorse",
-                "seahorse-caja",
-                "setroubleshoot",
-                "slick-greeter-mate",
-                "system-config-language",
-                "system-config-printer",
-                "system-config-printer-applet",
-                "usermode-gtk",
-                "xdg-desktop-portal-gtk",
-                "xdg-user-dirs-gtk",
-                "xmodmap",
-                "xrdb"
-            ],
             "sericea": [
                 "clipman",
                 "gvfs-mtp",
@@ -218,7 +124,7 @@
             "all": [],
             "kinoite": [
                 "kf6-kimageformats",
-		"qt6-qtimageformats"
+                "qt6-qtimageformats"
             ]
         },
         "exclude": {