From 933857e1cc701829b93d35649a32e7cc3df36810 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sun, 22 Nov 2015 19:42:59 +0200
Subject: KDE4 is replaced by PLASMA5

---
 files/UEFI/KDE4/EFI/BOOT/bootx64.efi               | Bin 802816 -> 0 bytes
 files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2         | Bin 2560080 -> 0 bytes
 files/UEFI/KDE4/EFI/BOOT/grub.cfg                  |  33 --------------------
 .../BOOT/themes/maggy/Mageia5-grub2-1024x768.png   | Bin 679782 -> 0 bytes
 .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2   | Bin 2795 -> 0 bytes
 .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2   | Bin 3139 -> 0 bytes
 .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2   | Bin 4205 -> 0 bytes
 .../BOOT/themes/maggy/MageiaLogo-Regular-20.pf2    | Bin 2984 -> 0 bytes
 files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt    |  34 ---------------------
 files/UEFI/KDE4/boot/efiboot.img                   | Bin 4194304 -> 0 bytes
 files/UEFI/PLASMA5/EFI/BOOT/bootx64.efi            | Bin 0 -> 802816 bytes
 files/UEFI/PLASMA5/EFI/BOOT/fonts/unicode.pf2      | Bin 0 -> 2560080 bytes
 files/UEFI/PLASMA5/EFI/BOOT/grub.cfg               |  33 ++++++++++++++++++++
 .../BOOT/themes/maggy/Mageia5-grub2-1024x768.png   | Bin 0 -> 679782 bytes
 .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2   | Bin 0 -> 2795 bytes
 .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2   | Bin 0 -> 3139 bytes
 .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2   | Bin 0 -> 4205 bytes
 .../BOOT/themes/maggy/MageiaLogo-Regular-20.pf2    | Bin 0 -> 2984 bytes
 files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/theme.txt |  34 +++++++++++++++++++++
 files/UEFI/PLASMA5/boot/efiboot.img                | Bin 0 -> 4194304 bytes
 files/glib2-branding.gschema.override              |   2 +-
 21 files changed, 68 insertions(+), 68 deletions(-)
 delete mode 100644 files/UEFI/KDE4/EFI/BOOT/bootx64.efi
 delete mode 100755 files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2
 delete mode 100644 files/UEFI/KDE4/EFI/BOOT/grub.cfg
 delete mode 100755 files/UEFI/KDE4/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
 delete mode 100755 files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
 delete mode 100755 files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
 delete mode 100755 files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
 delete mode 100755 files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
 delete mode 100755 files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt
 delete mode 100644 files/UEFI/KDE4/boot/efiboot.img
 create mode 100644 files/UEFI/PLASMA5/EFI/BOOT/bootx64.efi
 create mode 100755 files/UEFI/PLASMA5/EFI/BOOT/fonts/unicode.pf2
 create mode 100644 files/UEFI/PLASMA5/EFI/BOOT/grub.cfg
 create mode 100755 files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
 create mode 100755 files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
 create mode 100755 files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
 create mode 100755 files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
 create mode 100755 files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
 create mode 100755 files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/theme.txt
 create mode 100644 files/UEFI/PLASMA5/boot/efiboot.img

(limited to 'files')

diff --git a/files/UEFI/KDE4/EFI/BOOT/bootx64.efi b/files/UEFI/KDE4/EFI/BOOT/bootx64.efi
deleted file mode 100644
index bb2352c..0000000
Binary files a/files/UEFI/KDE4/EFI/BOOT/bootx64.efi and /dev/null differ
diff --git a/files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2
deleted file mode 100755
index 57b682a..0000000
Binary files a/files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2 and /dev/null differ
diff --git a/files/UEFI/KDE4/EFI/BOOT/grub.cfg b/files/UEFI/KDE4/EFI/BOOT/grub.cfg
deleted file mode 100644
index 71a916a..0000000
--- a/files/UEFI/KDE4/EFI/BOOT/grub.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-
-insmod efi_gop
-insmod efi_uga
-insmod video_bochs
-insmod video_cirrus
-insmod video_fb
-
-insmod font
-if loadfont ${prefix}/fonts/unicode.pf2
-then
-   insmod gfxterm
-   set gfxmode=auto
-   set gfxpayload=keep
-   terminal_output gfxterm
-fi
-
-insmod png
-set theme=/EFI/BOOT/themes/maggy/theme.txt
-export theme
-
-set timeout=10
-
-search --no-floppy --set=root -l 'Mageia-6-KDE4-LiveDVD'
-
-menuentry 'Boot Mageia 6 (Cauldron) Live' {
-        linux /boot/vmlinuz root=mgalive:LABEL=Mageia-6-KDE4-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
-        initrd /boot/cdrom/initrd.gz
-}
-
-menuentry 'Install Mageia 6 (Cauldron) Live' {
-        linux /boot/vmlinuz root=mgalive:LABEL=Mageia-6-KDE4-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
-        initrd /boot/cdrom/initrd.gz
-}
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
deleted file mode 100755
index 6bdaa67..0000000
Binary files a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png and /dev/null differ
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
deleted file mode 100755
index 442e338..0000000
Binary files a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 and /dev/null differ
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
deleted file mode 100755
index 4a435f7..0000000
Binary files a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 and /dev/null differ
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
deleted file mode 100755
index dee5391..0000000
Binary files a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 and /dev/null differ
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
deleted file mode 100755
index f12fa75..0000000
Binary files a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 and /dev/null differ
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt
deleted file mode 100755
index c645b40..0000000
--- a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# GRUB gfxmenu theme "maggy".
-
-title-text: "Mageia 6 UEFI"
-title-font: "MageiaLogo Bold 28"
-title-color: "white"
-
-desktop-image: "Mageia5-grub2-1024x768.png"
-terminal-font: "Unknown Regular 16"
-
-+ boot_menu {
-   left = 15%
-   top = 15%
-   width = 70%
-   height = 55%
-   item_font = "MageiaLogo Regular 20"
-   selected_item_font = "MageiaLogo Bold 20"
-   color_normal="black/black"
-   item_color = "#2397d4"
-   selected_item_color = "white"
-   item_height = 24
-   item_spacing = 10
-}
-
-+ progress_bar
-{
-   id = "__timeout__"
-   left = 15%
-   top = 65%
-   width = 70%
-   height = 1%
-   fg_color = "lightskyblue"
-   bg_color = "dodgerblue"
-   border_color = "midnightblue"
-}
diff --git a/files/UEFI/KDE4/boot/efiboot.img b/files/UEFI/KDE4/boot/efiboot.img
deleted file mode 100644
index 587f232..0000000
Binary files a/files/UEFI/KDE4/boot/efiboot.img and /dev/null differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/bootx64.efi b/files/UEFI/PLASMA5/EFI/BOOT/bootx64.efi
new file mode 100644
index 0000000..bb2352c
Binary files /dev/null and b/files/UEFI/PLASMA5/EFI/BOOT/bootx64.efi differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/PLASMA5/EFI/BOOT/fonts/unicode.pf2
new file mode 100755
index 0000000..57b682a
Binary files /dev/null and b/files/UEFI/PLASMA5/EFI/BOOT/fonts/unicode.pf2 differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/grub.cfg b/files/UEFI/PLASMA5/EFI/BOOT/grub.cfg
new file mode 100644
index 0000000..306c24f
--- /dev/null
+++ b/files/UEFI/PLASMA5/EFI/BOOT/grub.cfg
@@ -0,0 +1,33 @@
+
+insmod efi_gop
+insmod efi_uga
+insmod video_bochs
+insmod video_cirrus
+insmod video_fb
+
+insmod font
+if loadfont ${prefix}/fonts/unicode.pf2
+then
+   insmod gfxterm
+   set gfxmode=auto
+   set gfxpayload=keep
+   terminal_output gfxterm
+fi
+
+insmod png
+set theme=/EFI/BOOT/themes/maggy/theme.txt
+export theme
+
+set timeout=10
+
+search --no-floppy --set=root -l 'Mageia-6-PLASMA5-LiveDVD'
+
+menuentry 'Boot Mageia 6 (Cauldron) Live' {
+        linux /boot/vmlinuz root=mgalive:LABEL=Mageia-6-PLASMA5-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+        initrd /boot/cdrom/initrd.gz
+}
+
+menuentry 'Install Mageia 6 (Cauldron) Live' {
+        linux /boot/vmlinuz root=mgalive:LABEL=Mageia-6-PLASMA5-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
+        initrd /boot/cdrom/initrd.gz
+}
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
new file mode 100755
index 0000000..6bdaa67
Binary files /dev/null and b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
new file mode 100755
index 0000000..442e338
Binary files /dev/null and b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
new file mode 100755
index 0000000..4a435f7
Binary files /dev/null and b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
new file mode 100755
index 0000000..dee5391
Binary files /dev/null and b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
new file mode 100755
index 0000000..f12fa75
Binary files /dev/null and b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/theme.txt
new file mode 100755
index 0000000..c645b40
--- /dev/null
+++ b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/theme.txt
@@ -0,0 +1,34 @@
+# GRUB gfxmenu theme "maggy".
+
+title-text: "Mageia 6 UEFI"
+title-font: "MageiaLogo Bold 28"
+title-color: "white"
+
+desktop-image: "Mageia5-grub2-1024x768.png"
+terminal-font: "Unknown Regular 16"
+
++ boot_menu {
+   left = 15%
+   top = 15%
+   width = 70%
+   height = 55%
+   item_font = "MageiaLogo Regular 20"
+   selected_item_font = "MageiaLogo Bold 20"
+   color_normal="black/black"
+   item_color = "#2397d4"
+   selected_item_color = "white"
+   item_height = 24
+   item_spacing = 10
+}
+
++ progress_bar
+{
+   id = "__timeout__"
+   left = 15%
+   top = 65%
+   width = 70%
+   height = 1%
+   fg_color = "lightskyblue"
+   bg_color = "dodgerblue"
+   border_color = "midnightblue"
+}
diff --git a/files/UEFI/PLASMA5/boot/efiboot.img b/files/UEFI/PLASMA5/boot/efiboot.img
new file mode 100644
index 0000000..587f232
Binary files /dev/null and b/files/UEFI/PLASMA5/boot/efiboot.img differ
diff --git a/files/glib2-branding.gschema.override b/files/glib2-branding.gschema.override
index 52a4905..b4184eb 100644
--- a/files/glib2-branding.gschema.override
+++ b/files/glib2-branding.gschema.override
@@ -6,7 +6,7 @@ toolkit-accessibility = false
 # cursor-theme = ""
 ## Note: gtk[23]-branding-%{branding_name} must contain the same defaults for icon and gtk, otherwise the theme will change when gnome-settings-daemon starts
 # icon-theme = ""
-gtk-theme = "oxygen-gtk"
+#gtk-theme = "oxygen-gtk"
 
 [org.gnome.desktop.background]
 ## Default wallpaper
-- 
cgit v1.2.1