libraries/qt3: Fix docs, doinst, symlink.

Signed-off-by: B. Watson <yalhcru@gmail.com>
This commit is contained in:
B. Watson 2022-04-19 21:09:15 -04:00
parent 16c6a38dc0
commit a250a2c70a
2 changed files with 17 additions and 15 deletions

View file

@ -1,9 +1,6 @@
## This was causing problems compiling KDE for unknown reasons.
## So, we'll symlink the libraries into /opt/kde3 again...
# Add QT library directory to /etc/ld.so.conf:
if ! grep /opt/kde3/lib etc/ld.so.conf 1> /dev/null 2> /dev/null ; then
echo "/opt/kde3/lib" >> etc/ld.so.conf
fi
if [ -x /sbin/ldconfig ]; then
/sbin/ldconfig 2> /dev/null
if [ -e etc/ld.so.conf ]; then
if ! grep /opt/kde3/lib etc/ld.so.conf 1> /dev/null 2> /dev/null ; then
echo "/opt/kde3/lib" >> etc/ld.so.conf
fi
fi

View file

@ -29,6 +29,12 @@
# This is based on the original SlackBuild from /extra/kde-compat in
# Slackware 13.1
# 20220419 bkw: BUILD=3:
# - remove useless INSTALL from doc dir.
# - add SlackBuild to doc dir.
# - doinst.sh only edits ld.so.conf if it exists.
# - don't call ldconfig from doinst.sh (installpkg does that already).
# - remove broken symlink.
# 20220318 bkw: fix 32-bit build.
# 20211120 bkw: BUILD=2, install the profile scripts non-executable.
# 20200226 bkw: quit spamming /root, no change to package
@ -45,17 +51,11 @@
# - included patch for new libpng (based on work by Stuart Winter)
# Revision date 2012/08/09
# TODO: fix these:
#sbrun: WARNING: files altered outside the sandbox:
#u /root/.qt/.qt_plugins_3.3rc.lock
#t /root/.qt/qt_plugins_3.3rc.tmp
#u /root/.qt/qt_plugins_3.3rc
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=qt3
VERSION=${VERSION:-3.3.8b}
BUILD=${BUILD:-6}
BUILD=${BUILD:-7}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@ -225,8 +225,9 @@ cd -
# Add a documentation directory:
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
FAQ INSTALL LICENSE.GPL* LICENSE.QPL MANIFEST PLATFORMS README* changes* \
FAQ LICENSE.GPL* LICENSE.QPL MANIFEST PLATFORMS README* changes* \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
# Make a link to "qt3" w/o version number
cd $PKG/opt/kde3/lib${LIBDIRSUFFIX}
@ -239,6 +240,10 @@ rm -rf $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3/doc
rm -f $PKG/usr/lib*/*.la
# 20220419 bkw: broken symlink, targets the build directory. looks like
# it's completely extraneous, just remove it.
rm -f $PKG/opt/kde3/lib64/qt3/mkspecs/linux-g++/linux-g++
mkdir -p $PKG/install
cat $CWD/doinst.sh | sed -e "s|/lib|/lib${LIBDIRSUFFIX}|" \
> $PKG/install/doinst.sh