diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-10-02 19:21:52 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2021-10-03 08:59:57 +0200 |
commit | d5dc9cb46d62c408598feeb6fad80f4bb3d43bce (patch) | |
tree | 00aa97e8d29f87110d0809ec75d8dcee72ac8a59 /source/kde | |
parent | 42aee690f9ac2d4a5d557f829f1aa734339f5ee0 (diff) | |
download | current-d5dc9cb46d62c408598feeb6fad80f4bb3d43bce.tar.gz |
Sat Oct 2 19:21:52 UTC 202120211002192152
d/python-setuptools-58.2.0-x86_64-1.txz: Upgraded.
kde/kservice-5.86.0-x86_64-3.txz: Rebuilt.
Fix paths in kde.{csh,sh}. Thanks to marco70.
Since kdesu and kxmlgui are looking in /usr/lib${LIBDIRSUFFIX}/kf5 for
some reason, let's just link that location to libexec/kf5 to make things
work again. Also, I'm not sure why these things are in this particular
package, but I guess they had to go somewhere.
l/python-cffi-1.14.6-x86_64-1.txz: Added.
This is needed by hexchat-2.16.0.
l/python-pycparser-2.20-x86_64-1.txz: Added.
This is needed by hexchat-2.16.0.
l/vte-0.66.0-x86_64-1.txz: Upgraded.
xap/hexchat-2.16.0-x86_64-1.txz: Upgraded.
extra/brltty/brltty-6.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde')
-rw-r--r-- | source/kde/kde/build/kservice | 2 | ||||
-rw-r--r-- | source/kde/kde/post-install/kservice.post-install | 9 | ||||
-rw-r--r-- | source/kde/kde/post-install/kservice/profile.d/kde.csh | 2 | ||||
-rw-r--r-- | source/kde/kde/post-install/kservice/profile.d/kde.sh | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/source/kde/kde/build/kservice b/source/kde/kde/build/kservice index 0cfbf088..00750edc 100644 --- a/source/kde/kde/build/kservice +++ b/source/kde/kde/build/kservice @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/post-install/kservice.post-install b/source/kde/kde/post-install/kservice.post-install index a014f3ba..8da6bcb6 100644 --- a/source/kde/kde/post-install/kservice.post-install +++ b/source/kde/kde/post-install/kservice.post-install @@ -1,4 +1,4 @@ -# Add profile scripts +# Add profile scripts: mkdir -p $PKG/etc/profile.d cat $CWD/post-install/kservice/profile.d/kde.sh \ | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" \ @@ -7,3 +7,10 @@ cat $CWD/post-install/kservice/profile.d/kde.csh \ | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" \ > $PKG/etc/profile.d/kde.csh chmod 0755 $PKG/etc/profile.d/* + +# We still have a couple of things looking in the old location, +# so we'll kludge it with a link (hopefully not forever): +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/libexec/kf5 +if [ ! -e $PKG/usr/lib${LIBDIRSUFFIX}/kf5 ]; then + ( cd $PKG/usr/lib${LIBDIRSUFFIX} ; ln -sf libexec/kf5 . ) +fi 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 59de8963..a5bc081f 100644 --- a/source/kde/kde/post-install/kservice/profile.d/kde.csh +++ b/source/kde/kde/post-install/kservice/profile.d/kde.csh @@ -6,7 +6,7 @@ endif # Add KDE paths if they exist: if ( -d /usr/lib/kf5 ) then - setenv PATH ${PATH}:/usr/lib/kf5 + setenv PATH ${PATH}:/usr/lib/libexec/kf5 endif if ( -d /usr/lib/kde4/libexec ) then setenv PATH ${PATH}:/usr/lib/kde4/libexec 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 48bf4409..ced4a482 100644 --- a/source/kde/kde/post-install/kservice/profile.d/kde.sh +++ b/source/kde/kde/post-install/kservice/profile.d/kde.sh @@ -5,7 +5,7 @@ export KDEDIRS # Add KDE paths if they exist: if [ -d /usr/lib/kf5 ]; then - PATH="$PATH:/usr/lib/kf5" + PATH="$PATH:/usr/lib/libexec/kf5" fi if [ -d /usr/lib/kde4/libexec ]; then PATH="$PATH:/usr/lib/kde4/libexec" |