summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/xdg/plasma-workspace/env/env.sh12
-rw-r--r--etc/xdg/plasma-workspace/env/plasma6-firstsetup.sh (renamed from etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh)28
-rw-r--r--etc/xdg/plasma-workspace/shutdown/kuiserver5.sh11
-rw-r--r--var/lib/plasma6-profiles/common/share/config/README (renamed from var/lib/plasma5-profiles/common/share/config/README)0
-rw-r--r--var/lib/plasma6-profiles/common/share/config/ksmserverrc (renamed from var/lib/plasma5-profiles/common/share/config/ksmserverrc)0
-rw-r--r--var/lib/plasma6-profiles/common/xdg/baloofilerc (renamed from var/lib/plasma5-profiles/common/xdg/baloofilerc)0
-rw-r--r--var/lib/plasma6-profiles/common/xdg/kscreenlockerrc (renamed from var/lib/plasma5-profiles/common/xdg/kscreenlockerrc)0
-rw-r--r--var/lib/plasma6-profiles/common/xdg/plasma_workspace.notifyrc (renamed from var/lib/plasma5-profiles/common/xdg/plasma_workspace.notifyrc)0
-rw-r--r--var/lib/plasma6-profiles/common/xdg/systemsettingsrc (renamed from var/lib/plasma5-profiles/common/xdg/systemsettingsrc)0
9 files changed, 18 insertions, 33 deletions
diff --git a/etc/xdg/plasma-workspace/env/env.sh b/etc/xdg/plasma-workspace/env/env.sh
index 34def39..0bc19ca 100644
--- a/etc/xdg/plasma-workspace/env/env.sh
+++ b/etc/xdg/plasma-workspace/env/env.sh
@@ -2,21 +2,17 @@
# XDG_CONFIG_DIRS
#if [ -z "${XDG_CONFIG_DIRS}" ] ; then
-# XDG_CONFIG_DIRS=/etc/xdg:/var/lib/plasma5-profiles/common/xdg
+# XDG_CONFIG_DIRS=/etc/xdg:/var/lib/plasma6-profiles/common/xdg
# export XDG_CONFIG_DIRS
#fi
if [ "$MGA_MENU_STYLE" = "upstream" ]; then
if [ -z "$XDG_CONFIG_DIRS" ]; then
- export XDG_CONFIG_DIRS="/etc/xdg/kf5:/etc/xdg"
- else
- export XDG_CONFIG_DIRS="/etc/xdg/kf5:$XDG_CONFIG_DIRS"
+ export XDG_CONFIG_DIRS="/etc/xdg"
fi
else
if [ -z "$XDG_CONFIG_DIRS" ]; then
- export XDG_CONFIG_DIRS="/etc/xdg:/etc/xdg/kf5:/var/lib/plasma5-profiles/common/xdg"
- else
- export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:/etc/xdg/kf5:/var/lib/plasma5-profiles/common/xdg"
+ export XDG_CONFIG_DIRS="/etc/xdg:/var/lib/plasma6-profiles/common/xdg"
fi
export XDG_MENU_PREFIX="plasma-"
fi
@@ -24,7 +20,7 @@ fi
# XDG_DATA_DIRS
if [ -z "${XDG_DATA_DIRS}" ] ; then
- XDG_DATA_DIRS=/var/lib/plasma5-profiles/common/share:/usr/local/share:/usr/share
+ XDG_DATA_DIRS=/var/lib/plasma6-profiles/common/share:/usr/local/share:/usr/share
export XDG_DATA_DIRS
fi
diff --git a/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh b/etc/xdg/plasma-workspace/env/plasma6-firstsetup.sh
index 2cb434e..e58abca 100644
--- a/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh
+++ b/etc/xdg/plasma-workspace/env/plasma6-firstsetup.sh
@@ -4,18 +4,18 @@
# TODO: Factorize for Mageia 2
#
-KRCFG="$(which kreadconfig5)"
+KRCFG="$(which kreadconfig6)"
if [ ! -z "$KRCFG" ]; then # Check if kde is installed, otherwise do nothing
# "Desktop" Mageia icons"
- MGADESK=$(kreadconfig5 --group "Mageia" --key "MageiaDesktopFiles" --default "false")
+ MGADESK=$(kreadconfig6 --group "Mageia" --key "MageiaDesktopFiles" --default "false")
if [ ! "$MGADESK" = "true" ]; then
# TODO: We need to handle default => Default too
PROD=$(sed 's/.*product=\(.*\)/\L\1/' < /etc/product.id)
# We should handle i18n dir modes in xgd user dirs
- DIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DESKTOP_DIR --group "" )" )
+ DIR=$(eval "echo $(kreadconfig6 --file $HOME/.config/user-dirs.dirs --key XDG_DESKTOP_DIR --group "" )" )
if [ -z "${DIR}" ]; then
DIR="$HOME/Desktop"
fi
@@ -31,15 +31,15 @@ if [ ! -z "$KRCFG" ]; then # Check if kde is installed, otherwise do nothing
# Copy the "Trash" icon on the desktop
cp -f /usr/share/kio_desktop/directory.trash "${DIR}/org.kde.trash.desktop"
- kwriteconfig5 --group "Mageia" --key "MageiaDesktopFiles" --type "bool" 1
+ kwriteconfig6 --group "Mageia" --key "MageiaDesktopFiles" --type "bool" 1
fi
# Add .directory to XDG_*_DIR
- ICONSXDGDIR=$(kreadconfig5 --group "Mageia" --key "IconsXdgDir" --default "false")
+ ICONSXDGDIR=$(kreadconfig6 --group "Mageia" --key "IconsXdgDir" --default "false")
if [ ! "$ICONSXDGDIR" = "true" ]; then
- MUSICDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_MUSIC_DIR --group "" )" )
+ MUSICDIR=$(eval "echo $(kreadconfig6 --file $HOME/.config/user-dirs.dirs --key XDG_MUSIC_DIR --group "" )" )
if [ -z "$MUSICDIR" ]; then
MUSICDIR="$HOME/Music"
fi
@@ -53,7 +53,7 @@ EOF
fi
- DLDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DOWNLOAD_DIR --group "" )" )
+ DLDIR=$(eval "echo $(kreadconfig6 --file $HOME/.config/user-dirs.dirs --key XDG_DOWNLOAD_DIR --group "" )" )
if [ -z "$DLDIR" ]; then
DLDIR="$HOME/Downloads"
fi
@@ -67,7 +67,7 @@ EOF
fi
- DOCDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DOCUMENTS_DIR --group "" )" )
+ DOCDIR=$(eval "echo $(kreadconfig6 --file $HOME/.config/user-dirs.dirs --key XDG_DOCUMENTS_DIR --group "" )" )
if [ -z "$DOCDIR" ]; then
DOCDIR="$HOME/Documents"
fi
@@ -81,7 +81,7 @@ EOF
fi
- PICTUREDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_PICTURES_DIR --group "" )" )
+ PICTUREDIR=$(eval "echo $(kreadconfig6 --file $HOME/.config/user-dirs.dirs --key XDG_PICTURES_DIR --group "" )" )
if [ -z "$PICTUREDIR" ]; then
PICTUREDIR="$HOME/Pictures"
fi
@@ -95,7 +95,7 @@ EOF
fi
- VIDEOSDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_VIDEOS_DIR --group "" )" )
+ VIDEOSDIR=$(eval "echo $(kreadconfig6 --file $HOME/.config/user-dirs.dirs --key XDG_VIDEOS_DIR --group "" )" )
if [ -z "$VIDEOSDIR" ]; then
VIDEOSDIR="$HOME/Videos"
fi
@@ -107,13 +107,13 @@ Hidden=true
Icon=folder-video
EOF
fi
- kwriteconfig5 --group "Mageia" --key "IconsXdgDir" --type "bool" 1
+ kwriteconfig6 --group "Mageia" --key "IconsXdgDir" --type "bool" 1
fi
# "Desktop" Mageia icons"
- MGA5to6=$(kreadconfig5 --group "Mageia" --key "Mageia5to6" --default "false")
+ MGA5to6=$(kreadconfig6 --group "Mageia" --key "Mageia5to6" --default "false")
if [ ! "$MGA5to6" = "true" ]; then
- DIRDESKTOP=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DESKTOP_DIR --group "" )" )
+ DIRDESKTOP=$(eval "echo $(kreadconfig6 --file $HOME/.config/user-dirs.dirs --key XDG_DESKTOP_DIR --group "" )" )
HOME_OLD="$DIRDESKTOP/Home2.desktop"
TRASH="$DIRDESKTOP/trash.desktop"
if [ -e "$HOME_OLD" ]; then
@@ -124,7 +124,7 @@ EOF
rm -f "$TRASH"
fi
- kwriteconfig5 --group "Mageia" --key "Mageia5to6" --type "bool" 1
+ kwriteconfig6 --group "Mageia" --key "Mageia5to6" --type "bool" 1
fi
# end of main if: all the changes should be done inside this main if
fi
diff --git a/etc/xdg/plasma-workspace/shutdown/kuiserver5.sh b/etc/xdg/plasma-workspace/shutdown/kuiserver5.sh
deleted file mode 100644
index e064a9f..0000000
--- a/etc/xdg/plasma-workspace/shutdown/kuiserver5.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-## Workaround to kuiserver5 processes lingering after logout, see
-## https://bugs.kde.org/show_bug.cgi?id=348123
-
-qdbus-qt5 org.kde.kuiserver >& /dev/null && \
- qdbus-qt5 org.kde.kuiserver /MainApplication org.qtproject.Qt.QCoreApplication.quit
-
-qdbus-qt5 org.kde.kuiserver5 >& /dev/null && \
- qdbus-qt5 org.kde.kuiserver5 /MainApplication org.qtproject.Qt.QCoreApplication.quit
-
diff --git a/var/lib/plasma5-profiles/common/share/config/README b/var/lib/plasma6-profiles/common/share/config/README
index e69de29..e69de29 100644
--- a/var/lib/plasma5-profiles/common/share/config/README
+++ b/var/lib/plasma6-profiles/common/share/config/README
diff --git a/var/lib/plasma5-profiles/common/share/config/ksmserverrc b/var/lib/plasma6-profiles/common/share/config/ksmserverrc
index 734093f..734093f 100644
--- a/var/lib/plasma5-profiles/common/share/config/ksmserverrc
+++ b/var/lib/plasma6-profiles/common/share/config/ksmserverrc
diff --git a/var/lib/plasma5-profiles/common/xdg/baloofilerc b/var/lib/plasma6-profiles/common/xdg/baloofilerc
index 1735f7a..1735f7a 100644
--- a/var/lib/plasma5-profiles/common/xdg/baloofilerc
+++ b/var/lib/plasma6-profiles/common/xdg/baloofilerc
diff --git a/var/lib/plasma5-profiles/common/xdg/kscreenlockerrc b/var/lib/plasma6-profiles/common/xdg/kscreenlockerrc
index f15bdc4..f15bdc4 100644
--- a/var/lib/plasma5-profiles/common/xdg/kscreenlockerrc
+++ b/var/lib/plasma6-profiles/common/xdg/kscreenlockerrc
diff --git a/var/lib/plasma5-profiles/common/xdg/plasma_workspace.notifyrc b/var/lib/plasma6-profiles/common/xdg/plasma_workspace.notifyrc
index 26879e2..26879e2 100644
--- a/var/lib/plasma5-profiles/common/xdg/plasma_workspace.notifyrc
+++ b/var/lib/plasma6-profiles/common/xdg/plasma_workspace.notifyrc
diff --git a/var/lib/plasma5-profiles/common/xdg/systemsettingsrc b/var/lib/plasma6-profiles/common/xdg/systemsettingsrc
index 1735f7a..1735f7a 100644
--- a/var/lib/plasma5-profiles/common/xdg/systemsettingsrc
+++ b/var/lib/plasma6-profiles/common/xdg/systemsettingsrc
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-05 02:50:55 +0000