From 6085b2de36bba9de72776ab74682a7958c592895 Mon Sep 17 00:00:00 2001
From: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
Date: Tue, 21 May 2024 16:51:37 +0200
Subject: [PATCH] kitty's back

---
 _unmaintained/xap/kitty/SlackBuild |  70 --------------------
 xap/kitty/SlackBuild               | 103 +++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 70 deletions(-)
 delete mode 100755 _unmaintained/xap/kitty/SlackBuild
 create mode 100755 xap/kitty/SlackBuild

diff --git a/_unmaintained/xap/kitty/SlackBuild b/_unmaintained/xap/kitty/SlackBuild
deleted file mode 100755
index 423502f7..00000000
--- a/_unmaintained/xap/kitty/SlackBuild
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-# variables
-TAG=gwh
-TMP=/tmp/$TAG
-CWD=$(pwd)
-OUTPUT=/tmp
-
-PRGNAM=$(basename $CWD)
-GITHUB_REPO=kovidgoyal/kitty
-VERSION=${VERSION:-latest}
-
-ARCH=$(uname -m)
-BUILD=1
-
-PKG=$TMP/pkg-$PRGNAM
-
-PREFIX=/usr
-
-REPOSITORY=/home/installs/SlackBuilds/_repositories/$PRGNAM
-
-# nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM
-
-mkdir -p $PKG
-
-# mise en place
-[ ! -e $REPOSITORY ] && git clone https://github.com/${GITHUB_REPO}.git $REPOSITORY
-cd $REPOSITORY
-git pull --all
-
-cp -R $REPOSITORY $TMP/$PRGNAM
-cd $TMP/$PRGNAM/
-[ "x$VERSION" == "xlatest" ] && VERSION=$(git tag --sort=-taggerdate | head -n1)
-[ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_r$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
-
-# installation
-mkdir -p $PKG/
-python3 setup.py linux-package --update-check-interval=0
-mv linux-package $PKG/usr
-
-mkdir -p $PKG/usr/doc/$PRGNAM
-cp -R *.md *.rst LICENSE $PKG/usr/doc/$PRGNAM
-
-# correction
-cd $PKG
-chown -R root:root *
-
-# embaumement
-mkdir -p $PKG/install
-
-cat <<EOF > $PKG/install/slack-desc
-$PRGNAM: $PRGNAM (A cross-platform, fast, feature full, GPU based terminal emulator)
-$PRGNAM:
-$PRGNAM:
-$PRGNAM:
-$PRGNAM:
-$PRGNAM:
-$PRGNAM:
-$PRGNAM:
-$PRGNAM:
-$PRGNAM: https://sw.kovidgoyal.net/kitty/
-$PRGNAM:
-EOF
-
-# empaquetage
-cd $PKG
-rm -f $PKG/{,usr/}lib$(uname -m | grep -o 64)/*.la
-/sbin/makepkg --linkadd y --chown n --prepend $OUTPUT/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$TAG.txz
diff --git a/xap/kitty/SlackBuild b/xap/kitty/SlackBuild
new file mode 100755
index 00000000..394f1f19
--- /dev/null
+++ b/xap/kitty/SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# variables
+TAG=gwh
+TMP=/tmp/$TAG
+CWD=$(pwd)
+OUTPUT=/tmp
+
+PRGNAM=$(basename "$CWD")
+GITHUB_REPO=kovidgoyal/kitty
+VERSION=${VERSION:-latest}
+
+ARCH=$(uname -m)
+BUILD=1
+
+PKG=$TMP/pkg-$PRGNAM
+
+REPOSITORY=/home/installs/SlackBuilds/_repositories/$PRGNAM
+
+LIBDIRSUFFIX=$(uname -m | grep -o 64)
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+# nettoyage préalable
+rm -fr "$PKG" "${TMP:?}"/"$PRGNAM"
+
+mkdir -p "$PKG"
+
+# mise en place
+[ ! -e "$REPOSITORY" ] && git clone https://github.com/${GITHUB_REPO}.git "$REPOSITORY"
+cd "$REPOSITORY" || exit 1
+git pull --all
+
+cp -R "$REPOSITORY" "$TMP"/"$PRGNAM"
+cd "$TMP"/"$PRGNAM"/ || exit 1
+[ "$VERSION" == "latest" ] && VERSION=$(git tag --sort=-taggerdate | head -n1)
+[ "$VERSION" == "" ] && VERSION=trunk
+[ "$VERSION" == "trunk" ] && VERSION="git_r$(git rev-list --count HEAD)_$(git log -1 --format=%h)" # || git checkout $VERSION
+
+# installation
+mkdir -p "$PKG"/
+
+# sed surgery: setup.py allows overriding the compiler flags, but
+# puts a -O3 *after* whatever we set them to. All our SLKCFLAGS
+# choices have -O2.
+sed -i 's,-O3,-O2,g' setup.py
+
+OVERRIDE_CPPFLAGS="$SLKCFLAGS -Wl,-s" \
+                 OVERRIDE_CFLAGS="$SLKCFLAGS -Wl,-s" \
+                 python3 setup.py \
+                 --libdir-name "lib$LIBDIRSUFFIX" \
+                 --verbose linux-package \
+                 --ignore-compiler-warnings
+
+#mv linux-package "$PKG"/usr
+
+mkdir -p "$PKG"/usr/bin "$PKG"/usr/share "$PKG/usr/lib$LIBDIRSUFFIX"
+cp -a linux-package/bin/* "$PKG"/usr/bin
+cp -a linux-package/share/* "$PKG"/usr/share
+cp -a linux-package/lib*/* "$PKG/usr/lib$LIBDIRSUFFIX"
+strip "$PKG"/usr/bin/"$PRGNAM"
+
+
+mkdir -p "$PKG"/usr/doc/"$PRGNAM"
+cp -R ./*.md ./*.rst LICENSE "$PKG"/usr/doc/"$PRGNAM"
+
+# correction
+cd "$PKG" || exit 1
+chown -R root:root ./*
+
+# embaumement
+mkdir -p "$PKG"/install
+
+cat <<EOF > "$PKG"/install/slack-desc
+$PRGNAM: $PRGNAM (A cross-platform, fast, feature full, GPU based terminal emulator)
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM: https://sw.kovidgoyal.net/kitty/
+$PRGNAM:
+EOF
+
+# empaquetage
+cd "$PKG" || exit 1
+rm -f "$PKG"/{,usr/}lib"$LIBDIRSUFFIX"/*.la
+/sbin/makepkg --linkadd y --chown n --prepend "$OUTPUT/$PRGNAM-${VERSION//-//}-$ARCH-$BUILD$TAG.txz"