office/teapot: Fix fltk build, README.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 45 insertions, 13 deletions

diff --git a/office/teapot/README b/office/teapot/README
index c53540a1cb..c9c1b0c735 100644
--- a/office/teapot/README
+++ b/office/teapot/README
@@ -1,11 +1,12 @@
-Teapot is a compact spreadsheet software originally written by Michael Haardt.
-It features a (n)curses-based text terminal interface, and recently also a
-FLTK-based GUI.
+Teapot is a compact spreadsheet software originally written by Michael
+Haardt.  It features a (n)curses-based text terminal interface, and
+recently also a FLTK-based GUI.
 
-Another interesting feature is its modern approach to spread sheet theory: It
-sports true three-dimensional tables and iterative expressions. And since it
-breaks compatibility with the usual notions of big spreadsheet packages, it
-can also throw old syntactic cruft over board which many spreadsheets still
-inherit from the days of VisiCalc on ancient CP/M systems.
+Another interesting feature is its modern approach to spread
+sheet theory: It sports true three-dimensional tables and iterative
+expressions. And since it breaks compatibility with the usual notions
+of big spreadsheet packages, it can also throw old syntactic cruft
+over board which many spreadsheets still inherit from the days of
+VisiCalc on ancient CP/M systems.
 
 Optional dependency: fltk
diff --git a/office/teapot/teapot.SlackBuild b/office/teapot/teapot.SlackBuild
index 85d8f4e7d6..9d02a8577c 100644
--- a/office/teapot/teapot.SlackBuild
+++ b/office/teapot/teapot.SlackBuild
@@ -22,9 +22,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20201119 bkw: modified by SlackBuilds.org:
+# - BUILD=2.
+# - Fix fltk builds.
+# - Shut up a compiler warning.
+# - Restore original homepage/download, since the site is back up.
+# - Fix README to comply with 72-column limit.
+# - Fix doubleplus ungood refs undirectory /usr/share/doc in man page.
+# - Since the man page says there's a manual, actually install the
+#   manual as part of the package. To avoid a dependency on lyx (and
+#   consequently qt5!), pull the prebuilt docs out of upstream's
+#   binary package.
+
 PRGNAM=teapot
 VERSION=${VERSION:-2.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -62,6 +74,8 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+# Extract *only* the docs from the binary package:
+tar xvf $CWD/Teapot-$VERSION-Linux-i386.tar.gz --wildcards '*/share/doc/*'
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,6 +83,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# 20201119 bkw: README says fltk is an optional dep, but it wasn't
+# being picked up by cmake.
+patch -p1 < $CWD/fix_fltk_build.diff
+
+# 20201119 bkw: While we're in a patching state of mind, fix a
+# compiler warning.
+patch -p1 < $CWD/fix_mbslen_warning.diff
+
+# 20201119 bkw: No such thing as /usr/share/doc/teapot.
+sed -i "s,/usr/share/doc/$PRGNAM,/usr/doc/$PRGNAM-$VERSION,g" $PRGNAM.1
+
 mkdir -p build
 cd build
   cmake \
@@ -90,9 +115,13 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 rm -rf $PKG/usr/share
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# 20201119 bkw: Install the PDF and HTML docs.
+cd Teapot-$VERSION-Linux/share/doc/$PRGNAM
+mv html *.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/office/teapot/teapot.info b/office/teapot/teapot.info
index fc3da8e61d..7a4fbd9f89 100644
--- a/office/teapot/teapot.info
+++ b/office/teapot/teapot.info
@@ -1,8 +1,10 @@
 PRGNAM="teapot"
 VERSION="2.3.0"
-HOMEPAGE="https://web.archive.org/web/20171230003025/http://www.syntax-k.de/projekte/teapot/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/teapot-2.3.0.tar.gz"
-MD5SUM="ae59f90a5f70971703abccf0991dbd58"
+HOMEPAGE="https://www.syntax-k.de/projekte/teapot/"
+DOWNLOAD="https://www.syntax-k.de/projekte/teapot/teapot-2.3.0.tar.gz \
+          https://www.syntax-k.de/projekte/teapot/Teapot-2.3.0-Linux-i386.tar.gz"
+MD5SUM="ae59f90a5f70971703abccf0991dbd58 \
+        17ecda70a8478043e4a8b622e178bc55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""