Merge remote-tracking branch 'upstream/master'

community/awesome/Packages-Desktop

@@ -82,11 +82,11 @@ xdg-utils
 xfce4-settings-gtk3
 xfce4-power-manager-gtk3
 manjaro-zsh-config
-manjaro-browser-settings-native
+manjaro-browser-settings
 manjaro-hotfixes
 manjaro-settings-manager
-manjaro-wallpapers-17.0
+manjaro-wallpapers-18.0
-manjaro-awesome-settings
+manjaro-awesome-settings-18.0
 qt5ct
 kvantum-manjaro
 
@@ -99,7 +99,7 @@ inxi
 i3-scrot
 htop
 lxterminal
-chromium
+firefox
 galculator
 gnome-disk-utility
 gufw

community/awesome/desktop-overlay/etc/lightdm/slick-greeter.conf

@@ -1,5 +1,5 @@
 [Greeter]
-background=/usr/share/backgrounds/manjarowall17_07.jpg
+background=/usr/share/backgrounds/manjaro-wallpapers-18.0/light-stripe-maia.jpg
-theme-name=Adapta-Nokto-Maia
+theme-name=Matcha-dark-sea
-icon-theme-name=Arc-Maia
+icon-theme-name=Papirus-Dark-Maia
 draw-grid=false

community/i3/Packages-Desktop

@@ -55,7 +55,6 @@ htop
 inxi
 >extra isousb
 json-c
-kvantum-manjaro
 >multilib lib32-flex
 >extra libdvdcss
 >extra libgpod
@@ -74,8 +73,10 @@ manjaro-browser-settings
 manjaro-hotfixes
 manjaro-i3-settings
 >extra manjaro-printer
+manjaro-ranger-settings
 >extra manjaro-settings-manager-notifier
 markdown_previewer
+matcha-gtk-theme
 mesa-demos
 mlocate
 mobile-broadband-provider-info

manjaro/gnome/Packages-Desktop

@@ -13,6 +13,7 @@ manjaro-gdm-check #this check if nvidia closed drivers are installed and disable
 manjaro-gdm-theme #branding theme for GDM: 18.0 
 gedit 
 gtksourceview-pkgbuild #highlight for PKGBUILD
+manjaro-gnome-vanilla
 gnome-backgrounds
 gnome-calculator
 gnome-control-center
@@ -80,6 +81,7 @@ grub-theme-manjaro-dev #grub theme for installed S.O.
 manjaro-hotfixes
 manjaro-pulse
 manjaro-hello
+manjaro-application-utility
 mesa-demos
 mobile-broadband-provider-info
 modemmanager
@@ -187,4 +189,3 @@ ms-office-online
 #>extra subversion
 #>extra yaourt
 manjaro-aur-support #introduce for testing in community
-

manjaro/gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig

@@ -1,2 +1,2 @@
 [General]
-theme=KvAdaptaMaia
+theme=Arc

manjaro/kde/Packages-Desktop

@@ -91,10 +91,16 @@ terminus-font
 >extra steam-manjaro
 
 ## Package management
+packagekit-qt5
+discover
+flatpak
+fwupd 
 octopi
-octopi-notifier-frameworks
 octopi-cachecleaner
 octopi-repoeditor
+#octopi-notifier-frameworks
+#pamac
+#pamac-tray-appindicator
 
 ## Printing
 >extra cups
@@ -105,6 +111,7 @@ octopi-repoeditor
 >extra gtk3-print-backends
 >extra hplip
 >extra splix
+>extra system-config-printer
 
 ## Optional dependencies for hplip
 >extra pyqt5-common
@@ -144,15 +151,16 @@ systemsettings
 user-manager
 
 ## Themes QT/GTK/SDDM
-breeze
+#breeze
-breeze-gtk
+#breeze-gtk
 gnome-icon-theme
 gnome-themes-standard
 gtk-theme-breath
->extra oxygen
+#>extra oxygen
->extra oxygen-icons
+#>extra oxygen-icons
 plasma5-themes-breath  # Default
 sddm-breath-theme  # Default
+grub-theme-manjaro-dev
 
 ## Better systray/notifications support
 >extra sni-qt  # A Qt plugin that enables tray icons in qt4 applications
@@ -171,6 +179,7 @@ kfind
 kdeconnect
 okular
 >extra >x86_64 kget
+>extra >x86_64 libktorrent
 >extra >i686 kdenetwork-kget
 kdenetwork-filesharing
 #>extra kdenlive
@@ -236,7 +245,7 @@ poppler-data  # encoding data to display PDF documents containing CJK characters
 
 ## Applications
 appimagelauncher
->extra cantata
+#>extra cantata
 dmidecode # for inxi -m output
 htop
 imagewriter
@@ -250,7 +259,7 @@ manjaro-hello
 manjaro-settings-manager-kcm
 manjaro-settings-manager-knotifier
 powertop
->extra qbittorrent
+#>extra qbittorrent
 screenfetch
 systemd-kcm
 >extra thunderbird
@@ -258,12 +267,12 @@ vlc
 yakuake
 
 ## Optional dependencis for cantata
->extra mpd       # playback
+#>extra mpd       # playback
->extra perl-uri  # dynamic playlist
+#>extra perl-uri  # dynamic playlist
 
 ## Optional dependencies for libreoffice
->extra jre8-openjdk
+#>extra jre8-openjdk
->extra jdk8-openjdk
+#>extra jdk8-openjdk
 
 ## Documentation
 manjaro-documentation-en
@@ -282,12 +291,20 @@ xf86-input-mouse
 xf86-input-void
 
 ## Xorg Server and Graphics
+>multilib lib32-libva-intel-driver
+>multilib lib32-libva-mesa-driver
+>multilib lib32-libva-vdpau-driver
+libva-intel-driver
+libva-mesa-driver
+libva-vdpau-driver
+mesa-demos
+>multilib lib32-mesa-demos
+numlockx
 xdg-user-dirs
 xorg-server
 xorg-twm
 xorg-xinit
-mesa-demos
+xorg-xkill
->multilib lib32-mesa-demos
 
 ## Desktop Utils
 perl-file-mimeinfo
@@ -298,6 +315,6 @@ xdg-su
 manjaro-hotfixes
 
 ## Flatpak support
->extra flatpak
+#>extra flatpak
->extra xdg-desktop-portal
+#>extra xdg-desktop-portal
->extra xdg-desktop-portal-kde
+#>extra xdg-desktop-portal-kde

manjaro/xfce/Packages-Desktop

@@ -98,6 +98,7 @@ pamac
 >extra gtk3-print-backends
 >extra hplip
 >extra splix
+>extra system-config-printer
 
 ## Optional dependencies for hplip
 >extra pyqt5-common # For hplip
@@ -183,6 +184,8 @@ pavucontrol
 >extra manjaro-wallpapers-18.0
 gnome-icon-theme
 gnome-themes-standard
+grub-theme-manjaro-dev
+matcha-gtk-theme
 xcursor-simpleandsoft
 xcursor-vanilla-dmz-aa
 
@@ -205,6 +208,7 @@ inxi
 >extra libreoffice-still
 ms-office-online
 manjaro-hello
+manjaro-application-utility
 manjaro-settings-manager
 manjaro-settings-manager-notifier
 >basic midori
@@ -245,11 +249,17 @@ xf86-input-mouse
 xf86-input-void
 
 ## Xorg Server and Graphics
-xdg-user-dirs
+>multilib lib32-libva-intel-driver
-xorg-server
+>multilib lib32-libva-mesa-driver
-numlockx
+>multilib lib32-libva-vdpau-driver
+libva-intel-driver
+libva-mesa-driver
+libva-vdpau-driver
 mesa-demos
 >multilib lib32-mesa-demos
+numlockx
+xdg-user-dirs
+xorg-server
 xorg-twm
 xorg-xinit
 xorg-xkill

manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf

@@ -4,7 +4,7 @@ font-name = Cantarell Bold 12
 xft-antialias = true
 icon-theme-name = Adapta-Papirus-Maia
 screensaver-timeout = 60
-theme-name = Adapta-Eta-Maia
+theme-name = Matcha-sea
 cursor-theme-name = xcursor-breeze
 show-clock = false
 default-user-image = #avatar-default

shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc

@@ -4,10 +4,10 @@ componentName:  manjaro
 strings:
     productName:         Manjaro Linux
     shortProductName:    Manjaro
-    version:             18.0-beta-7
+    version:             18.0-rc-1
-    shortVersion:        18.0-beta-7
+    shortVersion:        18.0-rc-1
-    versionedName:       Manjaro Linux 18.0-beta-7 "Illyria"
+    versionedName:       Manjaro Linux 18.0-rc-1 "Illyria"
-    shortVersionedName:  Manjaro 18.0-beta-7
+    shortVersionedName:  Manjaro 18.0-rc-1
     bootloaderEntryName: Manjaro
 
 images: