4 files changed, 23 insertions, 25 deletions
diff --git a/system/noto-emoji/README b/system/noto-emoji/README
index 0afc38e079..098ab35df8 100644
--- a/system/noto-emoji/README
+++ b/system/noto-emoji/README
@@ -1,4 +1 @@
-noto-emoji - Color and Black-and-White Noto emoji fonts
-
-It seems to work well with chromium and gajim (firefox since version 52 bundles
-its own emoji font)
+noto-emoji - Color Noto emoji fonts
diff --git a/system/noto-emoji/noto-emoji.SlackBuild b/system/noto-emoji/noto-emoji.SlackBuild
index 5dab99a22a..895eee3b6c 100644
--- a/system/noto-emoji/noto-emoji.SlackBuild
+++ b/system/noto-emoji/noto-emoji.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for noto-emoji
 
-# Copyright 2017-2019 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2020,2022 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2023 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +23,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=noto-emoji
-SRCVERSION=${VERSION:-2019-11-19-unicode12}
-VERSION=${VERSION:-$(echo "$SRCVERSION" | cut -d- -f-3 | tr -d -)}
+VERSION=${VERSION:-2.042}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -40,9 +47,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION
-tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
-cd $PRGNAM-$SRCVERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -51,15 +58,11 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 install -d $PKG/usr/share/fonts/TTF/
-
 install -m644 fonts/NotoColorEmoji.ttf $PKG/usr/share/fonts/TTF/
 
-mkdir -p $PKG/etc/fonts/conf.avail/
-install -m 0644 $CWD/51-noto-color-emoji.conf.xml $PKG/etc/fonts/conf.avail/51-noto-color-emoji.conf
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE README.md  \
+  AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -68,4 +71,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/noto-emoji/noto-emoji.info b/system/noto-emoji/noto-emoji.info
index 72868fcb29..08cd257fa9 100644
--- a/system/noto-emoji/noto-emoji.info
+++ b/system/noto-emoji/noto-emoji.info
@@ -1,10 +1,8 @@
 PRGNAM="noto-emoji"
-VERSION="20191119"
+VERSION="2.042"
 HOMEPAGE="https://www.google.com/get/noto/help/emoji/"
-DOWNLOAD="https://github.com/googlei18n/noto-emoji/archive/v2019-11-19-unicode12/noto-emoji-2019-11-19-unicode12.tar.gz \
-          https://gist.githubusercontent.com/hexchain/47f550472e79d0805060/raw/d9ecd5a5fcb901bcfb75115f4b602f6c1d3020c1/51-noto-color-emoji.conf.xml"
-MD5SUM="8e449a8d1bfbca27332aba7c68a4c55f \
-        e2d9cf0460fa0315a8da5d8dedacf702"
+DOWNLOAD="https://github.com/googlei18n/noto-emoji/archive/v2.042/noto-emoji-2.042.tar.gz"
+MD5SUM="32f2e047f379bf9b4e4befac633178f7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/noto-emoji/slack-desc b/system/noto-emoji/slack-desc
index f8a4cce6a2..21a7abd353 100644
--- a/system/noto-emoji/slack-desc
+++ b/system/noto-emoji/slack-desc
@@ -8,8 +8,7 @@
           |-----handy-ruler------------------------------------------------------|
 noto-emoji: noto-emoji (Noto Emoji fonts)
 noto-emoji:
-noto-emoji: Color and Black-and-White Noto emoji fonts, and tools for working
-noto-emoji: with them.
+noto-emoji: Color Noto emoji fonts, and tools for working with them.
 noto-emoji:
 noto-emoji: https://github.com/googlei18n/noto-emoji
 noto-emoji:
@@ -17,3 +16,4 @@ noto-emoji:
 noto-emoji:
 noto-emoji:
 noto-emoji:
+noto-emoji: