From c81d685ddb651190d4093ed32c273577fdc38022 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Tue, 1 Oct 2019 22:47:12 +0200 Subject: [PATCH 1/4] [deepin] 18.1.1-pre --- community/deepin/Packages-Desktop | 6 ++ community/deepin/Packages-Live | 3 +- community/deepin/Packages-Root | 94 ++++++++++++++++++++++++++++++- community/deepin/profile.conf | 56 +----------------- 4 files changed, 103 insertions(+), 56 deletions(-) mode change 120000 => 100644 community/deepin/Packages-Root diff --git a/community/deepin/Packages-Desktop b/community/deepin/Packages-Desktop index 22f65b0..45c672c 100644 --- a/community/deepin/Packages-Desktop +++ b/community/deepin/Packages-Desktop @@ -1,10 +1,12 @@ >extra adapta-maia-theme alsa-firmware alsa-utils +>extra apparmor autoconf automake avahi >extra baobab +>extra bauh binutils bison >extra brasero @@ -16,6 +18,7 @@ deepin-file-manager deepin-gtk-theme >extra deepin-draw >extra deepin-image-viewer +deepin-kwin >extra deepin-movie >extra deepin-music >extra deepin-picker @@ -79,6 +82,7 @@ mesa-demos mlocate mobile-broadband-provider-info modemmanager +>extra ms-office-online >multilib lib32-mesa-demos netctl networkmanager @@ -90,6 +94,7 @@ nss-mdns ntp openresolv pamac +>extra pamac-snap-plugin patch >extra patchutils pkg-config @@ -103,6 +108,7 @@ pulseaudio-zeroconf >extra qpdfview >extra redshift screenfetch +>basic squashfs-tools >extra subversion >extra sushi syslog-ng diff --git a/community/deepin/Packages-Live b/community/deepin/Packages-Live index 8311b7b..db865fc 100644 --- a/community/deepin/Packages-Live +++ b/community/deepin/Packages-Live @@ -1,4 +1,4 @@ -calamares-git +calamares deepin-live grub-theme-live-manjaro gsmartcontrol @@ -7,4 +7,3 @@ manjaro-live-skel manjaro-live-systemd mkinitcpio-nfs-utils nbd -squashfs-tools diff --git a/community/deepin/Packages-Root b/community/deepin/Packages-Root deleted file mode 120000 index 60cc7bd..0000000 --- a/community/deepin/Packages-Root +++ /dev/null @@ -1 +0,0 @@ -../../shared/Packages-Root \ No newline at end of file diff --git a/community/deepin/Packages-Root b/community/deepin/Packages-Root new file mode 100644 index 0000000..3b47a4f --- /dev/null +++ b/community/deepin/Packages-Root @@ -0,0 +1,93 @@ +>i686 archlinux32-keyring +>manjaro manjaro-release +>multilib gcc-libs-multilib +acpi +acpid +amd-ucode +b43-fwcutter +bash-completion +btrfs-progs +bzip2 +coreutils +cpupower +crda +cronie +cryptsetup +dbus-x11 +device-mapper +dhclient +dhcpcd +diffutils +dmraid +dnsmasq +dosfstools +e2fsprogs +ecryptfs-utils +efibootmgr +exfat-utils +f2fs-tools +file +filesystem +findutils +gawk +gcc-libs +gettext +glibc +grep +grub +gzip +haveged +inetutils +intel-ucode +iproute2 +iptables +iputils +ipw2100-fw +ipw2200-fw +jfsutils +KERNEL +less +licenses +linux-firmware +logrotate +lsb-release +lvm2 +man-db +man-pages +manjaro-firmware +manjaro-system +mdadm +memtest86+ +mhwd +mhwd-db +mkinitcpio-openswap +nano +nfs-utils +ntfs-3g +os-prober +pacman +pciutils +perl +procps-ng +psmisc +reiserfsprogs +rsync +s-nail +sed +shadow +spectre-meltdown-checker +sudo +sysfsutils +systemd-fsck-silent +systemd-sysvcompat +tar +texinfo +tlp +usbutils +util-linux +vi +wget +which +wpa_supplicant +xfsprogs +zsh diff --git a/community/deepin/profile.conf b/community/deepin/profile.conf index d5a6d19..3f17138 100644 --- a/community/deepin/profile.conf +++ b/community/deepin/profile.conf @@ -1,61 +1,11 @@ -########################################## -###### use this file in the profile ###### -########################################## +#! /bin/bash -# use multilib packages; x86_64 only -# multilib="true" - -# default displaymanager: none -# supported; lightdm, sddm, gdm, lxdm, mdm displaymanager="lightdm" -# Set to false to disable autologin in the livecd -# autologin="true" +nonfree_mhwd="true" -# nonfree xorg drivers -# nonfree_mhwd="true" +enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd') -################ install ################ - -# possible values: grub;systemd-boot -# efi_boot_loader="grub" - -# configure calamares for netinstall -# netinstall="false" - -# configure calamares to use chrootcfg instead of unpackfs -# chrootcfg="false" - -# use geoip -# geoip="true" - -# unset defaults to given values -# names must match systemd service names -enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw') disable_systemd=('pacman-init') -# the same workgroup name if samba is used -# smb_workgroup="" - -################# livecd ################# - -# unset defaults to given value hostname="manjaro-deepin" - -# unset defaults to given value -# username="manjaro" - -# unset defaults to given value -# password="manjaro" - -# the login shell -# defaults to bash -# login_shell=/bin/bash - -# unset defaults to given values -# addgroups="lp,network,power,wheel" - -# unset defaults to given values -# names must match systemd service names -# services in enable_systemd array don't need to be listed here -# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live') From 77101169f892e3bd97a11ae625ddd1fe6f096be9 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Sun, 6 Oct 2019 01:03:45 +0200 Subject: [PATCH 2/4] [xfce] add xiccd --- manjaro/xfce/Packages-Desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index 826bca0..f7fac8e 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -277,6 +277,7 @@ xdg-su gtkhash-thunar manjaro-hotfixes >basic squashfs-tools +xiccd # enable color profile settings ## Handshake tools #faucet-tool From e1fc240898d4f83f9243d1784c53b218b9686867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sun, 6 Oct 2019 11:16:36 +0200 Subject: [PATCH 3/4] [prepare] 18.1.1-rc1 --- manjaro/gnome/Packages-Desktop | 5 +++-- manjaro/kde/Packages-Desktop | 1 + manjaro/xfce/Packages-Desktop | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index 0656356..0a321ba 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -84,7 +84,7 @@ grub-theme-manjaro #grub theme for installed S.O. manjaro-hotfixes manjaro-pulse manjaro-hello -#manjaro-application-utility #not compatible to pamac 9.0 yet +manjaro-application-utility mesa-demos mobile-broadband-provider-info modemmanager @@ -106,7 +106,8 @@ openresolv >extra flatpak >extra bauh pamac ->extra pamac-snap-plugin +>extra snapd +#>extra pamac-snap-plugin polkit-gnome powertop pulseaudio-bluetooth diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index 9ec9f97..49ccf46 100644 --- a/manjaro/kde/Packages-Desktop +++ b/manjaro/kde/Packages-Desktop @@ -97,6 +97,7 @@ pamac-tray-appindicator #pamac-cli >extra apparmor >extra snapd +#>extra pamac-snap-plugin #discover-snap #discover #packagekit-qt5 diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index 826bca0..23e64e2 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -88,6 +88,7 @@ ttf-bitstream-vera # xfce4-terminal default Monospace >extra bauh pamac >extra snapd +#>extra pamac-snap-plugin ## Java >extra jdk8-openjdk From f73c635942f2b208e9d3555324180bf66500469f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sun, 6 Oct 2019 12:32:51 +0200 Subject: [PATCH 4/4] [prepare] 18.1.1-rc1 - seems bauh needs snapd-glib --- manjaro/gnome/Packages-Desktop | 1 + manjaro/kde/Packages-Desktop | 1 + manjaro/xfce/Packages-Desktop | 1 + 3 files changed, 3 insertions(+) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index 4d43105..53482c9 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -105,6 +105,7 @@ openresolv >extra bauh pamac >extra snapd +>extra snapd-glib #>extra pamac-snap-plugin polkit-gnome powertop diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index 49ccf46..6948c71 100644 --- a/manjaro/kde/Packages-Desktop +++ b/manjaro/kde/Packages-Desktop @@ -97,6 +97,7 @@ pamac-tray-appindicator #pamac-cli >extra apparmor >extra snapd +>extra snapd-glib #>extra pamac-snap-plugin #discover-snap #discover diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index 525fc3a..400c0f2 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -88,6 +88,7 @@ ttf-bitstream-vera # xfce4-terminal default Monospace >extra bauh pamac >extra snapd +>extra snapd-glib #>extra pamac-snap-plugin ## Java