summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-02-13 03:13:30 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-16 08:18:40 +0700
commit13b97ada9091f8ccfdf8413e16e2a9fd0bface0b (patch)
tree0a48082ac0bd696c8fd47e5717589e877fc13468
parent5e683db34cb7eab502d6d5fc321b298a5ee0c2c4 (diff)
downloadslackbuilds-13b97ada9091f8ccfdf8413e16e2a9fd0bface0b.tar.gz
system/qingy: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/qingy/qingy.SlackBuild45
1 files changed, 32 insertions, 13 deletions
diff --git a/system/qingy/qingy.SlackBuild b/system/qingy/qingy.SlackBuild
index 9246c7fb9d..f8271d36bb 100644
--- a/system/qingy/qingy.SlackBuild
+++ b/system/qingy/qingy.SlackBuild
@@ -22,25 +22,35 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220213 bkw: Modified by SlackBuilds.org, BUILD=4:
+# - fix the build on 15.0. this was done by using libgcrypt instead of
+# openssl (because qingy can't handle the new openssl-1.1.x API).
+# - don't install useless INSTALL in doc dir.
+# - i486 => i586.
+# NOTE: All these fixes mean qingy compiles. I have *not* been
+# successful in actually getting it to work in graphics mode. With
+# -t (text mode), it actually works (but what's the point? we have
+# agetty already). In DirectFB mode, it gives a black screen, and
+# the --black-screen-workaround option isn't actually accepted by
+# /sbin/qingy-DirectFB (it is accepted by /sbin/qingy, but that
+# doesn't support DirectFB!).
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=qingy
VERSION=${VERSION:-1.0.0}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -50,8 +60,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -74,11 +84,10 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+SLKCFLAGS+=" -fcommon"
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -95,18 +104,28 @@ LDFLAGS="$SLKLDFLAGS" \
--build=$ARCH-slackware-linux \
--disable-optimizations \
--disable-screen-savers \
+ --enable-crypto=libgcrypt \
--enable-static=no
make
make install-strip DESTDIR=$PKG
+# get rid of hardcoded /lib/security paths in pam config file. not needed,
+# and *wrong* on x86_64.
+sed -i 's,/lib/security/,,' /etc/pam.d/qingy
+
+# TODO: install-info in doinst.sh, remove it in douninst.sh.
rm -f $PKG/usr/info/dir
gzip -9 $PKG/usr/info/*.info*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# TODO: qingy-keygen in doinst.sh (?)
+# TODO: /etc/qingy/settings should be a .new config file. so should
+# welcomes and probably the (pre|post)_GUI.sh scripts.
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc