summaryrefslogtreecommitdiffstats
path: root/source/kde
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-04-09 20:21:07 +0000
committer Eric Hameleers <alien@slackware.com>2021-04-10 08:59:51 +0200
commit0b6c0a0531b1ebd83557f88a8280c2c398ecb247 (patch)
tree7392f8d5c7405caca4ce91c08485d312d56e8fbe /source/kde
parenteb0d409bd7bed52cad64bf3044c7cdaf1afba18c (diff)
downloadcurrent-0b6c0a0531b1ebd83557f88a8280c2c398ecb247.tar.gz
current-0b6c0a0531b1ebd83557f88a8280c2c398ecb247.tar.xz
Fri Apr 9 20:21:07 UTC 202120210409202107
a/aaa_libraries-15.0-x86_64-5.txz: Rebuilt. Added: libcares.so.2.4.2. Upgraded: libexpat.so.1.7.0, libglib-2.0.so.0.6800.1, libgmodule-2.0.so.0.6800.1, libgobject-2.0.so.0.6800.1, libgthread-2.0.so.0.6800.1. d/python-setuptools-56.0.0-x86_64-1.txz: Upgraded. kde/kservice-5.80.0-x86_64-2.txz: Rebuilt. In the profile scripts, don't add a directory to the $PATH unless it exists. Thanks to Lockywolf and pghvlaans. l/gdk-pixbuf2-2.42.6-x86_64-1.txz: Upgraded. n/c-ares-1.17.1-x86_64-1.txz: Added. Adding this since curl can make use of it, and some programs expect this functionality. n/curl-7.76.0-x86_64-2.txz: Rebuilt. Recompiled to link with c-ares-1.17.1. Thanks to babydr. xap/mozilla-thunderbird-78.9.1-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/thunderbird/78.9.1/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2021-13/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23991 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23993 https://www.mozilla.org/en-US/security/advisories/mfsa2021-13/#MOZ-2021-23992 (* Security fix *) xap/pidgin-2.14.3-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde')
-rw-r--r--source/kde/kde/build/kservice2
-rw-r--r--source/kde/kde/post-install/kservice/profile.d/kde.csh10
-rw-r--r--source/kde/kde/post-install/kservice/profile.d/kde.sh11
3 files changed, 20 insertions, 3 deletions
diff --git a/source/kde/kde/build/kservice b/source/kde/kde/build/kservice
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kservice
+++ b/source/kde/kde/build/kservice
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/post-install/kservice/profile.d/kde.csh b/source/kde/kde/post-install/kservice/profile.d/kde.csh
index b0ce563f7..59de8963e 100644
--- a/source/kde/kde/post-install/kservice/profile.d/kde.csh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.csh
@@ -3,8 +3,16 @@
if ( ! $?KDEDIRS ) then
setenv KDEDIRS /usr
endif
-setenv PATH ${PATH}:/usr/lib/kf5:/usr/lib/kde4/libexec
+# Add KDE paths if they exist:
+if ( -d /usr/lib/kf5 ) then
+ setenv PATH ${PATH}:/usr/lib/kf5
+endif
+if ( -d /usr/lib/kde4/libexec ) then
+ setenv PATH ${PATH}:/usr/lib/kde4/libexec
+endif
+
+# Add /etc/kde/xdg to $XDG_CONFIG_DIRS:
if ( $?XDG_CONFIG_DIRS ) then
setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/kde/xdg
else
diff --git a/source/kde/kde/post-install/kservice/profile.d/kde.sh b/source/kde/kde/post-install/kservice/profile.d/kde.sh
index ec317ad1e..48bf44090 100644
--- a/source/kde/kde/post-install/kservice/profile.d/kde.sh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.sh
@@ -2,8 +2,17 @@
# KDE additions:
KDEDIRS=/usr
export KDEDIRS
-PATH="$PATH:/usr/lib/kf5:/usr/lib/kde4/libexec"
+
+# Add KDE paths if they exist:
+if [ -d /usr/lib/kf5 ]; then
+ PATH="$PATH:/usr/lib/kf5"
+fi
+if [ -d /usr/lib/kde4/libexec ]; then
+ PATH="$PATH:/usr/lib/kde4/libexec"
+fi
export PATH
+
+# Add /etc/kde/xdg to $XDG_CONFIG_DIRS:
if [ ! "$XDG_CONFIG_DIRS" = "" ]; then
XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/kde/xdg
else