Merge branch 'master' of github.com:gwenhael-le-moine/slackbuilds

a/kernel-gwh/SlackBuild

@@ -18,6 +18,7 @@ OUTPUT=/tmp
 NUMJOBS=${NUMJOBS:-$(nproc)}
 
 ANEW=${ANEW:-true}
+CONFIG=${CONFIG:-""}
 
 rm -fr "$PKG"
 
@@ -33,23 +34,21 @@ else
         SRC_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot"
     fi
 
-    [ ! -e "$CWD"/linux-"$VERSION".tar.gz ] && wget -c "$SRC_URL/linux-$VERSION.tar.gz" -O "$CWD/linux-$VERSION.tar.gz"
-    tar xf "$CWD/linux-$VERSION.tar.gz" -C "$PKG/usr/src/"
+    [ ! -e "$CWD"/linux-"$VERSION".tar.xz ] && wget -c "$SRC_URL/linux-$VERSION.tar.xz" -O "$CWD/linux-$VERSION.tar.xz"
+    tar xf "$CWD/linux-$VERSION.tar.xz" -C "$PKG/usr/src/"
 fi
 
 cd "$PKG/usr/src/" || exit 1
 ln -s "linux-$VERSION" linux
 cd "linux-$VERSION"
 
-if [ -e "$CWD/config-$THIS_HOST-$VERSION" ] ; then
-    cp "$CWD/config-$THIS_HOST-$VERSION" .config
-else
-    if [ -e "$CWD/config-$THIS_HOST" ] ; then
-        cp "$CWD/config-$THIS_HOST" .config
-    else
+if [ -n "$CONFIG" ] && [ -e "$CONFIG" ]; then
+    cat "$CONFIG" > .config
+fi
+if [ ! -f .config ]; then
     zcat /proc/config.gz > .config
 fi
-fi
+read
 
 make oldconfig "$@"
 
@@ -107,6 +106,7 @@ grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=grub
 echo OK
 
 echo -n "building initrd… "
+cd /
 eval \$(/usr/share/mkinitrd/mkinitrd_command_generator.sh -k $VERSION -r | sed "s|/boot/initrd.gz|/boot/initrd-gwh-${VERSION}.gz|")
 echo "OK"
 

ap/conty/SlackBuild

@@ -6,7 +6,7 @@ PRGNAM=$(basename $CWD)
 GITHUB_REPO=Kron4ek/Conty
 VERSION=${VERSION:-$(curl -s https://api.github.com/repos/${GITHUB_REPO}/releases/latest | grep tag_name | grep -o "[0-9.]*")}
 ARCH=${ARCH:-$(uname -m)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-gwh}
 
 EDITION=${EDITION:-"_lite_dwarfs"} # "", "_lite", "_dwarfs", "_lite_dwarfs"
@@ -33,8 +33,29 @@ cat <<EOF > steam
 
 $PREFIX/bin/conty steam "\$@"
 EOF
+
+mkdir -p $PKG$PREFIX/share/applications/
+cat <<EOF > $PKG$PREFIX/share/applications/steam.desktop
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=$PREFIX/bin/steam
+Name=Steam
+EOF
+
 for prg in wine winetricks lutris playonlinux4; do
     ln -s ${PRGNAM} $prg
+cat <<EOF > $PKG$PREFIX/share/applications/$prg.desktop
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=$PREFIX/bin/$prg
+Name=$prg
+EOF
 done
 
 chmod +x $PKG$PREFIX/bin/*

d/crystalline-bin/SlackBuild

@@ -15,7 +15,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 
 mkdir -p $REPOSITORY
 
-[ ! -e $REPOSITORY/crystalline_x86_64-unknown-linux-gnu-${VERSION}.gz ] && wget -c -O $REPOSITORY/crystalline_x86_64-unknown-linux-gnu-${VERSION}.gz https://github.com/elbywan/crystalline/releases/download/${VERSION}/crystalline_x86_64-unknown-linux-gnu.gz
+[ ! -e $REPOSITORY/crystalline_x86_64-unknown-linux-musl-${VERSION}.gz ] && wget -c -O $REPOSITORY/crystalline_x86_64-unknown-linux-musl-${VERSION}.gz https://github.com/elbywan/crystalline/releases/download/${VERSION}/crystalline_x86_64-unknown-linux-musl.gz
 
 DOCS="LICENSE README.md"
 for i in $DOCS; do
@@ -25,9 +25,9 @@ done
 rm -fr $PKG
 mkdir -p $PKG/usr/{bin,doc/crystalline}/
 
-cp $REPOSITORY/crystalline_x86_64-unknown-linux-gnu-${VERSION}.gz $PKG/usr/bin/
-gunzip $PKG/usr/bin/crystalline_x86_64-unknown-linux-gnu-${VERSION}.gz
-mv $PKG/usr/bin/crystalline_x86_64-unknown-linux-gnu-${VERSION} $PKG/usr/bin/crystalline
+cp $REPOSITORY/crystalline_x86_64-unknown-linux-musl-${VERSION}.gz $PKG/usr/bin/
+gunzip $PKG/usr/bin/crystalline_x86_64-unknown-linux-musl-${VERSION}.gz
+mv $PKG/usr/bin/crystalline_x86_64-unknown-linux-musl-${VERSION} $PKG/usr/bin/crystalline
 chmod +x $PKG/usr/bin/crystalline
 
 for i in $DOCS; do

e/emacs/SlackBuild

@@ -153,6 +153,7 @@ CFLAGS="$SLKCFLAGS" \
     # --with-x-toolkit=${X_TOOLKIT:-gtk3} \
     # --without-toolkit-scroll-bars \
 
+make bootstrap $NUMJOBS || exit 1
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 

rebuild-and-install-all.sh

@@ -6,6 +6,9 @@ CAT=${CAT:-$1}
 cd $WD
 ./what-s_installed.sh | grep -v "^❌.*" | cut -d\  -f2 | grep "^${CAT}/.*"
 
+echo "Ctrl-C to stop here, enter to continue"
+read
+
 for p in $(./what-s_installed.sh | grep -v "^❌.*" | cut -d\  -f2 | grep "^${CAT}/.*"); do
     (cd $p
      bash -e ./SlackBuild || echo "ERROR $p" >> $WD/_errors_rebuild)

xap/inkscape-bin/SlackBuild

@@ -0,0 +1,55 @@
+#!/bin/bash -e
+
+# variables
+CWD=$(pwd)
+VERSION=${VERSION:-1.2.2}
+ITEMNB=${ITEMNB:-37359}
+COMMITNB=${COMMITNB:-b0a8486}
+
+PRGNAM=$(basename $CWD)
+ARCH="AppImage"
+BUILD=1
+
+TAG=gwh
+TMP=/tmp/$TAG
+PKG=$TMP/pkg-$PRGNAM
+OUTPUT=/tmp
+
+PREFIX=/usr
+
+# nettoyage préalable
+rm -fr $PKG
+
+mkdir -p $PKG/opt/$PRGNAM
+
+# mise en place
+cd $PKG/opt/$PRGNAM
+
+wget -c https://inkscape.org/gallery/item/${ITEMNB}/Inkscape-${COMMITNB}-x86_64.AppImage -O ${PRGNAM}-${VERSION}.AppImage
+chmod +x ${PRGNAM}-${VERSION}.AppImage
+
+mkdir -p $PKG$PREFIX/bin/
+cd $PKG$PREFIX/bin/
+ln -s /opt/$PRGNAM/${PRGNAM}-${VERSION}.AppImage ${PRGNAM}
+
+# correction
+cd $PKG
+chown -R root:root *
+
+# embaumement
+mkdir -p $PKG/install
+cat <<EOF > $PKG/install/slack-desc
+$PRGNAM: $PRGNAM (A powerful, free design tool)
+$PRGNAM:
+$PRGNAM: Whether you are an illustrator, designer, web designer
+$PRGNAM: or just someone who needs to create some vector imagery,
+$PRGNAM: Inkscape is for you!
+$PRGNAM:
+$PRGNAM:
+$PRGNAM: https://www.inkscape.org
+$PRGNAM: 
+$PRGNAM:
+EOF
+
+# empaquetage
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$TAG.txz

xap/thorium-reader-bin/SlackBuild

@@ -0,0 +1,56 @@
+#!/bin/bash -e
+
+# variables
+CWD=$(pwd)
+GITHUB_REPO=edrlab/thorium-reader
+VERSION=${VERSION:-$(curl -s https://api.github.com/repos/${GITHUB_REPO}/releases/latest | jq -r .tag_name)}
+
+PRGNAM=$(basename $CWD)
+ARCH="AppImage"
+BUILD=1
+
+TAG=gwh
+TMP=/tmp/$TAG
+PKG=$TMP/pkg-$PRGNAM
+OUTPUT=/tmp
+
+REPOSITORY=/home/installs/SlackBuilds/_repositories/$PRGNAM
+
+PREFIX=/usr
+
+# nettoyage préalable
+rm -fr $PKG
+
+mkdir -p $PKG/opt/$PRGNAM
+
+# mise en place
+cd $PKG/opt/$PRGNAM
+
+wget -c https://github.com/${GITHUB_REPO}/releases/download/${VERSION}/Thorium-${VERSION#v}.AppImage -O ${PRGNAM}-${VERSION}.AppImage
+chmod +x ${PRGNAM}-${VERSION}.AppImage
+
+mkdir -p $PKG$PREFIX/bin/
+cd $PKG$PREFIX/bin/
+ln -s /opt/$PRGNAM/${PRGNAM}-${VERSION}.AppImage ${PRGNAM}
+
+# correction
+cd $PKG
+chown -R root:root *
+
+# embaumement
+mkdir -p $PKG/install
+cat <<EOF > $PKG/install/slack-desc
+$PRGNAM: $PRGNAM (ebook reader (LCP DRM))
+$PRGNAM:
+$PRGNAM:  A cross platform desktop reading app, based on the Readium Desktop toolkit
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM: https://www.edrlab.org/software/thorium-reader/
+$PRGNAM: https://github.com/$(GITHUB_REPO)
+$PRGNAM:
+EOF
+
+# empaquetage
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$TAG.txz

xap/x48/SlackBuild

@@ -3,9 +3,9 @@ set -x
 
 PRGNAM=x48
 
-BUILD=1
+BUILD=2
 GITHUB_REPO=gwenhael-le-moine/x48
-VERSION=${VERSION:-latest}
+VERSION=${VERSION:-trunk}
 
 ARCH=$(uname -m)
 LIBSUFFIX=$(echo $ARCH | grep -o "\(64\)")
@@ -23,7 +23,7 @@ PREFIX=/usr
 mkdir -p $TMP
 
 # Cleaning
-rm -fr $PRGNAM $PKG
+rm -fr $TMP/$PRGNAM $PKG
 
 # Fetching sources
 [ ! -e $REPOSITORY ] && git clone https://github.com/${GITHUB_REPO}.git $REPOSITORY
@@ -46,24 +46,11 @@ find . \
      \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
      -exec chmod 644 {} \;
 
-# Configuration
-./autogen.sh
-./configure \
-    --prefix=$PREFIX \
-    --mandir=$PREFIX/man \
-    --libdir=$PREFIX/lib$(echo "$ARCH" | grep -o "64") \
-    --sysconfdir=/etc
-
 # Building
-make
+make all PREFIX=/usr
 
 # Installation
-make install DESTDIR=$PKG
-
-mkdir -p $PKG$PREFIX/share/$PRGNAM
-cd $PKG$PREFIX/share/$PRGNAM
-cp $TMP/$PRGNAM/ROMs/*rom*.bz2 .
-find . -name "*.bz2" -exec bunzip2 {} \;
+make install DESTDIR=$PKG PREFIX=/usr
 
 # # Cleaning
 # cd $PKG
@@ -90,11 +77,11 @@ $PRGNAM: The x48 is an emulator of the Saturn Processor and the I/O of an
 $PRGNAM: HP48 calculator. There is a debugger for the Saturn Processor.
 $PRGNAM:
 $PRGNAM: initialization:
-$PRGNAM: $ mkdir ~/.hp48 && cp $PREFIX/share/$PRGNAM/gxrom-r ~/.hp48/rom.dump
-$PRGNAM: $ cd ~/.hp48 && x48 -initialize
+$PRGNAM: $ $PREFIX/share/$PRGNAM/setup-x48-home.sh
+$PRGNAM:
 $PRGNAM:
 $PRGNAM: http://x48.berlios.de/
-$PRGNAM:
+$PRGNAM: https://github.com/${GITHUB_REPO}
 EOF
 
 rm -f $PKG/{,usr/}lib$(uname -m | grep -o 64)/*.la

xap/x49gp/SlackBuild

@@ -8,7 +8,7 @@ GITHUB_REPO=gwenhael-le-moine/x49gp #claudiobsd/x49gp
 VERSION=${VERSION:-latest}
 NEWRPL_VERSION=1487
 
-BUILD=6
+BUILD=8
 
 ARCH=$(uname -m)
 LIBSUFFIX=$(echo $ARCH | grep -o "\(64\)")
@@ -57,6 +57,18 @@ make install DESTDIR=$PKG INSTALL_PREFIX=/usr INSTALL_MAN_DIR=/usr/man/man1
 mkdir -p $PKG$PREFIX/doc/$PRGNAM/
 cp README* sdcard $PKG$PREFIX/doc/$PRGNAM/
 
+mkdir -p $PKG$PREFIX/share/applications/
+cat <<EOF > $PKG$PREFIX/share/applications/$PRGNAM.desktop
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=$PREFIX/bin/x49gp
+Name=x49gp
+Icon=/usr/share/x49gp/hp50g.png
+EOF
+
 cat <<EOF > $PKG$PREFIX/doc/$PRGNAM/post-install.sh
 #!/bin/bash
 
@@ -70,7 +82,8 @@ unzip -d $PREFIX/share/$PRGNAM/ $PREFIX/doc/$PRGNAM/hp4950v215.zip
 rm $PREFIX/doc/$PRGNAM/hp4950v215.zip
 
 mkdir -p $PREFIX/share/$PRGNAM/newrpl/
-wget -c -O $PREFIX/share/$PRGNAM/newrpl/newrplfw.bin https://www.hpgcc3.org/downloads/newrplfw.bin
+wget -c -O $PREFIX/share/$PRGNAM/newrpl/newrplfw.bin.new https://www.hpgcc3.org/downloads/newrplfw.bin
+mv $PREFIX/share/$PRGNAM/newrpl/newrplfw.bin.new $PREFIX/share/$PRGNAM/newrpl/newrplfw.bin
 echo "newrplfw.bin" > $PREFIX/share/$PRGNAM/newrpl/update.scp
 EOF