summaryrefslogtreecommitdiff
path: root/source/kde
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-10-04 19:28:39 +0000
committerEric Hameleers <alien@slackware.com>2021-10-05 09:00:04 +0200
commitc8de49b25af424891cc61038361873c809f5c2b7 (patch)
tree4efc0afbcac561c4779c1251f354699da4fcf868 /source/kde
parentd1596dee9dd02b4f89228bf87a72a6fb8cefccf5 (diff)
downloadcurrent-c8de49b25af424891cc61038361873c809f5c2b7.tar.gz
Mon Oct 4 19:28:39 UTC 202120211004192839
a/util-linux-2.37.2-x86_64-3.txz: Rebuilt. Removed broken /usr/bin/raw symlink. Thanks to marav. d/gdb-11.1-x86_64-2.txz: Rebuilt. Don't ship .la files. d/vala-0.54.2-x86_64-1.txz: Upgraded. kde/artikulate-21.08.1-x86_64-3.txz: Rebuilt. Fixed broken COPYING{,.DOC} symlinks. Thanks to marav. kde/kservice-5.86.0-x86_64-4.txz: Rebuilt. In /etc/profile.d/kde.{csh,sh}: Fixed test for kf5 directory. Thanks to LuckyCyborg. Make adding /etc/kde/xdg to $XDG_CONFIG_DIRS conditional on the existence of that directory. l/imagemagick-7.1.0_9-x86_64-1.txz: Upgraded. n/bind-9.16.21-x86_64-4.txz: Rebuilt. Removed broken symlink. Thanks to marav. n/httpd-2.4.50-x86_64-1.txz: Upgraded. x/cldr-emoji-annotation-37.0_13.0_0_2-noarch-4.txz: Rebuilt. Fixed broken COPYING symlink. Thanks to marav. xap/x3270-4.0ga14-x86_64-2.txz: Rebuilt. Fixed symlinks in html directory. Thanks to marav.
Diffstat (limited to 'source/kde')
-rw-r--r--source/kde/kde/build/artikulate2
-rw-r--r--source/kde/kde/build/kservice2
-rwxr-xr-xsource/kde/kde/kde.SlackBuild2
-rw-r--r--source/kde/kde/post-install/kservice/profile.d/kde.csh13
-rw-r--r--source/kde/kde/post-install/kservice/profile.d/kde.sh14
5 files changed, 20 insertions, 13 deletions
diff --git a/source/kde/kde/build/artikulate b/source/kde/kde/build/artikulate
index 0cfbf088..00750edc 100644
--- a/source/kde/kde/build/artikulate
+++ b/source/kde/kde/build/artikulate
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/kde/build/kservice b/source/kde/kde/build/kservice
index 00750edc..b8626c4c 100644
--- a/source/kde/kde/build/kservice
+++ b/source/kde/kde/build/kservice
@@ -1 +1 @@
-3
+4
diff --git a/source/kde/kde/kde.SlackBuild b/source/kde/kde/kde.SlackBuild
index 459165b0..86b2bcd3 100755
--- a/source/kde/kde/kde.SlackBuild
+++ b/source/kde/kde/kde.SlackBuild
@@ -396,7 +396,7 @@ build_mod_pkg () {
else
cp -a \
AUTHORS* CONTRIBUTING* COPYING* HACKING* \
- INSTALL* MAINTAINERS README* NEWS* TODO* \
+ INSTALL* LICENSE* MAINTAINERS README* NEWS* TODO* \
$PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
# If there's a ChangeLog, installing at least part of the recent
# history is useful, but don't let it get totally out of control:
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 a5bc081f..6884c0f1 100644
--- a/source/kde/kde/post-install/kservice/profile.d/kde.csh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.csh
@@ -5,18 +5,21 @@ if ( ! $?KDEDIRS ) then
endif
# Add KDE paths if they exist:
-if ( -d /usr/lib/kf5 ) then
+if ( -d /usr/lib/libexec/kf5 ) then
setenv PATH ${PATH}:/usr/lib/libexec/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
+# If there's no $XDG_CONFIG_DIRS variable, set it to /etc/xdg:
+if ( ! $?XDG_CONFIG_DIRS ) then
+ setenv XDG_CONFIG_DIRS /etc/xdg
+endif
+
+# Add /etc/kde/xdg to $XDG_CONFIG_DIRS (if it exists):
+if ( -d /etc/kde/xdg ) then
setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/kde/xdg
-else
- setenv XDG_CONFIG_DIRS /etc/xdg:/etc/kde/xdg
endif
# Commented out, since PAM should take care of this:
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 ced4a482..8b7c3e37 100644
--- a/source/kde/kde/post-install/kservice/profile.d/kde.sh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.sh
@@ -4,7 +4,7 @@ KDEDIRS=/usr
export KDEDIRS
# Add KDE paths if they exist:
-if [ -d /usr/lib/kf5 ]; then
+if [ -d /usr/lib/libexec/kf5 ]; then
PATH="$PATH:/usr/lib/libexec/kf5"
fi
if [ -d /usr/lib/kde4/libexec ]; then
@@ -12,12 +12,16 @@ if [ -d /usr/lib/kde4/libexec ]; then
fi
export PATH
-# Add /etc/kde/xdg to $XDG_CONFIG_DIRS:
-if [ ! "$XDG_CONFIG_DIRS" = "" ]; then
+# If there's no $XDG_CONFIG_DIRS variable, set it to /etc/xdg:
+if [ -z "$XDG_CONFIG_DIRS" ]; then
+ XDG_CONFIG_DIRS=/etc/xdg
+fi
+
+# Add /etc/kde/xdg to $XDG_CONFIG_DIRS (if it exists):
+if [ -d /etc/kde/xdg ]; then
XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/kde/xdg
-else
- XDG_CONFIG_DIRS=/etc/xdg:/etc/kde/xdg
fi
+
export XDG_CONFIG_DIRS
# Commented out, since PAM should take care of this: