diff options
Diffstat (limited to 'office')
411 files changed, 6539 insertions, 4247 deletions
diff --git a/office/CherryTree/CherryTree.SlackBuild b/office/CherryTree/CherryTree.SlackBuild index 3e02fc043a..39e2a57da2 100644 --- a/office/CherryTree/CherryTree.SlackBuild +++ b/office/CherryTree/CherryTree.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for CherryTree -# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2020 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=CherryTree SRCNAM=${PRGNAM,,} -VERSION=${VERSION:-0.38.6} +VERSION=${VERSION:-0.39.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/CherryTree/CherryTree.info b/office/CherryTree/CherryTree.info index 25cfae173b..7d8f5e0c14 100644 --- a/office/CherryTree/CherryTree.info +++ b/office/CherryTree/CherryTree.info @@ -1,8 +1,8 @@ PRGNAM="CherryTree" -VERSION="0.38.6" +VERSION="0.39.2" HOMEPAGE="http://www.giuspen.com/cherrytree" -DOWNLOAD="http://www.giuspen.com/software/cherrytree-0.38.6.tar.xz" -MD5SUM="22342fdda66789d9bcd2ec8a5a14ab24" +DOWNLOAD="https://github.com/giuspen/cherrytree/archive/0.39.2/cherrytree-0.39.2.tar.gz" +MD5SUM="4cac6149f06ea402f08d1f4a4d939624" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pygtksourceview" diff --git a/office/FreeOffice/FreeOffice.SlackBuild b/office/FreeOffice/FreeOffice.SlackBuild new file mode 100644 index 0000000000..4bd56ee0e6 --- /dev/null +++ b/office/FreeOffice/FreeOffice.SlackBuild @@ -0,0 +1,99 @@ +#!/bin/sh + +# Slackware build script for FreeOffice + +# Copyright 2020 Andre Fernando, Indonesia +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=FreeOffice +SRCNAM=softmaker-${PRGNAM,,} +VERSION=${VERSION:-2018_978} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) + DEBARCH=i386 + ARCH=i586 + ;; + x86_64) + DEBARCH=amd64 + ARCH=x86_64 + ;; + # unsupported + *) + echo "ARCH $( uname -m ) is unsupported" + exit 1 + ;; + esac +else + case "$ARCH" in + i?86) + DEBARCH=i386 + ;; + x86_64) + DEBARCH=amd64 + ;; + # unsupported + *) + echo "$ARCH is unsupported" + exit 1 + ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM +mkdir -p $PRGNAM +cd $PRGNAM +ar -x $CWD/$SRCNAM-$VERSION-01_$DEBARCH.deb +tar xvf data.tar.xz -C $PKG +cd $PKG +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 $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +cp $CWD/*.desktop $PKG/usr/share/applications/ + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +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} diff --git a/office/FreeOffice/FreeOffice.info b/office/FreeOffice/FreeOffice.info new file mode 100644 index 0000000000..291305998a --- /dev/null +++ b/office/FreeOffice/FreeOffice.info @@ -0,0 +1,10 @@ +PRGNAM="FreeOffice" +VERSION="2018_978" +HOMEPAGE="https://www.freeoffice.com/" +DOWNLOAD="https://www.softmaker.net/down/softmaker-freeoffice-2018_978-01_i386.deb" +MD5SUM="32d74c5c109a53df7ad8312d43dfc866" +DOWNLOAD_x86_64="https://www.softmaker.net/down/softmaker-freeoffice-2018_978-01_amd64.deb" +MD5SUM_x86_64="2f42846d70bd4ebfaa6f1d0a73cd8689" +REQUIRES="" +MAINTAINER="Andre Fernando" +EMAIL="ando344@gmail.com" diff --git a/office/FreeOffice/README b/office/FreeOffice/README new file mode 100644 index 0000000000..a0dee50d4a --- /dev/null +++ b/office/FreeOffice/README @@ -0,0 +1,8 @@ +FreeOffice ( The best free alternative to Microsoft Office ) + +FreeOffice is a complete Office suite with a word processor, +a spreadsheet application and a presentation program – all compatible +with their counterparts in Microsoft Office. + +for add additional languages visit official sites: +https://www.freeoffice.com/en/download/dictionaries diff --git a/office/FreeOffice/doinst.sh b/office/FreeOffice/doinst.sh new file mode 100644 index 0000000000..aea0f894eb --- /dev/null +++ b/office/FreeOffice/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/office/FreeOffice/planmaker-free18.desktop b/office/FreeOffice/planmaker-free18.desktop new file mode 100644 index 0000000000..1a2cb71191 --- /dev/null +++ b/office/FreeOffice/planmaker-free18.desktop @@ -0,0 +1,21 @@ +[Desktop Entry] +Categories=Application;Office;Spreadsheet; +Comment=PlanMaker lets you create all kinds of spreadsheets -- from simple ones to the most complex ones. Includes a high-caliber charting module. +Encoding=UTF-8 +Exec=/usr/bin/planmaker18free %F +GenericName=Spreadsheet +Icon=/usr/share/pixmaps/pml18free.png +InitialPreference=10 +MimeType=application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12; +Name=FreeOffice 2018 PlanMaker +NoDisplay=false +Path[$e]=/usr/share/freeoffice2018 +StartupNotify=true +StartupWMClass=pm +Terminal=0 +TerminalOptions= +TryExec=/usr/bin/planmaker18free +Type=Application +Version=1.0 +X-KDE-SubstituteUID=false +X-KDE-Username= diff --git a/office/FreeOffice/presentations-free18.desktop b/office/FreeOffice/presentations-free18.desktop new file mode 100644 index 0000000000..a9d8a7a5ac --- /dev/null +++ b/office/FreeOffice/presentations-free18.desktop @@ -0,0 +1,21 @@ +[Desktop Entry] +Categories=Application;Office;Presentation; +Comment=The Presentations software lets you design any kind of presentation - even including special effects, animations, and transitions. +Encoding=UTF-8 +Exec=/usr/bin/presentations18free %F +GenericName=Presentation +Icon=/usr/share/pixmaps/prl18free.png +InitialPreference=10 +MimeType=application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow; +Name=FreeOffice 2018 Presentations +NoDisplay=false +Path[$e]=/usr/share/freeoffice2018 +StartupNotify=true +StartupWMClass=pr +Terminal=0 +TerminalOptions= +TryExec=/usr/bin/presentations18free +Type=Application +Version=1.0 +X-KDE-SubstituteUID=false +X-KDE-Username= diff --git a/office/FreeOffice/slack-desc b/office/FreeOffice/slack-desc new file mode 100644 index 0000000000..8b82587d03 --- /dev/null +++ b/office/FreeOffice/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +FreeOffice: FreeOffice (The best free alternative to Microsoft Office) +FreeOffice: +FreeOffice: FreeOffice is a complete Office suite with a word processor, +FreeOffice: a spreadsheet application and a presentation program – all compatible +FreeOffice: with their counterparts in Microsoft Office. +FreeOffice: +FreeOffice: +FreeOffice: Homepage: https://www.freeoffice.com/ +FreeOffice: +FreeOffice: +FreeOffice: diff --git a/office/FreeOffice/textmaker-free18.desktop b/office/FreeOffice/textmaker-free18.desktop new file mode 100644 index 0000000000..e24915cf3e --- /dev/null +++ b/office/FreeOffice/textmaker-free18.desktop @@ -0,0 +1,21 @@ +[Desktop Entry] +Categories=Application;Office;WordProcessor; +Comment=The TextMaker word processor lets you work on any type of document. +Encoding=UTF-8 +Exec=/usr/bin/textmaker18free %F +GenericName=Word Processor +Icon=/usr/share/pixmaps/tml18free.png +InitialPreference=10 +MimeType=application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;application/x-dbf;application/msword-template; +Name=FreeOffice 2018 TextMaker +NoDisplay=false +Path[$e]=/usr/share/freeoffice2018 +StartupNotify=true +StartupWMClass=tm +Terminal=0 +TerminalOptions= +TryExec=/usr/bin/textmaker18free +Type=Application +Version=1.0 +X-KDE-SubstituteUID=false +X-KDE-Username= diff --git a/office/JabRef/JabRef.SlackBuild b/office/JabRef/JabRef.SlackBuild index a71b3adf8a..edf204eac0 100644 --- a/office/JabRef/JabRef.SlackBuild +++ b/office/JabRef/JabRef.SlackBuild @@ -2,67 +2,70 @@ # Slackware build script for JabRef -# Copyright (c) 2008-2010, Antonio Hernández Blas <hba.nihilismus@gmail.com> +# Copyright 2008-2010, Antonio Hernández Blas <hba.nihilismus@gmail.com> +# Update by: Andre Barboza <bmg.andre@gmail.com> +# Copyright 2020, David O'Shaughnessy # All rights reserved. # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# 1.- Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Update by: Andre Barboza <bmg.andre@gmail.com> - -# This script is just a binary repackaging. +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=JabRef -VERSION=${VERSION:-2.9.2} +VERSION=${VERSION:-5.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -ARCH=${ARCH:-noarch} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG/opt/$PRGNAM $OUTPUT -install -D -m 0644 $CWD/$PRGNAM-$VERSION.jar $PKG/opt/$PRGNAM/$PRGNAM-$VERSION.jar +ARCH=${ARCH:-noarch} +DEBARCH=amd64 -mkdir -p $PKG/usr/bin -cat << EOF > $PKG/usr/bin/$PRGNAM -#!/bin/bash -cd \$HOME -java -jar /opt/$PRGNAM/$PRGNAM-$VERSION.jar \$@ -EOF -chmod 0755 $PKG/usr/bin/$PRGNAM +set -e -cd $PKG/opt/$PRGNAM +rm -rf "$PKG" +mkdir -p "$TMP" "$PKG" "$OUTPUT" +cd "$PKG" +ar p "$CWD"/${PRGNAM,,}_"$VERSION"-"$BUILD"_"$DEBARCH".deb data.tar.xz | tar xJv -install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop -install -D -m 0644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png +# permissions +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 $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +find "$PKG" -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +# create a symlink for program +mkdir -p "$PKG"/usr/bin +ln -s /opt/${PRGNAM,,}/bin/$PRGNAM "$PKG"/usr/bin/$PRGNAM -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh +# desktop and icon +install -D -m 0644 opt/${PRGNAM,,}/lib/${PRGNAM,,}-$PRGNAM.desktop -t "$PKG"/usr/share/applications +install -D -m 0644 opt/${PRGNAM,,}/lib/$PRGNAM.png -t "$PKG"/usr/share/pixmaps +# docs +install -D -m 0644 opt/${PRGNAM,,}/share/doc/* "$CWD"/$PRGNAM.SlackBuild -t "$PKG"/usr/doc/$PRGNAM-"$VERSION" +# package files +install -D -m 0644 "$CWD"/slack-desc "$CWD"/doinst.sh -t "$PKG"/install -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +cd "$PKG" +/sbin/makepkg -l y -c n "$OUTPUT"/$PRGNAM-"$VERSION"-"$ARCH"-"$BUILD""$TAG"."${PKGTYPE:-tgz}" diff --git a/office/JabRef/JabRef.info b/office/JabRef/JabRef.info index 230c0d955e..32c35e46a6 100644 --- a/office/JabRef/JabRef.info +++ b/office/JabRef/JabRef.info @@ -1,10 +1,10 @@ PRGNAM="JabRef" -VERSION="2.9.2" -HOMEPAGE="http://jabref.sourceforge.net/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/JabRef-2.9.2.jar" -MD5SUM="62575e9f6921c904fe8c2e4be2a34081" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="jdk" -MAINTAINER="Mário Antunes" -EMAIL="mariolpantunes@gmail.com" +VERSION="5.2" +HOMEPAGE="https://jabref.org" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/JabRef/jabref/releases/download/v5.2/jabref_5.2-1_amd64.deb" +MD5SUM_x86_64="c6479c48243e9a86cca2e0326b937678" +REQUIRES="" +MAINTAINER="David O'Shaughnessy" +EMAIL="dev@osh.id.au" diff --git a/office/JabRef/README b/office/JabRef/README index 8e01ca899d..52057ff55b 100644 --- a/office/JabRef/README +++ b/office/JabRef/README @@ -1,12 +1,6 @@ -JabRef is an open source bibliography reference manager. -The native file format used by JabRef is BibTeX, the -standard LaTeX bibliography format.b JabRef runs on the -Java VM (version 1.6 or newer), and should work equally -well on Windows, Linux and Mac OS X. +JabRef is an open source bibliography reference manager, with native +BibTeX and BibLaTeX support. JabRef helps you collect, edit, organize, +and cite your work. As of version 5, JabRef is bundled with its own +Java runtime. -BibTeX is an application and a bibliography file format -written by Oren Patashnik and Leslie Lamport for the LaTeX -document preparation system. Bibliographies generated by -LaTeX and BibTeX from a BibTeX file can be formatted to suit -any reference list specifications through the use of different -BibTeX style files. +This is a repackaging of the .deb release. diff --git a/office/JabRef/slack-desc b/office/JabRef/slack-desc index 9a3c4ac06d..08f6f0c520 100644 --- a/office/JabRef/slack-desc +++ b/office/JabRef/slack-desc @@ -8,10 +8,10 @@ |-----handy-ruler------------------------------------------------------| JabRef: JabRef (Reference Manager) JabRef: -JabRef: JabRef is an open source bibliography reference manager. The native -JabRef: file format used by JabRef is BibTeX, the standard LaTeX bibliography -JabRef: format.b JabRef runs on the Java VM (version 1.6 or newer), and -JabRef: should work equally well on Windows, Linux and Mac OS X. +JabRef: JabRef is an open source bibliography reference manager, with native +JabRef: BibTeX and BibLaTeX support. JabRef helps you collect, edit, organize, +JabRef: and cite your work. +JabRef: JabRef: JabRef: JabRef: diff --git a/office/LibreOffice/0001-Update-mdds-to-1.4.1.patch b/office/LibreOffice/0001-Update-mdds-to-1.4.1.patch deleted file mode 100644 index dc7fcce3af..0000000000 --- a/office/LibreOffice/0001-Update-mdds-to-1.4.1.patch +++ /dev/null @@ -1,693 +0,0 @@ -From 3debd23d47d1fcbef76033c739a0b7003824d4ca Mon Sep 17 00:00:00 2001 -From: Noel Grandin <noel.grandin@collabora.co.uk> -Date: Sat, 11 Aug 2018 13:25:09 +0200 -Subject: [PATCH] Update mdds to 1.4.1 - -loplugin:constantparam - -Reviewed-on: https://gerrit.libreoffice.org/58875 -Tested-by: Jenkins -Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> -(cherry picked from commit bb6f2b12e8f0bbc99a5ca93141d35fd40b043e55) - -Update mdds to 1.4.1. - -The largest change in 1.4.x relevant to the calc code is that the -multi_type_matrix::walk() methods now take a copy of the function -object rather than a reference, to allow for it to take an inline -lambda function. Instead, it does return a instance of the input -function object, similar to how std::for_each() behaves. - -In case the function object contains a large data member, try to -make it a moveable so that it will get moved rather than copied -when going through one of the walk() methods. - -Reviewed-on: https://gerrit.libreoffice.org/59584 -Tested-by: Jenkins -Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> -(cherry picked from commit 51f73f35ea61dd81dd3194af50394b98ff1bf8e9) - -mdds 1.4.1 is now a minimum requirement. - -Reviewed-on: https://gerrit.libreoffice.org/59614 -Tested-by: Jenkins -Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> -(cherry picked from commit 4d1f735fcf064b18ef2848cc1f5a2a0616b0b33d) - -fd08fc4a2ed75039e5292a35ff08726e0126c77f -647bcfbdd8e0417990ed93b25c1bca00f60df709 - -Change-Id: I676a8408e97cc8134009f764736cad68513c89ad ---- - configure.ac | 2 +- - download.lst | 4 +- - external/mdds/UnpackedTarball_mdds.mk | 3 - - external/mdds/c++17.patch | 22 --- - sc/inc/scmatrix.hxx | 6 +- - sc/source/core/tool/interpr3.cxx | 4 +- - sc/source/core/tool/scmatrix.cxx | 208 +++++++++++++++++++------- - 7 files changed, 161 insertions(+), 88 deletions(-) - delete mode 100644 external/mdds/c++17.patch - -diff --git a/configure.ac b/configure.ac -index 735ebf2e360a..3ff574a3f24f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8883,7 +8883,7 @@ AC_SUBST(SYSTEM_BOOST) - dnl =================================================================== - dnl Check for system mdds - dnl =================================================================== --libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.2 >= 1.2.3], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) -+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.4 >= 1.4.1], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) - - dnl =================================================================== - dnl Check for system glm -diff --git a/download.lst b/download.lst -index c40bece90e26..d4c145a0cfc9 100644 ---- a/download.lst -+++ b/download.lst -@@ -166,8 +166,8 @@ export LXML_SHA256SUM := 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a - export LXML_TARBALL := lxml-4.1.1.tgz - export MARIADB_CONNECTOR_C_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 - export MARIADB_CONNECTOR_C_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz --export MDDS_SHA256SUM := dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1 --export MDDS_TARBALL := mdds-1.3.1.tar.bz2 -+export MDDS_SHA256SUM := 9ac690c37f5f06dc88551405d5daf9d9ad25edf65aae6325b59e905c2ba444c3 -+export MDDS_TARBALL := mdds-1.4.1.tar.bz2 - export MDNSRESPONDER_SHA256SUM := 4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0 - export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz - export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba -diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk -index 4f6db6b24e7b..c015f4c13f5a 100644 ---- a/external/mdds/UnpackedTarball_mdds.mk -+++ b/external/mdds/UnpackedTarball_mdds.mk -@@ -13,10 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL))) - - $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0)) - --# c++17.patch upstreamed as <https://gitlab.com/mdds/mdds/merge_requests/11> "Remove some --# unnecessary uses of obsolete std::unary_function": - $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ -- external/mdds/c++17.patch \ - )) - - # vim: set noet sw=4 ts=4: -diff --git a/external/mdds/c++17.patch b/external/mdds/c++17.patch -deleted file mode 100644 -index d96910f34e68..000000000000 ---- a/external/mdds/c++17.patch -+++ /dev/null -@@ -1,22 +0,0 @@ ----- include/mdds/multi_type_matrix.hpp --+++ include/mdds/multi_type_matrix.hpp --@@ -149,7 +149,7 @@ -- -- private: -- template<typename _Func> --- struct walk_func : std::unary_function<typename store_type::const_iterator::value_type, void> --+ struct walk_func -- { -- _Func& m_func; -- walk_func(_Func& func) : m_func(func) {} ----- include/mdds/multi_type_vector.hpp --+++ include/mdds/multi_type_vector.hpp --@@ -139,7 +139,7 @@ -- block& operator=(block); -- }; -- --- struct element_block_deleter : public std::unary_function<void, const element_block_type*> --+ struct element_block_deleter -- { -- void operator() (const element_block_type* p) -- { -diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx -index 9be335fbc06b..b1bc5e0e3047 100644 ---- a/sc/inc/scmatrix.hxx -+++ b/sc/inc/scmatrix.hxx -@@ -399,7 +399,7 @@ public: - virtual void DivOp(bool bFlag, double fVal, ScMatrix& rMat) = 0; - virtual void PowOp(bool bFlag, double fVal, ScMatrix& rMat) = 0; - -- virtual std::vector<ScMatrix::IterateResult> Collect(bool bTextAsZero, const std::vector<std::unique_ptr<sc::op::Op>>& aOp) = 0; -+ virtual std::vector<ScMatrix::IterateResult> Collect(const std::vector<std::unique_ptr<sc::op::Op>>& aOp) = 0; - - virtual void ExecuteOperation(const std::pair<size_t, size_t>& rStartPos, const std::pair<size_t, size_t>& rEndPos, - DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc, StringOpFunction aStringFunc, -@@ -617,7 +617,7 @@ public: - virtual void DivOp(bool bFlag, double fVal, ScMatrix& rMat) override; - virtual void PowOp(bool bFlag, double fVal, ScMatrix& rMat) override; - -- virtual std::vector<ScMatrix::IterateResult> Collect(bool bTextAsZero, const std::vector<std::unique_ptr<sc::op::Op>>& aOp) override; -+ virtual std::vector<ScMatrix::IterateResult> Collect(const std::vector<std::unique_ptr<sc::op::Op>>& aOp) override; - - virtual void ExecuteOperation(const std::pair<size_t, size_t>& rStartPos, const std::pair<size_t, size_t>& rEndPos, - DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc, StringOpFunction aStringFunc, -@@ -837,7 +837,7 @@ public: - virtual void DivOp(bool bFlag, double fVal, ScMatrix& rMat) override; - virtual void PowOp(bool bFlag, double fVal, ScMatrix& rMat) override; - -- virtual std::vector<ScMatrix::IterateResult> Collect(bool bTextAsZero, const std::vector<std::unique_ptr<sc::op::Op>>& aOp) override; -+ virtual std::vector<ScMatrix::IterateResult> Collect(const std::vector<std::unique_ptr<sc::op::Op>>& aOp) override; - - virtual void ExecuteOperation(const std::pair<size_t, size_t>& rStartPos, const std::pair<size_t, size_t>& rEndPos, - DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc, StringOpFunction aStringFunc, -diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx -index 28e8cd9a9c48..88c0d8353783 100644 ---- a/sc/source/core/tool/interpr3.cxx -+++ b/sc/source/core/tool/interpr3.cxx -@@ -2745,12 +2745,12 @@ void ScInterpreter::ScFTest() - aOp.emplace_back(new sc::op::Op(0.0, [](double& rAccum, double fVal){rAccum += fVal;})); - aOp.emplace_back(new sc::op::Op(0.0, [](double& rAccum, double fVal){rAccum += fVal * fVal;})); - -- auto aVal1 = pMat1->Collect(false, aOp); -+ auto aVal1 = pMat1->Collect(aOp); - fSum1 = aVal1[0].mfFirst + aVal1[0].mfRest; - fSumSqr1 = aVal1[1].mfFirst + aVal1[1].mfRest; - fCount1 = aVal1[2].mnCount; - -- auto aVal2 = pMat2->Collect(false, aOp); -+ auto aVal2 = pMat2->Collect(aOp); - fSum2 = aVal2[0].mfFirst + aVal2[0].mfRest; - fSumSqr2 = aVal2[1].mfFirst + aVal2[1].mfRest; - fCount2 = aVal2[2].mnCount; -diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx -index 7f8c8767e917..7dadec9f0b57 100644 ---- a/sc/source/core/tool/scmatrix.cxx -+++ b/sc/source/core/tool/scmatrix.cxx -@@ -160,6 +160,12 @@ public: - maNewMatValues.reserve(nRow*nCol); - } - -+ CompareMatrixElemFunc( const CompareMatrixElemFunc& ) = delete; -+ CompareMatrixElemFunc& operator= ( const CompareMatrixElemFunc& ) = delete; -+ -+ CompareMatrixElemFunc( CompareMatrixElemFunc&& ) = default; -+ CompareMatrixElemFunc& operator= ( CompareMatrixElemFunc&& ) = default; -+ - void operator() (const MatrixImplType::element_block_node_type& node) - { - switch (node.type) -@@ -323,7 +329,7 @@ public: - const ScFullMatrix::EmptyOpFunction& aEmptyFunc) const; - - template<typename T> -- std::vector<ScMatrix::IterateResult> ApplyCollectOperation(bool bTextAsZero, const std::vector<std::unique_ptr<T>>& aOp); -+ std::vector<ScMatrix::IterateResult> ApplyCollectOperation(const std::vector<std::unique_ptr<T>>& aOp); - - void MatConcat(SCSIZE nMaxCol, SCSIZE nMaxRow, const ScMatrixRef& xMat1, const ScMatrixRef& xMat2, - SvNumberFormatter& rFormatter, svl::SharedStringPool& rPool); -@@ -979,7 +985,7 @@ void ScMatrixImpl::CompareEqual() - { - MatrixImplType::size_pair_type aSize = maMat.size(); - CompareMatrixElemFunc<ElemEqualZero> aFunc(aSize.row, aSize.column); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(std::move(aFunc)); - aFunc.swap(maMat); - } - -@@ -987,7 +993,7 @@ void ScMatrixImpl::CompareNotEqual() - { - MatrixImplType::size_pair_type aSize = maMat.size(); - CompareMatrixElemFunc<ElemNotEqualZero> aFunc(aSize.row, aSize.column); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(std::move(aFunc)); - aFunc.swap(maMat); - } - -@@ -995,7 +1001,7 @@ void ScMatrixImpl::CompareLess() - { - MatrixImplType::size_pair_type aSize = maMat.size(); - CompareMatrixElemFunc<ElemLessZero> aFunc(aSize.row, aSize.column); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(std::move(aFunc)); - aFunc.swap(maMat); - } - -@@ -1003,7 +1009,7 @@ void ScMatrixImpl::CompareGreater() - { - MatrixImplType::size_pair_type aSize = maMat.size(); - CompareMatrixElemFunc<ElemGreaterZero> aFunc(aSize.row, aSize.column); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(std::move(aFunc)); - aFunc.swap(maMat); - } - -@@ -1011,7 +1017,7 @@ void ScMatrixImpl::CompareLessEqual() - { - MatrixImplType::size_pair_type aSize = maMat.size(); - CompareMatrixElemFunc<ElemLessEqualZero> aFunc(aSize.row, aSize.column); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(std::move(aFunc)); - aFunc.swap(maMat); - } - -@@ -1019,7 +1025,7 @@ void ScMatrixImpl::CompareGreaterEqual() - { - MatrixImplType::size_pair_type aSize = maMat.size(); - CompareMatrixElemFunc<ElemGreaterEqualZero> aFunc(aSize.row, aSize.column); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(std::move(aFunc)); - aFunc.swap(maMat); - } - -@@ -1174,21 +1180,34 @@ public: - template<typename Op> - class WalkElementBlocksMultipleValues - { -- const std::vector<std::unique_ptr<Op>>& maOp; -+ const std::vector<std::unique_ptr<Op>>* mpOp; - std::vector<ScMatrix::IterateResult> maRes; - bool mbFirst:1; -- bool mbTextAsZero:1; - public: -- WalkElementBlocksMultipleValues(bool bTextAsZero, const std::vector<std::unique_ptr<Op>>& aOp) : -- maOp(aOp), mbFirst(true), mbTextAsZero(bTextAsZero) -+ WalkElementBlocksMultipleValues(const std::vector<std::unique_ptr<Op>>& aOp) : -+ mpOp(&aOp), mbFirst(true) - { -- for (const auto& rpOp : maOp) -+ for (const auto& rpOp : *mpOp) - { - maRes.emplace_back(rpOp->mInitVal, rpOp->mInitVal, 0); - } - maRes.emplace_back(0.0, 0.0, 0); // count - } - -+ WalkElementBlocksMultipleValues( const WalkElementBlocksMultipleValues& ) = delete; -+ WalkElementBlocksMultipleValues& operator= ( const WalkElementBlocksMultipleValues& ) = delete; -+ -+ WalkElementBlocksMultipleValues( WalkElementBlocksMultipleValues&& r ) : -+ mpOp(r.mpOp), maRes(std::move(r.maRes)), mbFirst(r.mbFirst) {} -+ -+ WalkElementBlocksMultipleValues& operator= ( WalkElementBlocksMultipleValues&& r ) -+ { -+ mpOp = r.mpOp; -+ maRes = std::move(r.maRes); -+ mbFirst = r.mbFirst; -+ return *this; -+ } -+ - const std::vector<ScMatrix::IterateResult>& getResult() const { return maRes; } - - void operator() (const MatrixImplType::element_block_node_type& node) -@@ -1205,17 +1224,17 @@ public: - { - if (mbFirst) - { -- for (auto i = 0u; i < maOp.size(); ++i) -+ for (auto i = 0u; i < mpOp->size(); ++i) - { -- (*maOp[i])(maRes[i].mfFirst, *it); -+ (*(*mpOp)[i])(maRes[i].mfFirst, *it); - } - mbFirst = false; - } - else - { -- for (auto i = 0u; i < maOp.size(); ++i) -+ for (auto i = 0u; i < mpOp->size(); ++i) - { -- (*maOp[i])(maRes[i].mfRest, *it); -+ (*(*mpOp)[i])(maRes[i].mfRest, *it); - } - } - } -@@ -1232,17 +1251,17 @@ public: - { - if (mbFirst) - { -- for (auto i = 0u; i < maOp.size(); ++i) -+ for (auto i = 0u; i < mpOp->size(); ++i) - { -- (*maOp[i])(maRes[i].mfFirst, *it); -+ (*(*mpOp)[i])(maRes[i].mfFirst, *it); - } - mbFirst = false; - } - else - { -- for (auto i = 0u; i < maOp.size(); ++i) -+ for (auto i = 0u; i < mpOp->size(); ++i) - { -- (*maOp[i])(maRes[i].mfRest, *it); -+ (*(*mpOp)[i])(maRes[i].mfRest, *it); - } - } - } -@@ -1250,9 +1269,6 @@ public: - } - break; - case mdds::mtm::element_string: -- if (mbTextAsZero) -- maRes.back().mnCount += node.size; -- break; - case mdds::mtm::element_empty: - default: - ; -@@ -1310,8 +1326,8 @@ template<typename Type> - class WalkAndMatchElements - { - Type maMatchValue; -- const size_t mnStartIndex; -- const size_t mnStopIndex; -+ size_t mnStartIndex; -+ size_t mnStopIndex; - size_t mnResult; - size_t mnIndex; - -@@ -1669,6 +1685,24 @@ public: - maResValues.reserve(nResSize); - } - -+ CompareMatrixFunc( const CompareMatrixFunc& ) = delete; -+ CompareMatrixFunc& operator= ( const CompareMatrixFunc& ) = delete; -+ -+ CompareMatrixFunc( CompareMatrixFunc&& r ) : -+ mrComp(r.mrComp), -+ mnMatPos(r.mnMatPos), -+ mpOptions(r.mpOptions), -+ maResValues(std::move(r.maResValues)) {} -+ -+ CompareMatrixFunc& operator= ( CompareMatrixFunc&& r ) -+ { -+ mrComp = r.mrComp; -+ mnMatPos = r.mnMatPos; -+ mpOptions = r.mpOptions; -+ maResValues = std::move(r.maResValues); -+ return *this; -+ } -+ - void operator() (const MatrixImplType::element_block_node_type& node) - { - sc::Compare::Cell& rCell = mrComp.maCells[mnMatPos]; -@@ -1777,6 +1811,24 @@ public: - maResValues.reserve(nResSize); - } - -+ CompareMatrixToNumericFunc( const CompareMatrixToNumericFunc& ) = delete; -+ CompareMatrixToNumericFunc& operator= ( const CompareMatrixToNumericFunc& ) = delete; -+ -+ CompareMatrixToNumericFunc( CompareMatrixToNumericFunc&& r ) : -+ mrComp(r.mrComp), -+ mfRightValue(r.mfRightValue), -+ mpOptions(r.mpOptions), -+ maResValues(std::move(r.maResValues)) {} -+ -+ CompareMatrixToNumericFunc& operator= ( CompareMatrixToNumericFunc&& r ) -+ { -+ mrComp = r.mrComp; -+ mfRightValue = r.mfRightValue; -+ mpOptions = r.mpOptions; -+ maResValues = std::move(r.maResValues); -+ return *this; -+ } -+ - void operator() (const MatrixImplType::element_block_node_type& node) - { - sc::Compare::Cell& rCell = mrComp.maCells[0]; -@@ -1840,6 +1892,17 @@ class ToDoubleArray - double mfNaN; - bool mbEmptyAsZero; - -+ void moveArray( ToDoubleArray& r ) -+ { -+ // Re-create the iterator from the new array after the array has been -+ // moved, to ensure that the iterator points to a valid array -+ // position. -+ size_t n = std::distance(r.maArray.begin(), r.miPos); -+ maArray = std::move(r.maArray); -+ miPos = maArray.begin(); -+ std::advance(miPos, n); -+ } -+ - public: - ToDoubleArray( size_t nSize, bool bEmptyAsZero ) : - maArray(nSize, 0.0), miPos(maArray.begin()), mbEmptyAsZero(bEmptyAsZero) -@@ -1847,6 +1910,23 @@ public: - mfNaN = CreateDoubleError( FormulaError::ElementNaN); - } - -+ ToDoubleArray( const ToDoubleArray& ) = delete; -+ ToDoubleArray& operator= ( const ToDoubleArray& ) = delete; -+ -+ ToDoubleArray( ToDoubleArray&& r ) : -+ mfNaN(r.mfNaN), mbEmptyAsZero(r.mbEmptyAsZero) -+ { -+ moveArray(r); -+ } -+ -+ ToDoubleArray& operator= ( ToDoubleArray&& r ) -+ { -+ mfNaN = r.mfNaN; -+ mbEmptyAsZero = r.mbEmptyAsZero; -+ moveArray(r); -+ return *this; -+ } -+ - void operator() (const MatrixImplType::element_block_node_type& node) - { - using namespace mdds::mtv; -@@ -1917,6 +1997,12 @@ public: - mfNaN = CreateDoubleError( FormulaError::ElementNaN); - } - -+ MergeDoubleArrayFunc( const MergeDoubleArrayFunc& ) = delete; -+ MergeDoubleArrayFunc& operator= ( const MergeDoubleArrayFunc& ) = delete; -+ -+ MergeDoubleArrayFunc( MergeDoubleArrayFunc&& ) = default; -+ MergeDoubleArrayFunc& operator= ( MergeDoubleArrayFunc&& ) = default; -+ - void operator() (const MatrixImplType::element_block_node_type& node) - { - using namespace mdds::mtv; -@@ -1982,7 +2068,7 @@ template<typename TOp> - ScMatrix::IterateResult GetValueWithCount(bool bTextAsZero, const MatrixImplType& maMat) - { - WalkElementBlocks<TOp> aFunc(bTextAsZero); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(aFunc); - return aFunc.getResult(); - } - -@@ -2006,49 +2092,49 @@ ScMatrix::IterateResult ScMatrixImpl::Product(bool bTextAsZero) const - size_t ScMatrixImpl::Count(bool bCountStrings, bool bCountErrors) const - { - CountElements aFunc(bCountStrings, bCountErrors); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(aFunc); - return aFunc.getCount(); - } - - size_t ScMatrixImpl::MatchDoubleInColumns(double fValue, size_t nCol1, size_t nCol2) const - { - WalkAndMatchElements<double> aFunc(fValue, maMat.size(), nCol1, nCol2); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(aFunc); - return aFunc.getMatching(); - } - - size_t ScMatrixImpl::MatchStringInColumns(const svl::SharedString& rStr, size_t nCol1, size_t nCol2) const - { - WalkAndMatchElements<svl::SharedString> aFunc(rStr, maMat.size(), nCol1, nCol2); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(aFunc); - return aFunc.getMatching(); - } - - double ScMatrixImpl::GetMaxValue( bool bTextAsZero ) const - { - CalcMaxMinValue<MaxOp> aFunc(bTextAsZero); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(aFunc); - return aFunc.getValue(); - } - - double ScMatrixImpl::GetMinValue( bool bTextAsZero ) const - { - CalcMaxMinValue<MinOp> aFunc(bTextAsZero); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(aFunc); - return aFunc.getValue(); - } - - double ScMatrixImpl::GetGcd() const - { - CalcGcdLcm<Gcd> aFunc; -- maMat.walk(aFunc); -+ aFunc = maMat.walk(aFunc); - return aFunc.getResult(); - } - - double ScMatrixImpl::GetLcm() const - { - CalcGcdLcm<Lcm> aFunc; -- maMat.walk(aFunc); -+ aFunc = maMat.walk(aFunc); - return aFunc.getResult(); - } - -@@ -2065,7 +2151,7 @@ ScMatrixRef ScMatrixImpl::CompareMatrix( - // function object that has much less branching for much better - // performance. - CompareMatrixToNumericFunc aFunc(nSize, rComp, rComp.maCells[1].mfValue, pOptions); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(std::move(aFunc)); - - // We assume the result matrix has the same dimension as this matrix. - const std::vector<double>& rResVal = aFunc.getValues(); -@@ -2077,7 +2163,7 @@ ScMatrixRef ScMatrixImpl::CompareMatrix( - } - - CompareMatrixFunc aFunc(nSize, rComp, nMatPos, pOptions); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(std::move(aFunc)); - - // We assume the result matrix has the same dimension as this matrix. - const std::vector<double>& rResVal = aFunc.getValues(); -@@ -2091,7 +2177,7 @@ void ScMatrixImpl::GetDoubleArray( std::vector<double>& rArray, bool bEmptyAsZer - { - MatrixImplType::size_pair_type aSize = maMat.size(); - ToDoubleArray aFunc(aSize.row*aSize.column, bEmptyAsZero); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(std::move(aFunc)); - aFunc.swap(rArray); - } - -@@ -2107,7 +2193,7 @@ void ScMatrixImpl::MergeDoubleArray( std::vector<double>& rArray, ScFullMatrix:: - case ScFullMatrix::Mul: - { - MergeDoubleArrayFunc<ArrayMul> aFunc(rArray); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(std::move(aFunc)); - } - break; - default: -@@ -2329,16 +2415,26 @@ struct MatrixOpWrapper - private: - MatrixImplType& mrMat; - MatrixImplType::position_type pos; -- T maOp; -+ const T* mpOp; - - public: -- MatrixOpWrapper(MatrixImplType& rMat, T const & aOp): -+ MatrixOpWrapper(MatrixImplType& rMat, const T& aOp): - mrMat(rMat), - pos(rMat.position(0,0)), -- maOp(aOp) -+ mpOp(&aOp) - { - } - -+ MatrixOpWrapper( const MatrixOpWrapper& r ) : mrMat(r.mrMat), pos(r.pos), mpOp(r.mpOp) {} -+ -+ MatrixOpWrapper& operator= ( const MatrixOpWrapper& r ) -+ { -+ mrMat = r.mrMat; -+ pos = r.pos; -+ mpOp = r.mpOp; -+ return *this; -+ } -+ - void operator()(const MatrixImplType::element_block_node_type& node) - { - switch (node.type) -@@ -2349,7 +2445,7 @@ public: - - block_type::const_iterator it = block_type::begin(*node.data); - block_type::const_iterator itEnd = block_type::end(*node.data); -- MatrixIteratorWrapper<block_type, T, typename T::number_value_type> aFunc(it, itEnd, maOp); -+ MatrixIteratorWrapper<block_type, T, typename T::number_value_type> aFunc(it, itEnd, *mpOp); - pos = mrMat.set(pos,aFunc.begin(), aFunc.end()); - } - break; -@@ -2360,7 +2456,7 @@ public: - block_type::const_iterator it = block_type::begin(*node.data); - block_type::const_iterator itEnd = block_type::end(*node.data); - -- MatrixIteratorWrapper<block_type, T, typename T::number_value_type> aFunc(it, itEnd, maOp); -+ MatrixIteratorWrapper<block_type, T, typename T::number_value_type> aFunc(it, itEnd, *mpOp); - pos = mrMat.set(pos, aFunc.begin(), aFunc.end()); - } - break; -@@ -2371,17 +2467,17 @@ public: - block_type::const_iterator it = block_type::begin(*node.data); - block_type::const_iterator itEnd = block_type::end(*node.data); - -- MatrixIteratorWrapper<block_type, T, typename T::number_value_type> aFunc(it, itEnd, maOp); -+ MatrixIteratorWrapper<block_type, T, typename T::number_value_type> aFunc(it, itEnd, *mpOp); - pos = mrMat.set(pos, aFunc.begin(), aFunc.end()); - } - break; - case mdds::mtm::element_empty: - { -- if (maOp.useFunctionForEmpty()) -+ if (mpOp->useFunctionForEmpty()) - { - std::vector<char> aVec(node.size); - MatrixIteratorWrapper<std::vector<char>, T, typename T::number_value_type> -- aFunc(aVec.begin(), aVec.end(), maOp); -+ aFunc(aVec.begin(), aVec.end(), *mpOp); - pos = mrMat.set(pos, aFunc.begin(), aFunc.end()); - } - } -@@ -2397,14 +2493,14 @@ template<typename T> - void ScMatrixImpl::ApplyOperation(T aOp, ScMatrixImpl& rMat) - { - MatrixOpWrapper<T> aFunc(rMat.maMat, aOp); -- maMat.walk(aFunc); -+ aFunc = maMat.walk(aFunc); - } - - template<typename T> --std::vector<ScMatrix::IterateResult> ScMatrixImpl::ApplyCollectOperation(bool bTextAsZero, const std::vector<std::unique_ptr<T>>& aOp) -+std::vector<ScMatrix::IterateResult> ScMatrixImpl::ApplyCollectOperation(const std::vector<std::unique_ptr<T>>& aOp) - { -- WalkElementBlocksMultipleValues<T> aFunc(bTextAsZero, aOp); -- maMat.walk(aFunc); -+ WalkElementBlocksMultipleValues<T> aFunc(aOp); -+ aFunc = maMat.walk(std::move(aFunc)); - return aFunc.getResult(); - } - -@@ -2544,8 +2640,10 @@ void ScMatrixImpl::ExecuteOperation(const std::pair<size_t, size_t>& rStartPos, - { - WalkElementBlockOperation aFunc(maMat.size().row, - aDoubleFunc, aBoolFunc, aStringFunc, aEmptyFunc); -- maMat.walk(aFunc, MatrixImplType::size_pair_type(rStartPos.first, rStartPos.second), -- MatrixImplType::size_pair_type(rEndPos.first, rEndPos.second)); -+ aFunc = maMat.walk( -+ aFunc, -+ MatrixImplType::size_pair_type(rStartPos.first, rStartPos.second), -+ MatrixImplType::size_pair_type(rEndPos.first, rEndPos.second)); - } - - #if DEBUG_MATRIX -@@ -3452,9 +3550,9 @@ void ScFullMatrix::ExecuteOperation(const std::pair<size_t, size_t>& rStartPos, - pImpl->ExecuteOperation(rStartPos, rEndPos, aDoubleFunc, aBoolFunc, aStringFunc, aEmptyFunc); - } - --std::vector<ScMatrix::IterateResult> ScFullMatrix::Collect(bool bTextAsZero, const std::vector<std::unique_ptr<sc::op::Op>>& aOp) -+std::vector<ScMatrix::IterateResult> ScFullMatrix::Collect(const std::vector<std::unique_ptr<sc::op::Op>>& aOp) - { -- return pImpl->ApplyCollectOperation(bTextAsZero, aOp); -+ return pImpl->ApplyCollectOperation(aOp); - } - - ScFullMatrix& ScFullMatrix::operator+= ( const ScFullMatrix& r ) -@@ -4216,10 +4314,10 @@ void ScVectorRefMatrix::PowOp(bool bFlag, double fVal, ScMatrix& rMat) - mpFullMatrix->PowOp(bFlag, fVal, rMat); - } - --std::vector<ScMatrix::IterateResult> ScVectorRefMatrix::Collect(bool bTextAsZero, const std::vector<std::unique_ptr<sc::op::Op>>& aOp) -+std::vector<ScMatrix::IterateResult> ScVectorRefMatrix::Collect(const std::vector<std::unique_ptr<sc::op::Op>>& aOp) - { - ensureFullMatrix(); -- return mpFullMatrix->Collect(bTextAsZero, aOp); -+ return mpFullMatrix->Collect(aOp); - } - - void ScVectorRefMatrix::ExecuteOperation(const std::pair<size_t, size_t>& rStartPos, --- -2.17.1 - diff --git a/office/LibreOffice/0001-Update-orcus-to-0.14.0.patch b/office/LibreOffice/0001-Update-orcus-to-0.14.0.patch deleted file mode 100644 index 2480f48b7a..0000000000 --- a/office/LibreOffice/0001-Update-orcus-to-0.14.0.patch +++ /dev/null @@ -1,801 +0,0 @@ -From 1d0727a104d76210814f41c1169df318e40c9d80 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida <kohei.yoshida@gmail.com> -Date: Mon, 27 Aug 2018 11:06:17 -0400 -Subject: [PATCH] Update orcus to 0.14.0. - -And make all necessary adjustments for the new version of orcus. - -Change-Id: I0dc207162a3ddfaad6da198a3d13b65f530757d5 -Reviewed-on: https://gerrit.libreoffice.org/59884 -Tested-by: Jenkins -Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> ---- - RepositoryExternal.mk | 4 +- - configure.ac | 2 +- - download.lst | 4 +- - .../0001-Missing-header-for-std-tolower.patch | 24 ++ - external/liborcus/ExternalPackage_liborcus.mk | 8 +- - external/liborcus/ExternalProject_liborcus.mk | 4 +- - external/liborcus/Library_orcus.mk | 2 + - external/liborcus/UnpackedTarball_liborcus.mk | 1 + - external/liborcus/gcc9.patch.0 | 3 +- - sc/source/filter/inc/orcusinterface.hxx | 107 ++++-- - sc/source/filter/orcus/interface.cxx | 322 +++++++++++++----- - sc/source/filter/orcus/xmlcontext.cxx | 5 +- - 12 files changed, 360 insertions(+), 126 deletions(-) - create mode 100644 external/liborcus/0001-Missing-header-for-std-tolower.patch - -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index cec79cc105e8..f172765a84f8 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -3295,7 +3295,7 @@ $(call gb_LinkTarget_set_include,$(1),\ - ) - - $(call gb_LinkTarget_add_libs,$(1),\ -- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.13 \ -+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.14 \ - ) - - $(if $(SYSTEM_BOOST), \ -@@ -3314,7 +3314,7 @@ $(call gb_LinkTarget_set_include,$(1),\ - ) - - $(call gb_LinkTarget_add_libs,$(1),\ -- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.13 \ -+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.14 \ - ) - - endef -diff --git a/configure.ac b/configure.ac -index 3c9e5dc5e908..a60a3e72689f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9196,7 +9196,7 @@ AC_SUBST(ENABLE_FUZZERS) - dnl =================================================================== - dnl Orcus - dnl =================================================================== --libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.13 >= 0.13.3]) -+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0]) - if test "$with_system_orcus" != "yes"; then - if test "$SYSTEM_BOOST" = "TRUE"; then - # =========================================================== -diff --git a/download.lst b/download.lst -index 1ed75b36f3b3..3532e2be3aa3 100644 ---- a/download.lst -+++ b/download.lst -@@ -194,8 +194,8 @@ export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89 - export OPENLDAP_TARBALL := openldap-2.4.45.tgz - export OPENSSL_SHA256SUM := 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00 - export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz --export ORCUS_SHA256SUM := bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b --export ORCUS_TARBALL := liborcus-0.13.4.tar.gz -+export ORCUS_SHA256SUM := 7bcfac3f4f490540292cfc87d3fde7b47eafa8450afa1e1a2c181d8293dcd4ef -+export ORCUS_TARBALL := liborcus-0.14.0.tar.gz - export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb - export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz - export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d -diff --git a/external/liborcus/0001-Missing-header-for-std-tolower.patch b/external/liborcus/0001-Missing-header-for-std-tolower.patch -new file mode 100644 -index 000000000000..2e00be92a872 ---- /dev/null -+++ b/external/liborcus/0001-Missing-header-for-std-tolower.patch -@@ -0,0 +1,24 @@ -+From 3a6bb93a382b4d5f1463ee3fdd54cab7048ff996 Mon Sep 17 00:00:00 2001 -+From: Kohei Yoshida <kohei.yoshida@gmail.com> -+Date: Fri, 31 Aug 2018 16:07:06 -0400 -+Subject: [PATCH] Missing header for std::tolower. -+ -+--- -+ src/parser/sax_token_parser.cpp | 1 + -+ 1 file changed, 1 insertion(+) -+ -+diff --git a/src/parser/sax_token_parser.cpp b/src/parser/sax_token_parser.cpp -+index 9790b498..44ba5844 100644 -+--- a/src/parser/sax_token_parser.cpp -++++ b/src/parser/sax_token_parser.cpp -+@@ -9,6 +9,7 @@ -+ #include "orcus/tokens.hpp" -+ -+ #include <mdds/sorted_string_map.hpp> -++#include <cctype> -+ -+ namespace orcus { -+ -+-- -+2.17.1 -+ -diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk -index 32382b7d89a1..ffa0b38bea19 100644 ---- a/external/liborcus/ExternalPackage_liborcus.mk -+++ b/external/liborcus/ExternalPackage_liborcus.mk -@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus)) - $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus)) - - ifeq ($(OS),MACOSX) --$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.13.0.dylib,src/liborcus/.libs/liborcus-0.13.0.dylib)) --$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.13.0.dylib,src/parser/.libs/liborcus-parser-0.13.0.dylib)) -+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.0.dylib,src/liborcus/.libs/liborcus-0.14.0.dylib)) -+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.0.dylib,src/parser/.libs/liborcus-parser-0.14.0.dylib)) - else ifeq ($(DISABLE_DYNLOADING),) --$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.13.so.0,src/liborcus/.libs/liborcus-0.13.so.0.0.0)) --$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.13.so.0,src/parser/.libs/liborcus-parser-0.13.so.0.0.0)) -+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.so.0,src/liborcus/.libs/liborcus-0.14.so.0.0.0)) -+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.so.0,src/parser/.libs/liborcus-parser-0.14.so.0.0.0)) - endif - - # vim: set noet sw=4 ts=4: -diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk -index 928c78e3a267..1aa591228f40 100644 ---- a/external/liborcus/ExternalProject_liborcus.mk -+++ b/external/liborcus/ExternalProject_liborcus.mk -@@ -114,8 +114,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : - $(MAKE) \ - $(if $(filter MACOSX,$(OS)),\ - && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ -- $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.13.0.dylib \ -- $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.13.0.dylib \ -+ $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.14.0.dylib \ -+ $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.14.0.dylib \ - ) \ - ) - -diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk -index 6457ec4afc0c..1f026c425244 100644 ---- a/external/liborcus/Library_orcus.mk -+++ b/external/liborcus/Library_orcus.mk -@@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ - UnpackedTarball/liborcus/src/liborcus/detection_result \ - UnpackedTarball/liborcus/src/liborcus/dom_tree \ - UnpackedTarball/liborcus/src/liborcus/format_detection \ -+ UnpackedTarball/liborcus/src/liborcus/formula_result \ - UnpackedTarball/liborcus/src/liborcus/global \ - UnpackedTarball/liborcus/src/liborcus/gnumeric_cell_context \ - UnpackedTarball/liborcus/src/liborcus/gnumeric_context \ -@@ -96,6 +97,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ - UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \ - UnpackedTarball/liborcus/src/liborcus/orcus_xml \ - UnpackedTarball/liborcus/src/liborcus/session_context \ -+ UnpackedTarball/liborcus/src/liborcus/spreadsheet_iface_util \ - UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \ - UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \ - UnpackedTarball/liborcus/src/liborcus/string_helper \ -diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk -index 215bd4b8cc15..f637cc73db46 100644 ---- a/external/liborcus/UnpackedTarball_liborcus.mk -+++ b/external/liborcus/UnpackedTarball_liborcus.mk -@@ -19,5 +19,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ - external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \ - external/liborcus/rpath.patch.0 \ -+ external/liborcus/0001-Missing-header-for-std-tolower.patch \ - )) - - ifeq ($(OS),WNT) -diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx -index 028fb4126f01..dce0d5b0a64e 100644 ---- a/sc/source/filter/inc/orcusinterface.hxx -+++ b/sc/source/filter/inc/orcusinterface.hxx -@@ -54,6 +54,7 @@ public: - ScOrcusGlobalSettings(ScDocumentImport& rDoc); - - virtual void set_origin_date(int year, int month, int day) override; -+ virtual void set_character_set(orcus::character_set_t cs) override; - - virtual void set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t grammar) override; - virtual orcus::spreadsheet::formula_grammar_t get_default_formula_grammar() const override; -@@ -181,7 +182,7 @@ public: - - virtual ~ScOrcusAutoFilter() override; - -- virtual void set_range(const char* p_ref, size_t n_ref) override; -+ virtual void set_range(const orcus::spreadsheet::range_t& range) override; - - virtual void set_column(orcus::spreadsheet::col_t col) override; - -@@ -214,22 +215,95 @@ public: - virtual void set_merge_cell_range(const orcus::spreadsheet::range_t& range) override; - }; - -+class ScOrcusSheet; -+ -+class ScOrcusFormula : public orcus::spreadsheet::iface::import_formula -+{ -+ enum class ResultType { NotSet, String, Value, Empty }; -+ -+ friend class ScOrcusSheet; -+ -+ ScOrcusSheet& mrSheet; -+ -+ SCCOL mnCol; -+ SCROW mnRow; -+ OUString maFormula; -+ formula::FormulaGrammar::Grammar meGrammar; -+ size_t mnSharedFormulaIndex; -+ bool mbShared; -+ -+ ResultType meResType; -+ size_t mnResult; // result string index. -+ double mfResult; -+ -+ void reset(); -+ -+public: -+ ScOrcusFormula( ScOrcusSheet& rSheet ); -+ virtual ~ScOrcusFormula() override; -+ -+ virtual void set_position(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col) override; -+ virtual void set_formula(orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n) override; -+ virtual void set_shared_formula_index(size_t index) override; -+ virtual void set_result_value(double value) override; -+ virtual void set_result_string(size_t sindex) override; -+ virtual void set_result_empty() override; -+ virtual void set_result_bool(bool value) override; -+ virtual void commit() override; -+}; -+ -+class ScOrcusArrayFormula : public orcus::spreadsheet::iface::import_array_formula -+{ -+ friend class ScOrcusSheet; -+ -+ ScOrcusSheet& mrSheet; -+ -+ SCCOL mnCol; -+ SCROW mnRow; -+ uint32_t mnColRange; -+ uint32_t mnRowRange; -+ OUString maFormula; -+ formula::FormulaGrammar::Grammar meGrammar; -+ -+ void reset(); -+ -+public: -+ ScOrcusArrayFormula( ScOrcusSheet& rSheet ); -+ virtual ~ScOrcusArrayFormula() override; -+ -+ virtual void set_range(const orcus::spreadsheet::range_t& range) override; -+ virtual void set_formula(orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n) override; -+ virtual void set_result_value(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double value) override; -+ virtual void set_result_string(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) override; -+ virtual void set_result_empty(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col) override; -+ virtual void set_result_bool(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, bool value) override; -+ virtual void commit() override; -+}; -+ - class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet - { -+ friend class ScOrcusFormula; -+ friend class ScOrcusArrayFormula; -+ - ScDocumentImport& mrDoc; - SCTAB mnTab; - ScOrcusFactory& mrFactory; - ScOrcusStyles& mrStyles; - sc::SharedFormulaGroups maFormulaGroups; -+ - ScOrcusAutoFilter maAutoFilter; - ScOrcusSheetProperties maProperties; - ScOrcusConditionalFormat maConditionalFormat; - ScOrcusNamedExpression maNamedExpressions; -+ ScOrcusFormula maFormula; -+ ScOrcusArrayFormula maArrayFormula; - - int mnCellCount; - - void cellInserted(); - -+ ScDocumentImport& getDoc(); -+ - public: - ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& rFactory); - -@@ -238,6 +312,8 @@ public: - virtual orcus::spreadsheet::iface::import_sheet_properties* get_sheet_properties() override; - virtual orcus::spreadsheet::iface::import_conditional_format* get_conditional_format() override; - virtual orcus::spreadsheet::iface::import_named_expression* get_named_expression() override; -+ virtual orcus::spreadsheet::iface::import_formula* get_formula() override; -+ virtual orcus::spreadsheet::iface::import_array_formula* get_array_formula() override; - - // Orcus import interface - virtual void set_auto(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) override; -@@ -251,33 +327,13 @@ public: - virtual void set_format(orcus::spreadsheet::row_t row_start, orcus::spreadsheet::col_t col_start, - orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end, size_t xf_index) override; - -- virtual void set_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n) override; -- virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) override; -- virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double val) override; -- -- virtual void set_shared_formula( -- orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex, -- const char* p_formula, size_t n_formula) override; -- -- virtual void set_shared_formula( -- orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex, -- const char* p_formula, size_t n_formula, const char* p_range, size_t n_range) override; -- -- virtual void set_shared_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) override; -- -- virtual void set_array_formula( -- orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, -- const char* p, size_t n, orcus::spreadsheet::row_t array_rows, orcus::spreadsheet::col_t array_cols) override; -- -- virtual void set_array_formula( -- orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, -- const char* p, size_t n, const char* p_range, size_t n_range) override; -- - virtual orcus::spreadsheet::range_size_t get_sheet_size() const override; - - SCTAB getIndex() const { return mnTab; } - - const sc::SharedFormulaGroups& getSharedFormulaGroups() const; -+ sc::SharedFormulaGroups& getSharedFormulaGroups(); -+ ScOrcusFactory& getFactory(); - }; - - class ScOrcusStyles : public orcus::spreadsheet::iface::import_styles -@@ -312,7 +368,7 @@ private: - - struct fill - { -- OUString maPattern; -+ orcus::spreadsheet::fill_pattern_t mePattern; - Color maFgColor; - Color maBgColor; - -@@ -446,7 +502,7 @@ public: - // fill - - virtual void set_fill_count(size_t n) override; -- virtual void set_fill_pattern_type(const char* s, size_t n) override; -+ virtual void set_fill_pattern_type(orcus::spreadsheet::fill_pattern_t fp) override; - virtual void set_fill_fg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) override; - virtual void set_fill_bg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) override; - virtual size_t commit_fill() override; -@@ -580,6 +636,7 @@ public: - - size_t appendString(const OUString& rStr); - size_t addString(const OUString& rStr); -+ const OUString* getString(size_t nIndex) const; - - void pushCellStoreAutoToken( const ScAddress& rPos, const OUString& rVal ); - void pushCellStoreToken( const ScAddress& rPos, uint32_t nStrIndex ); -diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx -index dcf3e83d7eae..7b8425d3007d 100644 ---- a/sc/source/filter/orcus/interface.cxx -+++ b/sc/source/filter/orcus/interface.cxx -@@ -101,6 +101,11 @@ void ScOrcusGlobalSettings::set_origin_date(int year, int month, int day) - mrDoc.setOriginDate(year, month, day); - } - -+void ScOrcusGlobalSettings::set_character_set(orcus::character_set_t /*cs*/) -+{ -+ // TODO -+} -+ - void ScOrcusGlobalSettings::set_default_formula_grammar(os::formula_grammar_t grammar) - { - meCalcGrammar = getCalcGrammarFromOrcus(grammar); -@@ -463,6 +468,11 @@ size_t ScOrcusFactory::addString(const OUString& rStr) - return appendString(rStr); - } - -+const OUString* ScOrcusFactory::getString(size_t nIndex) const -+{ -+ return nIndex < maStrings.size() ? &maStrings[nIndex] : nullptr; -+} -+ - void ScOrcusFactory::pushCellStoreAutoToken( const ScAddress& rPos, const OUString& rVal ) - { - maCellStoreTokens.emplace_back(rPos, CellStoreToken::Type::Auto); -@@ -816,10 +826,197 @@ ScOrcusSheet::ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& r - maProperties(mnTab, mrDoc), - maConditionalFormat(mnTab, rDoc.getDoc()), - maNamedExpressions(rDoc, rFactory.getGlobalSettings(), nTab), -+ maFormula(*this), -+ maArrayFormula(*this), - mnCellCount(0) - { - } - -+void ScOrcusFormula::reset() -+{ -+ mnCol = -1; -+ mnRow = -1; -+ maFormula.clear(); -+ meGrammar = formula::FormulaGrammar::GRAM_UNSPECIFIED; -+ mnSharedFormulaIndex = 0; -+ mbShared = false; -+ meResType = ResultType::NotSet; -+ mnResult = 0; -+ mfResult = 0.0; -+} -+ -+ScOrcusFormula::ScOrcusFormula( ScOrcusSheet& rSheet ) : -+ mrSheet(rSheet), -+ mnCol(-1), -+ mnRow(-1), -+ meGrammar(formula::FormulaGrammar::GRAM_UNSPECIFIED), -+ mnSharedFormulaIndex(0), -+ mbShared(false), -+ meResType(ResultType::NotSet), -+ mnResult(0), -+ mfResult(0.0) {} -+ -+ScOrcusFormula::~ScOrcusFormula() {} -+ -+void ScOrcusFormula::set_position(os::row_t row, os::col_t col) -+{ -+ mnCol = col; -+ mnRow = row; -+} -+ -+void ScOrcusFormula::set_formula(os::formula_grammar_t grammar, const char* p, size_t n) -+{ -+ maFormula = OUString(p, n, RTL_TEXTENCODING_UTF8); -+ meGrammar = getCalcGrammarFromOrcus(grammar); -+} -+ -+void ScOrcusFormula::set_shared_formula_index(size_t index) -+{ -+ mnSharedFormulaIndex = index; -+ mbShared = true; -+} -+ -+void ScOrcusFormula::set_result_value(double value) -+{ -+ meResType = ResultType::Value; -+ mfResult = value; -+} -+ -+void ScOrcusFormula::set_result_string(size_t sindex) -+{ -+ meResType = ResultType::String; -+ mnResult = sindex; -+} -+ -+void ScOrcusFormula::set_result_empty() -+{ -+ meResType = ResultType::Empty; -+} -+ -+void ScOrcusFormula::set_result_bool(bool value) -+{ -+ meResType = ResultType::Value; -+ mfResult = value ? 1.0 : 0.0; -+} -+ -+void ScOrcusFormula::commit() -+{ -+ ScOrcusFactory& rFactory = mrSheet.getFactory(); -+ sc::SharedFormulaGroups& rGroups = mrSheet.getSharedFormulaGroups(); -+ ScAddress aPos(mnCol, mnRow, mrSheet.getIndex()); -+ -+ if (mbShared) -+ { -+ if (maFormula.isEmpty()) -+ { -+ // shared formula that references existing formula token. -+ const ScTokenArray* pArray = rGroups.get(mnSharedFormulaIndex); -+ if (!pArray) -+ return; -+ } -+ else -+ { -+ // topmost shared formula with new formula token. -+ -+ // Compile the formula expression into tokens. -+ ScCompiler aComp(&mrSheet.getDoc().getDoc(), aPos, meGrammar); -+ ScTokenArray* pArray = aComp.CompileString(maFormula); -+ if (!pArray) -+ // Tokenization failed. -+ return; -+ -+ rGroups.set(mnSharedFormulaIndex, pArray); -+ } -+ rFactory.pushSharedFormulaToken(aPos, mnSharedFormulaIndex); -+ } -+ else -+ { -+ // non-shared formula -+ rFactory.pushCellStoreToken(aPos, maFormula, meGrammar); -+ } -+ -+ switch (meResType) -+ { -+ case ResultType::String: -+ { -+ const OUString* pStr = rFactory.getString(mnResult); -+ if (pStr) -+ rFactory.pushFormulaResult(aPos, *pStr); -+ break; -+ } -+ case ResultType::Value: -+ rFactory.pushFormulaResult(aPos, mfResult); -+ break; -+ default: -+ ; -+ } -+ -+ mrSheet.cellInserted(); -+} -+ -+void ScOrcusArrayFormula::reset() -+{ -+ mnCol = -1; -+ mnRow = -1; -+ mnColRange = 0; -+ mnRowRange = 0; -+ -+ maFormula.clear(); -+ meGrammar = formula::FormulaGrammar::GRAM_UNSPECIFIED; -+} -+ -+ScOrcusArrayFormula::ScOrcusArrayFormula( ScOrcusSheet& rSheet ) : -+ mrSheet(rSheet), -+ mnCol(-1), -+ mnRow(-1), -+ mnColRange(0), -+ mnRowRange(0), -+ meGrammar(formula::FormulaGrammar::GRAM_UNSPECIFIED) {} -+ -+ScOrcusArrayFormula::~ScOrcusArrayFormula() {} -+ -+void ScOrcusArrayFormula::set_range(const os::range_t& range) -+{ -+ mnCol = range.first.column; -+ mnRow = range.first.row; -+ -+ mnColRange = range.last.column - range.first.column + 1; -+ mnRowRange = range.last.row - range.first.column + 1; -+} -+ -+void ScOrcusArrayFormula::set_formula(os::formula_grammar_t grammar, const char* p, size_t n) -+{ -+ meGrammar = getCalcGrammarFromOrcus(grammar); -+ maFormula = OUString(p, n, RTL_TEXTENCODING_UTF8); -+} -+ -+void ScOrcusArrayFormula::set_result_value(os::row_t /*row*/, os::col_t /*col*/, double /*value*/) -+{ -+ // TODO : implement result cache for matrix -+} -+ -+void ScOrcusArrayFormula::set_result_string(os::row_t /*row*/, os::col_t /*col*/, size_t /*sindex*/) -+{ -+ // TODO : implement result cache for matrix -+} -+ -+void ScOrcusArrayFormula::set_result_empty(os::row_t /*row*/, os::col_t /*col*/) -+{ -+ // TODO : implement result cache for matrix -+} -+ -+void ScOrcusArrayFormula::set_result_bool(os::row_t /*row*/, os::col_t /*col*/, bool /*value*/) -+{ -+ // TODO : implement result cache for matrix -+} -+ -+void ScOrcusArrayFormula::commit() -+{ -+ ScAddress aPos(mnCol, mnRow, mrSheet.getIndex()); -+ mrSheet.getFactory().pushMatrixFormulaToken(aPos, maFormula, meGrammar, mnRowRange, mnColRange); -+ mrSheet.cellInserted(); -+} -+ - void ScOrcusSheet::cellInserted() - { - ++mnCellCount; -@@ -830,6 +1027,11 @@ void ScOrcusSheet::cellInserted() - } - } - -+ScDocumentImport& ScOrcusSheet::getDoc() -+{ -+ return mrDoc; -+} -+ - os::iface::import_auto_filter* ScOrcusSheet::get_auto_filter() - { - return &maAutoFilter; -@@ -855,6 +1057,18 @@ os::iface::import_named_expression* ScOrcusSheet::get_named_expression() - return &maNamedExpressions; - } - -+os::iface::import_formula* ScOrcusSheet::get_formula() -+{ -+ maFormula.reset(); -+ return &maFormula; -+} -+ -+os::iface::import_array_formula* ScOrcusSheet::get_array_formula() -+{ -+ maArrayFormula.reset(); -+ return &maArrayFormula; -+} -+ - void ScOrcusSheet::set_auto(os::row_t row, os::col_t col, const char* p, size_t n) - { - OUString aVal(p, n, RTL_TEXTENCODING_UTF8); -@@ -921,83 +1135,6 @@ void ScOrcusSheet::set_format(os::row_t row_start, os::col_t col_start, - mrDoc.getDoc().ApplyPatternAreaTab(col_start, row_start, col_end, row_end, mnTab, aPattern); - } - --void ScOrcusSheet::set_formula( -- os::row_t row, os::col_t col, os::formula_grammar_t grammar, const char* p, size_t n) --{ -- OUString aFormula(p, n, RTL_TEXTENCODING_UTF8); -- mrFactory.pushCellStoreToken( -- ScAddress(col, row, mnTab), aFormula, getCalcGrammarFromOrcus(grammar)); -- cellInserted(); --} -- --void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, const char* p, size_t n) --{ -- OUString aResult( p, n, RTL_TEXTENCODING_UTF8); -- mrFactory.pushFormulaResult(ScAddress(col, row, mnTab), aResult); --} -- --void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, double val) --{ -- mrFactory.pushFormulaResult(ScAddress(col, row, mnTab), val); --} -- --void ScOrcusSheet::set_shared_formula( -- os::row_t row, os::col_t col, os::formula_grammar_t grammar, size_t sindex, -- const char* p_formula, size_t n_formula) --{ -- ScAddress aPos(col, row, mnTab); -- OUString aFormula(p_formula, n_formula, RTL_TEXTENCODING_UTF8); -- formula::FormulaGrammar::Grammar eGram = getCalcGrammarFromOrcus(grammar); -- -- // Compile the formula expression into tokens. -- ScCompiler aComp(&mrDoc.getDoc(), aPos, eGram); -- ScTokenArray* pArray = aComp.CompileString(aFormula); -- if (!pArray) -- // Tokenization failed. -- return; -- -- maFormulaGroups.set(sindex, pArray); -- -- mrFactory.pushSharedFormulaToken(aPos, sindex); -- cellInserted(); --} -- --void ScOrcusSheet::set_shared_formula( -- os::row_t row, os::col_t col, os::formula_grammar_t grammar, size_t sindex, -- const char* p_formula, size_t n_formula, const char* /*p_range*/, size_t /*n_range*/) --{ -- set_shared_formula(row, col, grammar, sindex, p_formula, n_formula); --} -- --void ScOrcusSheet::set_shared_formula(os::row_t row, os::col_t col, size_t sindex) --{ -- ScAddress aPos(col, row, mnTab); -- -- const ScTokenArray* pArray = maFormulaGroups.get(sindex); -- if (!pArray) -- return; -- -- mrFactory.pushSharedFormulaToken(aPos, sindex); -- cellInserted(); --} -- --void ScOrcusSheet::set_array_formula( -- os::row_t row, os::col_t col, os::formula_grammar_t grammar, -- const char* p, size_t n, os::row_t array_rows, os::col_t array_cols) --{ -- OUString aFormula(p, n, RTL_TEXTENCODING_UTF8); -- formula::FormulaGrammar::Grammar eGrammar = getCalcGrammarFromOrcus(grammar); -- -- ScAddress aPos(col, row, mnTab); -- mrFactory.pushMatrixFormulaToken(aPos, aFormula, eGrammar, array_rows, array_cols); --} -- --void ScOrcusSheet::set_array_formula( -- os::row_t /*row*/, os::col_t /*col*/, os::formula_grammar_t /*grammar*/, -- const char* /*p*/, size_t /*n*/, const char* /*p_range*/, size_t /*n_range*/) --{ --} -- - orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const - { - orcus::spreadsheet::range_size_t ret; -@@ -1012,6 +1149,16 @@ const sc::SharedFormulaGroups& ScOrcusSheet::getSharedFormulaGroups() const - return maFormulaGroups; - } - -+sc::SharedFormulaGroups& ScOrcusSheet::getSharedFormulaGroups() -+{ -+ return maFormulaGroups; -+} -+ -+ScOrcusFactory& ScOrcusSheet::getFactory() -+{ -+ return mrFactory; -+} -+ - ScOrcusSharedStrings::ScOrcusSharedStrings(ScOrcusFactory& rFactory) : - mrFactory(rFactory) {} - -@@ -1087,7 +1234,7 @@ ScOrcusStyles::font::font(): - } - - ScOrcusStyles::fill::fill(): -- maPattern(""), -+ mePattern(orcus::spreadsheet::fill_pattern_t::none), - maFgColor(COL_WHITE), - maBgColor(COL_WHITE), - mbHasFillAttr(false) -@@ -1143,13 +1290,13 @@ void ScOrcusStyles::font::applyToItemSet(SfxItemSet& rSet) const - - void ScOrcusStyles::fill::applyToItemSet(SfxItemSet& rSet) const - { -- if (maPattern.equalsIgnoreAsciiCase("none")) -+ if (mePattern == orcus::spreadsheet::fill_pattern_t::none) - { - SAL_INFO("sc.orcus.style", "no fill style"); - return; - } - -- if (maPattern.equalsIgnoreAsciiCase("solid")) -+ if (mePattern == orcus::spreadsheet::fill_pattern_t::solid) - rSet.Put(SvxBrushItem(maFgColor, ATTR_BACKGROUND)); - } - -@@ -1575,10 +1722,9 @@ void ScOrcusStyles::set_fill_count(size_t /*n*/) - // needed at all? - } - --void ScOrcusStyles::set_fill_pattern_type(const char* s, size_t n) -+void ScOrcusStyles::set_fill_pattern_type(orcus::spreadsheet::fill_pattern_t fp) - { -- maCurrentFill.maPattern = OUString(s, n, RTL_TEXTENCODING_UTF8); -- maCurrentFill.mbHasFillAttr = true; -+ maCurrentFill.mePattern = fp; - } - - void ScOrcusStyles::set_fill_fg_color( -@@ -1962,12 +2108,12 @@ ScOrcusAutoFilter::~ScOrcusAutoFilter() - { - } - --void ScOrcusAutoFilter::set_range(const char* p_ref, size_t n_ref) -+void ScOrcusAutoFilter::set_range(const orcus::spreadsheet::range_t& range) - { -- OUString aRange(p_ref, n_ref, RTL_TEXTENCODING_UTF8); -- SAL_INFO("sc.orcus.autofilter", "set_range: " << aRange); -- -- maRange.Parse(aRange); -+ maRange.aStart.SetRow(range.first.row); -+ maRange.aStart.SetCol(range.first.column); -+ maRange.aEnd.SetRow(range.last.row); -+ maRange.aEnd.SetCol(range.last.column); - } - - void ScOrcusAutoFilter::set_column(orcus::spreadsheet::col_t col) -diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx -index e47b862c2138..5494ddefc434 100644 ---- a/sc/source/filter/orcus/xmlcontext.cxx -+++ b/sc/source/filter/orcus/xmlcontext.cxx -@@ -24,6 +24,7 @@ - #include <orcus/orcus_xml.hpp> - #include <orcus/global.hpp> - #include <orcus/sax_parser_base.hpp> -+#include <orcus/stream.hpp> - - #include <com/sun/star/ucb/XCommandEnvironment.hpp> - #include <comphelper/processfactory.hxx> -@@ -289,7 +290,9 @@ void ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) - } - } - -- filter.read_file(path); -+ std::string content = orcus::load_file_content(path); -+ filter.read_stream(content.data(), content.size()); -+ - aFactory.finalize(); - } - catch (const std::exception&) --- -2.17.1 - diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index f02b184f47..14fd0f2042 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=LibreOffice SRCNAM=libreoffice -VERSION=${VERSION:-6.1.4.2} +VERSION=${VERSION:-6.2.8.2} SHORT_VERSION=${VERSION%.*.*} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,10 +70,6 @@ rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.xz cd $SRCNAM-$VERSION -# Required for updates to mdds, liborcus (needs autogen.sh) -patch -p1 < $CWD/0001-Update-mdds-to-1.4.1.patch -patch -p1 < $CWD/0001-Update-orcus-to-0.14.0.patch - if [ "$HAVE_SRCS_TARBALL" = "1" ]; then tar xvf $CWD/$SRCNAM-${VERSION}-srcs.tar.xz fi @@ -95,9 +91,9 @@ jval="$(echo $MAKEFLAGS |grep -o "\-j *[0-9]*" | grep -o "[0-9]*")" || true # If PARALLEL environment variable is set, use that to override everything. [ "${PARALLEL:-0}" != "0" ] && parallel="--with-parallelism=$PARALLEL" -JAVA=${JAVA:-openjdk} -if [ "$JAVA" = "openjdk" ]; then - . /etc/profile.d/openjdk.sh +JAVA=${JAVA:-openjdk7} +if [ "$JAVA" = "openjdk7" ]; then + . /etc/profile.d/openjdk7.sh use_java="--with-java=java" elif [ "$JAVA" = "openjdk8" ]; then . /etc/profile.d/openjdk8.sh @@ -137,11 +133,16 @@ if pkg-config --exists libpq ; then postgresql="--with-system-postgresql" ; else if pkg-config --exists libucpp ; then ucpp="--with-system-ucpp" ; else ucpp="" ; fi if test -e /usr/include/lpsolve ; then lpsolve="--with-system-lpsolve" ; else lpsolve="" ; fi if pkg-config --exists mdds-1.4 ; then mdds="--with-system-mdds" ; else mdds="" ; fi -if test -e /usr/include/mysql_connection.h ; then mysql="--with-system-mysql-cppconn" ; else mysql="" ; fi if pkg-config --exists mythes ; then mythes="--with-system-mythes" ; else mythes="" ; fi if test -x /usr/bin/odbc_config ; then odbc="--with-system-odbc" ; else odbc="" ; fi #if test -d /usr/lib${LIBDIRSUFFIX}/python3*/site-packages/lxml ; then lxml="--with-system-lxml" ; else lxml="" ; fi -if pkg-config --exists xmlsec1 ; then xmlsec="--with-system-xmlsec" ; else xmlsec="" ; fi +if pkg-config --exists xmlsec1 ; then + xmlsec="--with-system-xmlsec" +else + xmlsec="" + # Also ensure correct nspr implementation is used if building libreoffice supplied xmlsec + sed -i -e 's:openssl:openssl --with-mozilla-ver=/usr:' external/xmlsec/ExternalProject_xmlsec.mk +fi #if test -e /usr/share/ant/lib/rhino.jar ; then rhino="--with-system-rhino --with-rhino-jar=/usr/share/ant/lib/rhino.jar" ; else rhino="" ; fi if pkg-config --exists libvlc ; then vlc="--enable-vlc" ; else vlc="" ; fi # Building with vlc backend is marked as experimental so demand explicit indication via environment variable VLC to do it. @@ -163,7 +164,6 @@ extlanguagetool="--enable-ext-languagetool"; [ "${EXTLANGUAGETOOL:-no}" != "yes" extwikipub="--enable-ext-wiki-publisher"; [ "${EXTWIKIPUB:-no}" != "yes" ] && extwikipub="" extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] && extnlpsolver="" -extmariadb="--enable-ext-mariadb-connector"; [ "${EXTMARIADB:-yes}" != "yes" ] && extmariadb="" ./autogen.sh \ CFLAGS="$SLKCFLAGS" \ @@ -179,13 +179,11 @@ extmariadb="--enable-ext-mariadb-connector"; [ "${EXTMARIADB:-yes}" != "yes" ] --with-vendor="Just Another Slacker" \ --with-lang="$LOLANGS" \ --enable-release-build=yes \ - --enable-ext-mariadb-connector \ --enable-gio \ $extct2n \ $extnumbertext \ $extnlpsolver \ $extlanguagetool \ - $extmariadb \ $extwikipub \ $avahi \ $Python3 \ @@ -194,7 +192,6 @@ extmariadb="--enable-ext-mariadb-connector"; [ "${EXTMARIADB:-yes}" != "yes" ] $use_ccache \ $use_java \ $parallel \ - --with-alloc=system \ --with-tls="nss" \ --with-x \ --without-krb5 \ @@ -261,7 +258,6 @@ extmariadb="--enable-ext-mariadb-connector"; [ "${EXTMARIADB:-yes}" != "yes" ] $valgrind \ $ucpp \ $odbc \ - $mysql \ $xmlsec \ diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info index 1145e53b9a..fc9a4c48ec 100644 --- a/office/LibreOffice/LibreOffice.info +++ b/office/LibreOffice/LibreOffice.info @@ -1,12 +1,12 @@ PRGNAM="LibreOffice" -VERSION="6.1.4.2" -HOMEPAGE="http://libreoffice.org" -DOWNLOAD="http://download.documentfoundation.org/libreoffice/src/6.1.4/libreoffice-6.1.4.2.tar.xz \ - http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-6.1.4.2-srcs.tar.xz" -MD5SUM="f6e69df90d8d6de6dd223d5309f71caa \ - 6846dfc948724bb9c89b29b5fa4f34e5" +VERSION="6.2.8.2" +HOMEPAGE="https://www.libreoffice.org" +DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/6.2.8/libreoffice-6.2.8.2.tar.xz \ + http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-6.2.8.2-srcs.tar.xz" +MD5SUM="1438fdfae3076b8b1b1460054a318f0b \ + b5d5e57832056d8a5625b1d5dc3aa024" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3 openjdk apache-ant perl-Archive-Zip" +REQUIRES="python3 openjdk7 apache-ant perl-Archive-Zip" MAINTAINER="Christoph Willing" EMAIL="chris.willing@linux.com" diff --git a/office/LibreOffice/README b/office/LibreOffice/README index 1f868fb2aa..dc7ee5981e 100644 --- a/office/LibreOffice/README +++ b/office/LibreOffice/README @@ -20,7 +20,7 @@ internal versions. Packages from SBo that will be use in this way are: libexttextcat libfreehand libmspub libmwaw libnumbertext liborcus libpagemaker libqxp libnumbertext libstaroffice libtommath libwps libzmf lpsolve mythes postgresql qt5 valgrind ucpp unixODBC avahi - mysql-connector-c++ libetonyek xmlsec vlc + libetonyek xmlsec vlc Remember, these packages are not essential but entirely optional. If not found, LibreOffice will simply build its own internal versions. @@ -35,10 +35,10 @@ Build time environment variables that may be set to vary features are as follows VLC="yes" This requires the vlc package (available from SBo) to be installed. -3. disable kde4 support (enabled by default) with: +2. disable kde4 support (enabled by default) with: KDE4="no" -4. support additional languages by overriding the LOLANGS variable, whose +3. support additional languages by overriding the LOLANGS variable, whose default setting is LOLANGS="de es fr id it ja nl vi zh-CN". Note that en-US is always added to whatever LOLANGS is set. Thus building with, for example, LOLANGS="de" sh LibreOffice @@ -46,19 +46,19 @@ Build time environment variables that may be set to vary features are as follows Additionally, setting LOLANGS="ALL" will build in support for all available languages. -5. A number of Java Development Kits are suitable for building LibreOffice. - The default JDK for this SlackBuild is openjdk. Others may be chosen by +4. A number of Java Development Kits are suitable for building LibreOffice. + The default JDK for this SlackBuild is openjdk7. Others may be chosen by setting the JAVA environment variable when running the SlackBuild. Recognised - values are openjdk (the default, not explicitly required), openjdk8 and jdk + values are openjdk7 (the default, not explicitly required), openjdk8 and jdk e.g. JAVA=jdk (to use SBo jdk package with Oracle binary version). Using an alternate JDK will require presence of the appropriate package when building - LibreOffice. Since the apache-ant package is already required by openjdk, + LibreOffice. Since the apache-ant package is already required by openjdk7, hence openjdk8, its listing in the REQUIRES field is redundant in these cases. However it remains listed to accomodate the case of JAVA=jdk, in which the apache-ant package is needed to build LibreOffice. Finally, setting JAVA=no will build LibreOffice without any Java support. -6. The number of parallel make jobs used by the LibreOffice build system defaults +5. The number of parallel make jobs used by the LibreOffice build system defaults to the number of available cpu cores. If the MAKEFLAGS environment variable contains the -j option e.g. MAKEFLAGS=-j6 @@ -69,7 +69,7 @@ Build time environment variables that may be set to vary features are as follows which would limit building to a single make process, overriding any value set with the -j option in MAKEFLAGS. -7. Use of ccache during building is turned off by default to save disk space (and +6. Use of ccache during building is turned off by default to save disk space (and possible build failure due to lack of disk space). It may be reinstated by setting the USE_CCACHE environment to "yes" e.g. USE_CCACHE=yes sh LibreOffice.SlackBuild @@ -90,5 +90,11 @@ to locate and open the downloaded .oxt file. The new dictionary will now appear in the Extension Manager. Some people have experienced difficulties building LibreOffice while a previoius -version is still installed. It is therefore recommended that any previous version -is removed while building LibreOffice. +version is still installed. It is therefore recommended that any previous +version should be removed before building LibreOffice. As well as removing any +LibreOffice installation, it is important to also clear environment variables +that were set by the installation i.e. + /sbin/removepkg LibreOffice + unset UNO_PATH + unset URE_BOOTSTRAP + diff --git a/office/MasterPDFEditor/MasterPDFEditor.SlackBuild b/office/MasterPDFEditor/MasterPDFEditor.SlackBuild index 0c124d1dd7..2d391257f8 100644 --- a/office/MasterPDFEditor/MasterPDFEditor.SlackBuild +++ b/office/MasterPDFEditor/MasterPDFEditor.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for MasterPDFEditor -# Copyright 2014-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=MasterPDFEditor SRCNAM=master-pdf-editor -VERSION=${VERSION:-5.2.20} +VERSION=${VERSION:-5.7.53} MAJVER=${MAJVER:-5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -42,21 +42,13 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" - SOURCEARCH="i386" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" - SOURCEARCH="i386" -elif [ "$ARCH" = "x86_64" ]; then +if [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" - SOURCEARCH="qt4.amd64" + SOURCEARCH="-qt5.x86_64" else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" + echo "Architecture is not supported." + exit 1 fi set -e @@ -65,14 +57,16 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT $PKG/opt cd $TMP rm -rf $SRCNAM-$MAJVER -tar xvf $CWD/${SRCNAM}-${VERSION}_${SOURCEARCH}.tar.gz -chown -R root:root $SRCNAM-$MAJVER -find -L $SRCNAM-$MAJVER \ +tar xvf $CWD/${SRCNAM}-${VERSION}${SOURCEARCH}.tar.gz +cd $SRCNAM-$MAJVER +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 {} \; +cd .. mv $SRCNAM-$MAJVER $PKG/opt cd $PKG/opt/$SRCNAM-$MAJVER diff --git a/office/MasterPDFEditor/MasterPDFEditor.info b/office/MasterPDFEditor/MasterPDFEditor.info index c6d043e9c7..89126ec4b3 100644 --- a/office/MasterPDFEditor/MasterPDFEditor.info +++ b/office/MasterPDFEditor/MasterPDFEditor.info @@ -1,10 +1,10 @@ PRGNAM="MasterPDFEditor" -VERSION="5.2.20" +VERSION="5.7.53" HOMEPAGE="https://code-industry.net/" -DOWNLOAD="https://code-industry.net/public/master-pdf-editor-5.2.20_i386.tar.gz" -MD5SUM="90ffe92ca1b417e0a0d92f7111e69120" -DOWNLOAD_x86_64="https://code-industry.net/public/master-pdf-editor-5.2.20_qt4.amd64.tar.gz" -MD5SUM_x86_64="2d308904a2d8d473c01ed3cd90cda36a" -REQUIRES="" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://code-industry.net/public/master-pdf-editor-5.7.53-qt5.x86_64.tar.gz" +MD5SUM_x86_64="5847c43318812eaf198a1338cdee83b5" +REQUIRES="qt5" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/office/ProjectLibre/ProjectLibre.SlackBuild b/office/ProjectLibre/ProjectLibre.SlackBuild index 8c2a2e49fa..6ef68b9b5c 100644 --- a/office/ProjectLibre/ProjectLibre.SlackBuild +++ b/office/ProjectLibre/ProjectLibre.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # SlackBuild Script for ProjectLibre -# Copyright 2012-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2012-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ProjectLibre -VERSION=${VERSION:-1.8.0} +VERSION=${VERSION:-1.9.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/ProjectLibre/ProjectLibre.info b/office/ProjectLibre/ProjectLibre.info index 37493746bf..e29265ce12 100644 --- a/office/ProjectLibre/ProjectLibre.info +++ b/office/ProjectLibre/ProjectLibre.info @@ -1,8 +1,8 @@ PRGNAM="ProjectLibre" -VERSION="1.8.0" +VERSION="1.9.3" HOMEPAGE="https://sourceforge.net/projects/projectlibre/" -DOWNLOAD="https://downloads.sourceforge.net/projectlibre/projectlibre-1.8.0.tar.gz" -MD5SUM="57648aa0ce61dd52072534fd0983a8de" +DOWNLOAD="https://downloads.sourceforge.net/projectlibre/projectlibre-1.9.3.tar.gz" +MD5SUM="00ba2b6f674fbdf781b04830c8d8a973" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk" diff --git a/office/ProjectLibre/projectlibre-path.patch b/office/ProjectLibre/projectlibre-path.patch index 544fc7ee32..4731e29ae9 100644 --- a/office/ProjectLibre/projectlibre-path.patch +++ b/office/ProjectLibre/projectlibre-path.patch @@ -1,12 +1,11 @@ -diff -Nur projectlibre-1.5.6.orig/projectlibre.sh projectlibre-1.5.6/projectlibre.sh ---- projectlibre-1.5.6.orig/projectlibre.sh 2013-06-28 18:27:31.000000000 -0500 -+++ projectlibre-1.5.6/projectlibre.sh 2013-07-13 00:47:40.964375049 -0500 -@@ -64,7 +64,7 @@ +--- projectlibre-1.9.0/projectlibre.sh.orig 2019-03-20 20:27:04.056920691 +0700 ++++ projectlibre-1.9.0/projectlibre.sh 2019-03-20 20:27:29.407188487 +0700 +@@ -70,7 +70,7 @@ JAVA_EXE="java" JAVA_OPTS="-Xms128m -Xmx768m" - #OPENPROJ_HOME0="/usr/share/projectlibre" --OPENPROJ_HOME0=`(dirname $0)` -+OPENPROJ_HOME0="/opt/ProjectLibre" - OPENPROJ_HOME="$OPENPROJ_HOME0" + #PROJECTLIBRE_HOME0="/usr/share/projectlibre" +-PROJECTLIBRE_HOME0=`(dirname $0)` ++PROJECTLIBRE_HOME0="/opt/ProjectLibre" + PROJECTLIBRE_HOME="$PROJECTLIBRE_HOME0" LOG_LEVEL="DEBUG" LOG_FILE="/dev/null" diff --git a/office/ReText/ReText.info b/office/ReText/ReText.info index 453ef3cf3d..3dd43ad5fb 100644 --- a/office/ReText/ReText.info +++ b/office/ReText/ReText.info @@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/31/91/6eff0afd947ca945dd63bb4f MD5SUM="06a9ff30858db23ea170a2c028392adb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3 Markups python3-PyQt5 Markdown" +REQUIRES="python3 Markups python3-PyQt5 Markdown python-markdown-math" MAINTAINER="MDrights" EMAIL="psychi2009@gmail.com" diff --git a/office/SOGo/SOGo.SlackBuild b/office/SOGo/SOGo.SlackBuild index d0f5eda30a..b04c90351e 100644 --- a/office/SOGo/SOGo.SlackBuild +++ b/office/SOGo/SOGo.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for SOGo -# Copyright 2018 Chris Walker Kempner, TX +# Copyright 2018-2020 Chris Walker Kempner, TX # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=SOGo -VERSION=${VERSION:-4.0.4} +VERSION=${VERSION:-5.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -131,7 +131,7 @@ sed -e "s,/lib/GNUstep,/lib${LIBDIRSUFFIX}/GNUstep,g" \ # Install documentation mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COPYING.GPL COPYING.LGPL ChangeLog ChangeLog.old NEWS README.md \ + COPYING.GPL COPYING.LGPL ChangeLog ChangeLog.old README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/office/SOGo/SOGo.info b/office/SOGo/SOGo.info index 37cc50b949..257b204e19 100644 --- a/office/SOGo/SOGo.info +++ b/office/SOGo/SOGo.info @@ -1,16 +1,16 @@ PRGNAM="SOGo" -VERSION="4.0.4" +VERSION="5.0.1" HOMEPAGE="https://sogo.nu/" -DOWNLOAD="https://sogo.nu/files/downloads/SOGo/Sources/SOGo-4.0.4.tar.gz \ +DOWNLOAD="https://sogo.nu/files/downloads/SOGo/Sources/SOGo-5.0.1.tar.gz \ https://sogo.nu/files/docs/SOGoInstallationGuide.pdf \ https://sogo.nu/files/docs/SOGoMozillaThunderbirdConfigurationGuide.pdf \ https://sogo.nu/files/docs/SOGoOutlookConnectorConfigurationGuide.pdf" -MD5SUM="263db91097e925adbdb4baa0f58a7e39 \ - 2c347720dce97c8585357ef57c32f89e \ - ab3fdf33d9f8f1cb75191092ef7a94e1 \ - a95762278780ca3b9c05ee645bd4fc3d" +MD5SUM="f7112b11568d68d58b32fb4ba64a8bbc \ + 69977733e37855bd521fdec223d9a7b9 \ + b4af8941febedb25c124a4ff3244b1f7 \ + 29e7144dd129d344d16509b188487ffb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="SOPE libmemcached" +REQUIRES="SOPE libmemcached libsodium" MAINTAINER="Chris Walker" EMAIL="kris240376@gmail.com" diff --git a/office/Ted/README b/office/Ted/README index a7bbcdbbc2..da0d6ebebf 100644 --- a/office/Ted/README +++ b/office/Ted/README @@ -1,8 +1,12 @@ Ted is a lightweight Word-processor that uses the RTF-format. It supports -multiple fonts and can print to PostScript printers. Ted is simple to use, +multiple fonts and can print to PostScript printers. Ted is simple to use, is easily compiled. Additional packages with spellcheckers for different languages exist and can be downloaded from the Ted homepage. -Note: This application doesn't work with Windowmaker +While Ted builds with the GTK+ widgets by default, you can build Ted +with Motif widgets by passing WIDGET=motif variable to the script. This +will also make Ted work under Window Maker but you might experience +minor visual glitches in properties input boxes while inputting +non-ASCII strings, e.g. in the author field. diff --git a/office/Ted/Ted.SlackBuild b/office/Ted/Ted.SlackBuild index ac32207a2b..b603e4ca54 100644 --- a/office/Ted/Ted.SlackBuild +++ b/office/Ted/Ted.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh # Slackware build script for Ted +# Copyright 2019 GOSIKI Agiri <agiri@cocaine.ninja>. +# Previously written by Willy Sudiarto Raharjo <willysr@slackbuilds.org>. # Originally written by Hannes Worst <hannesworst@gmail.com>. -# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All right reserved # # Redistribution and use of this script, with or without modification, is @@ -24,7 +25,7 @@ PRGNAM=Ted VERSION=${VERSION:-2.23} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -77,9 +78,17 @@ sed \ -e "/^M_ARCH/s|=.*|=$ARCH|" \ -i tedPackage/configure +# select appropriate widget set +WIDGET=${WIDGET:-gtk} +case $WIDGET in + gtk) widgetopt=GTK;; + motif) widgetopt=MOTIF;; + *) echo "Wrong widget set selected, choose gtk or motif only!"; exit 1;; +esac + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -make -j1 +make -j1 CONFIGURE_OPTIONS="--with-$widgetopt" make -j1 package find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/office/Ted/Ted.info b/office/Ted/Ted.info index df3ecf27ad..988d36ed0c 100644 --- a/office/Ted/Ted.info +++ b/office/Ted/Ted.info @@ -6,5 +6,5 @@ MD5SUM="4199df0deb82a90450135ec3f2b7d915" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libpaper" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" +MAINTAINER="GOSIKI Agiri" +EMAIL="agiri@cocaine.ninja" diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild index 77fdffe278..15aea248f5 100644 --- a/office/abiword/abiword.SlackBuild +++ b/office/abiword/abiword.SlackBuild @@ -26,11 +26,14 @@ # work correctly on Slackware # Now maintained by Robby Workman <rworkman@slackbuilds.org> +# 20200622 bkw: updated for v3.0.4, which fixes the flickering issue. +# abiword-docs hasn't seen a new release, we're still on 3.0.2 there. + PRGNAM=abiword -VERSION=${VERSION:-3.0.2} -DOCSVER=$VERSION # version of abiword-docs +VERSION=${VERSION:-3.0.4} +DOCSVER=3.0.2 # version of abiword-docs DOCTAR=3.0.1 # sigh, the tarball contains abiword-docs-3.0.1 still -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -77,8 +80,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# https://bugs.archlinux.org/task/46659 -patch -p1 < $CWD/bug13815.patch +# 20200622 bkw: don't let abiword create /root/.config/abiword/profile +# during the build process. Don't break ccache in the process. +mkdir -p tmphome +export CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache} +export HOME=$( pwd )/tmphome CPPFLAGS="-I$TMP/$PRGNAM-$VERSION" \ CFLAGS="$SLKCFLAGS" \ @@ -98,7 +104,7 @@ CXXFLAGS="$SLKCFLAGS -std=c++11" \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG +make install-strip DESTDIR=$PKG # Now install the separate abiword-docs cd abiword-docs-$DOCTAR @@ -118,16 +124,13 @@ cd abiword-docs-$DOCTAR make install DESTDIR=$PKG cd .. -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# 20200622 bkw: Skip useless docs. NEWS and ChangeLog are 0-byte placeholders, +# INSTALL is generic GNU confgure instructions. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - *.txt *.TXT AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.txt *.TXT AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/abiword/abiword.info b/office/abiword/abiword.info index 45f7615d73..bd7961e57c 100644 --- a/office/abiword/abiword.info +++ b/office/abiword/abiword.info @@ -1,9 +1,9 @@ PRGNAM="abiword" -VERSION="3.0.2" +VERSION="3.0.4" HOMEPAGE="http://www.abisource.com" -DOWNLOAD="http://abisource.com/downloads/abiword/3.0.2/source/abiword-3.0.2.tar.gz \ +DOWNLOAD="http://abisource.com/downloads/abiword/3.0.4/source/abiword-3.0.4.tar.gz \ http://abisource.com/downloads/abiword/3.0.2/source/abiword-docs-3.0.2.tar.gz" -MD5SUM="cda6dd58c747c133b421cc7eb18f5796 \ +MD5SUM="04e31887049a8c72297881bc153b77c4 \ c92c0e1e2081db20757231a53d80c338" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/office/adobe-reader/README b/office/adobe-reader/README index 95d9d1bb3f..802506346f 100644 --- a/office/adobe-reader/README +++ b/office/adobe-reader/README @@ -3,4 +3,13 @@ in "Slackware style" for easier system maintenance. xulrunner is an optional dependency (for the browser plugin). -This only works on the x86 architecture (no x86_64, arm, ...). +This only works on the x86 architecture (no x86_64, arm, ...), although +it may work on x86_64 systems with alienBOB's multilib installed. + +Note: The package will have the 3-letter language code in +the version number. The default language is "enu" (for US +English). E.g. for VERSION=9.5.5, the package will be called +adobe-reader-9.5.5_enu-i486-1_SBo.tgz by default. To use a different +language, first download the .tgz file for that language from Adobe's +site, then set ADOBE_LANG="xxx" in the environment, where "xxx" is the +3-letter language code and run the SlackBuild. diff --git a/office/aiksaurus/aiksaurus.SlackBuild b/office/aiksaurus/aiksaurus.SlackBuild index 1b6be843a0..d5b2bceb4c 100644 --- a/office/aiksaurus/aiksaurus.SlackBuild +++ b/office/aiksaurus/aiksaurus.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for aiksaurus -# Copyright 2009 David Woodfall <dave@unrealize.co.uk> +# Copyright 2009 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/office/aiksaurus/aiksaurus.info b/office/aiksaurus/aiksaurus.info index dd82a4a279..cb0290828d 100644 --- a/office/aiksaurus/aiksaurus.info +++ b/office/aiksaurus/aiksaurus.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/office/anorack/README b/office/anorack/README index 0f2124c1a3..20c4d5f4bd 100644 --- a/office/anorack/README +++ b/office/anorack/README @@ -1,9 +1,9 @@ The English language has two indefinite articles: a: used before words that begin with a consonant sound (e.g., a - program, a host, a user); - an: used before words that begin with a vowel sound (e.g., an - example, an hour, an undefined variable). + program, a host, a user); + an: used before words that begin with a vowel sound (e.g., an example, + an hour, an undefined variable). anorack is a specialized spell-checker that finds incorrect indefinite articles. diff --git a/office/anorack/anorack.SlackBuild b/office/anorack/anorack.SlackBuild index 86e4e1888e..fc2d4bb0d7 100644 --- a/office/anorack/anorack.SlackBuild +++ b/office/anorack/anorack.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for anorack -# Copyright 2018 Donald Cooley South Haven, Indiana USA +# Copyright 2018-2020 Donald Cooley, South Haven, Indiana, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=anorack -VERSION=${VERSION:-0.2.4} +VERSION=${VERSION:-0.2.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/anorack/anorack.info b/office/anorack/anorack.info index 7738daefbc..8f4af25894 100644 --- a/office/anorack/anorack.info +++ b/office/anorack/anorack.info @@ -1,8 +1,8 @@ PRGNAM="anorack" -VERSION="0.2.4" -HOMEPAGE="http://jwilk.net/software/anorack" -DOWNLOAD="https://github.com/jwilk/anorack/releases/download/0.2.4/anorack-0.2.4.tar.gz" -MD5SUM="c06e97e952f8837a61a4f3bce0c1f0cf" +VERSION="0.2.7" +HOMEPAGE="https://jwilk.net/software/anorack" +DOWNLOAD="https://github.com/jwilk/anorack/releases/download/0.2.7/anorack-0.2.7.tar.gz" +MD5SUM="a1220ec4e4f50cc249813b42b89d105c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3 espeak" diff --git a/office/aspell6-es/README b/office/aspell6-es/README deleted file mode 100644 index 5ab9815f7c..0000000000 --- a/office/aspell6-es/README +++ /dev/null @@ -1,14 +0,0 @@ -aspell6-es (Spanish language files for aspell) - -Spanish language files for aspell version >=0.60.6. - -The COES Spanish Language Tools are a research field of the -Departamento de Arquitectura y Tecnología de Sistemas Informáticos -(DATSI) of the Universidad Politécnica de Madrid (UPM) and the -Departamento de Informática of the Universidad CarlosIII de Madrid. - -The main task of this research is to to develop an extensive set of -Spanish grammatical rules and to apply them to test correctness on -documents written in Spanish. To enhance distribution, COES is -integrated with the ispell tool. COES is being distributed for free -since the end of 1994. diff --git a/office/aspell6-es/aspell6-es.info b/office/aspell6-es/aspell6-es.info deleted file mode 100644 index 382e930ad2..0000000000 --- a/office/aspell6-es/aspell6-es.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="aspell6-es" -VERSION="1.11_2" -HOMEPAGE="http://www.datsi.fi.upm.es/~coes/coes.html" -DOWNLOAD="http://www.datsi.fi.upm.es/~coes/aspell6-es-1.11-2.tar.bz2" -MD5SUM="8406336a89c64e47e96f4153d0af70c4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David O'Shaughnessy" -EMAIL="dev@osh.id.au" diff --git a/office/aspell6-es/slack-desc b/office/aspell6-es/slack-desc deleted file mode 100644 index e4f5788792..0000000000 --- a/office/aspell6-es/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -aspell6-es: aspell6-es (Spanish language files for aspell) -aspell6-es: -aspell6-es: Spanish language files for aspell version >=0.60.6. -aspell6-es: -aspell6-es: The COES Spanish Language Tools are a research field of the -aspell6-es: Departamento de Arquitectura y Tecnología de Sistemas Informáticos -aspell6-es: (DATSI) of the Universidad Politécnica de Madrid (UPM) and the -aspell6-es: Departamento de Informática of the Universidad CarlosIII de Madrid. -aspell6-es: -aspell6-es: (http://www.datsi.fi.upm.es/~coes/coes.html) -aspell6-es: diff --git a/office/bibtex2html/bibtex2html.SlackBuild b/office/bibtex2html/bibtex2html.SlackBuild index 86b38c06fc..61fb63b6d4 100644 --- a/office/bibtex2html/bibtex2html.SlackBuild +++ b/office/bibtex2html/bibtex2html.SlackBuild @@ -82,10 +82,12 @@ CXXFLAGS="$SLKCFLAGS" \ # so we need to patch this to be based in ${prefix}, as for `BINDIR`. sed -i 's/MANDIR = \/usr\/man/MANDIR = ${prefix}\/man/' Makefile +###sbolint off # Compile the application and install it into the $PKG directory. As # the Makefile does not support `DESTDIR`, in this case we need to use # `prefix`. Only `/usr/bin` and `/usr/man` are installed, so it is # enough to specify `$PKG/usr`. +###sbolint on make make install prefix=$PKG/usr diff --git a/office/calcurse/README b/office/calcurse/README index 0332ff35b4..be95ad316f 100644 --- a/office/calcurse/README +++ b/office/calcurse/README @@ -1,6 +1,9 @@ -calcurse is a calendar and scheduling application for the command line. It -helps keep track of events, appointments and everyday tasks. A configurable -notification system reminds user of upcoming deadlines, the curses based -interface can be customized to suit user needs and a very powerful set of -command line options can be used to filter and format appointments, making -it suitable for use in scripts. +Calcurse is a calendar and scheduling application for the command line. +It helps keep track of events, appointments and everyday tasks. A +configurable notification system reminds user of upcoming deadlines, the +curses based interface can be customized to suit user needs and a very +powerful set of command line options can be used to filter and format +appointments, making it suitable for use in scripts. + +There is an optional dependency on httplib2 if you want to use the +calcurse-caldav utility. diff --git a/office/calcurse/calcurse.SlackBuild b/office/calcurse/calcurse.SlackBuild index 84a4bb13ec..41c8d29ce6 100644 --- a/office/calcurse/calcurse.SlackBuild +++ b/office/calcurse/calcurse.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for calcurse -# Copyright 2018 Dave Woodfall <dave@dawoodfall.net> +# Copyright 2018 Dave Woodfall <dave@slackbuilds.org> # Copyright 2017 Frédéric Galusik, Lyon, France # Copyright 2007-2011 Michiel van Wessem, Manchester, United Kingdom # All rights reserved. @@ -27,7 +27,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=calcurse -VERSION=${VERSION:-4.3.0} +VERSION=${VERSION:-4.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/calcurse/calcurse.info b/office/calcurse/calcurse.info index 89e4f975ac..d3a8a11736 100644 --- a/office/calcurse/calcurse.info +++ b/office/calcurse/calcurse.info @@ -1,10 +1,10 @@ PRGNAM="calcurse" -VERSION="4.3.0" +VERSION="4.7.1" HOMEPAGE="http://calcurse.org/" -DOWNLOAD="https://calcurse.org/files/calcurse-4.3.0.tar.gz" -MD5SUM="1a16b7bdf948529856df14a240c79f71" +DOWNLOAD="https://calcurse.org/files/calcurse-4.7.1.tar.gz" +MD5SUM="1645068d2a15da6c773f231a1441a760" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dave Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/office/calibre-bin/README b/office/calibre-bin/README new file mode 100644 index 0000000000..6266cbab06 --- /dev/null +++ b/office/calibre-bin/README @@ -0,0 +1,7 @@ +Calibre is a powerful and easy to use e-book manager. It allows to do +nearly everything and it takes things a step beyond normal e-book +software. It's also completely free and open source and great for both +casual users and computer experts. + +This script repackage the official binary tarball that includes all its +dependencies. diff --git a/office/pdfstudio11/pdfstudio11.SlackBuild b/office/calibre-bin/calibre-bin.SlackBuild index ad45025c3c..def2d94619 100644 --- a/office/pdfstudio11/pdfstudio11.SlackBuild +++ b/office/calibre-bin/calibre-bin.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for pdfstudio11 +# Slackware build script for calibre-bin -# Copyright 2017, Alexander Verbovetsky, Moscow, Russia +# Copyright 2019-2021, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,24 +22,18 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=pdfstudio11 -VERSION=${VERSION:-11.0.7} +PRGNAM=calibre-bin +VERSION=${VERSION:-5.15.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac + ARCH="$( uname -m )" fi case "$ARCH" in - i?86) DEBARCH="" ;; - x86_64) DEBARCH=64 ;; - *) printf "\n$ARCH is unsupported for the PDF Studio.\n\n" - exit 1 ;; + i?86) ARCH=i686 ;; + arm*) ARCH=arm ;; esac CWD=$(pwd) @@ -52,29 +46,22 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $PKG -ar p $CWD/PDFStudio_v${VERSION//./_}_linux${DEBARCH}.deb data.tar.gz | tar xvz -mkdir -p usr/bin -ln -s /opt/pdfstudio11/pdfstudio11 usr/bin/pdfstudio -mkdir -p usr/share/applications -cp $CWD/$PRGNAM.desktop usr/share/applications/ -mkdir -p usr/doc/$PRGNAM-$VERSION -cp $CWD/pdfstudio11_userguide.pdf usr/doc/$PRGNAM-$VERSION/ +mkdir -p opt/calibre usr/bin \ + usr/share/{desktop-directories,applications,metainfo,mime/packages,icons/hicolor,zsh/site-functions} +tar xvf $CWD/${PRGNAM%-bin}-$VERSION-$ARCH.txz -C opt/calibre +XDG_DATA_DIRS=$PKG/usr/share XDG_CONFIG_HOME=$PKG/root/.config opt/calibre/calibre_postinstall --root=$PKG/usr +rmdir -p root/.config +shopt -s extglob +rm -r usr/share/{desktop-directories,mime/!(packages)} +shopt -u extglob +rm -f usr/share/applications/mimeinfo.cache -if [ "${OWNJAVA:-no}" = "yes" ]; then - cd opt/pdfstudio11/jre - for pack_file in lib/*.jar.pack; do - jar_file=`echo "$pack_file" | awk '{ print substr($0,1,length-5) }'` - bin/unpack200 -r "$pack_file" "$jar_file" - done - for pack_file in lib/ext/*.jar.pack; do - jar_file=`echo "$pack_file" | awk '{ print substr($0,1,length-5) }'` - bin/unpack200 -r "$pack_file" "$jar_file" - done - bin/java -Xshare:dump &>/dev/null - cd $PKG -else - rm -rf opt/pdfstudio11/jre -fi +cd usr/bin +for f in $(find . -maxdepth 1 -type l); do + ln -sf "/opt/calibre/${f:2}" . +done +rm calibre-uninstall +cd ../.. chown -R root:root . find -L . \ @@ -82,12 +69,11 @@ find -L . \ -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 {} \; -chmod 0755 $PKG -for f in additionalcopyrights.html license.html; do - unzip -p opt/pdfstudio11/lib/pdfstudio.jar \ - resources/$f > usr/doc/$PRGNAM-$VERSION/$f -done +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p install diff --git a/office/calibre-bin/calibre-bin.info b/office/calibre-bin/calibre-bin.info new file mode 100644 index 0000000000..66002b3a25 --- /dev/null +++ b/office/calibre-bin/calibre-bin.info @@ -0,0 +1,10 @@ +PRGNAM="calibre-bin" +VERSION="5.15.0" +HOMEPAGE="https://calibre-ebook.com" +DOWNLOAD="https://download.calibre-ebook.com/5.15.0/calibre-5.15.0-i686.txz" +MD5SUM="66fd3a67515ea40d67267bea163ad929" +DOWNLOAD_x86_64="https://download.calibre-ebook.com/5.15.0/calibre-5.15.0-x86_64.txz" +MD5SUM_x86_64="2d0a5e8c350537f79efda07610c089fc" +REQUIRES="libxkbcommon" +MAINTAINER="Alexander Verbovetsky" +EMAIL="alik@ejik.org" diff --git a/office/calibre-bin/doinst.sh b/office/calibre-bin/doinst.sh new file mode 100644 index 0000000000..aea0f894eb --- /dev/null +++ b/office/calibre-bin/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/office/calibre-bin/slack-desc b/office/calibre-bin/slack-desc new file mode 100644 index 0000000000..5cb50ffed1 --- /dev/null +++ b/office/calibre-bin/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +calibre-bin: calibre-bin (Ebook manager) +calibre-bin: +calibre-bin: Calibre is a powerful and easy to use e-book manager. It allows to do +calibre-bin: nearly everything and it takes things a step beyond normal e-book +calibre-bin: software. It's also completely free and open source and great for both +calibre-bin: casual users and computer experts. +calibre-bin: +calibre-bin: This is a repackaging of the official binary tarball that includes all +calibre-bin: its dependencies. +calibre-bin: +calibre-bin: Homepage: https://calibre-ebook.com diff --git a/office/coolreader/README b/office/coolreader/README index 1eb527ec91..ca7de57c79 100644 --- a/office/coolreader/README +++ b/office/coolreader/README @@ -1 +1,18 @@ +coolreader (e-book reader) + CoolReader is an e-book reader for various platforms. + +Supported file formats include plain text, HTML, RTF, Microsoft Word +(.doc), Palm Pilot (.prc, .pdb, .pml, .mobi), FB2, and EPUB. + +Optional dependencies: The default user interface is Qt4, which +doesn't require anything extra. If you prefer Qt5 or wxWidgets: + +qt5 - install qt5, then run: GUI=qt5 ./coolreader.SlackBuild + +wx - install wxPython or wxGTK3 (last one installed 'wins'), then run: + GUI=wx ./coolreader.SlackBuild + +Note: coolreader is "chatty": it logs a lot of meaningless warnings +and errors to stderr. Unless there's an actual problem with the +application, you can ignore this stuff. diff --git a/office/coolreader/coolreader.SlackBuild b/office/coolreader/coolreader.SlackBuild index d4cd5b4820..4464360dad 100644 --- a/office/coolreader/coolreader.SlackBuild +++ b/office/coolreader/coolreader.SlackBuild @@ -2,7 +2,8 @@ # Slackware build script for CoolReader -# Copyright 2011-2012 Fridrich von Stauffenberg <cancellor2@gmail.com> +# Copyright 2011-2012 Fridrich von Stauffenberg <email removed> +# Copyright 2020 B. Watson <yalhcru@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,19 +23,37 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20210222 bkw: update for v3.2.54. Upstream no longer ships libunibreak +# and fribidi source, so add them to DOWNLOAD. Replace qt4_settings_ui.diff +# with a more robust sed command. Add -fpermissive. Sigh. + +# 20201102 bkw: +# - update for v3.2.50. +# - embiggen the default window size. +# - make standard (since the 1980s!) keyboard accelerators work +# (alt-f for file menu, alt-v for view, etc), in the qt4/5 UIs. + +# 20201019 bkw: +# - update for v3.2.49, new homepage. +# - allow for building qt4, qt5, wx UIs. +# - replace useless/inaccurate man page with our own. + +# 20200126 bkw, BUILD=2: +# - take over maintenance +# - i486 => i586 +# - make .desktop file validate +# - fix documetn => document typo +# - add supported filetypes to README and slack-desc +# - save/load settings (.ini file) to ~/.cr3, not /usr/share/cr3. + PRGNAM=coolreader -VERSION=${VERSION:-3.0.56} +VERSION=${VERSION:-3.2.54} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -ORIG_PRGNAM=cr3 -ORIG_VERSION=$VERSION-7 -ORIG_DIRNAME=cr$ORIG_VERSION -ORIG_FILENAME=${ORIG_PRGNAM}_$VERSION.orig.tar.gz - if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -45,8 +64,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" @@ -61,44 +80,119 @@ fi set -e +FBDVER=${FBDVER:-1.0.10} +LUBVER=${LUBVER:-4.3} + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $ORIG_DIRNAME -tar xvf $CWD/$ORIG_FILENAME -cd $ORIG_DIRNAME -chown -R root:root . +rm -rf $PRGNAM-cr$VERSION +tar xvf $CWD/$PRGNAM-cr$VERSION.tar.gz +cd $PRGNAM-cr$VERSION +( cd thirdparty + tar xvf $CWD/fribidi-$FBDVER.tar.xz + tar xvf $CWD/libunibreak-$LUBVER.tar.gz ) +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# Apply coolreader-specific patches to thirdparty libs. +( cd thirdparty/fribidi-$FBDVER + for i in ../../thirdparty_repo/patches/fribidi/*.patch; do + patch -p1 < $i + done ) + +( cd thirdparty/libunibreak-$LUBVER + for i in ../../thirdparty_repo/patches/libunibreak/*.patch; do + patch -p1 < $i + done ) + +# FFS, it's 2020, we don't need GUI apps hardcoded to start at +# 640x400 window size. Honestly we don't need them hardcoded at +# all, but since that's what coolreader does, pick a size that's +# bigger than a 3x5" index card on a modern screen... +sed -i 's,\(<height>\)400,\11024,' cr3qt/src/mainwindow.ui +sed -i 's,\(<width>\)600,\11280,' cr3qt/src/mainwindow.ui + +# Use bundled libunibreak, ours is too old (3.0). +# Use bundled fribidi, Pat's is too old (0.19.7). +sed -i -e '/find_package(libunibreak)/d' \ + -e '/find_package(FriBidi)/d' \ + CMakeLists.txt + +# Install the docs in the right place for Slackware. +sed -i "s,share/doc/cr3,doc/$PRGNAM-$VERSION," cr3qt/CMakeLists.txt + +# The settings sed for qt4 was made by loading cr3qt/src/settings.ui +# into Qt Designer and saving it again. Needed because upstream's +# using a different (older?) version of qt4. + +GUI=${GUI:-QT} +GUI="$( echo $GUI | tr a-z A-Z )" +case "$GUI" in + QT) UI=Qt4 + sed -i '/<property name="currentText"/s,>, stdset="0">,' cr3qt/src/settings.ui + ;; + QT5) UI=Qt5 ;; + WX) # Either 2.8.x or 3.0.x works, be specific in the slack-desc. + UI="wxWidgets $( wx-config --version | cut -d. -f1,2)" ;; + *) echo "*** Unsupported GUI '$GUI', use one of: QT QT5 WX" + exit 1 ;; +esac + +# 20201103 bkw: Alt+F for the File menu, Alt+V for View, etc. This +# has been a UI standard since before Windows 1.0 (MS-DOS apps had it), +# and I'm not sure why upstream didn't include it. Only affects the +# Qt4/5 UIs. +sed -i 's,>\(File\|View\|Navigation\|Help\)<,>\&\1<,' \ + cr3qt/src/mainwindow.ui + +# This is undocumented and exists purely for my own use. It gets rid +# of the "Escape = minimize" keystroke, because I keep expecting Escape +# to exit (like 3 or 4 other document readers I use regularly). +# Only affects the Qt4/5 UIs. +if [ "${NO_ESCAPE:-no}" = "yes" ]; then + echo "=== Activating super-secret Urchlay mode" + echo -e 'g/>Esc<\n-1,+1d\nw\nq' | ed cr3qt/src/mainwindow.ui +fi + +echo "=== Building $UI GUI" mkdir -p build cd build -cmake \ - -D CMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -D CMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D LIB_SUFFIX=${LIBDIRSUFFIX} \ - -D CMAKE_BUILD_TYPE=Release \ - -D MAX_IMAGE_SCALE_MUL=2 \ - -D DOC_DATA_COMPRESSION_LEVEL=3 \ - -D DOC_BUFFER_SIZE=0x1400000 \ - -D GUI=QT .. -make VERBOSE=1 -make install DESTDIR=$PKG + cmake \ + -D USE_UNRAR=1 \ + -D CMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -D CMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D LIB_SUFFIX=${LIBDIRSUFFIX} \ + -D CMAKE_BUILD_TYPE=Release \ + -D MAX_IMAGE_SCALE_MUL=2 \ + -D DOC_DATA_COMPRESSION_LEVEL=3 \ + -D DOC_BUFFER_SIZE=0x1400000 \ + -D GUI=$GUI .. + make VERBOSE=1 + make install/strip DESTDIR=$PKG cd .. -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ - grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/man -mv $PKG/usr/share/man/* $PKG/usr/man +# Upstream's man page doesn't document all the options, and incorrectly +# refers to the (nonexistent) info page. It's also hardcoded to install +# to /usr/share/man. rm -rf $PKG/usr/share/man +mkdir -p $PKG/usr/man/man1 +gzip -9c < $CWD/cr3.1 > $PKG/usr/man/man1/cr3.1.gz + +# Tired of having to remember the binary's called something other than +# the package and source name. +ln -s cr3 $PKG/usr/bin/$PRGNAM +ln -s cr3.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz +# This dir already exists with GUI=QT or QT5, but not WX. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/doc/$ORIG_PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share/doc +cp -a README.md cr3gui/COPYING $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc +sed "s,@UI@,$UI," $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG diff --git a/office/coolreader/coolreader.info b/office/coolreader/coolreader.info index c5b6d8c40f..975d7c9aee 100644 --- a/office/coolreader/coolreader.info +++ b/office/coolreader/coolreader.info @@ -1,10 +1,14 @@ PRGNAM="coolreader" -VERSION="3.0.56" -HOMEPAGE="https://sourceforge.net/projects/crengine/" -DOWNLOAD="https://downloads.sourceforge.net/crengine/CoolReader3/cr3_3.0.56.orig.tar.gz" -MD5SUM="cc221a608a1b5fea2db5a519c14eeb39" +VERSION="3.2.54" +HOMEPAGE="https://github.com/buggins/coolreader" +DOWNLOAD="https://github.com/buggins/coolreader/archive/cr3.2.54/coolreader-cr3.2.54.tar.gz \ + https://github.com/adah1972/libunibreak/releases/download/libunibreak_4_3/libunibreak-4.3.tar.gz \ + https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz" +MD5SUM="b1c15673c84f3171fa9a2c471bb0b54e \ + f0c4488fad8dc92a11f4523d22c099d3 \ + 97c87da9930e8e70fbfc8e2bcd031554" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere.com" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/office/coolreader/cr3.1 b/office/coolreader/cr3.1 new file mode 100644 index 0000000000..fda4cb2375 --- /dev/null +++ b/office/coolreader/cr3.1 @@ -0,0 +1,85 @@ +.\" Man page generated from reStructuredText. +. +.TH CR3 1 "2020-10-19" "3.2.49" "SlackBuilds.org" +.SH NAME +cr3 \- coolreader (e-book reader) +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.\" RST source for cr3(1) man page. Convert with: +. +.\" rst2man.py cr3.rst > cr3.1 +. +.\" rst2man.py comes from the SBo development/docutils package. +. +.SH SYNOPSIS +.sp +cr3 [\fI\-options\fP] [filename] +.SH DESCRIPTION +.sp +CoolReader is an e\-book reader for various platforms. +.sp +Supported file formats include plain text, HTML, RTF, Microsoft Word +(.doc), Palm Pilot (.prc, .pdb, .pml, .mobi), FB2, and EPUB. +.SH OPTIONS +.INDENT 0.0 +.TP +.B \-\-version +Output version number. +.UNINDENT +.INDENT 0.0 +.TP +.B \-?, \-h, \-\-help +Output usage string. +.TP +.B \-\-loglevel=ERROR|WARN|INFO|DEBUG|TRACE +Set logging level. +.TP +.B \-\-logfile=<filename>|stdout|stderr +Set log file. Default is stderr. +.UNINDENT +.SH FILES +.INDENT 0.0 +.TP +.B ~/.cr3/ +Per\-user configuration, cache, and bookmarks. It\(aqs not recommended to +edit \fBcr3.ini\fP by hand. +.UNINDENT +.SH COPYRIGHT +.sp +See the file /usr/doc/coolreader\-3.2.49/COPYING for license information. +.SH AUTHORS +.sp +cr3 was written by Vadim Lopatin, aka buggins. +.sp +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. +.SH SEE ALSO +.sp +The cr3 homepage: \fI\%https://github.com/buggins/coolreader\fP +.\" Generated by docutils manpage writer. +. diff --git a/office/coolreader/cr3.rst b/office/coolreader/cr3.rst new file mode 100644 index 0000000000..04b3abe02e --- /dev/null +++ b/office/coolreader/cr3.rst @@ -0,0 +1,74 @@ +.. RST source for cr3(1) man page. Convert with: +.. rst2man.py cr3.rst > cr3.1 +.. rst2man.py comes from the SBo development/docutils package. + +.. Note to SBo admins: Please don't include this file in the doc dir +.. in the package. It's here because it's the source for the man page. + +.. |version| replace:: 3.2.49 +.. |date| date:: + +=== +cr3 +=== + +-------------------------- +coolreader (e-book reader) +-------------------------- + +:Manual section: 1 +:Manual group: SlackBuilds.org +:Date: |date| +:Version: |version| + +SYNOPSIS +======== + +cr3 [*-options*] [filename] + +DESCRIPTION +=========== + +CoolReader is an e-book reader for various platforms. + +Supported file formats include plain text, HTML, RTF, Microsoft Word +(.doc), Palm Pilot (.prc, .pdb, .pml, .mobi), FB2, and EPUB. + +OPTIONS +======= + +--version Output version number. + +-?, -h, --help + Output usage string. + +--loglevel=ERROR|WARN|INFO|DEBUG|TRACE + Set logging level. + +--logfile=<filename>|stdout|stderr + Set log file. Default is stderr. + +FILES +===== + +~/.cr3/ + Per-user configuration, cache, and bookmarks. It's not recommended to + edit **cr3.ini** by hand. + +COPYRIGHT +========= + +See the file /usr/doc/coolreader-|version|/COPYING for license information. + +AUTHORS +======= + +cr3 was written by Vadim Lopatin, aka buggins. + +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. + +SEE ALSO +======== + +The cr3 homepage: https://github.com/buggins/coolreader diff --git a/office/coolreader/slack-desc b/office/coolreader/slack-desc index 0983516646..655f530274 100644 --- a/office/coolreader/slack-desc +++ b/office/coolreader/slack-desc @@ -10,10 +10,10 @@ coolreader: coolreader (e-book reader) coolreader: coolreader: CoolReader is an e-book reader for various platforms. coolreader: -coolreader: Homepage: https://sourceforge.net/projects/crengine/ -coolreader: -coolreader: -coolreader: +coolreader: Supported file formats include plain text, HTML, RTF, Microsoft Word +coolreader: (.doc), Palm Pilot (.prc, .pdb, .pml, .mobi), FB2, and EPUB. coolreader: +coolreader: This package built with the @UI@ user interface. coolreader: +coolreader: Homepage: https://sourceforge.net/projects/crengine/ coolreader: diff --git a/office/diction/README b/office/diction/README new file mode 100644 index 0000000000..18d9a3c566 --- /dev/null +++ b/office/diction/README @@ -0,0 +1,11 @@ +diction (grammar checker) + +GNU diction and style are free implementations of old standard +UNIX commands, that are not available on many modern systems, +because they have been unbundled. Diction prints wordy and commonly +misused phrases. Style analyses surface characteristics of a document, +e.g. sentence length and various readability measures, but unlike the +original code, it lacks sentence type, word usage and most sentence +beginning processing. + +Both commands support Dutch, English and German documents. diff --git a/office/diction/diction.SlackBuild b/office/diction/diction.SlackBuild new file mode 100644 index 0000000000..bf4fc516c7 --- /dev/null +++ b/office/diction/diction.SlackBuild @@ -0,0 +1,81 @@ +#!/bin/sh + +# Slackware build script for diction + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=diction +VERSION=${VERSION:-1.14} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +strip $PRGNAM style +make install DESTDIR=$PKG +gzip $PKG/usr/man/man?/*.? + +# These 2 files are identical, make one a symlink +rm -f $PKG/usr/share/$PRGNAM/C +ln -s en $PKG/usr/share/$PRGNAM/C + +mkdir -p $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 + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/diction/diction.info b/office/diction/diction.info new file mode 100644 index 0000000000..42287d84af --- /dev/null +++ b/office/diction/diction.info @@ -0,0 +1,10 @@ +PRGNAM="diction" +VERSION="1.14" +HOMEPAGE="https://www.gnu.org/software/diction/diction.html" +DOWNLOAD="http://www.moria.de/~michael/diction/diction-1.14.tar.gz" +MD5SUM="2a162c2ae7cb4a28e9471dd756b38019" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/office/diction/slack-desc b/office/diction/slack-desc new file mode 100644 index 0000000000..63394cc89b --- /dev/null +++ b/office/diction/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +diction: diction (grammar checker) +diction: +diction: GNU diction and style are free implementations of old standard +diction: UNIX commands, that are not available on many modern systems, +diction: because they have been unbundled. Diction prints wordy and commonly +diction: misused phrases. Style analyses surface characteristics of a document, +diction: e.g. sentence length and various readability measures, but unlike the +diction: original code, it lacks sentence type, word usage and most sentence +diction: beginning processing. +diction: +diction: diff --git a/office/djvusmooth/djvusmooth.SlackBuild b/office/djvusmooth/djvusmooth.SlackBuild index cef458bec7..4230c990e3 100644 --- a/office/djvusmooth/djvusmooth.SlackBuild +++ b/office/djvusmooth/djvusmooth.SlackBuild @@ -6,8 +6,10 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20191130 bkw: update for v0.3, add required dep subprocess32 + PRGNAM=djvusmooth -VERSION=${VERSION:-0.2.19} +VERSION=${VERSION:-0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -34,11 +36,8 @@ 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 \ - -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 {} \+ sed -i 's,share/man,man,' setup.py python setup.py install --root=$PKG @@ -51,7 +50,7 @@ cat $CWD/$PRGNAM.xpm > $PKG/usr/share/pixmaps/$PRGNAM.xpm echo "Icon=$PRGNAM" >> $PKG/usr/share/applications/$PRGNAM.desktop mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc/COPYING doc/changelog doc/credits.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a doc/COPYING doc/changelog doc/credits* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/djvusmooth/djvusmooth.info b/office/djvusmooth/djvusmooth.info index 72ccfe3fce..e3c5c42553 100644 --- a/office/djvusmooth/djvusmooth.info +++ b/office/djvusmooth/djvusmooth.info @@ -1,10 +1,10 @@ PRGNAM="djvusmooth" -VERSION="0.2.19" +VERSION="0.3" HOMEPAGE="http://jwilk.net/software/djvusmooth" -DOWNLOAD="https://github.com/jwilk/djvusmooth/releases/download/0.2.19/djvusmooth-0.2.19.tar.gz" -MD5SUM="d592bce9fdcdd8344ed0def9c8e6ee82" +DOWNLOAD="https://github.com/jwilk/djvusmooth/releases/download/0.3/djvusmooth-0.3.tar.gz" +MD5SUM="efb65f32eabd9c69c5a0a469d0547d04" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="wxPython python-djvulibre" +REQUIRES="wxPython python-djvulibre subprocess32" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" diff --git a/office/enpass/README b/office/enpass/README new file mode 100644 index 0000000000..0f418b8a76 --- /dev/null +++ b/office/enpass/README @@ -0,0 +1,20 @@ +Enpass is a multiplatform password manager keeping your passwords across +Linux, Winows, MacOS, iOS, Android, and browsers. + +If browser fails to open Enpass after synchronization service has been +authenticated - run this command (as regular user) and try again: + +# xdg-mime default enpass.desktop x-scheme-handler/enpassauth + +If Enpass is picking the wrong scale factor for your display, add the +following lines to your ~/.profile + +export QT_AUTO_SCREEN_SCALE_FACTOR=0 +export QT_SCREEN_FACTORS=1 +(adjust as per your display) + +In case of multiple displays: + +export "QT_SCREEN_SCALE_FACTORS=1;1" + +Logout/login current desktop session and start Enpass. diff --git a/office/enpass/doinst.sh b/office/enpass/doinst.sh new file mode 100644 index 0000000000..a8304db5b7 --- /dev/null +++ b/office/enpass/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache /usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/office/enpass/enpass.SlackBuild b/office/enpass/enpass.SlackBuild new file mode 100644 index 0000000000..4ef4686a44 --- /dev/null +++ b/office/enpass/enpass.SlackBuild @@ -0,0 +1,69 @@ +#!/bin/sh +# +# Slackware build script for Enpass +# +# Copyright 2019 Justin Teague Houston, US +# +# Based loosely on Patrick J. Volkerding's google-chrome.SlackBuild +# +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=enpass +VERSION=${VERSION:-6.2.0.537} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=${ARCH:-$(uname -m)} + +case "$ARCH" in + x86_64) DEBARCH="amd64" ; LIBDIRSUFFIX="64" ; ARCH=x86_64 ;; + *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $PKG +ar p $CWD/${PRGNAM}_${VERSION}_${DEBARCH}.deb data.tar.gz | tar xvz || exit 1 +chown -R root:root . +chmod -R u+w,go+r-w,a-s . + +chmod 0755 . + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/icons $PKG/usr/doc/ +mv $PKG/usr/share/doc/enpass/changelog.gz $PKG/usr/doc/$PRGNAM-$VERSION/ +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/usr/bin +ln -s $PKG/opt/enpass/Enpass $PKG/usr/bin/enpass + +mkdir -p $PKG/install +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} diff --git a/office/enpass/enpass.info b/office/enpass/enpass.info new file mode 100644 index 0000000000..676cc2c566 --- /dev/null +++ b/office/enpass/enpass.info @@ -0,0 +1,10 @@ +PRGNAM="enpass" +VERSION="6.2.0.537" +HOMEPAGE="https://www.enpass.io/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://apt.enpass.io/pool/main/e/enpass/enpass_6.2.0.537_amd64.deb" +MD5SUM_x86_64="a66c2d0af78e36b042ec5bab7de67b93" +REQUIRES="" +MAINTAINER="Justin Teague" +EMAIL="baumerang@posteo.net" diff --git a/office/pdfjam/slack-desc b/office/enpass/slack-desc index 8f35a106b2..6774dc991e 100644 --- a/office/pdfjam/slack-desc +++ b/office/enpass/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -pdfjam: pdfjam (pdf toolkit) -pdfjam: -pdfjam: PDFjam is a collection of shell scripts for PDF manipulation, like -pdfjam: joining, rotating, modifying page layout, generating printer -pdfjam: spreads, and more. -pdfjam: -pdfjam: https://www2.warwick.ac.uk/fac/sci/statistics/staff/\ -pdfjam: academic-research/firth/software/pdfjam/ -pdfjam: -pdfjam: -pdfjam: +enpass: enpass (a multiplatform password manager) +enpass: +enpass: enpass is a multiplatorm password manager keeping your passwords +enpass: across Linux, Windows, MacOS, iOS, Android, and browsers. +enpass: +enpass: Home https://www.enpass.io/ +enpass: +enpass: +enpass: +enpass: +enpass: diff --git a/office/etmtk/README b/office/etmtk/README index 0085003667..d3bbb19445 100644 --- a/office/etmtk/README +++ b/office/etmtk/README @@ -1,9 +1,9 @@ etmtk is an acronym for event and task manager. -In contrast to most calendar/todo applications, creating items (events, tasks, -and so forth) in etm does not require filling out fields in a form. Instead, -items are created as free-form text entries using a simple, intuitive format -and stored in plain text files. +In contrast to most calendar/todo applications, creating items (events, +tasks, and so forth) in etm does not require filling out fields in +a form. Instead, items are created as free-form text entries using a +simple, intuitive format and stored in plain text files. -Before running etm for the first time run this command as user: -mkdir ~/.etm +Before running etm for the first time run this command as user: mkdir +~/.etm diff --git a/office/etmtk/etmtk.SlackBuild b/office/etmtk/etmtk.SlackBuild index 8e5a11a743..834a80ff93 100644 --- a/office/etmtk/etmtk.SlackBuild +++ b/office/etmtk/etmtk.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for etmtk -# Copyright 2016-2017 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2016-2021 Jostein Berntsen <jvbernts@online.no> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=etmtk -VERSION=${VERSION:-3.2.31} +VERSION=${VERSION:-3.2.37} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/etmtk/etmtk.info b/office/etmtk/etmtk.info index a168f00447..99476c970e 100644 --- a/office/etmtk/etmtk.info +++ b/office/etmtk/etmtk.info @@ -1,10 +1,10 @@ PRGNAM="etmtk" -VERSION="3.2.31" +VERSION="3.2.37" HOMEPAGE="http://people.duke.edu/~dgraham/etmtk/" -DOWNLOAD="http://people.duke.edu/~dgraham/etmtk/etmtk-3.2.31.tar.gz" -MD5SUM="ec05c44702c6ea1db05e0daf110ff91d" +DOWNLOAD="https://github.com/dagraham/etm-tk/releases/download/v3.2.37/etmtk-3.2.37.tar.gz" +MD5SUM="46c776a7de9ada38555b28c52d4b330d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python-dateutil PyYAML" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/evince/README b/office/evince/README index 0bf4384784..9798de4cf8 100644 --- a/office/evince/README +++ b/office/evince/README @@ -1,3 +1,5 @@ +evince (a simple gtk-based document viewer) + Evince is a document viewer for multiple document formats. It currently supports pdf, postscript, djvu, tiff and dvi. The goal of evince is to replace the multiple document viewers that exist on the GNOME Desktop @@ -6,10 +8,16 @@ with a single simple application. Evince is specifically designed to support the following file formats: * PDF * Postscript -* djvu -* tiff -* dvi -Texlive is an optional dependency (for dvi support). +* DjVu +* TIFF +* CBR/CBZ (comic books) +* DVI (requires optional dependency texlive) +* XPS (requires optional dependency libgxps) This uses dconf (runtime-only) to save various settings (and even then, not ALL settings are saved). + +Note: this is the last version I could get to compile and run on Slackware +14.2. Newer versions of evince require newer glib2 and gtk+3 libraries +than 14.2 provides, so please don't email me asking for updates (you'll +have to wait until Slackware 15.0 is released). diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild index ea4071c6eb..a1f6e48489 100644 --- a/office/evince/evince.SlackBuild +++ b/office/evince/evince.SlackBuild @@ -4,6 +4,7 @@ # Copyright 2009 Andrew Brouwers <abrouwers@gmail.com> # Copyright 2009-2014, Michiel van Wessem, Manchester, United Kingdom. +# Copyright 2019, B. Watson # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +24,16 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Now maintained by B. Watson <yalhcru@gmail.com> + +# 20191231 bkw: +# - take over maintenance +# - update for v3.28.5.3, which is the last version that will build with +# Slack 14.2's rather outdated gtk+3 libraries. Actually it requires +# some fugly hackery to work, see shim.h for gory details and polemic. + PRGNAM=evince -VERSION=${VERSION:-3.20.2} +VERSION=${VERSION:-3.28.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -36,8 +45,6 @@ if [ -z "$ARCH" ]; then esac fi -NLS=${NLS:-YES} - CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -66,15 +73,15 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz 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 {} \+ # If we have any patches apply them here: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/evince/files/ +# 20191231 bkw: I'll leave this here, but I have NOT tested it. +# It was never documented in README, caveat hactor. +NLS=${NLS:-YES} if [ "$NLS" != "YES" ]; then # disable NLS - we're going for a small package here. rm po/*.po @@ -82,6 +89,20 @@ if [ "$NLS" != "YES" ]; then -e 's/ENABLE_NLS 1/ENABLE_NLS 0/g' configure fi +# 20200101 bkw: "shim" to let us actually compile with gtk+-3.18 and +# glib-2.46.2. Supposedly these versions are supported by evince-3.28.5, +# but upstream uses a couple of functions that are new in gtk+-3.22 +# and glib-2.52. Fortunately it's stuff we can work around with a few +# #defines. +SLKCFLAGS="$SLKCFLAGS -include $CWD/shim.h" + +# 20200101 bkw: 14.2's mime stuff identifies djvu files as +# image/vnd.djvu only, but evince wants image/vnd.djvu+multipage. +sed -i '/^ *DJVU_MIME_TYPES/s|="|&image/vnd.djvu;|' configure + +# If we were building 3.30.x, we'd need this: +# --without-gspell \ + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -99,27 +120,29 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-t1lib \ --enable-comics \ --enable-dvi \ + --enable-ps \ + --enable-xps \ --enable-introspection \ --disable-static \ --disable-nautilus \ --disable-maintainer-mode \ + --with-systemduserunitdir=no \ --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG +# ugh. glib-genmarshal's flags changed gratuitously. +sed -i 's,--prototypes,--header,' libview/Makefile + +make V=1 +make install-strip DESTDIR=$PKG # Fix desktop entry sed -i "/NoDisplay=true/d" $PKG/usr/share/applications/evince.desktop -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +gzip -9 $PKG/usr/man/man1/$PRGNAM.1 rm -rf $PKG/{usr/share/gtk-doc,etc} mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING NEWS README MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/evince/evince.info b/office/evince/evince.info index d82e5a87c7..91a6eca4f1 100644 --- a/office/evince/evince.info +++ b/office/evince/evince.info @@ -1,10 +1,10 @@ PRGNAM="evince" -VERSION="3.20.2" +VERSION="3.28.5" HOMEPAGE="http://projects.gnome.org/evince/" -DOWNLOAD="https://download.gnome.org/sources/evince/3.20/evince-3.20.2.tar.xz" -MD5SUM="3da5f98a360829ac49f754873494ce1a" +DOWNLOAD="https://download.gnome.org/sources/evince/3.28/evince-3.28.5.tar.xz" +MD5SUM="855600d64544a959add349e32f5185e0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Michiel van Wessem" -EMAIL="michiel@slackbuilds.org" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/office/evince/shim.h b/office/evince/shim.h new file mode 100644 index 0000000000..8439c34ac5 --- /dev/null +++ b/office/evince/shim.h @@ -0,0 +1,25 @@ +/* 20191231 bkw: This seems like stupidity: g_content_type_is_mime_type + is a new function in glib-2.52, which literally just calls the + g_content_type_is_a function from older glibs, and returns its + result. Here's the function from the glib-2.52 source: + + gboolean + g_content_type_is_mime_type (const gchar *type, + const gchar *mime_type) + { + return g_content_type_is_a (type, mime_type); + } + + The docs describe it as a "convenience wrapper" but there's + nothing more or less convenient about it, except that it breaks builds + with older glib versions. Why does it even exist? + */ +#define g_content_type_is_mime_type(x,y) g_content_type_is_a(x,y) + +/* 20191231 bkw: We'd need gtk+-3.22 to have gtk_popover_popup and + gtk_popover_popdown. They're functionally the same as gtk_widget_show + and gtk_widget_hide, except they have a "transition" (fade-in/out). + Some folks might actually prefer it without the fade. + */ +#define gtk_popover_popup(x) gtk_widget_show(GTK_WIDGET(x)) +#define gtk_popover_popdown(x) gtk_widget_hide(GTK_WIDGET(x)) diff --git a/office/evince/slack-desc b/office/evince/slack-desc index 3936ba82a4..7701e9823d 100644 --- a/office/evince/slack-desc +++ b/office/evince/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -evince: evince (a simple gnome-based document viewer) +evince: evince (a simple gtk-based document viewer) evince: evince: Evince is a document viewer for multiple document formats. -evince: It currently supports pdf, postscript, djvu, tiff, and dvi. +evince: It currently supports pdf, postscript, djvu, tiff, dvi, cbr/cbz, +evince: and xps. evince: evince: The goal of evince is to replace the multiple document viewers evince: that exist on the GNOME Desktop with a single simple application. evince: evince: Homepage: http://projects.gnome.org/evince/ evince: -evince: diff --git a/office/extractpdfmark/README b/office/extractpdfmark/README index 46242e890d..cb7031367a 100644 --- a/office/extractpdfmark/README +++ b/office/extractpdfmark/README @@ -1,5 +1,5 @@ This program is able to extract page mode and named destinations as -PDFmarks from PDF. By using this you can get small PDF files that have +PDF marks from PDF. By using this you can get small PDF files that have preserved them. When you create a PDF document using a TeX system, you may include many diff --git a/office/extractpdfmark/extractpdfmark.SlackBuild b/office/extractpdfmark/extractpdfmark.SlackBuild index 1a762059fb..494f6d8620 100644 --- a/office/extractpdfmark/extractpdfmark.SlackBuild +++ b/office/extractpdfmark/extractpdfmark.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for extractpdfmark -# Copyright 2017 Andy Goth <andrew.m.goth@gmail.com> +# Copyright 2019 Andy Goth <andrew.m.goth@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=extractpdfmark -VERSION=${VERSION:-1.0.2} +VERSION=${VERSION:-1.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/extractpdfmark/extractpdfmark.info b/office/extractpdfmark/extractpdfmark.info index 1be9c6a254..a0c318d30d 100644 --- a/office/extractpdfmark/extractpdfmark.info +++ b/office/extractpdfmark/extractpdfmark.info @@ -1,8 +1,8 @@ PRGNAM="extractpdfmark" -VERSION="1.0.2" +VERSION="1.1.0" HOMEPAGE="https://www.ctan.org/tex-archive/support/extractpdfmark" -DOWNLOAD="https://github.com/trueroad/extractpdfmark/releases/download/v1.0.2/extractpdfmark-1.0.2.tar.gz" -MD5SUM="0032e431cb7796f486a2a6de2ae5a74f" +DOWNLOAD="https://github.com/trueroad/extractpdfmark/releases/download/v1.1.0/extractpdfmark-1.1.0.tar.gz" +MD5SUM="04335bfbe3e743201e86f27f884cc4a3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/fbpdf/README b/office/fbpdf/README index e47293c2b7..7c031b3be1 100644 --- a/office/fbpdf/README +++ b/office/fbpdf/README @@ -4,8 +4,8 @@ fbpdf is a framebuffer pdf/djvu file viewer. It can use either mupdf or poppler libraries for rendering pdf files and it uses djvulibre library for rendering djvu files. -By default, the fbpdf2 (poppler support) executable is built, along -with fbdjvu. If you want mupdf support, install mupdf before running +By default, the fbpdf2 (poppler support) executable is built, along with +fbdjvu. If you want mupdf support, install mupdf-legacy before running this build and it will be auto-detected. The executable that uses mupdf will be called fbpdf. diff --git a/office/fbpdf/fbpdf.SlackBuild b/office/fbpdf/fbpdf.SlackBuild index 4c5540d276..dbed12b0ed 100644 --- a/office/fbpdf/fbpdf.SlackBuild +++ b/office/fbpdf/fbpdf.SlackBuild @@ -8,12 +8,12 @@ # Source tarball made from: git clone git://repo.or.cz/fbpdf.git -# 20170313 bkw: -# - update for 20161202 (commit e31a61b), needed due to mupdf update. +# 20200218 bkw: mupdf got updated to an incompatible version, use mupdf-legacy. +# 20170313 bkw: update for 20161202 (commit e31a61b), need due to mupdf update. PRGNAM=fbpdf VERSION=${VERSION:-20161202} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -52,11 +52,8 @@ 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 \ - -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 {} \+ # This patch has been sent upstream. In my opinion, fbpdf is needlessly # difficult to use without it. @@ -65,11 +62,6 @@ find -L . \ [ "${PRISTINE:-no}" != "yes" ] && \ patch -p1 < $CWD/navigation.diff -# mupdf API keeps changing -sed -i \ - -e 's,-lmupdf -lmupdfthird,`pkg-config --libs mupdf` -lharfbuzz,' \ - Makefile - mkdir -p $PKG/usr/bin # always build these two. @@ -77,8 +69,18 @@ make ${PRGNAM}2 fbdjvu install -s -m0755 ${PRGNAM}2 $PKG/usr/bin install -s -m0755 fbdjvu $PKG/usr/bin -# autodetect mupdf, build fbpdf if found (seems OK with mupdf-1.9a) -if pkg-config --exists mupdf; then +# autodetect mupdf-legacy, build fbpdf if found +if [ -d /opt/mupdf-legacy ]; then + # Use old libs/headers. Works even if a newer mupdf is installed in /usr. + PKG_CONFIG_PATH=/opt/mupdf-legacy/lib$LIBDIRSUFFIX/pkgconfig:$PKG_CONFIG_PATH + export PKG_CONFIG_PATH + + # mupdf API keeps changing + sed -i \ + -e '/^CFLAGS/s,$, $(shell pkg-config --cflags mupdf),' \ + -e 's,-lmupdf -lmupdfthird,$(shell pkg-config --libs mupdf) -lharfbuzz,' \ + Makefile + make clean make $PRGNAM install -s -m0755 $PRGNAM $PKG/usr/bin diff --git a/office/fbpdf/fbpdf.info b/office/fbpdf/fbpdf.info index 95dc64c565..00b76dd479 100644 --- a/office/fbpdf/fbpdf.info +++ b/office/fbpdf/fbpdf.info @@ -1,7 +1,7 @@ PRGNAM="fbpdf" VERSION="20161202" HOMEPAGE="http://litcave.rudi.ir/" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/fbpdf-20161202.tar.gz" +DOWNLOAD="https://slackware.uk/~urchlay/src/fbpdf-20161202.tar.gz" MD5SUM="f022012d639e1b93d3ae1e547f79df55" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/office/fbreader/fbreader.info b/office/fbreader/fbreader.info index 140f2b7ab5..e544679049 100644 --- a/office/fbreader/fbreader.info +++ b/office/fbreader/fbreader.info @@ -6,5 +6,5 @@ MD5SUM="ed13a9c3aeb68aaa98a1dd6f7947a31d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libunibreak" -MAINTAINER="Niels Horn" -EMAIL="niels.horn@gmail.com" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/office/focuswriter-legacy/README b/office/focuswriter-legacy/README new file mode 100644 index 0000000000..080dda1e89 --- /dev/null +++ b/office/focuswriter-legacy/README @@ -0,0 +1,8 @@ +FocusWriter is a fullscreen, distraction-free word processor designed +to immerse you as much as possible in your work. +The program autosaves your progress, and reloads the last files you +had open to make it easy to jump back in during your next writing +session, and has many other features that make it such that only one +thing matters: your writing. + +Newer versions of FocusWriter depend on qt5. diff --git a/office/focuswriter-legacy/doinst.sh b/office/focuswriter-legacy/doinst.sh new file mode 100644 index 0000000000..4a25de5e6f --- /dev/null +++ b/office/focuswriter-legacy/doinst.sh @@ -0,0 +1,10 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/office/focuswriter-legacy/focuswriter-legacy.SlackBuild b/office/focuswriter-legacy/focuswriter-legacy.SlackBuild new file mode 100644 index 0000000000..e3044ba089 --- /dev/null +++ b/office/focuswriter-legacy/focuswriter-legacy.SlackBuild @@ -0,0 +1,95 @@ +#!/bin/sh + +# Slackware build script for focuswriter-legacy + +# Copyright 2014 Scalzi Giuseppe Switzerland +# Updated 2016 Morten Juhl-Johansen Zölde-Fejér +# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=focuswriter-legacy +VERSION=${VERSION:-1.5.7} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=focuswriter + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION-src.tar.bz2 +cd $SRCNAM-$VERSION +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 {} \; + +qmake PREFIX=/usr +make +make install INSTALL_ROOT=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING INSTALL README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mv $PKG/usr/share/man $PKG/usr +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/install +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} diff --git a/office/focuswriter-legacy/focuswriter-legacy.info b/office/focuswriter-legacy/focuswriter-legacy.info new file mode 100644 index 0000000000..0e81abdae1 --- /dev/null +++ b/office/focuswriter-legacy/focuswriter-legacy.info @@ -0,0 +1,10 @@ +PRGNAM="focuswriter-legacy" +VERSION="1.5.7" +HOMEPAGE="https://gottcode.org/focuswriter/" +DOWNLOAD="https://gottcode.org/focuswriter/focuswriter-1.5.7-src.tar.bz2" +MD5SUM="088dd0b696b60b3cc6c59793ec5eea6d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu1@isaacyu1.com" diff --git a/office/focuswriter-legacy/slack-desc b/office/focuswriter-legacy/slack-desc new file mode 100644 index 0000000000..7268bb3acf --- /dev/null +++ b/office/focuswriter-legacy/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +focuswriter-legacy: focuswriter-legacy (distraction-free word processor) +focuswriter-legacy: +focuswriter-legacy: FocusWriter is a fullscreen, distraction-free word processor designed +focuswriter-legacy: to immerse you as much as possible in your work. +focuswriter-legacy: The program autosaves your progress, and reloads the last files you +focuswriter-legacy: had open to make it easy to jump back in during your next writing +focuswriter-legacy: session, and has many other features that make it such that only one +focuswriter-legacy: thing matters: your writing. +focuswriter-legacy: +focuswriter-legacy: http://gottcode.org/focuswriter/ +focuswriter-legacy: diff --git a/office/focuswriter/README b/office/focuswriter/README index 61463f8371..0c98992a0c 100644 --- a/office/focuswriter/README +++ b/office/focuswriter/README @@ -1,6 +1,9 @@ -FocusWriter is a fullscreen, distraction-free word processor -designed to immerse you as much as possible in your work. +FocusWriter is a fullscreen, distraction-free word processor designed +to immerse you as much as possible in your work. The program autosaves your progress, and reloads the last files you had open to make it easy to jump back in during your next writing session, and has many other features that make it such that only one thing matters: your writing. + +A focuswriter-legacy SlackBuild, which does not depend on qt5, +is available. diff --git a/office/focuswriter/focuswriter.SlackBuild b/office/focuswriter/focuswriter.SlackBuild index c3dec34066..586ffff733 100644 --- a/office/focuswriter/focuswriter.SlackBuild +++ b/office/focuswriter/focuswriter.SlackBuild @@ -3,8 +3,9 @@ # Slackware build script for focuswriter # Copyright 2014 Scalzi Giuseppe Switzerland -# All rights reserved. # Updated 2016 Morten Juhl-Johansen Zölde-Fejér +# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com> +# All rights reserved. # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -24,13 +25,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=focuswriter -VERSION=${VERSION:-1.5.7} +VERSION=${VERSION:-1.7.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +42,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" @@ -69,7 +70,7 @@ 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 {} \; -qmake PREFIX=/usr +qmake-qt5 PREFIX=/usr make make install INSTALL_ROOT=$PKG diff --git a/office/focuswriter/focuswriter.info b/office/focuswriter/focuswriter.info index 7d11e63118..7e46d02fbc 100644 --- a/office/focuswriter/focuswriter.info +++ b/office/focuswriter/focuswriter.info @@ -1,10 +1,10 @@ PRGNAM="focuswriter" -VERSION="1.5.7" +VERSION="1.7.6" HOMEPAGE="https://gottcode.org/focuswriter/" -DOWNLOAD="https://gottcode.org/focuswriter/focuswriter-1.5.7-src.tar.bz2" -MD5SUM="088dd0b696b60b3cc6c59793ec5eea6d" +DOWNLOAD="https://gottcode.org/focuswriter/focuswriter-1.7.6-src.tar.bz2" +MD5SUM="ba9e316b4bc0c4568d71f7dc3cd64fff" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Morten Juhl-Johansen Zölde-Fejér" -EMAIL="mjjzf@syntaktisk.dk" +REQUIRES="qt5" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu1@isaacyu1.com" diff --git a/office/focuswriter/slack-desc b/office/focuswriter/slack-desc index 32385b11ef..b742081979 100644 --- a/office/focuswriter/slack-desc +++ b/office/focuswriter/slack-desc @@ -8,8 +8,8 @@ |-----handy-ruler------------------------------------------------------| focuswriter: focuswriter (distraction-free word processor) focuswriter: -focuswriter: FocusWriter is a fullscreen, distraction-free word processor -focuswriter: designed to immerse you as much as possible in your work. +focuswriter: FocusWriter is a fullscreen, distraction-free word processor designed +focuswriter: to immerse you as much as possible in your work. focuswriter: The program autosaves your progress, and reloads the last files you focuswriter: had open to make it easy to jump back in during your next writing focuswriter: session, and has many other features that make it such that only one diff --git a/office/fop-legacy/README b/office/fop-legacy/README new file mode 100644 index 0000000000..e72fb644e1 --- /dev/null +++ b/office/fop-legacy/README @@ -0,0 +1,23 @@ +Apache FOP is a print formatter driven by XSL formatting objects. It +is a Java application that reads a formatting object tree conforming +to the XSL 1.1 Recommendation (05 December 2006) and then turns it +into a PDF document, certain other output formats or allows you to +preview it directly on screen. + +Output formats currently supported include PDF, PS, PCL, AFP, XML +(area tree representation), Print, AWT and PNG, and to a lesser extent, +RTF and TXT. The primary output target is PDF. + +The goals of the Apache FOP project are to deliver an XSL-FO to PDF +formatter that is compliant to at least the Basic conformance level +described in the W3C Recommendation from 05 December 2006, and that +complies with the November 2001 Portable Document Format Specification +(Version 1.4) from Adobe Systems. + +This is the old fop 2.3 for the incredibly ancient jdk 6 (including +openjdk6). If you are running jdk 7 or newer, you will need fop, also +available on SBo. + +Also note that fop and fop-legacy cannot coexist on the same computer. + +jai and jai-imageio are optional but recommended dependencies. diff --git a/office/fop-legacy/README.postinst b/office/fop-legacy/README.postinst new file mode 100644 index 0000000000..d079a0e881 --- /dev/null +++ b/office/fop-legacy/README.postinst @@ -0,0 +1,13 @@ +After installing, create .foprc in your home dir with the following + +FOP_OPTS="-Xmx###m" +FOP_HOME="/opt/fop" + +Delete and replace the #'s with the amount of RAM your computer has +in megabytes. + +Use can run "free -m" in the terminal to get the info: +Example : + +FOP_OPTS="-Xmx1024m" // If you have a GB RAM +FOP_HOME="/opt/fop" diff --git a/office/fop-legacy/fop-legacy.SlackBuild b/office/fop-legacy/fop-legacy.SlackBuild new file mode 100644 index 0000000000..24f7faefb6 --- /dev/null +++ b/office/fop-legacy/fop-legacy.SlackBuild @@ -0,0 +1,109 @@ +#!/bin/sh + +# Slackware build script for fop + +# Copyright 2015 Thorn Inurcide USA +# Copyright 2020 Lenard Spencer, Orlando, Florida, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=fop-legacy +SRCNAM=fop +VERSION=2.3 +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION-src.tar.gz +cd $SRCNAM-$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 {} \; + +# Increase hyphenation stacksize from 512k to 1M: +sed -e '/hyph\.stack/s/512k/1M/' -i fop/build.xml + +# Copy hyphenation tables: +unzip $CWD/offo-hyphenation.zip +cp offo-hyphenation/hyph/* fop/hyph +rm -rf offo-hyphenation + +# Compiles with apache-ant: +( cd fop +ant all javadocs +mkdir -p $PKG/opt/$PRGNAM-$VERSION +install -v -d -m755 $PKG/opt/$PRGNAM-$VERSION/ +mv build/javadocs . +cp -va build conf examples javadocs fop* lib \ + $PKG/opt/$PRGNAM-$VERSION ) + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Create fop symlink to /usr/bin: +mkdir -p $PKG/usr/bin +( ln -sf /opt/${PRGNAM}-${VERSION}/${PRGNAM} $PKG/usr/bin/ ) + +# Symlink it all to /opt/fop so .foprc won't need edited every update: +( cd $PKG/opt ; ln -sf ${PRGNAM}-${VERSION} ${PRGNAM} ) + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README NOTICE LICENSE KEYS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/fop-legacy/fop-legacy.info b/office/fop-legacy/fop-legacy.info new file mode 100644 index 0000000000..45a81bef04 --- /dev/null +++ b/office/fop-legacy/fop-legacy.info @@ -0,0 +1,12 @@ +PRGNAM="fop-legacy" +VERSION="2.3" +HOMEPAGE="https://xmlgraphics.apache.org/fop/" +DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.3-src.tar.gz \ + https://downloads.sourceforge.net/offo/2.2/offo-hyphenation.zip" +MD5SUM="fc95040a8db4a7f22c6f26e18fd6d033 \ + bf9c09bf05108ef9661b8f08d91c2336" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="apache-ant" +MAINTAINER="Lenard Spencer" +EMAIL="lenardrspencer@gmail.com" diff --git a/office/fop-legacy/slack-desc b/office/fop-legacy/slack-desc new file mode 100644 index 0000000000..4bf71b54a2 --- /dev/null +++ b/office/fop-legacy/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +fop-legacy: fop-legacy (print formatter) +fop-legacy: +fop-legacy: Apache FOP is a print formatter driven by XSL formatting objects. It +fop-legacy: is a Java application that reads a formatting object tree conforming +fop-legacy: to the XSL 1.1 Recommendation (05 December 2006) and renders the +fop-legacy: resulting pages to a specified output. Current outputs supported +fop-legacy: include PDF, PS, PCL,AFP, XML (area tree representation), Print, +fop-legacy: AWT, and TXT. The primary output target is PDF. +fop-legacy: This version is for jdk6, including openjdk6. +fop-legacy: +fop-legacy: Home: https://xmlgraphics.apache.org/fop/ diff --git a/office/fop/README b/office/fop/README index 2deacbff89..063a19b2f8 100644 --- a/office/fop/README +++ b/office/fop/README @@ -1,8 +1,29 @@ -Apache FOP is a print formatter driven by XSL formatting objects. It -is a Java application that reads a formatting object tree conforming -to the XSL 1.1 Recommendation (05 December 2006) and then turns it -into a PDF document, certain other output formats or allows you to -preview it directly on screen. - -Note that not all parts of the XSL 1.1 specification have yet been -implemented. +Apache FOP (Formatting Objects Processor) is a print formatter driven +by XSL formatting objects (XSL-FO) and an output independent formatter. +It is a Java application that reads a formatting object (FO) tree and +renders the resulting pages to a specified output. + +Output formats currently supported include PDF, PS, PCL, AFP, XML +(area tree representation), Print, AWT and PNG, and to a lesser extent, +RTF and TXT. The primary output target is PDF. + +The goals of the Apache FOP project are to deliver an XSL-FO to PDF +formatter that is compliant to at least the Basic conformance level +described in the W3C Recommendation from 05 December 2006, and that +complies with the November 2001 Portable Document Format Specification +(Version 1.4) from Adobe Systems. + +Conformance to the XML 1.0 and 1.1 Recommendations, XSLT 1.0 and 2.0 +Recommendations and the XML Namespaces Recommendation is understood. +Other relevant documents, such as the XPath and XLink Working Drafts, +are referenced as necessary. The FOP Project will attempt to use the +latest version of evolving specifications. + +The default build is for jdk 7 and 8 (including openjdk). To build +on jdk11 and newer, pass JDK11=yes to the build scrip. If you are +still running the (incredibly ancient) jdk 6, please use fop2.0, also +available on SBo. + +Requires apache-ant and apache-maven. + +jai and jai-imageio are optional but recommended dependencies. diff --git a/office/fop/fop.SlackBuild b/office/fop/fop.SlackBuild index df361192a0..80b4d2bea5 100644 --- a/office/fop/fop.SlackBuild +++ b/office/fop/fop.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for fop # Copyright 2015 Thorn Inurcide USA +# Copyright 2020, 2021 Lenard Spencer, Orlando, Florida, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=fop -VERSION=${VERSION:-2.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.6} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,23 +70,43 @@ 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 {} \; -# Fix an Issue with Java 8 thanks LFS =] -sed -i '\@</javad@i\ -<arg value="-Xdoclint:none"/>\ -<arg value="--allow-script-in-comments"/>' build.xml +if [ "${JDK11:-no}" = "yes" ]; then +# Fix an Issue with Java 11 and newer: + sed -i '\@</javad@i\ + <arg value="-Xdoclint:none"/>\ + <arg value="--allow-script-in-comments"/>\ + <arg value="--ignore-source-errors"/>' \ + fop/build.xml +# With jdk11 and newer, the minimum source version is 1.7, while +# the fop build system has 1.6. Change it here: + sed -e 's/1\.6/1.7/' \ + -i fop/build.xml +else + # Fix an Issue with Java 8 and older: + sed -i '\@</javad@i\ + <arg value="--allow-script-in-comments"/>' fop/build.xml +fi -# Compiles with apache-ant: -ant compile -ant jar-main -ant javadocs +# Increase hyphenation stacksize from 512k to 1M: +sed -e '/hyph\.stack/s/512k/1M/' -i fop/build.xml -mv build/javadocs . +# Copy updated {pdf,font}box files: +rm fop/lib/fontbox-2.0.*.jar || true +cp $CWD/{font,pdf}box-2.0.*.jar fop/lib +# Copy hyphenation tables: +unzip $CWD/offo-hyphenation.zip +cp offo-hyphenation/hyph/* fop/hyph +rm -rf offo-hyphenation + +# Compiles with apache-ant: +( cd fop +ant all javadocs mkdir -p $PKG/opt/$PRGNAM-$VERSION install -v -d -m755 $PKG/opt/$PRGNAM-$VERSION/ - -cp -va build conf examples fop* javadocs lib status.xml \ - $PKG/opt/$PRGNAM-$VERSION +mv build/javadocs . +cp -va build conf examples javadocs fop* lib \ + $PKG/opt/$PRGNAM-$VERSION ) find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/office/fop/fop.info b/office/fop/fop.info index ed30b5d04f..9cfe10aec6 100644 --- a/office/fop/fop.info +++ b/office/fop/fop.info @@ -1,10 +1,16 @@ PRGNAM="fop" -VERSION="2.0" -HOMEPAGE="http://www.apache.org" -DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.0-src.tar.gz" -MD5SUM="754e5307a73433afb5c4c9b11d45e302" +VERSION="2.6" +HOMEPAGE="https://xmlgraphics.apache.org/fop/" +DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.6-src.tar.gz \ + http://mirror.reverse.net/pub/apache/pdfbox/2.0.23/fontbox-2.0.23.jar \ + http://mirror.reverse.net/pub/apache/pdfbox/2.0.23/pdfbox-2.0.23.jar \ + https://downloads.sourceforge.net/offo/2.2/offo-hyphenation.zip" +MD5SUM="1d6bc84d2ab7f971bbc628080e3c307f \ + f9aa90c666c88ff29e3cd34c15d538ca \ + 6b71c42c567d419f068f46f410dcc3a5 \ + bf9c09bf05108ef9661b8f08d91c2336" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="apache-ant jai" -MAINTAINER="Thorn Inurcide" -EMAIL="thorn-inurcide@yandex.com" +REQUIRES="apache-ant apache-maven" +MAINTAINER="Lenard Spencer" +EMAIL="lenardrspencer@gmail.com" diff --git a/office/fop/slack-desc b/office/fop/slack-desc index db6fddeee2..e9326593e5 100644 --- a/office/fop/slack-desc +++ b/office/fop/slack-desc @@ -10,10 +10,10 @@ fop: fop (print formatter) fop: fop: Apache FOP is a print formatter driven by XSL formatting objects. It fop: is a Java application that reads a formatting object tree conforming -fop: to the XSL 1.1 Recommendation (05 December 2006) and then turns it -fop: into a PDF document, certain other output formats or allows you to -fop: preview it directly on screen. Note that not all parts of the XSL -fop: 1.1 specification have yet been implemented. +fop: to the XSL 1.1 Recommendation (05 December 2006) and renders the +fop: resulting pages to a specified output. Current outputs supported +fop: include PDF, PS, PCL,AFP, XML (area tree representation), Print, +fop: AWT, and TXT. The primary output target is PDF. fop: +fop: Home: https://xmlgraphics.apache.org/fop/ fop: -fop: Home: apache.org diff --git a/office/ganttproject/ganttproject.SlackBuild b/office/ganttproject/ganttproject.SlackBuild index 448ff3b7b2..7938d4f30d 100644 --- a/office/ganttproject/ganttproject.SlackBuild +++ b/office/ganttproject/ganttproject.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ganttproject -VERSION=${VERSION:-2.8.9} -VERSION_BUILD=${VERSION_BUILD:-r2335} +VERSION=${VERSION:-2.8.11} +VERSION_BUILD=${VERSION_BUILD:-r2396} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/ganttproject/ganttproject.info b/office/ganttproject/ganttproject.info index 8e3b533e97..1bbdb9834b 100644 --- a/office/ganttproject/ganttproject.info +++ b/office/ganttproject/ganttproject.info @@ -1,8 +1,8 @@ PRGNAM="ganttproject" -VERSION="2.8.9" +VERSION="2.8.11" HOMEPAGE="https://www.ganttproject.biz" -DOWNLOAD="https://github.com/bardsoftware/ganttproject/releases/download/ganttproject-2.8.9/ganttproject_2.8.9-r2335-1_all.deb" -MD5SUM="ac90e0290098b4b35e793356ef84518c" +DOWNLOAD="https://github.com/bardsoftware/ganttproject/releases/download/ganttproject-2.8.11/ganttproject_2.8.11-r2396-1_all.deb" +MD5SUM="a7b7c90c4e96b8995dd55fb314f103e1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk" diff --git a/office/gcal/gcal.SlackBuild b/office/gcal/gcal.SlackBuild index 8ea0a4e404..e3b653f557 100644 --- a/office/gcal/gcal.SlackBuild +++ b/office/gcal/gcal.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for gcal -# Copyright 2013 David Woodfall <dave@dawoodfall.net> +# Copyright 2013 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/office/gcal/gcal.info b/office/gcal/gcal.info index 860303ea4e..5af28ba2a2 100644 --- a/office/gcal/gcal.info +++ b/office/gcal/gcal.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/office/ghostwriter/README b/office/ghostwriter/README new file mode 100644 index 0000000000..b3755370a4 --- /dev/null +++ b/office/ghostwriter/README @@ -0,0 +1,13 @@ +ghostwriter is a distraction-free Markdown editor, featuring a full +screen mode and a clean interface. With Markdown, you can write now, +and format later. + +Some of the features include: + +- built-in and custom themes, +- live HTML preview, +- export to multiple formats, +- navigation with outline, +- focus and Hemingway modes, +- document and session statistics, +- drag and drop images. diff --git a/office/ghostwriter/doinst.sh b/office/ghostwriter/doinst.sh new file mode 100644 index 0000000000..aea0f894eb --- /dev/null +++ b/office/ghostwriter/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/office/ghostwriter/fix-build-with-qt5.15.patch b/office/ghostwriter/fix-build-with-qt5.15.patch new file mode 100644 index 0000000000..358e8bd21c --- /dev/null +++ b/office/ghostwriter/fix-build-with-qt5.15.patch @@ -0,0 +1,21 @@ +commit ecad6c28195e535ae8ea8a29a91fa14f5e39faa9 +Author: Andrzej Telszewski <andrzej@telszewski.com> +Date: Wed Apr 7 22:55:57 2021 +0200 + + Fix build error with Qt 5.15 + + Shamelessly based on upstream patch: + https://github.com/wereturtle/ghostwriter/commit/f8f4ec0a1b53d1f3e670817f051c59444851cf7f + +diff --git a/src/MarkdownEditor.cpp b/src/MarkdownEditor.cpp +index 2e4a9a1..45fc3e4 100644 +--- a/src/MarkdownEditor.cpp ++++ b/src/MarkdownEditor.cpp +@@ -34,6 +34,7 @@ + #include <QUrl> + #include <QPixmap> + #include <QPainter> ++#include <QPainterPath> + #include <QFileInfo> + #include <QDir> + diff --git a/office/ghostwriter/ghostwriter.SlackBuild b/office/ghostwriter/ghostwriter.SlackBuild new file mode 100644 index 0000000000..f9b6b2b7aa --- /dev/null +++ b/office/ghostwriter/ghostwriter.SlackBuild @@ -0,0 +1,100 @@ +#!/bin/sh + +# Slackware build script for ghostwriter + +# Copyright 2021 Andrzej Telszewski, Szczecin +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=ghostwriter +VERSION=${VERSION:-1.8.1} +BUILD=${BUILD:-2} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP + +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION + +chown -R root:root . +chmod -R a-st,u+rwX,go-w+rX . + +# Fix build error with Qt 5.15 + +cat $CWD/fix-build-with-qt5.15.patch | patch -p1 + +# Adjust docs location. + +sed -i $PRGNAM.pro -e "s|man\.path.*$|man.path = /usr/man/man1|" + +qmake-qt5 -r $PRGNAM.pro \ + QMAKE_CFLAGS="$SLKCFLAGS" \ + QMAKE_CXXFLAGS="$SLKCFLAGS" \ + PREFIX=/usr + +make +make install INSTALL_ROOT=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +gzip -9 $PKG/usr/man/man1/$PRGNAM.1 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a {BUILD_MAC,CHANGELOG,CREDITS,README}.md COPYING $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +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} diff --git a/office/ghostwriter/ghostwriter.info b/office/ghostwriter/ghostwriter.info new file mode 100644 index 0000000000..cbc1933ccf --- /dev/null +++ b/office/ghostwriter/ghostwriter.info @@ -0,0 +1,10 @@ +PRGNAM="ghostwriter" +VERSION="1.8.1" +HOMEPAGE="https://wereturtle.github.io/ghostwriter/" +DOWNLOAD="https://github.com/wereturtle/ghostwriter/archive/v1.8.1/ghostwriter-1.8.1.tar.gz" +MD5SUM="67f6b671a8e10bc91872fd65dea2b78f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="qt5" +MAINTAINER="Andrzej Telszewski" +EMAIL="andrzej@telszewski.com" diff --git a/office/ghostwriter/slack-desc b/office/ghostwriter/slack-desc new file mode 100644 index 0000000000..a710c6fd2b --- /dev/null +++ b/office/ghostwriter/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +ghostwriter: ghostwriter (distraction-free Markdown editor) +ghostwriter: +ghostwriter: ghostwriter is a distraction-free Markdown editor, featuring a full +ghostwriter: screen mode and a clean interface. With Markdown, you can write now, +ghostwriter: and format later. +ghostwriter: +ghostwriter: Homepage: https://wereturtle.github.io/ghostwriter/ +ghostwriter: +ghostwriter: +ghostwriter: +ghostwriter: diff --git a/office/gnucash-docs/README b/office/gnucash-docs/README index 442bde372c..0dbc6ce019 100644 --- a/office/gnucash-docs/README +++ b/office/gnucash-docs/README @@ -2,7 +2,7 @@ This is the documentation package for Gnucash. This builds the internal help and user guides for Gnucash. -For the HTML help and user guides to read outside the Gnucash +For the HTML help and user guides to read outside of the Gnucash application, pass HTML="yes" to the script. For the EPUB help and user guides, pass EPUB="yes" to the script. @@ -23,7 +23,7 @@ ru for Russian (guide only, no help - defaults to C) Note 1: This script builds the internal guides in all available languages, but the HTML guides are only in the spacified language -to save space and avoid any excessive package bloat. +to save space and avoid excessive package bloat. Note 2: This builds the docs for version 3.x of Gnucash. If you need the old stable 2.6 branch, use gnucash-legacy-docs, also diff --git a/office/gnucash-docs/gnucash-docs.SlackBuild b/office/gnucash-docs/gnucash-docs.SlackBuild index f35b880592..d43e8ff27f 100644 --- a/office/gnucash-docs/gnucash-docs.SlackBuild +++ b/office/gnucash-docs/gnucash-docs.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gnucash-docs -# Copyright 2018 Lenard Spencer <lspencer31@cfl.rr.com> +# Copyright 2018, 2019, 2020 Lenard Spencer <lenardrspencer@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=gnucash-docs DESTNAM=gnucash -VERSION=${VERSION:-3.4} +VERSION=${VERSION:-3.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -38,10 +38,7 @@ OUTPUT=${OUTPUT:-/tmp} ARCH=noarch # does not install any binary files -# Set DOCLANG to C if it is empty: -if [ ! "$DOCLANG" ]; then - DOCLANG=C -fi +DOCLANG=${DOCLANG:-"C"} set -e @@ -49,7 +46,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION-1.tar.?z* +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,14 +66,10 @@ make -j1 install DESTDIR=$PKG docdir=/usr/doc/$DESTNAM-$VERSION if [ "$HTML" = "yes" ]; then mkdir -p $PKG/usr/doc/$DESTNAM-$VERSION/html - cd guide/${DOCLANG:-C} || cd guide/C - echo "in `pwd`" - sleep 2 + cd guide/$DOCLANG || cd guide/C make html cp -vR gnucash-guide $PKG/usr/doc/$DESTNAM-$VERSION/html - cd ../../help/${DOCLANG:-C} || cd ../../help/C - echo "in `pwd`" - sleep 2 + cd ../../help/$DOCLANG || cd ../../help/C make html cp -vR gnucash-help $PKG/usr/doc/$DESTNAM-$VERSION/html cd ../.. @@ -85,14 +78,10 @@ fi if [ -x /opt/fop/fop ]; then if [ "$PDF" = "yes" ]; then mkdir -p $PKG/usr/doc/$DESTNAM-$VERSION - cd guide/${DOCLANG:-C} || cd guide/C - echo "in `pwd`" - sleep 2 + cd guide/$DOCLANG || cd guide/C make pdf cp -vR gnucash-guide.pdf $PKG/usr/doc/$DESTNAM-$VERSION - cd ../../help/${DOCLANG:-C} || cd ../../help/C - echo "in `pwd`" - sleep 2 + cd ../../help/$DOCLANG || cd ../../help/C make pdf cp -vR gnucash-help.pdf $PKG/usr/doc/$DESTNAM-$VERSION cd ../.. @@ -101,14 +90,10 @@ fi if [ "$EPUB" = "yes" ]; then mkdir -p $PKG/usr/doc/$DESTNAM-$VERSION - cd guide/${DOCLANG:-C} || cd guide/C - echo "in `pwd`" - sleep 2 + cd guide/$DOCLANG || cd guide/C make epub cp -vR gnucash-guide.epub $PKG/usr/doc/$DESTNAM-$VERSION - cd ../../help/${DOCLANG:-C} || cd ../../help/C - echo "in `pwd`" - sleep 2 + cd ../../help/$DOCLANG || cd ../../help/C make epub cp -vR gnucash-help.epub $PKG/usr/doc/$DESTNAM-$VERSION cd ../.. diff --git a/office/gnucash-docs/gnucash-docs.info b/office/gnucash-docs/gnucash-docs.info index 27b72791db..e2e666940f 100644 --- a/office/gnucash-docs/gnucash-docs.info +++ b/office/gnucash-docs/gnucash-docs.info @@ -1,8 +1,8 @@ PRGNAM="gnucash-docs" -VERSION="3.4" +VERSION="3.11" HOMEPAGE="http://www.gnucash.org" -DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-docs-3.4-1.tar.gz" -MD5SUM="4c6d522914e8b7eb166888bb2198d832" +DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-docs-3.11.tar.gz" +MD5SUM="1886563b1fc7b2582a19a96484609581" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gnucash rarian yelp" diff --git a/office/gnucash-legacy-docs/gnucash-legacy-docs.SlackBuild b/office/gnucash-legacy-docs/gnucash-legacy-docs.SlackBuild index 4be745e8eb..754e917070 100644 --- a/office/gnucash-legacy-docs/gnucash-legacy-docs.SlackBuild +++ b/office/gnucash-legacy-docs/gnucash-legacy-docs.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gnucash-legacy-docs -# Copyright 2018 Lenard Spencer <lspencer31@cfl.rr.com> +# Copyright 2018, 2019, 2020 Lenard Spencer <lenardrspencer@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/office/gnucash-legacy-docs/gnucash-legacy-docs.info b/office/gnucash-legacy-docs/gnucash-legacy-docs.info index d7d301f559..39441735b8 100644 --- a/office/gnucash-legacy-docs/gnucash-legacy-docs.info +++ b/office/gnucash-legacy-docs/gnucash-legacy-docs.info @@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-docs-2.6.20.tar.gz" MD5SUM="b55a5a2d2486ec3e2c3b392bc397b822" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gnucash rarian yelp" +REQUIRES="gnucash-legacy rarian yelp" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/office/gnucash-legacy/README b/office/gnucash-legacy/README index 6070b0bd0f..d1c71a62a1 100644 --- a/office/gnucash-legacy/README +++ b/office/gnucash-legacy/README @@ -9,9 +9,13 @@ on professional accounting principles to ensure balanced books and accurate reports. Pass OFX="yes" for OFX (USA) (requies libofx) -Pass AQ="yes" to enable aqbanking (Germany) (requires aqbanking) + Pass WITHPYTHON="yes" to enable Python bindings for report gereration. +Note that the AQ="yes/no" switch has been removed as this version of +gnucash will not build with the new versions of aqbanking; the older +versions of aqbanking are not only obsolete, but no longer available. + If you want the SQL database integration, you must first have libdbi and libdbi-drivers installed, and then pass the DBI="yes" flag. diff --git a/office/gnucash-legacy/gnucash-legacy.SlackBuild b/office/gnucash-legacy/gnucash-legacy.SlackBuild index c7e7923415..c203787a98 100644 --- a/office/gnucash-legacy/gnucash-legacy.SlackBuild +++ b/office/gnucash-legacy/gnucash-legacy.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for gnucash-legacy # Copyright 2015 Trayan Denev, tdenev@gmail.com -# This version Copyright 2018 Lenard Spencer <lspencer31@cfl.rr.com> +# Copyright 2018 Lenard Spencer <lenardrspencer@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -85,14 +85,6 @@ else OFXBANKING="--disable-ofx" fi -if [ "$AQ" = "yes" ]; then - AQBANKING="--enable-aqbanking" - echo " building with aqbanking enabled" - sleep 1 -else - AQBANKING="--disable-aqbanking" -fi - if [ "$WITHPYTHON" = "yes" ]; then W_PYTHON="--enable-python" echo " building with Python bindings enabled" @@ -129,7 +121,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$SRCNAM-$VERSION \ $W_PYTHON \ $OFXBANKING \ - $AQBANKING \ + --disable-aqbanking \ --disable-schemas-compile \ $DBIARGS \ --build=$ARCH-slackware-linux diff --git a/office/gnucash/README b/office/gnucash/README index 20215f5293..35bbcb0a93 100644 --- a/office/gnucash/README +++ b/office/gnucash/README @@ -8,20 +8,33 @@ As quick and intuitive to use as a checkbook register, it is based on professional accounting principles to ensure balanced books and accurate reports. -The dependencies webkitgtk, goffice0.8 and libgnomecanvas have been -dropped, with webkit2gtk, python3, and gtest being the new dependencies. - Pass OFX="yes" for OFX (USA) (requies libofx) + Pass AQ="yes" to enable aqbanking (Germany) (requires aqbanking) + Pass WITHPYTHON="yes" to enable Python bindings for report gereration. If you want the SQL database integration, you must first have libdbi -and libdbi-drivers installed (with postgresql support), and then pass -the DBI="yes" flag. +and libdbi-drivers installed and pass DBI="yes" to the build script. + +The script now incudes an option to build with ninja. To use this +option, make sure ninja is installed and pass NINJA="yes" to the +build script. NOTE: You must remove any previous installation of Gnucash before -running this script, otherwise the build will fail. +running this script, otherwise the build will most likely fail. + +This script builds version 3.11. If you need the old stable 2.6.x +series, please use gnucash-legacy, also available on SBo. + +Please note version 3.11 will be the last for Slackware 14.2. +Version 4.x will NOT build on 14.2 because of outdated dependencies +(gcc, cmake, and glib2 among others). + +NOTE FOR CURRENT/15.0 -This script builds version 3.x which is now considered stable by the -upstream developers. If you need the old stable 2.6.x series, please -use gnucash-legacy, also available on SBo. +If you are building on current (15.0 EXPERIMENTAL), you will need the +guile2.2 package from Ponce's -current repo. Alternatively, you can +download version 4.1 or later from the gnucash website and build that +by passing VERSION=4.(1 or later) to the script without having to +install guile2.2. (Version 4.0 still requires guile2.2.) diff --git a/office/gnucash/gnucash-boost-1.73.patch b/office/gnucash/gnucash-boost-1.73.patch new file mode 100644 index 0000000000..ab3a015199 --- /dev/null +++ b/office/gnucash/gnucash-boost-1.73.patch @@ -0,0 +1,10 @@ +--- gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp.orig 2020-05-11 19:38:43.108485371 +0000 ++++ gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp +@@ -34,6 +34,7 @@ extern "C" { + #include "gnc-commodity.h" + } + ++#include <algorithm> + #include <string> + #include <vector> + #include <boost/optional.hpp> diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild index 5aee6ffa02..1257563bab 100644 --- a/office/gnucash/gnucash.SlackBuild +++ b/office/gnucash/gnucash.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for gnucash # Copyright 2015 Trayan Denev, tdenev@gmail.com -# This version Copyright 2018 Lenard Spencer <lspencer31@cfl.rr.com> +# This version Copyright 2018 Lenard Spencer <lenardrspencer@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,10 +24,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gnucash -VERSION=${VERSION:-3.4} +VERSION=${VERSION:-3.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PACKAGER=${PACKAGER:-"Just Another Slacker"} if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -69,15 +70,15 @@ if [ -e /usr/bin/gnucash ]; then fi if [ "$DBI" = "yes" ]; then - DBIARGS="-DWITH_SQL=ON -DGNC_DBD_DIR=/usr/lib${LIBDIRSUFFIX}/dbd/ " - echo " building with dbi enabled" + DBIARGS="-DWITH_SQL=ON -DGNC_DBD_DIR=/usr/lib${LIBDIRSUFFIX}/dbd/" + echo " building with SQL integration enabled" sleep 1 else DBIARGS="-DWITH_SQL=OFF " fi if [ "$OFX" = "yes" ]; then - OFXBANKING="DWITH_OFX=ON" + OFXBANKING="-DWITH_OFX=ON" echo " building with OFX enabled" sleep 1 else @@ -102,12 +103,11 @@ fi set -e - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-${VERSION}.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -116,6 +116,14 @@ 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 {} \; +# New option to build with ninja: +if [ "${NINJA:-no}" = "yes" ]; then + echo "building using Ninja:" + NINJABUILD="-GNinja" +else + NINJABUILD="" +fi + mkdir -p build cd build cmake \ @@ -124,19 +132,21 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DSYSCONFDIR=/etc \ - -DLOCALSTATEDIR=/var \ - -DDOCDIR=/usr/doc/$PRGNAM-$VERSION \ - -DINFODIR=/usr/info \ -DCOMPILE_GSCHEMAS=OFF \ - -DMANDIR=/usr/man \ $DBIARGS \ $W_PYTHON \ $OFXBANKING \ $AQBANKING \ + $NINJABUILD \ + -DGNUCASH_BUILD_ID="$VERSION-`date -I` by $PACKAGER" \ -DCMAKE_BUILD_TYPE=release .. -make -make -j1 install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION +if [ $NINJA = "yes" ]; then + DESTDIR="$PKG" ninja install +else + make + make -j1 install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION +fi find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -148,10 +158,11 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r # Don't clobber these mv $PKG/etc/gnucash/environment $PKG/etc/gnucash/environment.new -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog DOCUMENTERS HACKING LICENSE NEWS README* TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION || true +mkdir -p $PKG/usr/doc +mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rmdir $PKG/usr/share/doc +ln -s $PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/office/gnucash/gnucash.info b/office/gnucash/gnucash.info index 4a9a62e16c..c899627c28 100644 --- a/office/gnucash/gnucash.info +++ b/office/gnucash/gnucash.info @@ -1,10 +1,10 @@ PRGNAM="gnucash" -VERSION="3.4" +VERSION="3.11" HOMEPAGE="http://www.gnucash.org/" -DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-3.4.tar.bz2" -MD5SUM="dbf81026c0937345b6ecf932dfff432d" +DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-3.11.tar.bz2" +MD5SUM="391f07eb0934618154d9e9c7d717d8e6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="webkit2gtk python3 gtest" +REQUIRES="webkit2gtk pygobject3-python3 gtest" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/office/goldendict/goldendict.SlackBuild b/office/goldendict/goldendict.SlackBuild index 3f3f4fc23b..2d1e6b478f 100644 --- a/office/goldendict/goldendict.SlackBuild +++ b/office/goldendict/goldendict.SlackBuild @@ -57,6 +57,7 @@ chown -R root:root . $(type -p qmake-qt5 || echo qmake) PREFIX=/usr \ CONFIG+=no_epwing_support \ + CONFIG+=zim_support \ DISABLE_INTERNAL_PLAYER=$DISABLE_INTERNAL_PLAYER make install INSTALL_ROOT=$PKG diff --git a/office/grisbi/README b/office/grisbi/README index f8835546ed..69dafd95ca 100644 --- a/office/grisbi/README +++ b/office/grisbi/README @@ -3,4 +3,4 @@ Windows, released under the GPL licence. Its aim is to provide you with the most simple and intuitive software for basic use, and still very powerful if you spend a little time on the setup. -Optional dependencies: cunit, libofx and goffice0.8 +Optional dependencies: cunit, libofx and goffice diff --git a/office/grisbi/doinst.sh b/office/grisbi/doinst.sh index aea0f894eb..f25bed6fb6 100644 --- a/office/grisbi/doinst.sh +++ b/office/grisbi/doinst.sh @@ -11,3 +11,9 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi + +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi diff --git a/office/grisbi/grisbi.SlackBuild b/office/grisbi/grisbi.SlackBuild index 690264a2eb..3df7924090 100644 --- a/office/grisbi/grisbi.SlackBuild +++ b/office/grisbi/grisbi.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for grisbi -# Copyright 2010-2018 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2010-2019 Larry Hajali <larryhaja[at]gmail[dot]com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=grisbi -VERSION=${VERSION:-1.0.4} +VERSION=${VERSION:-1.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,6 +69,13 @@ 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 {} \; +# Test for cunit +if pkg-config --exists cunit; then + CUNIT_ENABLED="yes" +else + CUNIT_ENABLED="no" +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -79,6 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-static=no \ --disable-dependency-tracking \ --disable-silent-rules \ + --with-cunit=$CUNIT_ENABLED \ --build=$ARCH-slackware-linux make diff --git a/office/grisbi/grisbi.info b/office/grisbi/grisbi.info index 65b4327803..556dfa8a2f 100644 --- a/office/grisbi/grisbi.info +++ b/office/grisbi/grisbi.info @@ -1,8 +1,8 @@ PRGNAM="grisbi" -VERSION="1.0.4" +VERSION="1.2.2" HOMEPAGE="http://www.grisbi.org/" -DOWNLOAD="https://downloads.sourceforge.net/grisbi/grisbi-1.0.4.tar.bz2" -MD5SUM="23215e7be14cc2ff64ea36f406fc1599" +DOWNLOAD="https://downloads.sourceforge.net/grisbi/grisbi-1.2.2.tar.bz2" +MD5SUM="4397b442cd893e07da11fef9bfd8fa49" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/hamster/hamster.SlackBuild b/office/hamster/hamster.SlackBuild index 4795941492..fb9acdfd23 100644 --- a/office/hamster/hamster.SlackBuild +++ b/office/hamster/hamster.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for Hamster - The Gnome Time Tracker # -# Copyright 2016 Marek Srejma (sam_web@yahoo.de) +# Copyright 2016-2020 Marek Srejma (sam_web@yahoo.de) # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,12 +23,10 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=hamster -VERSION=${VERSION:-1.04} +VERSION=${VERSION:-3.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -ARCHIVE="hamster-time-tracker-$VERSION" - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -61,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$ARCHIVE -tar xvf $CWD/$PRGNAM-$ARCHIVE.tar.gz || tar xvf $CWD/$ARCHIVE.tar.gz -cd $PRGNAM-$ARCHIVE +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ @@ -83,7 +81,7 @@ DESTDIR=$PKG \ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING MAINTAINERS NEWS README.textile TODO \ + AUTHORS COPYING MAINTAINERS NEWS.md README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/office/hamster/hamster.info b/office/hamster/hamster.info index 7003f8b396..6bd813e0e8 100644 --- a/office/hamster/hamster.info +++ b/office/hamster/hamster.info @@ -1,10 +1,10 @@ PRGNAM="hamster" -VERSION="1.04" +VERSION="3.0.2" HOMEPAGE="http://projecthamster.org/" -DOWNLOAD="https://github.com/projecthamster/hamster/archive/hamster-time-tracker-1.04.tar.gz" -MD5SUM="148ffee0c26c5c4ddfa4ebc9a21fa860" +DOWNLOAD="https://github.com/projecthamster/hamster/archive/v3.0.2/hamster-3.0.2.tar.gz" +MD5SUM="1c229c304cc0aae85f02c72a4e27d66a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gnome-python2-gconf pyxdg" +REQUIRES="pygobject3-python3 dbus-python3 pyxdg" MAINTAINER="Marek Srejma" EMAIL="sam_web@yahoo.de" diff --git a/office/hebcal/hebcal.SlackBuild b/office/hebcal/hebcal.SlackBuild index b52bda74c2..f74215ff85 100644 --- a/office/hebcal/hebcal.SlackBuild +++ b/office/hebcal/hebcal.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for hebcal -# Copyright 2017 Judah Milgram, Washington DC +# Copyright 2017-2021 Judah Milgram, Washington DC # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=hebcal -VERSION=${VERSION:-4.13} +VERSION=${VERSION:-4.24} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/hebcal/hebcal.info b/office/hebcal/hebcal.info index 1fb679f4cc..67cd9ae299 100644 --- a/office/hebcal/hebcal.info +++ b/office/hebcal/hebcal.info @@ -1,10 +1,10 @@ PRGNAM="hebcal" -VERSION="4.13" +VERSION="4.24" HOMEPAGE="http://hebcal.github.io/" -DOWNLOAD="https://github.com/hebcal/hebcal/archive/v4.13/hebcal-4.13.tar.gz" -MD5SUM="23fb97bf63cd330d4d0a32b8ba69548a" +DOWNLOAD="https://github.com/hebcal/hebcal/archive/v4.24/hebcal-4.24.tar.gz" +MD5SUM="5772b0f41c07ff4bd9814da6fcb155d5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Judah Milgram" -EMAIL="milgram@cgpp.com" +EMAIL="milgram at cgpp dot com" diff --git a/office/htmldoc/htmldoc.SlackBuild b/office/htmldoc/htmldoc.SlackBuild index f88d47c057..4cd6246b80 100644 --- a/office/htmldoc/htmldoc.SlackBuild +++ b/office/htmldoc/htmldoc.SlackBuild @@ -29,9 +29,18 @@ # Feb 01 2017: Alfredo # Update script for html-1.8.29, fix the problem with /usr/share/htmldoc/data # not being copied into the package +# +# +# May 01 2020: organixpear +# Update script for htmldoc-1.9.8 +# This was a needed update as htmldoc-1.8.29 was 3 years out of date +# and the build would fail on recent versions (current) of Slackware. +# gnutls support was also found to be working in htmldoc-1.9.8 so +# support was added. Misc updates and cleanups to install commands. +# PRGNAM=htmldoc -VERSION=${VERSION:-1.8.29} +VERSION=${VERSION:-1.9.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -48,7 +57,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCFILES="CHANGES.txt README.txt COMPILE.txt COPYING.txt htmldoc.readme" +DOCFILES="CHANGES.md README.md COPYING" if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -70,7 +79,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION-source.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -113,22 +122,14 @@ make all # Copy some files who are not automatically installed (main binary, .desktop, icons, etc..) mkdir -p $PKG/usr/bin install -m 755 htmldoc/$PRGNAM $PKG/usr/bin -mkdir -p $PKG/usr/man/man1 -cp -a doc/$PRGNAM.1 $PKG/usr/man/man1 mkdir -p $PKG/usr/share/applications cp -a desktop/$PRGNAM.desktop $PKG/usr/share/applications -mkdir -p $PKG/usr/share/mimelnk/application -cp -a desktop/vnd.htmldoc-book.desktop $PKG/usr/share/mimelnk/application mkdir -p $PKG/usr/share/mime/packages cp -a desktop/htmldoc.xml $PKG/usr/share/mime/packages -mkdir -p $PKG/usr/share/icons/hicolor/{16x16,24x24,32x32,48x48,64x64,96x96,128x128}/apps/ -cp -a desktop/htmldoc-16.png $PKG/usr/share/icons/hicolor/16x16/apps/$PRGNAM.png -cp -a desktop/htmldoc-24.png $PKG/usr/share/icons/hicolor/24x24/apps/$PRGNAM.png +mkdir -p $PKG/usr/share/icons/hicolor/{16x16,24x24,32x32,48x48,64x64,96x96,128x128,256x256}/apps/ cp -a desktop/htmldoc-32.png $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png -cp -a desktop/htmldoc-48.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png -cp -a desktop/htmldoc-64.png $PKG/usr/share/icons/hicolor/64x64/apps/$PRGNAM.png -cp -a desktop/htmldoc-96.png $PKG/usr/share/icons/hicolor/96x96/apps/$PRGNAM.png cp -a desktop/htmldoc-128.png $PKG/usr/share/icons/hicolor/128x128/apps/$PRGNAM.png +cp -a desktop/htmldoc-256.png $PKG/usr/share/icons/hicolor/256x256/apps/$PRGNAM.png mkdir -p $PKG/usr/share/htmldoc/ cp -a fonts $PKG/usr/share/htmldoc/ cp -a data $PKG/usr/share/htmldoc/ @@ -137,7 +138,6 @@ cp -a data $PKG/usr/share/htmldoc/ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done # Just in case .. diff --git a/office/htmldoc/htmldoc.info b/office/htmldoc/htmldoc.info index 5bdd183509..310daf33e4 100644 --- a/office/htmldoc/htmldoc.info +++ b/office/htmldoc/htmldoc.info @@ -1,8 +1,8 @@ PRGNAM="htmldoc" -VERSION="1.8.29" +VERSION="1.9.8" HOMEPAGE="https://www.msweet.org/htmldoc/index.html" -DOWNLOAD="http://www.mirrorservice.org/sites/distfiles.finkmirrors.net/md5/dd2a05e2608d4f34db13c17a6667bb5e/htmldoc-1.8.29-source.tar.bz2" -MD5SUM="dd2a05e2608d4f34db13c17a6667bb5e" +DOWNLOAD="https://github.com/michaelrsweet/htmldoc/releases/download/v1.9.8/htmldoc-1.9.8-source.tar.gz" +MD5SUM="71c7d0dd3b4e01cfc9b9e932b8b58f01" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fltk" diff --git a/office/hunspell-de/hunspell-de.SlackBuild b/office/hunspell-de/hunspell-de.SlackBuild index 26029dfd02..50cc3a5bf2 100644 --- a/office/hunspell-de/hunspell-de.SlackBuild +++ b/office/hunspell-de/hunspell-de.SlackBuild @@ -50,15 +50,16 @@ find -L . \ make hunspell/de_DE.aff hunspell/de_DE.dic hunspell/de_AT.aff hunspell/de_AT.dic hunspell/de_CH.aff hunspell/de_CH.dic -pushd hunspell -install -dm755 $PKG/usr/share/hunspell -install -m644 de_*.dic de_*.aff $PKG/usr/share/hunspell -install -dm755 $PKG/usr/share/myspell/dicts -cd $PKG/usr/share/myspell/dicts -for file in $PKGDIR/usr/share/hunspell/*; do - ln -sv ../../hunspell/$(basename $file) . -done -popd +cd hunspell + install -dm755 $PKG/usr/share/hunspell + install -m644 de_*.dic de_*.aff $PKG/usr/share/hunspell + install -dm755 $PKG/usr/share/myspell/dicts + cd $PKG/usr/share/myspell/dicts + for file in $PKGDIR/usr/share/hunspell/*; do + ln -sv ../../hunspell/$(basename $file) . + done + cd - +cd .. mkdir $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/office/hunspell-de/hunspell-de.info b/office/hunspell-de/hunspell-de.info index 5786d6f64a..80e008706b 100644 --- a/office/hunspell-de/hunspell-de.info +++ b/office/hunspell-de/hunspell-de.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Johannes Schoepfer" -EMAIL="slackbuilds[at]schoepfer[dot]info" +EMAIL="slackbuilds@schoepfer.info" diff --git a/office/hunspell-en/hunspell-en.SlackBuild b/office/hunspell-en/hunspell-en.SlackBuild index debd82f350..2f7c757d63 100644 --- a/office/hunspell-en/hunspell-en.SlackBuild +++ b/office/hunspell-en/hunspell-en.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for hunspell-en # Copyright 2014, Pablo Santamaria (pablosantamaria@gmail.com) -# Copyright 2017 Donald Cooley South Haven, IN USA +# Copyright 2017-2019 Donald Cooley South Haven, IN USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ # Based on the Arch PKGBUILD PRGNAM=hunspell-en -VERSION=${VERSION:-2017.01.22} +VERSION=${VERSION:-2018.04.16} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} ARCH="noarch" diff --git a/office/hunspell-en/hunspell-en.info b/office/hunspell-en/hunspell-en.info index 11d0589ed9..91968fc37f 100644 --- a/office/hunspell-en/hunspell-en.info +++ b/office/hunspell-en/hunspell-en.info @@ -1,16 +1,16 @@ PRGNAM="hunspell-en" -VERSION="2017.01.22" +VERSION="2018.04.16" HOMEPAGE="http://wordlist.aspell.net/dicts/" -DOWNLOAD="http://downloads.sourceforge.net/wordlist/hunspell-en_AU-2017.01.22.zip \ - http://downloads.sourceforge.net/wordlist/hunspell-en_CA-2017.01.22.zip \ - http://sourceforge.net/projects/wordlist/files/speller/2017.01.22/hunspell-en_GB-ise-2017.01.22.zip \ - http://sourceforge.net/projects/wordlist/files/speller/2017.01.22/hunspell-en_GB-ize-2017.01.22.zip \ - http://downloads.sourceforge.net/wordlist/hunspell-en_US-2017.01.22.zip" -MD5SUM="c55adaea27508bc55db4b4b27c6d9822 \ - 10e7b9ae290217a127056897496d26ea \ - dfdfdffda442324960a9c75e489a5e18 \ - 2f514a3e2e847f4eac3ec14e43cc2d85 \ - 9af4f5e765f02bce36c9ee91fcce02b5" +DOWNLOAD="http://downloads.sourceforge.net/wordlist/hunspell-en_AU-2018.04.16.zip \ + http://downloads.sourceforge.net/wordlist/hunspell-en_CA-2018.04.16.zip \ + http://sourceforge.net/projects/wordlist/files/speller/2018.04.16/hunspell-en_GB-ise-2018.04.16.zip \ + http://sourceforge.net/projects/wordlist/files/speller/2018.04.16/hunspell-en_GB-ize-2018.04.16.zip \ + http://downloads.sourceforge.net/wordlist/hunspell-en_US-2018.04.16.zip" +MD5SUM="e1a9c9cf76effc073354688ba86c7702 \ + 3cded9c03cbed3422ad51bbd8199ee42 \ + 2c7cc43290b5a7e25397227a285bab6f \ + 06e61c1ff7a23e33daa1a7d4b4e37928 \ + 266fae31d899f7682bc81d9b0aa5832e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/impressive/impressive.SlackBuild b/office/impressive/impressive.SlackBuild index 61651c7e5c..be8a20dcd3 100644 --- a/office/impressive/impressive.SlackBuild +++ b/office/impressive/impressive.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for impressive # Copyright 2010 Binh Nguyen <binhvng@gmail.com> -# Copyright 2015-2018 Brenton Earl <brent@exitstatusone.com> +# Copyright 2015-2018,2020 Brenton Earl <brent@exitstatusone.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ PRGNAM=impressive SRCNAM=Impressive -VERSION=${VERSION:-0.12.0} +VERSION=${VERSION:-0.12.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/impressive/impressive.info b/office/impressive/impressive.info index 98d7aa7fbb..f322d5a9b6 100644 --- a/office/impressive/impressive.info +++ b/office/impressive/impressive.info @@ -1,8 +1,8 @@ PRGNAM="impressive" -VERSION="0.12.0" +VERSION="0.12.1" HOMEPAGE="http://impressive.sourceforge.net/" -DOWNLOAD="https://sourceforge.net/projects/impressive/files/Impressive/0.12.0/Impressive-0.12.0.tar.gz" -MD5SUM="743bd446a3cb2712a09b7471529c5139" +DOWNLOAD="https://sourceforge.net/projects/impressive/files/Impressive/0.12.1/Impressive-0.12.1.tar.gz" +MD5SUM="05f997d27dd183d9da38439787cdb736" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pygame pilkit" diff --git a/office/jstock/jstock.SlackBuild b/office/jstock/jstock.SlackBuild index f48972232b..89d383d91d 100644 --- a/office/jstock/jstock.SlackBuild +++ b/office/jstock/jstock.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=jstock -VERSION=${VERSION:-1.0.7.37} +VERSION=${VERSION:-1.0.7.44} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/jstock/jstock.info b/office/jstock/jstock.info index 9142e5d450..8fa6924491 100644 --- a/office/jstock/jstock.info +++ b/office/jstock/jstock.info @@ -1,8 +1,8 @@ PRGNAM="jstock" -VERSION="1.0.7.37" +VERSION="1.0.7.44" HOMEPAGE="http://www.jstock.org/" -DOWNLOAD="https://github.com/yccheok/jstock/releases/download/release_1-0-7-37/jstock-1.0.7.37-bin.zip" -MD5SUM="aa352907a525c0212d85797fbc41ad7f" +DOWNLOAD="https://github.com/yccheok/jstock/releases/download/release_1-0-7-44/jstock-1.0.7.44-bin.zip" +MD5SUM="07756665d8dc7b78da3efeab895b66de" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk" diff --git a/office/keepassx/keepassx.SlackBuild b/office/keepassx/keepassx.SlackBuild index 6d5224874a..c55e2eced1 100644 --- a/office/keepassx/keepassx.SlackBuild +++ b/office/keepassx/keepassx.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # SlackBuild for KeePassX, 14 August 2017 -# awg <awg@cock.li> +# Copyright 2020 M.A. Begue mab974@gmail.com # All rights reserved. # # Permission to use, copy, modify, or distribute this software for any @@ -20,6 +20,7 @@ ## KeePassX itself remains a copyrighted work. ## Please see the file COPYING in the source distribution. + PRGNAM=keepassx VERSION=${VERSION:-2.0.3} BUILD=${BUILD:-1} diff --git a/office/keepassx/keepassx.info b/office/keepassx/keepassx.info index 1659fa1bf8..271c95a46c 100644 --- a/office/keepassx/keepassx.info +++ b/office/keepassx/keepassx.info @@ -6,5 +6,5 @@ MD5SUM="7852c9f1a0c04971c10370a757257dcd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="awg" -EMAIL="awg@cock.li" +MAINTAINER="Michel A. BEGUE" +EMAIL="mab974@gmail.com" diff --git a/office/keepassxc/README b/office/keepassxc/README index de1dc55ca1..ab9f3501dd 100644 --- a/office/keepassxc/README +++ b/office/keepassxc/README @@ -7,18 +7,27 @@ baseline. KeePassXC may be installed alongside KeePassX (also available as a SlackBuild). KeePassXC can be built with YubiKey two-factor authentication support for -unlocking the database. This introduces a dependency on ykpers and can be +unlocking the database. This introduces a dependency on misc/ykpers and can be enabled by passing YUBIKEY=ON to the script. -KeePassXC will be built with browser support, meaning it can function as +Browser support is enabled by default, meaning that KeePassXC can function as password storage for Mozilla Firefox and Chromium/Chrome. This may be disabled by passing BROWSER=OFF to the script. -KeePassXC will be built with SSH agent support, meaning that KeepassXC can -interact with a running agent. This may be disabled by passing SSHAGENT=OFF to -the script. +KeePassXC will be built with SSH agent support, allowing it to interact with a +running agent. This may be disabled by passing SSHAGENT=OFF to the script. -KeePassXC will be built with networking support, meaning that website favicons -can be downloaded. This maybe disabled by passing NETWORKING=OFF to the script. +Networking support, allowing website favicons to be downloaded, is enabled by +default. This maybe disabled by passing NETWORKING=OFF to the script. + +To include documentation, rubygem-asciidoctor must be installed and DOCS=ON +must be passed to the script. + +Support for database sharing and synchronisation using KeeShare will be +disabled. It can be enabled by setting KEESHARE=ON, or a secure version can be +enabled with KEESHARE_SECURE=ON, providing libraries/quazip-qt5 is installed. + +KeePassXC will display a notification of new releases unless the option +UPDATECHECK=OFF is provided. Autotype may be disabled by passing AUTOTYPE=OFF. diff --git a/office/keepassxc/keepassxc.SlackBuild b/office/keepassxc/keepassxc.SlackBuild index 35ac0975a9..2ee32823c3 100644 --- a/office/keepassxc/keepassxc.SlackBuild +++ b/office/keepassxc/keepassxc.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for KeePassXC -# Copyright 2017-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=keepassxc -VERSION=${VERSION:-2.3.4} +VERSION=${VERSION:-2.6.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,15 +71,21 @@ find -L . \ mkdir -p build cd build + export LDFLAGS="-ltermcap" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_TESTS=OFF \ - -DWITH_XC_BROWSER="${BROWSER:-ON}" \ - -DWITH_XC_YUBIKEY="${YUBIKEY:-OFF}" \ - -DWITH_XC_NETWORKING="${NETWORKING:-ON}" \ - -DWITH_XC_AUTOTYPE="${AUTOTYPE:-ON}" \ - -DWITH_XC_SSHAGENT="${SSHAGENT:-ON}" \ + -DWITH_XC_BROWSER=${BROWSER:-ON} \ + -DWITH_XC_YUBIKEY=${YUBIKEY:-OFF} \ + -DWITH_XC_NETWORKING=${NETWORKING:-ON} \ + -DWITH_XC_AUTOTYPE=${AUTOTYPE:-ON} \ + -DWITH_XC_DOCS=${DOCS:-OFF} \ + -DWITH_XC_SSHAGENT=${SSHAGENT:-ON} \ + -DWITH_XC_KEESHARE=${KEESHARE:-OFF} \ + -DWITH_XC_KEESHARE_SECURE=${KEESHARE_SECURE:-OFF} \ + -DWITH_XC_UPDATECHECK=${UPDATECHECK:-ON} \ .. make @@ -89,13 +95,14 @@ cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mv $PKG/usr/share/man $PKG/usr -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +if [ "$DOCS" = "ON" ]; then + find $PKG/usr/man -type f -exec gzip -9 {} \; + for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - CHANGELOG COPYING README.md \ + CHANGELOG.md COPYING README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/office/keepassxc/keepassxc.info b/office/keepassxc/keepassxc.info index fa5ab1368f..1569fdc32c 100644 --- a/office/keepassxc/keepassxc.info +++ b/office/keepassxc/keepassxc.info @@ -1,10 +1,10 @@ PRGNAM="keepassxc" -VERSION="2.3.4" +VERSION="2.6.4" HOMEPAGE="https://github.com/keepassxreboot/keepassxc" -DOWNLOAD="https://github.com/keepassxreboot/keepassxc/releases/download/2.3.4/keepassxc-2.3.4-src.tar.xz" -MD5SUM="c8f8280cf4155c32d0b50c059d0a3edf" +DOWNLOAD="https://github.com/keepassxreboot/keepassxc/releases/download/2.6.4/keepassxc-2.6.4-src.tar.xz" +MD5SUM="9574ff6fdd215e014569fc8a6b1f56e9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="argon2 libsodium qt5" +REQUIRES="argon2 libsodium qrencode qt5" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/office/kmymoney/README b/office/kmymoney/README index 499d009510..81bc1e7bdd 100644 --- a/office/kmymoney/README +++ b/office/kmymoney/README @@ -1,4 +1,6 @@ KmyMoney is a simple financial accounting manager for KDE for personal or small-business use. It is a full double-entry accounting software package. libofx 0.9.4+ is an optional dependency to support ofxbanking. -aqbanking and gwenhywfar are optional dependencies to support Kbanking. +agbanking and gwenhywfar are optional dependencies to support Kbanking. + +p7zip is a build-time dependency. It is required to decompress the source file. diff --git a/office/kmymoney/kmymoney.SlackBuild b/office/kmymoney/kmymoney.SlackBuild index c8c5369902..378a846bbb 100644 --- a/office/kmymoney/kmymoney.SlackBuild +++ b/office/kmymoney/kmymoney.SlackBuild @@ -2,7 +2,7 @@ # SlackBuild script for kmymoney -# Copyright 2016-2018 Christophe Nguyen, France +# Copyright 2016-2019 Christophe Nguyen, France # Copyright 2010-2014 Gilcio Amaral <gilcio.amaral@gmail.com> # Copyright 2007-2008 Michiel van Wessem, Manchester, United Kingdom # All rights reserved. @@ -27,7 +27,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=kmymoney -VERSION=${VERSION:-4.8.2} +VERSION=${VERSION:-4.8.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -64,7 +64,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT rm -rf $TMP/$PRGNAM-$VERSION cd $TMP -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +7z x $CWD/$PRGNAM-$VERSION-src.7z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -80,7 +80,6 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DHTML_INSTALL_DIR=/usr/doc/$PRGNAM-$VERSION/HTML \ -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 diff --git a/office/kmymoney/kmymoney.info b/office/kmymoney/kmymoney.info index fd54aad744..f2c8ebc877 100644 --- a/office/kmymoney/kmymoney.info +++ b/office/kmymoney/kmymoney.info @@ -1,10 +1,10 @@ PRGNAM="kmymoney" -VERSION="4.8.2" -HOMEPAGE="https://kmymoney.org" -DOWNLOAD="https://download.kde.org/stable/kmymoney/4.8.2/src/kmymoney-4.8.2.tar.xz" -MD5SUM="8dde70893b49d14ba101dc95f78d5984" +VERSION="4.8.4" +HOMEPAGE="http://www.kmymoney.org" +DOWNLOAD="https://download.kde.org/stable/kmymoney/4.8.4/src/kmymoney-4.8.4-src.7z" +MD5SUM="b18a5714db7a098155f2c29dbf31b458" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libalkimia" +REQUIRES="p7zip libalkimia" MAINTAINER="Christophe Nguyen" EMAIL="cnguyenminhtan@free.fr" diff --git a/office/kmymoney/slack-desc b/office/kmymoney/slack-desc index f9239e0c5c..28064f3829 100644 --- a/office/kmymoney/slack-desc +++ b/office/kmymoney/slack-desc @@ -13,7 +13,7 @@ kmymoney: personal or small-business use. It is a complete and full kmymoney: double-entry accounting software package. kmymoney: kmymoney: -kmymoney: Homepage: https://kmymoney.org +kmymoney: Homepage: http://kmymoney.org kmymoney: kmymoney: kmymoney: diff --git a/office/krop/krop.SlackBuild b/office/krop/krop.SlackBuild index 9c49d8e7cd..44aaf0fd21 100644 --- a/office/krop/krop.SlackBuild +++ b/office/krop/krop.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for krop -# Copyright 2018, Alexander Verbovetsky, Moscow, Russia +# Copyright 2018-2020, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=krop -VERSION=${VERSION:-0.5.1} +VERSION=${VERSION:-0.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,8 +81,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/share/applications install -m 0644 -o root -g root krop.desktop $PKG/usr/share/applications/ -mkdir -p $PKG/usr/man/man1 -gzip -c9 krop.1 > $PKG/usr/man/man1/krop.1.gz +mv $PKG/usr/share/man $PKG/usr +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a ChangeLog README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/office/krop/krop.info b/office/krop/krop.info index 27b6f3f9de..766a235fbe 100644 --- a/office/krop/krop.info +++ b/office/krop/krop.info @@ -1,8 +1,8 @@ PRGNAM="krop" -VERSION="0.5.1" +VERSION="0.6.0" HOMEPAGE="http://arminstraub.com/computer/krop" -DOWNLOAD="https://github.com/arminstraub/krop/archive/v0.5.1/krop-0.5.1.tar.gz" -MD5SUM="ce3043ce29462d89c69e37d08097ab73" +DOWNLOAD="https://github.com/arminstraub/krop/archive/v0.6.0/krop-0.6.0.tar.gz" +MD5SUM="8bf9e9d64a4f7b749980a14dc699f96a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python-poppler-qt4 PyPDF2" diff --git a/office/latexdiff/latexdiff.SlackBuild b/office/latexdiff/latexdiff.SlackBuild index 61ffae61d2..cf7ca6c9ce 100644 --- a/office/latexdiff/latexdiff.SlackBuild +++ b/office/latexdiff/latexdiff.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for latexdiff -# Copyright 2018 Dominik Drobek <dominik.drobek (at) o2.pl> +# Copyright 2018, 2020 Dominik Drobek <dominik.drobek (at) o2.pl> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=latexdiff -VERSION=${VERSION:-1.3.0} +VERSION=${VERSION:-1.3.1.1} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/latexdiff/latexdiff.info b/office/latexdiff/latexdiff.info index eb10f1d567..7756e6662b 100644 --- a/office/latexdiff/latexdiff.info +++ b/office/latexdiff/latexdiff.info @@ -1,8 +1,8 @@ PRGNAM="latexdiff" -VERSION="1.3.0" +VERSION="1.3.1.1" HOMEPAGE="https://www.ctan.org/tex-archive/support/latexdiff" -DOWNLOAD="https://github.com/ftilmann/latexdiff/releases/download/1.3.0/latexdiff-1.3.0.tar.gz" -MD5SUM="b8cdd944ad6c459c78a9ec75cfb0b3c2" +DOWNLOAD="https://github.com/ftilmann/latexdiff/releases/download/1.3.1.1/latexdiff-1.3.1.1.tar.gz" +MD5SUM="1f1b3f8ace259e24e0c3d8cad5f85dc6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/libreoffice-helppack/libreoffice-helppack.SlackBuild b/office/libreoffice-helppack/libreoffice-helppack.SlackBuild index e7bd29ec58..d647b7ce5a 100644 --- a/office/libreoffice-helppack/libreoffice-helppack.SlackBuild +++ b/office/libreoffice-helppack/libreoffice-helppack.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libreoffice-helppack -VERSION=${VERSION:-"6.1.4"} +VERSION=${VERSION:-"6.2.8.2"} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/libreoffice-helppack/libreoffice-helppack.info b/office/libreoffice-helppack/libreoffice-helppack.info index 03cbd64f07..fe86cacdb6 100644 --- a/office/libreoffice-helppack/libreoffice-helppack.info +++ b/office/libreoffice-helppack/libreoffice-helppack.info @@ -1,10 +1,10 @@ PRGNAM="libreoffice-helppack" -VERSION="6.1.4" +VERSION="6.2.8.2" HOMEPAGE="https://www.libreoffice.org" -DOWNLOAD="https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_en-US.tar.gz" -MD5SUM="b14fc21605eee902936d7ac6ef7a3abe" -DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86_64/LibreOffice_6.1.4_Linux_x86-64_rpm_helppack_en-US.tar.gz" -MD5SUM_x86_64="da52c914c2030102dc4b087ff8055242" +DOWNLOAD="https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.8.2/rpm/x86/LibreOffice_6.2.8.2_Linux_x86_rpm_helppack_en-US.tar.gz" +MD5SUM="49d2053569e09f1069ba100a073110d9" +DOWNLOAD_x86_64="https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.8.2/rpm/x86_64/LibreOffice_6.2.8.2_Linux_x86-64_rpm_helppack_en-US.tar.gz" +MD5SUM_x86_64="dd505c6bd07187996a18d09f90e6432c" REQUIRES="libreoffice" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/office/libreoffice-langpack/libreoffice-langpack.SlackBuild b/office/libreoffice-langpack/libreoffice-langpack.SlackBuild index 2c9c9d62d5..eba42bbf82 100644 --- a/office/libreoffice-langpack/libreoffice-langpack.SlackBuild +++ b/office/libreoffice-langpack/libreoffice-langpack.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libreoffice-langpack -VERSION=${VERSION:-"6.1.4"} +VERSION=${VERSION:-"6.2.8.2"} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/libreoffice-langpack/libreoffice-langpack.info b/office/libreoffice-langpack/libreoffice-langpack.info index c391f08eff..b7b91b6f57 100644 --- a/office/libreoffice-langpack/libreoffice-langpack.info +++ b/office/libreoffice-langpack/libreoffice-langpack.info @@ -1,10 +1,10 @@ PRGNAM="libreoffice-langpack" -VERSION="6.1.4" +VERSION="6.2.8.2" HOMEPAGE="https://www.libreoffice.org" -DOWNLOAD="https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_en-GB.tar.gz" -MD5SUM="c99a53c8f1fe8d02047135277d4278e7" -DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86_64/LibreOffice_6.1.4_Linux_x86-64_rpm_langpack_en-GB.tar.gz" -MD5SUM_x86_64="daabb4d99b5008c5c9fda66954759fd6" +DOWNLOAD="https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.8.2/rpm/x86/LibreOffice_6.2.8.2_Linux_x86_rpm_langpack_en-GB.tar.gz" +MD5SUM="6fb9c1631dbef66750babdeb3cfed2fe" +DOWNLOAD_x86_64="https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.8.2/rpm/x86_64/LibreOffice_6.2.8.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz" +MD5SUM_x86_64="82ce56931e08b4e77e237c0fd0bf66f4" REQUIRES="libreoffice" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/office/libreoffice/libreoffice.SlackBuild b/office/libreoffice/libreoffice.SlackBuild index d9c35110bc..0c1463eb07 100644 --- a/office/libreoffice/libreoffice.SlackBuild +++ b/office/libreoffice/libreoffice.SlackBuild @@ -2,9 +2,9 @@ # Slackware build script for LibreOffice -# Copyright 2006,2007,2008,2009,2010 Robby Workman, Northport, Alabama, USA +# Copyright 2006.2007,2008,2009,2010 Robby Workman, Northport, Alabama, USA # Copyright 2010-2014 Niels Horn, Rio de Janeiro, RJ, Brazil -# Copyright 2014-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2014-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libreoffice -VERSION=${VERSION:-"6.1.4"} +VERSION=${VERSION:-"6.2.8.2"} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -175,6 +175,10 @@ if [ "$DISABLE_JAVA" = "YES" ]; then chmod -x $PKG/opt/libreoffice$SRCSHORT/program/javaldx fi +# Add libreoffice.sh to set SAL_USE_VCLPLUGIN=gtk +mkdir -p $PKG/etc/profile.d/ +install -m755 $CWD/libreoffice.sh $PKG/etc/profile.d/ + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/office/libreoffice/libreoffice.info b/office/libreoffice/libreoffice.info index 63a1a1e5d5..c0d1a7097a 100644 --- a/office/libreoffice/libreoffice.info +++ b/office/libreoffice/libreoffice.info @@ -1,10 +1,10 @@ PRGNAM="libreoffice" -VERSION="6.1.4" +VERSION="6.2.8.2" HOMEPAGE="https://www.libreoffice.org" -DOWNLOAD="https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm.tar.gz" -MD5SUM="8d6ea64da1af73af58534da3c20cdb0e" -DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86_64/LibreOffice_6.1.4_Linux_x86-64_rpm.tar.gz" -MD5SUM_x86_64="02a97471a4a31e5f5698e10ed373c4d4" +DOWNLOAD="https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.8.2/rpm/x86/LibreOffice_6.2.8.2_Linux_x86_rpm.tar.gz" +MD5SUM="501a1d2e0cd3c0a52619ccddb722567a" +DOWNLOAD_x86_64="https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.8.2/rpm/x86_64/LibreOffice_6.2.8.2_Linux_x86-64_rpm.tar.gz" +MD5SUM_x86_64="aa1935b21c06f4fd4abf864eb0d2c7a0" REQUIRES="jdk avahi" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/office/libreoffice/libreoffice.sh b/office/libreoffice/libreoffice.sh new file mode 100644 index 0000000000..c234b1cbe2 --- /dev/null +++ b/office/libreoffice/libreoffice.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +export SAL_USE_VCLPLUGIN=gtk diff --git a/office/lout/install-fix.patch b/office/lout/install-fix.patch index 00b75ebbe9..9a2148480e 100644 --- a/office/lout/install-fix.patch +++ b/office/lout/install-fix.patch @@ -1,11 +1,11 @@ ---- lout-3.39-org/makefile 2010-04-21 15:52:47.000000000 -0700 -+++ lout-3.39/makefile 2012-05-14 14:26:11.095459297 -0700 -@@ -386,12 +386,6 @@ - mkdir $(LOUTLIBDIR)/$(LIBLOCA) +--- lout-3.42/makefile 2020-12-27 16:45:43.000000000 -0800 ++++ lout-3.42-slackware/makefile 2021-01-08 10:42:01.398114307 -0800 +@@ -402,12 +402,6 @@ + $(MKDIR) $(LOUTLIBDIR)/$(LIBLOCA) chmod 755 $(LOUTLIBDIR)/$(LIBLOCA) @echo "" - @echo "(c) Initializing run (should be silent, no errors expected)" -- $(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init +- $(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init -I $(LOUTLIBDIR)/$(LIBINCL) -H $(LOUTLIBDIR)/$(LIBHYPH) -D $(LOUTLIBDIR)/$(LIBDATA) - @echo "" - @echo "(d) Changing mode of files just created by initializing run" - chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/* diff --git a/office/lout/lout.SlackBuild b/office/lout/lout.SlackBuild index 55fa5f4939..9fad17c4be 100644 --- a/office/lout/lout.SlackBuild +++ b/office/lout/lout.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=lout -VERSION=${VERSION:-3.40} +VERSION=${VERSION:-3.42} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -115,8 +115,6 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done cp $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/ -cp $CWD/$PRGNAM-$VERSION-user.ps.gz $PKG/usr/doc/$PRGNAM-$VERSION/ -find $PKG/usr/doc/$PRGNAM-$VERSION -name "*.ps" | xargs gzip mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/office/lout/lout.info b/office/lout/lout.info index d86cf98a45..83ad97f70b 100644 --- a/office/lout/lout.info +++ b/office/lout/lout.info @@ -1,10 +1,8 @@ PRGNAM="lout" -VERSION="3.40" -HOMEPAGE="http://savannah.nongnu.org/projects/lout" -DOWNLOAD="http://download.savannah.gnu.org/releases/lout/lout-3.40.tar.gz \ - http://download.savannah.gnu.org/releases/lout/lout-3.40-user.ps.gz" -MD5SUM="fd0fe084cebd07fc209d392a2d380755 \ - 07fea75d0d03a3cd783646f638747f18" +VERSION="3.42" +HOMEPAGE="https://github.com/william8000/lout" +DOWNLOAD="https://github.com/william8000/lout/archive/3.42/lout-3.42.tar.gz" +MD5SUM="f69866918f309bed399fae1822f26bf0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/lowdown/README b/office/lowdown/README new file mode 100644 index 0000000000..31b4b3f3a6 --- /dev/null +++ b/office/lowdown/README @@ -0,0 +1,15 @@ +lowdown is a Markdown translator producing HTML5 and roff documents in +the ms and man formats. It's just clean, secure, open source C code with +no dependencies. Its canonical documentation is lowdown(1) for the +formatter, lowdown(5) for the syntax, and the library interface at +lowdown(3). + +lowdown started as a fork of hoedown to add sandboxing (pledge(2), +capsicum(4), or sandbox_init(3)) and roff output to securely generate +PDFs on OpenBSD with just mandoc(1). + +It has grown to admit many more extensions and outputs, and can even be +used to show the difference between two Markdown documents with +lowdown-diff, documented as the lowdown diffing engine. This uses a +tree-based difference algorithm to show semantically-valid Markdown +differences. diff --git a/office/aspell6-es/aspell6-es.SlackBuild b/office/lowdown/lowdown.SlackBuild index ee2bedce5a..9141e9419b 100644 --- a/office/aspell6-es/aspell6-es.SlackBuild +++ b/office/lowdown/lowdown.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for aspell6-es +# Slackware build script for lowdown -# Copyright 2017 David O'Shaughnessy +# Copyright 2020, Charles A. Daniels, United States # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=aspell6-es -VERSION=${VERSION:-1.11_2} -SRCVER=$(echo $VERSION | tr _ -) +PRGNAM=lowdown +VERSION=${VERSION:-0.5.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$SRCVER -tar xvf $CWD/$PRGNAM-$SRCVER.tar.bz2 -cd $PRGNAM-$SRCVER +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 \ @@ -70,12 +69,24 @@ 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 {} \; -./configure +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + PREFIX="/usr" + make make install DESTDIR=$PKG +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README COPYING Copyright $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + LICENSE.md \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/lowdown/lowdown.info b/office/lowdown/lowdown.info new file mode 100644 index 0000000000..efa0a2ea30 --- /dev/null +++ b/office/lowdown/lowdown.info @@ -0,0 +1,10 @@ +PRGNAM="lowdown" +VERSION="0.5.4" +HOMEPAGE="https://kristaps.bsd.lv/lowdown/" +DOWNLOAD="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-0.5.4.tar.gz" +MD5SUM="df02cae66bc9f26aeb5f14836388de93" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Charles Daniels" +EMAIL="charles@cdaniels.net" diff --git a/office/lowdown/slack-desc b/office/lowdown/slack-desc new file mode 100644 index 0000000000..d876040958 --- /dev/null +++ b/office/lowdown/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +lowdown: lowdown (simple markdown translator) +lowdown: +lowdown: lowdown is a Markdown translator producing HTML5 and roff documents +lowdown: in the ms and man formats. It's just clean, secure, open source C code +lowdown: with no dependencies. Its canonical documentation is lowdown(1) for +lowdown: the formatter, lowdown(5) for the syntax, and the library interface +lowdown: at lowdown(3). +lowdown: +lowdown: Homepage: https://github.com/Symbian9/lowdown +lowdown: +lowdown: diff --git a/office/lumina-calculator/README b/office/lumina-calculator/README new file mode 100644 index 0000000000..88d37ddabd --- /dev/null +++ b/office/lumina-calculator/README @@ -0,0 +1 @@ +lumina-calculator is Scientific Calculator for the Lumina Desktop. diff --git a/office/pdfstudio11/doinst.sh b/office/lumina-calculator/doinst.sh index 5fb28930db..5fb28930db 100644 --- a/office/pdfstudio11/doinst.sh +++ b/office/lumina-calculator/doinst.sh diff --git a/office/lumina-calculator/lumina-calculator.SlackBuild b/office/lumina-calculator/lumina-calculator.SlackBuild new file mode 100644 index 0000000000..30a0f36fb9 --- /dev/null +++ b/office/lumina-calculator/lumina-calculator.SlackBuild @@ -0,0 +1,101 @@ +#!/bin/sh + +# Slackware build script for lumina-calculator + +# Copyright 2019, 2020 Chris Abela, Malta +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=lumina-calculator +VERSION=${VERSION:-1.6.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM +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 \ + -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 {} \; + +cd src-qt5 +qmake-qt5 \ + PREFIX=/usr \ + LIBPREFIX=/usr/lib${LIBDIRSUFFIX} \ + QMAKE_CFLAGS="$SLKCFLAGS" \ + QMAKE_CXXFLAGS="$SLKCFLAGS" \ + QT5LIBDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ + L_ETCDIR=/etc \ + QMAKE_CFLAGS_ISYSTEM="-I" + +sed -i 's/gzip -c/gzip -9c/' Makefile +make +make install INSTALL_ROOT=$PKG DESTDIR=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cd .. +cp -a \ + LICENSE README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +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} diff --git a/office/lumina-calculator/lumina-calculator.info b/office/lumina-calculator/lumina-calculator.info new file mode 100644 index 0000000000..b3e42a4199 --- /dev/null +++ b/office/lumina-calculator/lumina-calculator.info @@ -0,0 +1,10 @@ +PRGNAM="lumina-calculator" +VERSION="1.6.0" +HOMEPAGE="https://github.com/lumina-desktop/lumina-calculator" +DOWNLOAD="https://github.com/lumina-desktop/lumina-calculator/archive/v1.6.0/lumina-calculator-1.6.0.tar.gz" +MD5SUM="320996336e910e2626c5523111ed817f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="qt5" +MAINTAINER="Chris Abela" +EMAIL="kristofru@gmail.com" diff --git a/office/lumina-calculator/slack-desc b/office/lumina-calculator/slack-desc new file mode 100644 index 0000000000..07645d1546 --- /dev/null +++ b/office/lumina-calculator/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +lumina-calculator: lumina-calculator (Scientific Calculator for the Lumina Desktop) +lumina-calculator: +lumina-calculator: This is a graphical, scientific calculator with history and recall +lumina-calculator: abilities. +lumina-calculator: +lumina-calculator: +lumina-calculator: +lumina-calculator: +lumina-calculator: +lumina-calculator: +lumina-calculator: diff --git a/office/lumina-pdf/README b/office/lumina-pdf/README new file mode 100644 index 0000000000..591775a7e8 --- /dev/null +++ b/office/lumina-pdf/README @@ -0,0 +1 @@ +lumina-pdf is a PDF Viewer Utility for the Lumina Desktop. diff --git a/office/pdfstudio12/doinst.sh b/office/lumina-pdf/doinst.sh index 5fb28930db..5fb28930db 100644 --- a/office/pdfstudio12/doinst.sh +++ b/office/lumina-pdf/doinst.sh diff --git a/office/lumina-pdf/lumina-pdf.SlackBuild b/office/lumina-pdf/lumina-pdf.SlackBuild new file mode 100644 index 0000000000..b4855dc338 --- /dev/null +++ b/office/lumina-pdf/lumina-pdf.SlackBuild @@ -0,0 +1,101 @@ +#!/bin/sh + +# Slackware build script for lumina-pdf + +# Copyright 2019, 2020 Chris Abela, Malta +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=lumina-pdf +VERSION=${VERSION:-1.6.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +patch -p0 <$CWD/lumina-pdf.patch +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 {} \; + +cd src-qt5 +qmake-qt5 \ + PREFIX=/usr \ + LIBPREFIX=/usr/lib${LIBDIRSUFFIX} \ + QMAKE_CFLAGS="$SLKCFLAGS" \ + QMAKE_CXXFLAGS="$SLKCFLAGS" \ + QT5LIBDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ + L_ETCDIR=/etc \ + QMAKE_CFLAGS_ISYSTEM="-I" + +make +make install INSTALL_ROOT=$PKG DESTDIR=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cd .. +cp -a \ + LICENSE README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +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} diff --git a/office/lumina-pdf/lumina-pdf.info b/office/lumina-pdf/lumina-pdf.info new file mode 100644 index 0000000000..b1b7011550 --- /dev/null +++ b/office/lumina-pdf/lumina-pdf.info @@ -0,0 +1,10 @@ +PRGNAM="lumina-pdf" +VERSION="1.6.0" +HOMEPAGE="https://github.com/lumina-desktop/lumina-pdf/" +DOWNLOAD="https://github.com/lumina-desktop/lumina-pdf/archive/v1.6.0/lumina-pdf-1.6.0.tar.gz" +MD5SUM="725a2b37775b6fb36b8653e86b5442d1" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="poppler-qt5" +MAINTAINER="Chris Abela" +EMAIL="kristofru@gmail.com" diff --git a/office/lumina-pdf/lumina-pdf.patch b/office/lumina-pdf/lumina-pdf.patch new file mode 100644 index 0000000000..0e3fd5c5fa --- /dev/null +++ b/office/lumina-pdf/lumina-pdf.patch @@ -0,0 +1,12 @@ +diff -Naur lumina-pdf-1.6.0/src-qt5/Renderer-poppler.cpp lumina-pdf-1.6.0-patched/src-qt5/Renderer-poppler.cpp +--- lumina-pdf-1.6.0/src-qt5/Renderer-poppler.cpp 2020-02-04 20:56:36.000000000 +0100 ++++ lumina-pdf-1.6.0-patched/src-qt5/Renderer-poppler.cpp 2020-05-18 13:34:31.211851748 +0200 +@@ -72,7 +72,7 @@ + DOC->setRenderHint(Poppler::Document::Antialiasing); + DOC->setRenderHint(Poppler::Document::TextAntialiasing); + // qDebug() << "Opening File:" << path; +- doctitle = DOC->title(); ++ // doctitle = DOC->title(); + if (doctitle.isEmpty()) { + doctitle = path.section("/", -1); + } diff --git a/office/lumina-pdf/slack-desc b/office/lumina-pdf/slack-desc new file mode 100644 index 0000000000..891131199c --- /dev/null +++ b/office/lumina-pdf/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +lumina-pdf: lumina-pdf (PDF Viewer Utility for the Lumina Desktop) +lumina-pdf: +lumina-pdf: PDF Viewer Utility +lumina-pdf: +lumina-pdf: +lumina-pdf: +lumina-pdf: +lumina-pdf: +lumina-pdf: +lumina-pdf: +lumina-pdf: diff --git a/office/lyx/README b/office/lyx/README index 7f819af3a1..dfddcefb2f 100644 --- a/office/lyx/README +++ b/office/lyx/README @@ -1,13 +1,13 @@ LyX - A WYSIWYM document processor. -LyX is a document processor that encourages an approach to -writing based on the structure of your documents (WYSIWYM) +LyX is a document processor that encourages an approach to +writing based on the structure of your documents (WYSIWYM) and not simply their appearance (WYSIWYG). -LyX combines the power and flexibility of TeX/LaTeX with the +LyX combines the power and flexibility of TeX/LaTeX with the ease of use of a graphical interface. -This results in world-class support for creation of mathematical -content (via a fully integrated equation editor) and structured +This results in world-class support for creation of mathematical +content (via a fully integrated equation editor) and structured documents like academic articles, theses, and books. LyX requires a working installation of TeX/LaTeX. For this you diff --git a/office/lyx/lyx.SlackBuild b/office/lyx/lyx.SlackBuild index a43528f065..9ef11d4703 100644 --- a/office/lyx/lyx.SlackBuild +++ b/office/lyx/lyx.SlackBuild @@ -5,7 +5,7 @@ # Now maintained by R. S. Ananda Murthy (rsamurti@gmail.com) PRGNAM=lyx -VERSION=${VERSION:-2.3.2} +VERSION=${VERSION:-2.3.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -41,9 +41,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION-2 -tar xvf $CWD/$PRGNAM-$VERSION-2.tar.xz -cd $PRGNAM-$VERSION-2 +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/office/lyx/lyx.info b/office/lyx/lyx.info index fcd75c7916..5bc29cbd91 100644 --- a/office/lyx/lyx.info +++ b/office/lyx/lyx.info @@ -1,8 +1,8 @@ PRGNAM="lyx" -VERSION="2.3.2" +VERSION="2.3.6.1" HOMEPAGE="http://www.lyx.org" -DOWNLOAD="https://fossies.org/linux/misc/lyx-2.3.2-2.tar.xz" -MD5SUM="b8fd5cae897da39375f68f2023b643f8" +DOWNLOAD="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/lyx-2.3.6.1.tar.xz" +MD5SUM="e8cb8d271dda076fa0671aa7605ba384" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/mairix/mairix.SlackBuild b/office/mairix/mairix.SlackBuild index 3707c91369..cfb8dc849e 100644 --- a/office/mairix/mairix.SlackBuild +++ b/office/mairix/mairix.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mairix -# Copyright 2015-2018 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2015-2018 Jostein Berntsen <jvbernts@online.no> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Written by Jostein Berntsen <jbernts@broadpark.no> +# Written by Jostein Berntsen <jvbernts@online.no> PRGNAM=mairix VERSION=${VERSION:-0.24} diff --git a/office/mairix/mairix.info b/office/mairix/mairix.info index bf502dbd8e..dce2800e0e 100644 --- a/office/mairix/mairix.info +++ b/office/mairix/mairix.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/mate-calc/README b/office/mate-calc/README new file mode 100644 index 0000000000..4cc5cec9d9 --- /dev/null +++ b/office/mate-calc/README @@ -0,0 +1,6 @@ +This is mate-calc, a fork of gnome-calc, the calculator application that +was previously in the OpenWindows Deskset of the Solaris 8 operating +system. It incorporates a multiple precision arithmetic packages based +on the work of Professor Richard Brent. + +It supports scientific, financial and logical modes. diff --git a/office/mate-calc/doinst.sh b/office/mate-calc/doinst.sh new file mode 100644 index 0000000000..f25bed6fb6 --- /dev/null +++ b/office/mate-calc/doinst.sh @@ -0,0 +1,19 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi diff --git a/office/mate-calc/mate-calc.SlackBuild b/office/mate-calc/mate-calc.SlackBuild new file mode 100644 index 0000000000..a166f47b0c --- /dev/null +++ b/office/mate-calc/mate-calc.SlackBuild @@ -0,0 +1,105 @@ +#!/bin/sh + +# Slackware build script for mate-calc + +# Copyright 2013 Chess Griffin <chess.griffin@gmail.com> Raleigh, NC +# Copyright 2013-2020 Willy Sudiarto Raharjo <willysr@slackware-id.org> +# Copyright 2020 Johannes Schoepfer, Germany +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=mate-calc +VERSION=${VERSION:-1.18.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +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 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --without-help-dir \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION + +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +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} diff --git a/office/mate-calc/mate-calc.info b/office/mate-calc/mate-calc.info new file mode 100644 index 0000000000..5ebf954ff3 --- /dev/null +++ b/office/mate-calc/mate-calc.info @@ -0,0 +1,10 @@ +PRGNAM="mate-calc" +VERSION="1.18.2" +HOMEPAGE="https://www.mate-desktop.org/" +DOWNLOAD="https://pub.mate-desktop.org/releases/1.18/mate-calc-1.18.2.tar.xz" +MD5SUM="305ed2580b9d06ce06440b8f7df0b743" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Johannes Schoepfer" +EMAIL="slackbuilds@schoepfer.info" diff --git a/office/mate-calc/slack-desc b/office/mate-calc/slack-desc new file mode 100644 index 0000000000..72bfd115c6 --- /dev/null +++ b/office/mate-calc/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +mate-calc: mate-calc (calculator for the MATE desktop) +mate-calc: +mate-calc: mate-calc is a fork of gnome-calc, a calculator application for +mate-calc: the MATE desktop. +mate-calc: It supports scientific, financial and logical modes. +mate-calc: +mate-calc: +mate-calc: +mate-calc: +mate-calc: Homepage: https://www.mate-desktop.org +mate-calc: diff --git a/office/moneydance/moneydance.SlackBuild b/office/moneydance/moneydance.SlackBuild index 8d51115337..3a4bf1be72 100644 --- a/office/moneydance/moneydance.SlackBuild +++ b/office/moneydance/moneydance.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# + # Slackware build script for moneydance -# Copyright 2008-2017 Robby Workman, Tuscaloosa, AL, USA +# Copyright 2008-2020 Robby Workman, Tuscaloosa, AL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=moneydance -VERSION=${VERSION:-2017.1597} +VERSION=${VERSION:-2021.2006} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -38,9 +38,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then - MDARCH=x86 -elif [ "$ARCH" = "x86_64" ]; then +if [ "$ARCH" = "x86_64" ]; then MDARCH=amd64 else printf "$ARCH is not supported.\n"; exit 1 @@ -48,13 +46,17 @@ fi set -e -rm -rf $PKG -mkdir -p $PKG/opt $OUTPUT -tar xvf $CWD/Moneydance_linux_${MDARCH}.tar.gz -C $PKG/opt +rm -rf $TMP/$PRGNAM $PKG +mkdir -p $TMP/$PRGNAM $PKG +cd $TMP/$PRGNAM +ar -x $CWD/${PRGNAM}_linux_amd64.deb +tar xvf data.tar.bz2 -C $PKG + +rm -f $PKG/opt/Moneydance/create_desktop_file.sh mkdir -p $PKG/usr/bin ln -s /opt/Moneydance/Moneydance $PKG/usr/bin/moneydance -ln -s /opt/Moneydance/Moneydance $PKG/usr/bin +ln -s /opt/Moneydance/Moneydance $PKG/usr/bin/Moneydance mkdir -p $PKG/usr/share/applications cat $CWD/moneydance.desktop > $PKG/usr/share/applications/$PRGNAM.desktop @@ -65,8 +67,9 @@ ln -s /opt/Moneydance/resources/moneydance_icon32.png \ $PKG/usr/share/pixmaps/$PRGNAM.png mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/opt/Moneydance/README.md $PKG/usr/doc/$PRGNAM-$VERSION ln -s /opt/Moneydance/resources/license.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PRGNAM-$VERSION/license.txt cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/moneydance/moneydance.info b/office/moneydance/moneydance.info index 7cb9d06d34..5144ebfca4 100644 --- a/office/moneydance/moneydance.info +++ b/office/moneydance/moneydance.info @@ -1,10 +1,10 @@ PRGNAM="moneydance" -VERSION="2017.1597" +VERSION="2020.2006" HOMEPAGE="http://moneydance.com" -DOWNLOAD="http://infinitekind.com/stabledl/2017/Moneydance_linux_x86.tar.gz" -MD5SUM="a238bf03130bdf944fecd1fcf2ab8bb7" -DOWNLOAD_x86_64="http://infinitekind.com/stabledl/2017/Moneydance_linux_amd64.tar.gz" -MD5SUM_x86_64="80ce4c0c690c483bb09cf22d0ac64cab" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://infinitekind.com/stabledl/current/moneydance_linux_amd64.deb" +MD5SUM_x86_64="a537fa1f72492d6de2e60aae09c87b8b" REQUIRES="" MAINTAINER="Robby Workman" EMAIL="rworkman@slackbuilds.org" diff --git a/office/msee/README b/office/msee/README new file mode 100644 index 0000000000..047a88b004 --- /dev/null +++ b/office/msee/README @@ -0,0 +1,2 @@ +*msee* is a command-line tool to read markdown file. +And it's a library help your command-line software to output readable markdown content. diff --git a/office/msee/msee.SlackBuild b/office/msee/msee.SlackBuild new file mode 100644 index 0000000000..55dedc7d08 --- /dev/null +++ b/office/msee/msee.SlackBuild @@ -0,0 +1,70 @@ +#!/bin/sh + +# Slackware build script for msee + +# Copyright 2020 Tonus +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=msee +VERSION=${VERSION:-0.3.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \ + -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 {} \; + +DESTDIR=$PKG npm install -g $CWD/$PRGNAM-$VERSION.tar.gz + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + Example.md Help.md History.md README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/msee/msee.info b/office/msee/msee.info new file mode 100644 index 0000000000..9442b13dd9 --- /dev/null +++ b/office/msee/msee.info @@ -0,0 +1,10 @@ +PRGNAM="msee" +VERSION="0.3.3" +HOMEPAGE="https://github.com/firede/msee" +DOWNLOAD="https://github.com/firede/msee/archive/v0.3.3/msee-0.3.3.tar.gz" +MD5SUM="4c08715e10433ba43dcf1efe799676eb" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="google-go-lang" +MAINTAINER="Tonus" +EMAIL="tonus1@gmail.com" diff --git a/office/msee/slack-desc b/office/msee/slack-desc new file mode 100644 index 0000000000..d155be43b7 --- /dev/null +++ b/office/msee/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +msee: msee (command line tool) +msee: +msee: +msee: msee is a command-line tool to read markdown file. +msee: +msee: And it's a library help your command-line software to output readable +msee: markdown content. +msee: +msee: +msee: +msee: diff --git a/office/mtp2-fonts/mtp2-fonts.SlackBuild b/office/mtp2-fonts/mtp2-fonts.SlackBuild index b4429c26c0..dc76fa06fb 100644 --- a/office/mtp2-fonts/mtp2-fonts.SlackBuild +++ b/office/mtp2-fonts/mtp2-fonts.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mtp2-fonts -# Copyright 2017, Alexander Verbovetsky, Moscow, Russia +# Copyright 2017-2020, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=mtp2-fonts VERSION=${VERSION:-2.1a} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -55,6 +55,11 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; rm -r texmf/dvips + +sed --in-place \ + -e 's/^\\alloc@0\\count\\countdef\\insc@unt/\\newcount/' \ + texmf/tex/latex/mtpro2/mtpro2.sty + find . \ \( -name "*.txt" -o -name "*.tex" -o -name "*.fd" -o -name "*.map" \ -o -name "*.sty" -o -name "*.tpm" \) -exec sed -i 's/\r$//' {} \; diff --git a/office/mtp2-fonts/mtp2-fonts.info b/office/mtp2-fonts/mtp2-fonts.info index 64a73176cd..35257db40a 100644 --- a/office/mtp2-fonts/mtp2-fonts.info +++ b/office/mtp2-fonts/mtp2-fonts.info @@ -1,6 +1,6 @@ PRGNAM="mtp2-fonts" VERSION="2.1a" -HOMEPAGE="http://pctex.com/mtpro2.html" +HOMEPAGE="https://pctex.com/mtpro2.html" DOWNLOAD="http://mirrors.ctan.org/fonts/mtp2lite.zip" MD5SUM="afd69b0d82ec8b32b7b012e5cfcd7d00" DOWNLOAD_x86_64="" diff --git a/office/mtp2-fonts/slack-desc b/office/mtp2-fonts/slack-desc index 58f93e53d5..6656d08ebf 100644 --- a/office/mtp2-fonts/slack-desc +++ b/office/mtp2-fonts/slack-desc @@ -16,4 +16,4 @@ mtp2-fonts: consists of 15 fonts and replaces the Computer Modern math fonts. Th mtp2-fonts: complete set consists of 68 fonts and provides also script, curly, mtp2-fonts: Fraktur, bold math, blackboard bold fonts, and AMS symbols. mtp2-fonts: -mtp2-fonts: Homepage: http://pctex.com/mtpro2.html +mtp2-fonts: Homepage: https://pctex.com/mtpro2.html diff --git a/office/mu/mu.SlackBuild b/office/mu/mu.SlackBuild index c4c856b5bf..8f5a4a243d 100644 --- a/office/mu/mu.SlackBuild +++ b/office/mu/mu.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mu -# Copyright 2013-2018 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2013-2018 Jostein Berntsen <jvbernts@online.no> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/office/mu/mu.info b/office/mu/mu.info index 534da643df..752e3ee3b5 100644 --- a/office/mu/mu.info +++ b/office/mu/mu.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/mupdf-legacy/README b/office/mupdf-legacy/README new file mode 100644 index 0000000000..316ee5ca37 --- /dev/null +++ b/office/mupdf-legacy/README @@ -0,0 +1,19 @@ +mupdf-legacy (older version of mupdf) + +mupdf is a lightweight PDF, CBZ, and XPS viewer and toolkit. mupdf-legacy +is an older version of mupdf that gets installed to /opt/mupdf-legacy, +for use with zathura-pdf-mupdf and fbpdf2. + +Notes: + +1. Since this gets installed to /opt, the binaries (mupdf-x11, etc) will + not be in your $PATH. This is by design: for standalone use, it's + better to install the regular mupdf package, which is the latest + version. + +2. JavaScript support and shared libraries are disabled. Again, you want + the regular mupdf package for these. + +3. Any build that links with this needs to be modified so it looks for + headers and libraries in /opt/mupdf-legacy. See zathura-pdf-mupdf for + an example. diff --git a/office/mupdf-legacy/mupdf-legacy.SlackBuild b/office/mupdf-legacy/mupdf-legacy.SlackBuild new file mode 100644 index 0000000000..a3ca9bd611 --- /dev/null +++ b/office/mupdf-legacy/mupdf-legacy.SlackBuild @@ -0,0 +1,141 @@ +#!/bin/sh + +# Slackware build script for mupdf-legacy + +# Originally written by Hubert Hesse (email removed). +# Heavily modified by B. Watson (yalhcru@gmail.com). + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# 20200218 bkw: rename this build to -legacy, remove dynamic linking +# and JavaScript support, install to /opt. Also get rid +# of .desktop and icon. +# 20180623 bkw: BUILD=2, add patch for dynamic linking. Thanks +# to Thomas Morper for pointing me in the right direction. +# 20180615 bkw: update for 1.13.0, move old change comments to ChangeLog.old +# 20180101 bkw: update for 1.12.0. +# 20170711 bkw: update for 1.11. +# 20170621 bkw: fix build with -current's newer openjpeg, BUILD=2. +# 20170122 bkw: update for 1.10a. + +PRGNAM=mupdf-legacy +VERSION=${VERSION:-1.13.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=mupdf + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION-source +tar xvf $CWD/$SRCNAM-$VERSION-source.tar.gz +cd $SRCNAM-$VERSION-source + +# don't find/chown/chmod until after the thirdparty junk is removed. + +# Build against system libs instead of bundled ones. If we didn't do this, +# libmupdf would be useless for building anything else. + +# Everything removed from thirdparty/ has to be installed systemwide, and must +# either be a Slackware core pkg, or mentioned in REQUIRES= in the .info +# file... except mujs, which is mupdf's javascript support lib. If missing, +# we end up with a mupdf with no JS support, which is fine for use with +# zathura-pdf-mupdf and fbpdf use. + +rm -rf thirdparty/* +sed -i 's,murun\.o,,' Makefile +sed -i 's,pdf_drop_js.*,;,' source/pdf/pdf-xref.c +sed -i '/murun_main/d' source/tools/mutool.c + +chown -R root:root . +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# ref https://bugs.ghostscript.com/show_bug.cgi?id=697175 +sed -i '/#define *OPJ_STATIC/d' source/fitz/load-jpx.c + +# Hard-code the version number so it'll stop trying to use git to retrieve +# it and spewing harmless but scary 'fatal: Not a git repository' errors. +sed -i "/^VERSION/s,=.*,= $VERSION," Makefile + +make verbose=yes \ + XCFLAGS="$SLKCFLAGS -DJBIG_NO_MEMENTO" \ + HAVE_MUJS="no" \ + build=release \ + prefix=/opt/$PRGNAM \ + libdir=/opt/$PRGNAM/lib$LIBDIRSUFFIX \ + mandir=/opt/$PRGNAM/man \ + docdir=/usr/doc/$PRGNAM-$VERSION \ + DESTDIR=$PKG \ + all extra-apps install + +# 1.12.0 used to install this stuff with 'make install', 1.13.0 doesn't: +for i in mjsgen muraster mupdf-x11-curl; do + [ -e build/release/$i ] && install -s -m0755 build/release/$i $PKG/opt/$PRGNAM/bin +done + +strip $PKG/opt/$PRGNAM/bin/* +gzip -9 $PKG/opt/$PRGNAM/man/man1/*.1 + +# Compatibility symlinks. Older versions, the binary is just "mupdf". +# Separate -curl binary exists in 1.5 but not 1.4. +ln -s $SRCNAM-x11 $PKG/opt/$PRGNAM/bin/$SRCNAM +ln -s $SRCNAM.1.gz $PKG/opt/$PRGNAM/man/man1/$SRCNAM-x11.1.gz +[ -e $PKG/opt/$PRGNAM/bin/$SRCNAM-x11-curl ] && \ + ln -s $SRCNAM.1.gz $PKG/opt/$PRGNAM/man/man1/$SRCNAM-x11-curl.1.gz + +# mujstest is useless if we don't have JS support. +rm -f $PKG/opt/$PRGNAM/bin/mujstest + +# Installed permissions are atrocious (everything 755). +find $PKG -type f | xargs chmod 644 +chmod 755 $PKG/opt/$PRGNAM/bin/* + +# .pc file taken from debian and parameterized. +PCLIBS="-l$SRCNAM -lfreetype -lharfbuzz -ljbig2dec -ljpeg -lcrypto -lopenjp2 -lz -lm" +PCLIBS="$PCLIBS -lmupdfthird" + +mkdir -p $PKG/opt/$PRGNAM/lib$LIBDIRSUFFIX/pkgconfig/ +sed -e "s,@LIB@,lib$LIBDIRSUFFIX,g" \ + -e "s,@VERSION@,$VERSION,g" \ + -e "s,@PCLIBS@,$PCLIBS,g" \ + $CWD/$SRCNAM.pc > $PKG/opt/$PRGNAM/lib$LIBDIRSUFFIX/pkgconfig/$SRCNAM.pc + +# 'make install' already installed most of the docs. +cp -a CONTRIBUTORS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/mupdf-legacy/mupdf-legacy.info b/office/mupdf-legacy/mupdf-legacy.info new file mode 100644 index 0000000000..ec48712348 --- /dev/null +++ b/office/mupdf-legacy/mupdf-legacy.info @@ -0,0 +1,10 @@ +PRGNAM="mupdf-legacy" +VERSION="1.13.0" +HOMEPAGE="https://www.mupdf.com/" +DOWNLOAD="https://www.mupdf.com/downloads/archive/mupdf-1.13.0-source.tar.gz" +MD5SUM="447bc5c3305efe9645e12fce759e0198" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="jbig2dec" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/office/mupdf-legacy/mupdf.pc b/office/mupdf-legacy/mupdf.pc new file mode 100644 index 0000000000..62fa58267f --- /dev/null +++ b/office/mupdf-legacy/mupdf.pc @@ -0,0 +1,11 @@ +prefix=/opt/mupdf-legacy +exec_prefix=${prefix} +libdir=${exec_prefix}/@LIB@ +includedir=${prefix}/include + +Name: mupdf +Description: Library for rendering PDF documents +Requires.private: freetype2 +Version: @VERSION@ +Libs: -L${libdir} @PCLIBS@ +Cflags: -I${includedir} diff --git a/office/mupdf-legacy/slack-desc b/office/mupdf-legacy/slack-desc new file mode 100644 index 0000000000..8cb115f27c --- /dev/null +++ b/office/mupdf-legacy/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +mupdf-legacy: mupdf-legacy (a lightweight PDF, CBZ, and XPS viewer and toolkit) +mupdf-legacy: +mupdf-legacy: This is an older version of mupdf. +mupdf-legacy: +mupdf-legacy: The renderer in MuPDF is tailored for high quality anti-aliased +mupdf-legacy: graphics. MuPDF renders text with metrics and spacing accurate to +mupdf-legacy: within fractions of a pixel for the highest fidelity in reproducing +mupdf-legacy: the look of a printed page on screen. +mupdf-legacy: +mupdf-legacy: https://www.mupdf.com/ +mupdf-legacy: diff --git a/office/mupdf/README b/office/mupdf/README index 9c57e36921..4d84fe11bb 100644 --- a/office/mupdf/README +++ b/office/mupdf/README @@ -12,14 +12,13 @@ features can be added on by integrators if they so desire. Notes: -1. By default, mupdf is built without JavaScript support. If you want -to try mupdf's experimental JavaScript support, build with MUJS=yes in -the script's environment. +1. It's no longer possible to build mupdf without JavaScript support. -2. Two mupdf executables are installed in /usr/bin. mupdf-x11 is the +2. Three mupdf executables are installed in /usr/bin. mupdf-x11 is the regular PDF viewer, and mupdf-x11-curl has support for fetching remote resources from the network (which may be considered a security risk). +mupdf-gl uses OpenGL for rendering (and doesn't support curl). -3. By default, mupdf is now built as shared libraries. If for some -reason you need static libs instead, build with STATIC=yes in the -script's environment. See README_shared.txt for more information. +3. mupdf's PDF digital signature verification and signing support is +disabled in this build, because Slackware 14.2's openssl is too old. +For most users, this is a rarely- or never-used feature anyway. diff --git a/office/mupdf/README_shared.txt b/office/mupdf/README_shared.txt deleted file mode 100644 index 227928d253..0000000000 --- a/office/mupdf/README_shared.txt +++ /dev/null @@ -1,56 +0,0 @@ - -Here is a hopefully informative mini-rant about shared library support -for mupdf. - -Upstream doesn't do shared libraries and doesn't recommend distro -packages use them. This build used to follow that advice. However, -mupdf is just too large to use as a static library. We end up with a -47MB libmupdf.a, plus 7 33MB binaries. *Every* distro I've looked at -ships mupdf as shared libs, despite upstream's policy. - -A long time ago (in 2013), I used to patch mupdf for shared lib support, -but I removed it when it stopped applying cleanly. Thomas Morper on the -slackbuilds-users mailing list recently (2018) asked if I could include -a patch (from LFS) that adds shared library support, so starting with -mupdf 1.13.0, BUILD 2, we have shared libraries again. - -In case someone *really* disagrees with this change, I added a STATIC=yes -environment setting. If you use this, you get static libs and no -shared ones, per upstream's policy. This has been tested and works for -1.13.0-2, but be aware that I probably won't be testing static builds -for every mupdf release. If you run into trouble, email me and/or the -slackbuilds-users list. - -The library versioning scheme I had to use is unfortunate. The major -soname version is supposed to only change when there's an incompatible ABI -change. The way I'm doing it, it changes for every mupdf release [*]. This -is because upstream doesn't tell us when the ABI changes, because it's -not relevant for them. They support only static libs specifically to -avoid the headache of having to track and minimize ABI changes. Whenever -they want to change the ABI, they just do it. Anything built against the -old version will keep working fine, because it's statically linked. With -shared libs, I have to invent my own library versioning scheme. - -The end result of this is, I (humble packager) can't easily tell when -the ABI has changed, so I treat every release [*] as an ABI change. Means -anything linked with libmupdf will fail with 'cannot open shared object -file' after a mupdf upgrade, so it'll have to be rebuilt. The alternative -would be to use unversioned shared libs, which would (seem to) avoid -the need to rebuild... but whenever the undocumented ABI changed, we'd -get weird behaviour and segfaults instead of a clean error message. - -The shared library patch used here is by me (B. Watson), based on a -patch from Linux From Scratch. The original LFS patch doesn't include -versioned libs, I suspect becase in LFS you tend to upgrade the entire -OS by rebuilding it, instead of upgrading just one library. - -Right now, the only SBo builds affected by mupdf upgrades will be -zathura-pdf-mupdf and possibly fbpdf (if built with optional mupdf -support). Both have been tested with shared mupdf, and both compile and -run cleanly. - -[*] Actually, not micro-version point releases (e.g. 1.13.0 => 1.13.1). - Hopefully this doesn't cause a problem later. Upstream has just - switched to a major.minor.micro version scheme starting with 1.13.0, - so I don't know how often there will be micro-version bumps, and - whether or not they'll have ABI changes. diff --git a/office/mupdf/doinst.sh b/office/mupdf/doinst.sh new file mode 100644 index 0000000000..9424ce43ff --- /dev/null +++ b/office/mupdf/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/office/mupdf/mupdf.SlackBuild b/office/mupdf/mupdf.SlackBuild index bccd04f5cb..bd6aad3948 100644 --- a/office/mupdf/mupdf.SlackBuild +++ b/office/mupdf/mupdf.SlackBuild @@ -7,6 +7,8 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20201020 bkw: update for 1.18.0. See notes, below. +# 20200217 bkw: update for 1.16.1. # 20180623 bkw: BUILD=2, add patch for dynamic linking. Thanks # to Thomas Morper for pointing me in the right direction. # 20180615 bkw: update for 1.13.0, move old change comments to ChangeLog.old @@ -15,9 +17,43 @@ # 20170621 bkw: fix build with -current's newer openjpeg, BUILD=2. # 20170122 bkw: update for 1.10a. +# Notes for 1.18.0: +# - This script can no longer build older versions, too many changes. +# - Upstream *finally* supports building as a shared library, so I and +# all other distro packagers can stop patching it... except the +# shared lib is unversioned, which means upgrades would cause more +# breakage than they should. So there's still some trickery here to +# build a versioned solib. +# - I've got rid of the STATIC=yes option and now only build shared libs. +# As a side effect, libmupdf-third is gone, but I've included a +# placeholder so stuff that links with it, will work without patching. +# - gumbo (HTML parser) is now a hard dep. The source is bundled, so +# there's no need to create a new gumbo SlackBuild, but it does mean +# the mupdf shared lib has grown in size. +# - mupdf-gl uses freeglut. The version we have in 14.2 is new enough to +# build with, but old enough that you can't copy text from mupdf-gl. +# So we build the bundled version here. +# - API docs are now included in the package. +# - Now using upstream's icons, including scalable SVG. +# - Add missing doinst.sh +# - There's now the option to build with tesseract and leptonica, +# but it's disabled in this script. I have yet to get it to +# actually *do* anything other than fail to build (when using +# upstream's tesseract/leptonica forks) or complain about being +# unable to load eng.traineddata (using SBo tesseract/leptonica, +# and yes eng.traineddata is fine). Until I work out what's wrong, +# or upstream releases a new version, this script doesn't support +# building with tesseract. Don't contact me about this before March +# 1, 2021, unless you actually have a patch that fixes it. After +# that, if this message is still here, feel free to remind me to +# revisit it. +# - Slackware 14.2's libcrypto (from openssl) is too old for mupdf, +# and there's no bundled souce for it. So currently mupdf is being +# built without libcrypto. Hope that's OK. + PRGNAM=mupdf -VERSION=${VERSION:-1.13.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.18.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -48,105 +84,97 @@ else fi set -e +# Tesseract code left here for future reference. At some point upstream +# (or maybe I) will fix it. +if [ "${TESSERACT:-no}" = "yes" ]; then + TESSARGS="USE_SYSTEM_LEPTONICA=yes USE_SYSTEM_TESSERACT=yes" + cat <<EOF +*** +*** 20201023 bkw: Tesseract support in mupdf is currently broken. If +*** you want to forcibly build with it, edit the SlackBuild. Aborting. +*** +EOF + exit 1 +else + TESSARGS="HAVE_LEPTONICA=no HAVE_TESSERACT=no" +fi + + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION-source -tar xvf $CWD/$PRGNAM-$VERSION-source.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION-source.tar.?z cd $PRGNAM-$VERSION-source -# don't find/chown/chmod until after the thirdparty junk is removed. - -# Build against system libs instead of bundled ones. If we didn't do this, -# libmupdf would be useless for building anything else. - -# Everything removed from thirdparty/ has to be installed systemwide, and must -# either be a Slackware core pkg, or mentioned in REQUIRES= in the .info -# file... except mujs, which is mupdf's javascript support lib. If missing, -# we end up with a mupdf with no JS support, which is probably a good idea -# for the default build. If you want javascript, MUJS=yes in the env. - -MUJS="${MUJS:-no}" - -if [ "$MUJS" = "yes" ]; then - mv thirdparty/mujs .keep - rm -rf thirdparty/* - mv .keep thirdparty/mujs - WITH=with -else - rm -rf thirdparty/* - sed -i 's,murun\.o,,' Makefile - sed -i 's,pdf_drop_js.*,;,' source/pdf/pdf-xref.c - sed -i '/murun_main/d' source/tools/mutool.c - WITH=without -fi - 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -# ref https://bugs.ghostscript.com/show_bug.cgi?id=697175 -sed -i '/#define *OPJ_STATIC/d' source/fitz/load-jpx.c +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ # Hard-code the version number so it'll stop trying to use git to retrieve # it and spewing harmless but scary 'fatal: Not a git repository' errors. sed -i "/^VERSION/s,=.*,= $VERSION," Makefile -# 20180623 bkw: Finally, dynamic linking again. Patch is based on -# http://www.linuxfromscratch.org/patches/blfs/svn/mupdf-1.13.0-shared_libs-1.patch -# but I added versioned sonames. See README_shared.txt for the gory details. -STATIC=${STATIC:-no} +# As of 1.18.0, we don't actually have to patch the Makefile +# to do a versioned shared lib, but we do have to override some +# variables. SOMAJOR is the mupdf major and zero-padded minor version +# jammed together (e.g. 113 for 1.13.0, 203 for 2.3.0). SOMINOR is the +# mupdf micro version (e.g. 0 for 1.13.0). +SOMAJOR=$(echo $VERSION | cut -d. -f1-2 | sed -e 's,\.[0-9]$,0&,' -e 's,\.,,g') +SOMINOR=$(echo $VERSION | cut -d. -f3- | sed 's,\.,,g' ) +SOVER=$SOMAJOR.$SOMINOR -if [ "$STATIC" != "yes" ]; then - patch -p1 < $CWD/shared_libs.diff - LIBTYPE=shared -else - LIBTYPE=static -fi +# Shared libraries should be installed executable. +sed -i '/install.*644.*INSTALL_LIBS/s,644,755,' Makefile + +# tesseract autodetection is mildly broken: +sed -i 's,tesseract-ocr,tesseract,' Makerules +# Build against system libs instead of bundled ones, where possible. +# C++ (XCXXFLAGS) is only actually used if building with tesseract. make verbose=yes \ + shared=yes \ + LIB_LDFLAGS="-shared -Wl,-soname -Wl,libmupdf.so.$SOMAJOR" \ + SO="so.$SOVER" \ XCFLAGS="$SLKCFLAGS -DJBIG_NO_MEMENTO" \ - HAVE_MUJS="$MUJS" \ + XCXXFLAGS="-std=c++11 -fpermissive" \ + USE_SYSTEM_LIBS=yes \ + USE_SYSTEM_GUMBO=no \ + USE_SYSTEM_GLUT=no \ + $TESSARGS \ build=release \ prefix=/usr \ libdir=/usr/lib$LIBDIRSUFFIX \ mandir=/usr/man \ docdir=/usr/doc/$PRGNAM-$VERSION \ DESTDIR=$PKG \ - all extra-apps install - -# 1.12.0 used to install this stuff with 'make install', 1.13.0 doesn't: -for i in mjsgen muraster mupdf-x11-curl; do - [ -e build/release/$i ] && install -s -m0755 build/release/$i $PKG/usr/bin -done - -strip $PKG/usr/bin/* - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + all install + +# bins and libs are already stripped. +gzip -9 $PKG/usr/man/man1/*.1 + +# ldconfig will create the libmupdf.so.$SOVER link, but the libmupdf.so +# one has to be part of the package. +ln -s lib$PRGNAM.so.$SOMAJOR.$SOMINOR $PKG/usr/lib$LIBDIRSUFFIX/lib$PRGNAM.so + +# Historically, mupdf has included two libraries: libmupdf itself, +# and libmupdf-third, containing all the bundled third party code +# included with the source. In version 1.18.0, when building a +# shared lib, no libmupdf-third gets created (all the code ends up in +# libmupdf.so). However, most projects that link with libmupdf expect +# this library to exist. This will probably change in the future as +# those projects get updated for the changes in mupdf, but for now, +# to be compatible with older mupdf versions, we include an empty +# libmupdf-third for stuff to link with. +ar crs $PKG/usr/lib$LIBDIRSUFFIX/libmupdf-third.a # Compatibility symlinks. Older versions, the binary is just "mupdf". # Separate -curl binary exists in 1.5 but not 1.4. ln -s $PRGNAM-x11 $PKG/usr/bin/$PRGNAM -ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM-x11.1.gz -[ -e $PKG/usr/bin/$PRGNAM-x11-curl ] && \ - ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM-x11-curl.1.gz - -# mujstest is useless if we don't have JS support. Also libmupdfthird.a -# ends up 8 bytes long & has no object code in it. -[ "$MUJS" = "yes" ] || \ - rm -f $PKG/usr/bin/mujstest \ - $PKG/usr/lib$LIBDIRSUFFIX/libmupdfthird.a - -# Installed permissions are atrocious (everything 755). -find $PKG -type f | xargs chmod 644 -chmod 755 $PKG/usr/bin/* -if [ "$STATIC" != "yes" ]; then - chmod 755 $PKG/usr/lib$LIBDIRSUFFIX/lib*.so.*.* -fi +for i in x11 x11-curl gl; do + [ -e $PKG/usr/bin/$PRGNAM-$i ] && \ + ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM-$i.1.gz +done # .desktop taken from debian and modified: # - make it validate. @@ -154,13 +182,14 @@ fi mkdir -p $PKG/usr/share/applications cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop -# Icon converted from platform/x11/mupdf.ico, with icotool. -mkdir -p $PKG/usr/share/pixmaps -cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png +# Use shipped PNG and SVG icons. +mkdir -p $PKG/usr/share/pixmaps $PKG/usr/share/icons/hicolor/scalable/apps +cat docs/logo/mupdf-icon.png > $PKG/usr/share/pixmaps/$PRGNAM.png +cat docs/logo/mupdf-logo.svg > $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg # .pc file taken from debian and parameterized. -PCLIBS="-l$PRGNAM -lfreetype -lharfbuzz -ljbig2dec -ljpeg -lcrypto -lopenjp2 -lz -lm" -[ "$MUJS" = "yes" ] && PCLIBS="$PCLIBS -lmupdfthird" +# -lcrypto used to be in this list, will be again someday. +PCLIBS="-l$PRGNAM -lfreetype -lharfbuzz -ljbig2dec -ljpeg -lopenjp2 -lz -lm" mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/ sed -e "s,@LIB@,lib$LIBDIRSUFFIX,g" \ @@ -169,15 +198,12 @@ sed -e "s,@LIB@,lib$LIBDIRSUFFIX,g" \ $CWD/$PRGNAM.pc > $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/$PRGNAM.pc # 'make install' already installed most of the docs. -cp -a CONTRIBUTORS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CONTRIBUTORS docs/api $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# slack-desc will conveniently say whether javascript is built in, -# and whether libs are shared or static. mkdir -p $PKG/install -sed -e "s,@WITH@,$WITH," \ - -e "s,@LIBTYPE@,$LIBTYPE," \ - $CWD/slack-desc > $PKG/install/slack-desc +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} diff --git a/office/mupdf/mupdf.info b/office/mupdf/mupdf.info index 1baf451ab3..5865c171ae 100644 --- a/office/mupdf/mupdf.info +++ b/office/mupdf/mupdf.info @@ -1,8 +1,8 @@ PRGNAM="mupdf" -VERSION="1.13.0" +VERSION="1.18.0" HOMEPAGE="https://www.mupdf.com/" -DOWNLOAD="https://www.mupdf.com/downloads/archive/mupdf-1.13.0-source.tar.gz" -MD5SUM="447bc5c3305efe9645e12fce759e0198" +DOWNLOAD="https://www.mupdf.com/downloads/archive/mupdf-1.18.0-source.tar.xz" +MD5SUM="3135391b027cdbedf915db1787b4ea05" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jbig2dec" diff --git a/office/mupdf/mupdf.png b/office/mupdf/mupdf.png Binary files differdeleted file mode 100644 index f7cf1a6e1b..0000000000 --- a/office/mupdf/mupdf.png +++ /dev/null diff --git a/office/mupdf/shared_libs.diff b/office/mupdf/shared_libs.diff deleted file mode 100644 index 465028f632..0000000000 --- a/office/mupdf/shared_libs.diff +++ /dev/null @@ -1,76 +0,0 @@ -diff -Naur mupdf-1.13.0-source/Makefile mupdf-1.13.0-source.patched/Makefile ---- mupdf-1.13.0-source/Makefile 2018-04-12 09:14:06.000000000 -0400 -+++ mupdf-1.13.0-source.patched/Makefile 2018-06-23 15:24:50.242018433 -0400 -@@ -14,7 +14,7 @@ - # Do not specify CFLAGS or LIBS on the make invocation line - specify - # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that - # set a variable that was set on the command line. --CFLAGS += $(XCFLAGS) -Iinclude -+CFLAGS += $(XCFLAGS) -Iinclude -fPIC - LIBS += $(XLIBS) -lm - - LIBS += $(FREETYPE_LIBS) -@@ -325,10 +325,10 @@ - - # --- Library --- - --MUPDF_LIB = $(OUT)/libmupdf.a --THIRD_LIB = $(OUT)/libmupdfthird.a --THREAD_LIB = $(OUT)/libmuthreads.a --PKCS7_LIB = $(OUT)/libmupkcs7.a -+MUPDF_LIB = $(OUT)/libmupdf.so -+THIRD_LIB = $(OUT)/libmupdfthird.so -+THREAD_LIB = $(OUT)/libmuthreads.so -+PKCS7_LIB = $(OUT)/libmupkcs7.so - - MUPDF_OBJ := \ - $(FITZ_OBJ) \ -@@ -355,12 +355,16 @@ - $(ZLIB_OBJ) \ - $(LCMS2_OBJ) - --$(MUPDF_LIB) : $(MUPDF_OBJ) -+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB) -+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(SOMAJOR) -Wl,--no-undefined - $(THIRD_LIB) : $(THIRD_OBJ) -+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so.$(SOMAJOR) -Wl,--no-undefined - $(THREAD_LIB) : $(THREAD_OBJ) -+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so.$(SOMAJOR) -Wl,--no-undefined -lpthread - $(PKCS7_LIB) : $(PKCS7_OBJ) -+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupkcs7.so.$(SOMAJOR) - --INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) -+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB) - - # --- Tools and Apps --- - -@@ -444,6 +448,14 @@ - - VERSION = $(shell git describe --tags) - -+# 20180623 bkw: major/minor/micro versions for shared library. -+# SOMAJOR is the mupdf major/minor version jammed together (e.g. 113 -+# for 1.13.0). -+# SOMINOR is the mupdf micro version (e.g. 0 for 1.13.0). -+SOMAJOR = $(shell echo $(VERSION) | cut -d. -f1-2 | sed 's,\.,,g' ) -+SOMINOR = $(shell echo $(VERSION) | cut -d. -f3- | sed 's,\.,,g' ) -+SOVER = $(SOMAJOR).$(SOMINOR) -+ - version: - sed -i~ -e '/FZ_VERSION /s/".*"/"'$(VERSION)'"/' include/mupdf/fitz/version.h - -@@ -482,7 +494,13 @@ - install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf - - install -d $(DESTDIR)$(libdir) -- install $(INSTALL_LIBS) $(DESTDIR)$(libdir) -+ install -s -m0755 $(INSTALL_LIBS) $(DESTDIR)$(libdir) -+ ( cd $(DESTDIR)$(libdir) ; \ -+ for i in $(INSTALL_LIBS); do \ -+ j=$$( basename $$i) ; \ -+ mv $$j $$j.$(SOVER) ; \ -+ ln -s $$j.$(SOVER) $$j ; \ -+ done ) - - install -d $(DESTDIR)$(bindir) - install $(INSTALL_APPS) $(DESTDIR)$(bindir) diff --git a/office/mupdf/slack-desc b/office/mupdf/slack-desc index c04023860d..b2765401f2 100644 --- a/office/mupdf/slack-desc +++ b/office/mupdf/slack-desc @@ -9,11 +9,11 @@ mupdf: mupdf (a lightweight PDF, CBZ, and XPS viewer and toolkit) mupdf: mupdf: The renderer in MuPDF is tailored for high quality anti-aliased -mupdf: graphics. MuPDF renders text with metrics and spacing accurate to +mupdf: graphics. MuPDF renders text with metrics and spacing accurate to mupdf: within fractions of a pixel for the highest fidelity in reproducing mupdf: the look of a printed page on screen. mupdf: mupdf: https://www.mupdf.com/ mupdf: -mupdf: This package was built @WITH@ JavaSscript support, and installs -mupdf: @LIBTYPE@ libraries. +mupdf: +mupdf: diff --git a/office/mythes/mythes.info b/office/mythes/mythes.info index f4e2bb0224..f2bb6be82a 100644 --- a/office/mythes/mythes.info +++ b/office/mythes/mythes.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/office/notmuch/notmuch.SlackBuild b/office/notmuch/notmuch.SlackBuild index e0ff4ef414..9a2c386a43 100644 --- a/office/notmuch/notmuch.SlackBuild +++ b/office/notmuch/notmuch.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for notmuch -# Copyright 2015-2018 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2015-2018 Jostein Berntsen <jvbernts@online.no> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Written by Jostein Berntsen <jbernts@broadpark.no> +# Written by Jostein Berntsen <jvbernts@online.no> PRGNAM=notmuch -VERSION=${VERSION:-0.28} +VERSION=${VERSION:-0.28.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/notmuch/notmuch.info b/office/notmuch/notmuch.info index 32a804516a..ff4f542f79 100644 --- a/office/notmuch/notmuch.info +++ b/office/notmuch/notmuch.info @@ -1,10 +1,10 @@ PRGNAM="notmuch" -VERSION="0.28" +VERSION="0.28.2" HOMEPAGE="https://notmuchmail.org" -DOWNLOAD="https://github.com/notmuch/notmuch/archive/0.28/notmuch-0.28.tar.gz" -MD5SUM="eeb4d2333388a19845a0fb1b9302cf5a" +DOWNLOAD="https://github.com/notmuch/notmuch/archive/0.28.2/notmuch-0.28.2.tar.gz" +MD5SUM="687e7e3d36ecf1a37e06faf19154b9b9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/nts/nts.SlackBuild b/office/nts/nts.SlackBuild index 99cca5b1cb..3c3d87fe07 100644 --- a/office/nts/nts.SlackBuild +++ b/office/nts/nts.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for nts -# Written by Jostein Berntsen <jbernts@broadpark.no> +# Written by Jostein Berntsen <jvbernts@online.no> PRGNAM=nts VERSION=${VERSION:-82} diff --git a/office/nts/nts.info b/office/nts/nts.info index dbce62a787..136bf3c0d3 100644 --- a/office/nts/nts.info +++ b/office/nts/nts.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python-dateutil wxPython" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.SlackBuild b/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.SlackBuild index 97c53cadb8..64c8abfd6c 100644 --- a/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.SlackBuild +++ b/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for onlyoffice-desktopeditors -# Copyright 2017-2019, Alexander Verbovetsky, Moscow, Russia +# Copyright 2017-2021, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=onlyoffice-desktopeditors -VERSION=${VERSION:-5.2.8} +VERSION=${VERSION:-6.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.info b/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.info index 30ef11dcca..6aba4bfbd6 100644 --- a/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.info +++ b/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.info @@ -1,10 +1,10 @@ PRGNAM="onlyoffice-desktopeditors" -VERSION="5.2.8" +VERSION="6.2.0" HOMEPAGE="https://www.onlyoffice.com/apps.aspx" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/ONLYOFFICE/DesktopEditors/releases/download/ONLYOFFICE-DesktopEditors-5.2.8/onlyoffice-desktopeditors_amd64.deb" -MD5SUM_x86_64="b0d9cd518cd5a8b7520d407909327dba" +DOWNLOAD_x86_64="https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v6.2.0/onlyoffice-desktopeditors_amd64.deb" +MD5SUM_x86_64="2bb6a62e6ab85b2bcd7633431064f8a5" REQUIRES="gtkglext krb5 ttf-carlito" MAINTAINER="Alexander Verbovetsky" EMAIL="alik@ejik.org" diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild index 857e7cdc9f..32f4e8d1a6 100644 --- a/office/openoffice.org/openoffice.org.SlackBuild +++ b/office/openoffice.org/openoffice.org.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for openoffice.org -# Copyright 2018 Donald Cooley South Haven, Indiana USA +# Copyright 2018-2019 Donald Cooley South Haven, Indiana USA # With help from Ekin Akoglu to fix missing menu icons and script cleanup, # and a diff from Dominik Drobek to remove unnecessary RPM cruft. # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org @@ -30,8 +30,8 @@ PRGNAM=openoffice.org SRCNAM=openoffice -VERSION=${VERSION:-4.1.6} -BUILD_ID=${BUILD_ID:-9790} +VERSION=${VERSION:-4.1.7} +BUILD_ID=${BUILD_ID:-9800} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} SRCSHORT=$(echo $VERSION | cut -f1 -d.) diff --git a/office/openoffice.org/openoffice.org.info b/office/openoffice.org/openoffice.org.info index 26660e98c6..c748fa84d7 100644 --- a/office/openoffice.org/openoffice.org.info +++ b/office/openoffice.org/openoffice.org.info @@ -1,10 +1,10 @@ PRGNAM="openoffice.org" -VERSION="4.1.6" +VERSION="4.1.7" HOMEPAGE="https://openoffice.org" -DOWNLOAD="https://sourceforge.net/projects/openofficeorg.mirror/files/4.1.6/binaries/en-US/Apache_OpenOffice_4.1.6_Linux_x86_install-rpm_en-US.tar.gz" -MD5SUM="bce40d89c33b7fba8ea5a963e1c623cc" -DOWNLOAD_x86_64="https://sourceforge.net/projects/openofficeorg.mirror/files/4.1.6/binaries/en-US/Apache_OpenOffice_4.1.6_Linux_x86-64_install-rpm_en-US.tar.gz" -MD5SUM_x86_64="d47fa2274aad8e263eff9b913470d2cb" +DOWNLOAD="https://sourceforge.net/projects/openofficeorg.mirror/files/4.1.7/binaries/en-US/Apache_OpenOffice_4.1.7_Linux_x86_install-rpm_en-US.tar.gz" +MD5SUM="650016711ab925eb0350c4d2fbbecd92" +DOWNLOAD_x86_64="https://sourceforge.net/projects/openofficeorg.mirror/files/4.1.7/binaries/en-US/Apache_OpenOffice_4.1.7_Linux_x86-64_install-rpm_en-US.tar.gz" +MD5SUM_x86_64="f71d8bbc7c1901e808e7c5d5e6eaa051" REQUIRES="" MAINTAINER="Donald Cooley" EMAIL="chytraeu@sdf.org" diff --git a/office/org-mode/Makefile.patch b/office/org-mode/Makefile.patch deleted file mode 100644 index 7daae18e01..0000000000 --- a/office/org-mode/Makefile.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.back 2011-10-14 00:08:29.754834385 +0400 -+++ Makefile 2011-10-14 00:47:36.227996214 +0400 -@@ -14,7 +14,7 @@ - EMACS=emacs - - # Where local software is found --prefix=/usr/local -+prefix=${DESTDIR} - - # Where local lisp files go. - lispdir = $(prefix)/share/emacs/site-lisp -@@ -246,7 +246,7 @@ - - doc/org.html: doc/org.texi - (cd doc && $(TEXI2HTML) --no-split -o org.html org.texi) -- UTILITIES/manfull.pl doc/org.html -+# UTILITIES/manfull.pl doc/org.html - - doc/orgcard.pdf: doc/orgcard.tex - (cd doc && pdftex orgcard.tex) -@@ -277,7 +277,7 @@ - $(TEXI2HTML) -o doc/guide doc/orgguide.texi - UTILITIES/guidesplit.pl doc/guide/*.html - --info: doc/org -+info: doc/org-7.7 - - pdf: doc/org.pdf doc/orgguide.pdf - diff --git a/office/org-mode/README b/office/org-mode/README deleted file mode 100644 index ca97958eca..0000000000 --- a/office/org-mode/README +++ /dev/null @@ -1,18 +0,0 @@ -Org is an Emacs mode for keeping notes, maintaining TODO lists, and -doing project planning with a fast and effective plain-text system. - -Org keeps simple things simple. When first fired up, it should feel -like a straightforward, easy to use outliner. Complexity is not -imposed, but a large amount of functionality is available when you -need it. Org is a toolbox and can be used in different ways, for -example as: - -- an outline extension with visibility cycling and structure editing -- an ASCII system and table editor for taking structured notes -- an ASCII table editor with spreadsheet-like capabilities -- a TODO list editor -- a full agenda and planner with deadlines and work scheduling -- an environment to implement David Allen's GTD system -- a basic database application -- a simple hypertext system, with HTML and LaTeX export -- a publishing tool to create a set of interlinked webpages diff --git a/office/org-mode/org-mode.SlackBuild b/office/org-mode/org-mode.SlackBuild deleted file mode 100644 index cabce06e4c..0000000000 --- a/office/org-mode/org-mode.SlackBuild +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -# Slackware build script for Org-mode - -# Written by Valeriy Timchenko <ValTimchenko@gmail.com> - -PRGNAM=org-mode -VERSION=${VERSION:-7.7} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH="noarch" - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf org-$VERSION -tar xvf $CWD/org-$VERSION.tar.gz -cd org-$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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -patch Makefile $CWD/Makefile.patch -DESTDIR=/usr make all html -mv doc/{org,org-$pkgver} -DESTDIR=$PKG/usr make install -DESTDIR=$PKG/usr make install-info -#DESTDIR=$PKG/usr PKG=$PKG make install-info - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -rm -f $PKG/usr/share/info/dir -gzip -9 $PKG/usr/share/info/* -# Move org.gz to org-$VERSION.gz, so EMACS's org.gz won't be overwritten -mv $PKG/usr/share/info/{org,org-$VERSION}.gz -mv $PKG/usr/share/info $PKG/usr/info - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - README request-assign-future.txt doc/*.pdf doc/*.html \ - $PKG/usr/doc/$PRGNAM-$VERSION - -# Move contrib/ to /usr/share/org-mode-$VERSION -mkdir -p $PKG/usr/share/$PRGNAM-$VERSION -cp -R contrib $PKG/usr/share/$PRGNAM-$VERSION - -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/org-mode/org-mode.info b/office/org-mode/org-mode.info deleted file mode 100644 index 6cc37ba33c..0000000000 --- a/office/org-mode/org-mode.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="org-mode" -VERSION="7.7" -HOMEPAGE="https://orgmode.org" -DOWNLOAD="https://orgmode.org/org-7.7.tar.gz" -MD5SUM="236289876d9c33ac47c6383ec738ce6a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="jdk" -MAINTAINER="Valeriy Timchenko" -EMAIL="ValTimchenko@gmail.com" diff --git a/office/pandoc-bin/README b/office/pandoc-bin/README new file mode 100644 index 0000000000..c9bd8189e7 --- /dev/null +++ b/office/pandoc-bin/README @@ -0,0 +1,44 @@ +If you need to convert files from one markup format into another, pandoc +is your swiss-army knife. + +Pandoc can convert documents in (several dialects of) Markdown, +reStructuredText, textile, HTML, DocBook, LaTeX, MediaWiki markup, TWiki +markup, TikiWiki markup, DokuWiki markup, Creole 1.0, Vimwiki markup, +roff man, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, Microsoft Word +docx, LibreOffice ODT, EPUB, Jupyter notebooks ipynb, or Haddock markup +to +HTML formats + XHTML, HTML5, and HTML slide shows using Slidy, reveal.js, Slideous, + S5, or DZSlides +Word processor formats + Microsoft Word docx, OpenOffice/LibreOffice ODT, OpenDocument XML, + Microsoft PowerPoint. +Ebooks + EPUB version 2 or 3, FictionBook2 +Documentation formats + DocBook version 4 or 5, TEI Simple, GNU TexInfo, roff man, roff ms, + Haddock markup +Archival formats + JATS +Page layout formats + InDesign ICML +Outline formats + OPML +TeX formats + LaTeX, ConTeXt, LaTeX Beamer slides +PDF + via pdflatex, xelatex, lualatex, pdfroff, wkhtml2pdf, prince, or + weasyprint. +Lightweight markup formats + Markdown (including CommonMark and GitHub-flavored Markdown), + reStructuredText, AsciiDoc, Emacs Org-Mode, Emacs Muse, Textile, + txt2tags, MediaWiki markup, DokuWiki markup, TikiWiki markup, TWiki + markup, Vimwiki markup, and ZimWiki markup. +Interactive notebook formats + Jupyter notebook (ipynb) +Custom formats + custom writers can be written in lua. + +NOTE: +This slackbuild repackages the official binary from the Pandoc GitHub. +There are no additional dependencies. diff --git a/office/pandoc-bin/pandoc-bin.SlackBuild b/office/pandoc-bin/pandoc-bin.SlackBuild new file mode 100644 index 0000000000..e41b66d849 --- /dev/null +++ b/office/pandoc-bin/pandoc-bin.SlackBuild @@ -0,0 +1,76 @@ +#!/bin/sh + +# Slackware build script for pandoc-bin + +# Copyright 2019-2021 Andrew Payne <phalange@komputermatrix.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=pandoc-bin +SRCNAM=pandoc +VERSION=${VERSION:-2.13} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ "$ARCH" = "x86_64" ]; then + BIT="64bit" +else + echo "$ARCH is not supported." + exit 1 +fi + +set -e + +TMP=${TMP:-/tmp/SBo} +CWD=$(pwd) +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +rm -rf $PKG +mkdir -p $TMP $PKG/usr $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION-linux-amd64.tar.gz +cd $SRCNAM-$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 {} \; + +cp -r bin $PKG/usr/ +cp -r share/man $PKG/usr/ + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-bin.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/pandoc-bin/pandoc-bin.info b/office/pandoc-bin/pandoc-bin.info new file mode 100644 index 0000000000..465f946965 --- /dev/null +++ b/office/pandoc-bin/pandoc-bin.info @@ -0,0 +1,10 @@ +PRGNAM="pandoc-bin" +VERSION="2.13" +HOMEPAGE="https://github.com/jgm/pandoc" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/jgm/pandoc/releases/download/2.13/pandoc-2.13-linux-amd64.tar.gz" +MD5SUM_x86_64="4453baf7a3880c9f08c623d017761346" +REQUIRES="" +MAINTAINER="Andrew Payne" +EMAIL="phalange@komputermatrix.com" diff --git a/office/pandoc-bin/slack-desc b/office/pandoc-bin/slack-desc new file mode 100644 index 0000000000..b8d4cfba69 --- /dev/null +++ b/office/pandoc-bin/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +pandoc-bin: pandoc-bin (a universal document converter) +pandoc-bin: +pandoc-bin: Pandoc is a Haskell library for converting from one markup format to +pandoc-bin: another, and a command-line tool that uses this library. +pandoc-bin: +pandoc-bin: Pandoc can convert between numerous markup and word processing +pandoc-bin: formats, including, but not limited to, various flavors of Markdown, +pandoc-bin: HTML, LaTeX and Word docx. +pandoc-bin: +pandoc-bin: +pandoc-bin: Homepage: https://pandoc.org/ diff --git a/office/paps/paps.SlackBuild b/office/paps/paps.SlackBuild index dbe2e0c7ad..4cd6cebab1 100644 --- a/office/paps/paps.SlackBuild +++ b/office/paps/paps.SlackBuild @@ -23,6 +23,8 @@ # Now maintained by B. Watson <yalhcru@gmail.com>. +# 20191130 bkw: update for v0.7.1. upstream removed README.md and examples. + # 20180629 bkw: # - Take over maintenance. # - Include README.md (not README) in doc dir, since README just says @@ -34,8 +36,8 @@ # - Simplify script a bit. PRGNAM=paps -VERSION=${VERSION:-0.7.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.7.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -74,11 +76,8 @@ 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 \ - -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 {} \+ ./autogen.sh CFLAGS="$SLKCFLAGS" \ @@ -88,7 +87,6 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib$LIBDIRSUFFIX \ --sysconfdir=/etc/paps \ --mandir=/usr/man \ - --enable-static=no \ --build=$ARCH-slackware-linux make @@ -96,8 +94,7 @@ make install-strip DESTDIR=$PKG gzip -9 $PKG/usr/man/man1/$PRGNAM.1 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING.LIB ChangeLog README.md NEWS examples/* \ - $PKG/usr/doc/$PRGNAM-$VERSION/ +cp -a AUTHORS COPYING.LIB ChangeLog NEWS $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/paps/paps.info b/office/paps/paps.info index abee426617..70cd0a7d6e 100644 --- a/office/paps/paps.info +++ b/office/paps/paps.info @@ -1,8 +1,8 @@ PRGNAM="paps" -VERSION="0.7.0" +VERSION="0.7.1" HOMEPAGE="https://github.com/dov/paps" -DOWNLOAD="https://github.com/dov/paps/archive/0.7.0/paps-0.7.0.tar.gz" -MD5SUM="17e97ec3697ca9ec03f36fc20d002b36" +DOWNLOAD="https://github.com/dov/paps/releases/download/v0.7.1/paps-0.7.1.tar.gz" +MD5SUM="b058bcc7d958fb53408942088cc1f365" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/pdf2djvu/pdf2djvu.SlackBuild b/office/pdf2djvu/pdf2djvu.SlackBuild index b824453984..821cfa8983 100644 --- a/office/pdf2djvu/pdf2djvu.SlackBuild +++ b/office/pdf2djvu/pdf2djvu.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pdf2djvu -VERSION=${VERSION:-0.9.10} +VERSION=${VERSION:-0.9.17.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/pdf2djvu/pdf2djvu.info b/office/pdf2djvu/pdf2djvu.info index da282fd4ef..950ac20572 100644 --- a/office/pdf2djvu/pdf2djvu.info +++ b/office/pdf2djvu/pdf2djvu.info @@ -1,8 +1,8 @@ PRGNAM="pdf2djvu" -VERSION="0.9.10" +VERSION="0.9.17.1" HOMEPAGE="https://jwilk.net/software/pdf2djvu" -DOWNLOAD="https://github.com/jwilk/pdf2djvu/releases/download/0.9.10/pdf2djvu-0.9.10.tar.xz" -MD5SUM="ffe447f9261e27353d101243788f863f" +DOWNLOAD="https://github.com/jwilk/pdf2djvu/releases/download/0.9.17.1/pdf2djvu-0.9.17.1.tar.xz" +MD5SUM="fd803adb96319b39e38392d6d5415142" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="nose GraphicsMagick" diff --git a/office/pdfjam/README b/office/pdfjam/README deleted file mode 100644 index 7d3d58266c..0000000000 --- a/office/pdfjam/README +++ /dev/null @@ -1,4 +0,0 @@ -PDFjam is a collection of shell scripts providing a simple interface -to functionality of the pdfpages package for pdfLaTeX. PDFjam can -rotate pages, join PDFs, n-up several pages onto one page, generate a -printer spread for books, and much much more. diff --git a/office/pdfjam/pdfjam.SlackBuild b/office/pdfjam/pdfjam.SlackBuild deleted file mode 100644 index 79a862e459..0000000000 --- a/office/pdfjam/pdfjam.SlackBuild +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -# Slackware build script for pdfjam -# Copyright 2016 Klaatu klaatu@member.fsf.org -# -# GNU All-Permissive License -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. This file is offered as-is, -# without any warranty. - -PRGNAM=pdfjam -VERSION=${VERSION:-2.08} -VERTAR=${VERTAR:-latest} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -ARCH='noarch' -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/"$PRGNAM"_"$VERTAR".tgz -cd $PRGNAM -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 {} \; - -# already in PRGNAM -mkdir $PKG/usr -mv bin $PKG/usr/bin -mkdir -p $PKG/usr/man/man1 -mkdir $PKG/etc -mv pdfjam.conf $PKG/etc -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION - -for i in man1/* ; do gzip -9c "$i" > $PKG/usr/man/"$i".gz ; done - -cp -a COPYING VERSION tests.zip PDFjam-README.html pdfdroplets.png \ - $PKG/usr/doc/$PRGNAM-$VERSION/ -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/pdfjam/pdfjam.info b/office/pdfjam/pdfjam.info deleted file mode 100644 index d97fbbdeed..0000000000 --- a/office/pdfjam/pdfjam.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="pdfjam" -VERSION="2.08" -HOMEPAGE="https://www2.warwick.ac.uk/fac/sci/statistics/staff/academic-research/firth/software/pdfjam" -DOWNLOAD="https://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam/pdfjam_latest.tgz" -MD5SUM="7df075df7f129091f826275ce8c1f374" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Klaatu" -EMAIL="klaatu@member.fsf.org" diff --git a/office/pdfstudio/README b/office/pdfstudio/README new file mode 100644 index 0000000000..f3e5937d08 --- /dev/null +++ b/office/pdfstudio/README @@ -0,0 +1,43 @@ +PDF Studio is an all-in-one, easy to use PDF editor that provides all +PDF features needed at a fraction of the cost of Adobe Acrobat and other +PDF editors. PDF Studio maintains full compatibility with the PDF +Standard. + +PDF Studio is a commercial Java based program. It is available in +Standard and Pro editions, and also as a free demo. The demo version +adds watermarks to all edited PDFs. + +Key features of PDF Studio: + + * Create PDFs + * Scan-To-PDF + * Annotate and Markup PDFs + * Precision Measuring Tools + * Fill In & Save PDF Forms + * Secure Documents + * Append / Delete Pages + * Create Watermarks, Headers, Footers + * Loupe, Pan & Zoom, Rulers, etc... + * Document Storage Integrations + * Docusign Integration + * Supports the new PDF 2.0 standards + * Interactive Form Designer + * OCR (Text Recognition) + * Content Editing (Text and Images) + * Redact & Sanitize PDFs + * Compare PDFs + * Optimize PDFs + * Digitally Sign PDFs + * Advanced PDF Splitting & Merging + * Batch Process Multiple PDFs + * Tag PDFs for Accessibility (PDF/UA) + * PDF/A Validation / Conversion + * Advanced Imposition & Printer + +By default PDF Studio uses the system-wide Java. + +If you pass OWNJAVA=yes to the SlackBuild script: +OWNJAVA=yes ./pdfstudio.SlackBuild +a version of Java that comes packaged with PDF Studio will be installed +under the PDF Studio installation directory, this Java will not be used +by other programs. diff --git a/office/pdfstudio2018/doinst.sh b/office/pdfstudio/doinst.sh index 5fb28930db..5fb28930db 100644 --- a/office/pdfstudio2018/doinst.sh +++ b/office/pdfstudio/doinst.sh diff --git a/office/pdfstudio12/pdfstudio12.SlackBuild b/office/pdfstudio/pdfstudio.SlackBuild index 08f7120e78..27f10fc1cf 100644 --- a/office/pdfstudio12/pdfstudio12.SlackBuild +++ b/office/pdfstudio/pdfstudio.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for pdfstudio12 +# Slackware build script for pdfstudio -# Copyright 2017-2018, Alexander Verbovetsky, Moscow, Russia +# Copyright 2017-2021, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=pdfstudio12 -VERSION=${VERSION:-12.0.7} +PRGNAM=pdfstudio +VERSION=${VERSION:-2020.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +YEAR=${VERSION:0:4} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -54,14 +55,23 @@ mkdir -p $TMP $PKG $OUTPUT cd $PKG ar p $CWD/PDFStudio_v${VERSION//./_}_linux${DEBARCH}.deb data.tar.gz | tar xvz mkdir -p usr/bin -ln -s /opt/pdfstudio12/pdfstudio12 usr/bin/pdfstudio +ln -s /opt/pdfstudio${YEAR}/pdfstudio${YEAR} usr/bin/pdfstudio + mkdir -p usr/share/applications -cp $CWD/$PRGNAM.desktop usr/share/applications/ +echo -e "[Desktop Entry] +Type=Application +Name=PDF Studio ${YEAR} +Exec=/bin/sh "/opt/pdfstudio${YEAR}/pdfstudio${YEAR}" +Icon=/opt/pdfstudio${YEAR}/.install4j/pdfstudio${YEAR}.png +Terminal=false +Categories=Office; +MimeType=application/pdf;" \ +> usr/share/applications/${PRGNAM}${YEAR}.desktop + mkdir -p usr/doc/$PRGNAM-$VERSION -cp $CWD/pdfstudio12_userguide.pdf usr/doc/$PRGNAM-$VERSION/ if [ "${OWNJAVA:-no}" = "yes" ]; then - cd opt/pdfstudio12/jre + cd opt/pdfstudio${YEAR}/jre for pack_file in lib/*.jar.pack; do jar_file=`echo "$pack_file" | awk '{ print substr($0,1,length-5) }'` bin/unpack200 -r "$pack_file" "$jar_file" @@ -73,7 +83,7 @@ if [ "${OWNJAVA:-no}" = "yes" ]; then bin/java -Xshare:dump &>/dev/null cd $PKG else - rm -rf opt/pdfstudio12/jre + rm -rf opt/pdfstudio${YEAR}/jre fi chown -R root:root . @@ -85,7 +95,7 @@ find -L . \ chmod 0755 $PKG for f in additionalcopyrights.html license.html; do - unzip -p opt/pdfstudio12/lib/pdfstudio.jar \ + unzip -p opt/pdfstudio${YEAR}/lib/pdfstudio.jar \ resources/$f > usr/doc/$PRGNAM-$VERSION/$f done cat $CWD/$PRGNAM.SlackBuild > usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/office/pdfstudio/pdfstudio.info b/office/pdfstudio/pdfstudio.info new file mode 100644 index 0000000000..c037064411 --- /dev/null +++ b/office/pdfstudio/pdfstudio.info @@ -0,0 +1,10 @@ +PRGNAM="pdfstudio" +VERSION="2020.4.0" +HOMEPAGE="https://www.qoppa.com/pdfstudio/" +DOWNLOAD="https://download.qoppa.com/pdfstudio/v2020/PDFStudio_v2020_4_0_linux.deb" +MD5SUM="54b767608e88afdeeeb7292c278624c2" +DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudio/v2020/PDFStudio_v2020_4_0_linux64.deb" +MD5SUM_x86_64="d4b8f062f90d191a7fca0b003101e772" +REQUIRES="jdk" +MAINTAINER="Alexander Verbovetsky" +EMAIL="alik@ejik.org" diff --git a/office/pdfstudio/slack-desc b/office/pdfstudio/slack-desc new file mode 100644 index 0000000000..a0b189b600 --- /dev/null +++ b/office/pdfstudio/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +pdfstudio: pdfstudio (PDF editor) +pdfstudio: +pdfstudio: PDF Studio is an all-in-one, easy to use PDF editor that provides all +pdfstudio: PDF features needed at a fraction of the cost of Adobe Acrobat and +pdfstudio: other PDF editors. PDF Studio maintains full compatibility with the +pdfstudio: PDF Standard. +pdfstudio: +pdfstudio: PDF Studio is a commercial Java based program. It is available in +pdfstudio: Standard and Pro editions, and also as a free demo. +pdfstudio: +pdfstudio: Home page: https://www.qoppa.com/pdfstudio/ diff --git a/office/pdfstudio11/README b/office/pdfstudio11/README deleted file mode 100644 index bbefc131b6..0000000000 --- a/office/pdfstudio11/README +++ /dev/null @@ -1,39 +0,0 @@ -PDF Studio is an all-in-one, easy to use PDF editor that provides all -PDF features needed at a fraction of the cost of Adobe Acrobat and other -PDF editors. PDF Studio maintains full compatibility with the PDF -Standard. - -PDF Studio is a commercial Java based program. It is available in -Standard and Pro editions, and also as a free demo. The demo version -adds watermarks to all edited PDFs. - -Key features of PDF Studio: - - * Create PDFs - * Review and Annotate PDFs - * Fill and save PDF forms - * Interactive form field designer - * Secure PDFs - * Digitally sign PDFs - * Combine and rearrange documents - * Add watermarks, headers & footers - * OCR (text recognition) - * Edit PDF content - * Redact permanently - * Compare PDFs - * Optimize PDFs - * Batch process multiple PDFs - * Precision measuring tools - * Preflight and convert to PDF/A - * PDF linearization (for fast web view) - * Convert to HTML5/SVG - * Annotation tool chest - * Loupe, pan & zoom, rulers & grids - -By default PDF Studio uses the system-wide Java. - -If you pass OWNJAVA=yes to the SlackBuild script: -OWNJAVA=yes ./pdfstudio11.SlackBuild -a version of Java that comes packaged with PDF Studio will be installed -under the PDF Studio installation directory, this Java will not be used -by other programs. diff --git a/office/pdfstudio11/pdfstudio11.desktop b/office/pdfstudio11/pdfstudio11.desktop deleted file mode 100644 index 9a3f33ab1e..0000000000 --- a/office/pdfstudio11/pdfstudio11.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Application -Name=PDF Studio 11 -Exec=/bin/sh "/opt/pdfstudio11/pdfstudio11" -Icon=/opt/pdfstudio11/.install4j/pdfstudio11.png -Categories=Office; diff --git a/office/pdfstudio11/pdfstudio11.info b/office/pdfstudio11/pdfstudio11.info deleted file mode 100644 index 8ce42ac7cc..0000000000 --- a/office/pdfstudio11/pdfstudio11.info +++ /dev/null @@ -1,14 +0,0 @@ -PRGNAM="pdfstudio11" -VERSION="11.0.7" -HOMEPAGE="https://www.qoppa.com/pdfstudio/" -DOWNLOAD="https://download.qoppa.com/pdfstudio/v11/PDFStudio_v11_0_7_linux.deb \ - https://www.qoppa.com/files/pdfstudio/guide/pdfstudio11_userguide.pdf" -MD5SUM="c5b3a7e019b9912d21da3ae94a5f4d64 \ - 3f0735dbfa9113c4f00cd484d3c35a4a" -DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudio/v11/PDFStudio_v11_0_7_linux64.deb \ - https://www.qoppa.com/files/pdfstudio/guide/pdfstudio11_userguide.pdf" -MD5SUM_x86_64="282ba7d5b42861db59d9a6288738edab \ - 3f0735dbfa9113c4f00cd484d3c35a4a" -REQUIRES="jdk" -MAINTAINER="Alexander Verbovetsky" -EMAIL="alik@ejik.org" diff --git a/office/pdfstudio11/slack-desc b/office/pdfstudio11/slack-desc deleted file mode 100644 index 25d7abd4b0..0000000000 --- a/office/pdfstudio11/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pdfstudio11: pdfstudio11 (PDF editor) -pdfstudio11: -pdfstudio11: PDF Studio is an all-in-one, easy to use PDF editor that provides all -pdfstudio11: PDF features needed at a fraction of the cost of Adobe Acrobat and -pdfstudio11: other PDF editors. PDF Studio maintains full compatibility with the -pdfstudio11: PDF Standard. -pdfstudio11: -pdfstudio11: PDF Studio is a commercial Java based program. It is available in -pdfstudio11: Standard and Pro editions, and also as a free demo. -pdfstudio11: -pdfstudio11: Home page: https://www.qoppa.com/pdfstudio/ diff --git a/office/pdfstudio12/README b/office/pdfstudio12/README deleted file mode 100644 index cfb82ae9da..0000000000 --- a/office/pdfstudio12/README +++ /dev/null @@ -1,43 +0,0 @@ -PDF Studio is an all-in-one, easy to use PDF editor that provides all -PDF features needed at a fraction of the cost of Adobe Acrobat and other -PDF editors. PDF Studio maintains full compatibility with the PDF -Standard. - -PDF Studio is a commercial Java based program. It is available in -Standard and Pro editions, and also as a free demo. The demo version -adds watermarks to all edited PDFs. - -Key features of PDF Studio: - - * Create PDFs - * Review and annotate PDFs - * Fill and save PDF forms - * Interactive form field designer - * Secure PDFs - * Digitally sign PDFs - * Combine and rearrange documents - * Add watermarks, headers & footers - * OCR (text recognition) - * Edit PDF content - * Redact permanently - * Compare PDFs - * Optimize PDFs - * Batch process multiple PDFs - * Precision measuring tools - * Preflight and convert to PDF/A - * PDF linearization (for fast web view) - * Convert to HTML5/SVG - * Annotation tool chest - * Loupe, pan & zoom, rulers & grids - * Advanced imposition - -By default PDF Studio uses the system-wide Java. - -If you pass OWNJAVA=yes to the SlackBuild script: -OWNJAVA=yes ./pdfstudio12.SlackBuild -a version of Java that comes packaged with PDF Studio will be installed -under the PDF Studio installation directory, this Java will not be used -by other programs. - -NOTE: The license of the sources don't permit free distribution, so sources -must be coming from upstream project. diff --git a/office/pdfstudio12/pdfstudio12.desktop b/office/pdfstudio12/pdfstudio12.desktop deleted file mode 100644 index 43da567b3d..0000000000 --- a/office/pdfstudio12/pdfstudio12.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Application -Name=PDF Studio 12 -Exec=/bin/sh "/opt/pdfstudio12/pdfstudio12" -Icon=/opt/pdfstudio12/.install4j/pdfstudio12.png -Categories=Office; diff --git a/office/pdfstudio12/pdfstudio12.info b/office/pdfstudio12/pdfstudio12.info deleted file mode 100644 index dd77c07a48..0000000000 --- a/office/pdfstudio12/pdfstudio12.info +++ /dev/null @@ -1,14 +0,0 @@ -PRGNAM="pdfstudio12" -VERSION="12.0.7" -HOMEPAGE="https://www.qoppa.com/pdfstudio/" -DOWNLOAD="https://download.qoppa.com/pdfstudio/v12/PDFStudio_v12_0_7_linux.deb \ - https://www.qoppa.com/files/pdfstudio/guide/pdfstudio12_userguide.pdf" -MD5SUM="549848976e78ac0769fbf945f274aa49 \ - 14d7dba62244bd5a2d381acb7f457ad2" -DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudio/v12/PDFStudio_v12_0_7_linux64.deb \ - https://www.qoppa.com/files/pdfstudio/guide/pdfstudio12_userguide.pdf" -MD5SUM_x86_64="ec6ebfa91c422ea50f699f61d9cefb49 \ - 14d7dba62244bd5a2d381acb7f457ad2" -REQUIRES="jdk %README%" -MAINTAINER="Alexander Verbovetsky" -EMAIL="alik@ejik.org" diff --git a/office/pdfstudio12/slack-desc b/office/pdfstudio12/slack-desc deleted file mode 100644 index 1759837b40..0000000000 --- a/office/pdfstudio12/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pdfstudio12: pdfstudio12 (PDF editor) -pdfstudio12: -pdfstudio12: PDF Studio is an all-in-one, easy to use PDF editor that provides all -pdfstudio12: PDF features needed at a fraction of the cost of Adobe Acrobat and -pdfstudio12: other PDF editors. PDF Studio maintains full compatibility with the -pdfstudio12: PDF Standard. -pdfstudio12: -pdfstudio12: PDF Studio is a commercial Java based program. It is available in -pdfstudio12: Standard and Pro editions, and also as a free demo. -pdfstudio12: -pdfstudio12: Home page: https://www.qoppa.com/pdfstudio/ diff --git a/office/pdfstudio2018/README b/office/pdfstudio2018/README deleted file mode 100644 index f485e38da9..0000000000 --- a/office/pdfstudio2018/README +++ /dev/null @@ -1,46 +0,0 @@ -PDF Studio is an all-in-one, easy to use PDF editor that provides all -PDF features needed at a fraction of the cost of Adobe Acrobat and other -PDF editors. PDF Studio maintains full compatibility with the PDF -Standard. - -PDF Studio is a commercial Java based program. It is available in -Standard and Pro editions, and also as a free demo. The demo version -adds watermarks to all edited PDFs. - -Key features of PDF Studio: - - * Create PDFs - * Review and annotate PDFs - * Fill and save PDF forms - * Interactive form field designer - * Secure PDFs - * Digitally sign PDFs - * Combine and rearrange documents - * Add watermarks, headers & footers - * OCR (text recognition) - * Edit PDF content - * Redact permanently - * Compare PDFs - * Optimize PDFs - * Batch process multiple PDFs - * Precision measuring tools - * Preflight and convert to PDF/A - * PDF linearization (for fast web view) - * Convert to HTML5/SVG - * Annotation tool chest - * Loupe, pan & zoom, rulers & grids - * Advanced imposition - * Inline text content editing with reflow - * Rich text in form fields - * Ribbon UI - -By default PDF Studio uses the system-wide Java. - -If you pass OWNJAVA=yes to the SlackBuild script: -OWNJAVA=yes ./pdfstudio2018.SlackBuild -a version of Java that comes packaged with PDF Studio will be installed -under the PDF Studio installation directory, this Java will not be used -by other programs. - -NOTE: The license of the sources don't permit free distribution, so sources -must be coming from upstream project. diff --git a/office/pdfstudio2018/pdfstudio2018.desktop b/office/pdfstudio2018/pdfstudio2018.desktop deleted file mode 100644 index 8d0461d4f5..0000000000 --- a/office/pdfstudio2018/pdfstudio2018.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Application -Name=PDF Studio 2018 -Exec=/bin/sh "/opt/pdfstudio2018/pdfstudio2018" -Icon=/opt/pdfstudio2018/.install4j/pdfstudio2018.png -Categories=Office; diff --git a/office/pdfstudio2018/pdfstudio2018.info b/office/pdfstudio2018/pdfstudio2018.info deleted file mode 100644 index db38ac84b9..0000000000 --- a/office/pdfstudio2018/pdfstudio2018.info +++ /dev/null @@ -1,14 +0,0 @@ -PRGNAM="pdfstudio2018" -VERSION="18.2.2" -HOMEPAGE="https://www.qoppa.com/pdfstudio/" -DOWNLOAD="https://download.qoppa.com/pdfstudio/PDFStudio_linux.deb \ - https://www.qoppa.com/files/pdfstudio/guide/pdfstudio2018_userguide.pdf" -MD5SUM="f0515e68785c57cd7f0d0a85768f94be \ - 7c29b6aaafa835a454305e8ac12a5b4c" -DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudio/PDFStudio_linux64.deb \ - https://www.qoppa.com/files/pdfstudio/guide/pdfstudio2018_userguide.pdf" -MD5SUM_x86_64="58f7613abb6586276ec717dbee5afe2c \ - 7c29b6aaafa835a454305e8ac12a5b4c" -REQUIRES="jdk %README%" -MAINTAINER="Alexander Verbovetsky" -EMAIL="alik@ejik.org" diff --git a/office/pdfstudio2018/slack-desc b/office/pdfstudio2018/slack-desc deleted file mode 100644 index 631cbcaa4a..0000000000 --- a/office/pdfstudio2018/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pdfstudio2018: pdfstudio2018 (PDF editor) -pdfstudio2018: -pdfstudio2018: PDF Studio is an all-in-one, easy to use PDF editor that provides all -pdfstudio2018: PDF features needed at a fraction of the cost of Adobe Acrobat and -pdfstudio2018: other PDF editors. PDF Studio maintains full compatibility with the -pdfstudio2018: PDF Standard. -pdfstudio2018: -pdfstudio2018: PDF Studio is a commercial Java based program. It is available in -pdfstudio2018: Standard and Pro editions, and also as a free demo. -pdfstudio2018: -pdfstudio2018: Home page: https://www.qoppa.com/pdfstudio/ diff --git a/office/pdfstudioviewer/README b/office/pdfstudioviewer/README new file mode 100644 index 0000000000..250390b3ff --- /dev/null +++ b/office/pdfstudioviewer/README @@ -0,0 +1,26 @@ +PDF Studio Viewer is a cross-platform PDF reader that is reliable and +easy to use. PDF Studio Viewer can annotate PDF documents and fill +interactive forms. For more editing features, there is the pdfstudio +package. + +PDF Studio Viewer is a free proprietary Java based program (while +pdfstudio is not free). + +Key features of PDF Studio Viewer: + + * Display PDFs with high fidelity + * Annotate & Markup PDFs + * Fill & Save Forms + * Render Digital Signatures & Layers + * Advanced User Interface + * Advanced Print & Search Options + * Document Storage Integrations + * DocuSign Integration + +By default PDF Studio Viewer uses the system-wide Java. + +If you pass OWNJAVA=yes to the SlackBuild script: +OWNJAVA=yes ./pdfstudioviewer.SlackBuild +a version of Java that comes packaged with PDF Studio Viewer will be +installed under the PDF Studio Viewer installation directory, this Java +will not be used by other programs. diff --git a/office/pdfstudioviewer/doinst.sh b/office/pdfstudioviewer/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/office/pdfstudioviewer/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/office/pdfstudio2018/pdfstudio2018.SlackBuild b/office/pdfstudioviewer/pdfstudioviewer.SlackBuild index 9f9b0ea4f9..07ddfd8dfc 100644 --- a/office/pdfstudio2018/pdfstudio2018.SlackBuild +++ b/office/pdfstudioviewer/pdfstudioviewer.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for pdfstudio2018 +# Slackware build script for pdfstudioviewer -# Copyright 2018, Alexander Verbovetsky, Moscow, Russia +# Copyright 2019-2021, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=pdfstudio2018 -VERSION=${VERSION:-18.2.2} +PRGNAM=pdfstudioviewer +VERSION=${VERSION:-2020.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +YEAR=${VERSION:0:4} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -38,7 +39,7 @@ fi case "$ARCH" in i?86) DEBARCH="" ;; x86_64) DEBARCH=64 ;; - *) printf "\n$ARCH is unsupported for the PDF Studio.\n\n" + *) printf "\n$ARCH is unsupported for the PDF Studio Viewer.\n\n" exit 1 ;; esac @@ -52,16 +53,25 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $PKG -ar p $CWD/PDFStudio_linux${DEBARCH}.deb data.tar.gz | tar xvz +ar p $CWD/PDFStudioViewer_v${VERSION//./_}_linux${DEBARCH}.deb data.tar.gz | tar xvz mkdir -p usr/bin -ln -s /opt/pdfstudio2018/pdfstudio2018 usr/bin/pdfstudio +ln -s /opt/pdfstudioviewer${YEAR}/pdfstudioviewer${YEAR} usr/bin/pdfstudioviewer + mkdir -p usr/share/applications -cp $CWD/$PRGNAM.desktop usr/share/applications/ +echo -e "[Desktop Entry] +Type=Application +Name=PDF Studio Viewer ${YEAR} +Exec=/bin/sh "/opt/pdfstudioviewer${YEAR}/pdfstudioviewer${YEAR}" +Icon=/opt/pdfstudioviewer${YEAR}/.install4j/pdfstudioviewer${YEAR}.png +Terminal=false +Categories=Office;Viewer; +MimeType=application/pdf;" \ +> usr/share/applications/${PRGNAM}${YEAR}.desktop + mkdir -p usr/doc/$PRGNAM-$VERSION -cp $CWD/pdfstudio2018_userguide.pdf usr/doc/$PRGNAM-$VERSION/ if [ "${OWNJAVA:-no}" = "yes" ]; then - cd opt/pdfstudio2018/jre + cd opt/pdfstudioviewer${YEAR}/jre for pack_file in lib/*.jar.pack; do jar_file=`echo "$pack_file" | awk '{ print substr($0,1,length-5) }'` bin/unpack200 -r "$pack_file" "$jar_file" @@ -73,7 +83,7 @@ if [ "${OWNJAVA:-no}" = "yes" ]; then bin/java -Xshare:dump &>/dev/null cd $PKG else - rm -rf opt/pdfstudio2018/jre + rm -rf opt/pdfstudioviewer${YEAR}/jre fi chown -R root:root . @@ -84,8 +94,8 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; chmod 0755 $PKG -for f in additionalcopyrights.html license.html; do - unzip -p opt/pdfstudio2018/lib/pdfstudio.jar \ +for f in additionalcopyrights.html license_viewer.html; do + unzip -p opt/pdfstudioviewer${YEAR}/lib/pdfstudio.jar \ resources/$f > usr/doc/$PRGNAM-$VERSION/$f done cat $CWD/$PRGNAM.SlackBuild > usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/office/pdfstudioviewer/pdfstudioviewer.info b/office/pdfstudioviewer/pdfstudioviewer.info new file mode 100644 index 0000000000..2099167cae --- /dev/null +++ b/office/pdfstudioviewer/pdfstudioviewer.info @@ -0,0 +1,10 @@ +PRGNAM="pdfstudioviewer" +VERSION="2020.4.0" +HOMEPAGE="https://www.qoppa.com/pdfstudioviewer/" +DOWNLOAD="https://download.qoppa.com/pdfstudioviewer/v2020/PDFStudioViewer_v2020_4_0_linux.deb" +MD5SUM="b00266ac215c57010652919cf5ecd997" +DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudioviewer/v2020/PDFStudioViewer_v2020_4_0_linux64.deb" +MD5SUM_x86_64="915bf1db64f138d75c5bb314b44c6c07" +REQUIRES="jdk" +MAINTAINER="Alexander Verbovetsky" +EMAIL="alik@ejik.org" diff --git a/office/pdfstudioviewer/slack-desc b/office/pdfstudioviewer/slack-desc new file mode 100644 index 0000000000..127290594d --- /dev/null +++ b/office/pdfstudioviewer/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +pdfstudioviewer: pdfstudioviewer (PDF reader) +pdfstudioviewer: +pdfstudioviewer: PDF Studio Viewer is a cross-platform PDF reader that is reliable and +pdfstudioviewer: easy to use. PDF Studio Viewer can annotate PDF documents and fill +pdfstudioviewer: interactive forms. +pdfstudioviewer: +pdfstudioviewer: PDF Studio Viewer is a free proprietary Java based program. +pdfstudioviewer: +pdfstudioviewer: Home page: https://www.qoppa.com/pdfstudioviewer/ +pdfstudioviewer: +pdfstudioviewer: diff --git a/office/plover/README b/office/plover/README new file mode 100644 index 0000000000..f54d2b900a --- /dev/null +++ b/office/plover/README @@ -0,0 +1,10 @@ +Plover (rhymes with "lover") is a desktop application that allows +anyone to use stenography to write on their computer, up to speeds of +200WPM and beyond. + +Plover is part of the Open Steno Project. The Open Steno Project's +goal is to provide everything you need to learn machine shorthand +on your own, from free software, to cheap hardware, to learning +resources. + +Plover is GPLv2+ as of version 3.1.0. See the license for details. diff --git a/office/plover/doinst.sh b/office/plover/doinst.sh new file mode 100644 index 0000000000..aea0f894eb --- /dev/null +++ b/office/plover/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/office/plover/plover.SlackBuild b/office/plover/plover.SlackBuild new file mode 100644 index 0000000000..b793a75144 --- /dev/null +++ b/office/plover/plover.SlackBuild @@ -0,0 +1,70 @@ +#!/bin/sh + +# Slackware build script for plover + +# Copyright 2020 Alan Aversa USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=plover +VERSION=${VERSION:-4.0.0.dev8.66.g685bd33} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=${ARCH:-$(uname -m)} +if [ $ARCH != "x86_64" ]; then + echo "$ARCH is not supported." + exit 1 +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +mkdir $PRGNAM-$VERSION +cp $CWD/$PRGNAM-$VERSION-x86_64.AppImage $PRGNAM-$VERSION/$PRGNAM +cd $PRGNAM-$VERSION +chown -R root:root $PRGNAM +chmod 755 $PRGNAM + +mkdir -p $PKG/usr/bin +mv $PRGNAM $PKG/usr/bin/ + +mkdir -p $PKG/usr/share/applications +cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop + +mkdir -p $PKG/usr/share/pixmaps +cp $CWD/$PRGNAM.png $PKG/usr/share/pixmaps + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +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} diff --git a/office/plover/plover.desktop b/office/plover/plover.desktop new file mode 100644 index 0000000000..519ee5da65 --- /dev/null +++ b/office/plover/plover.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Plover +GenericName=Stenography +Comment=Plover stenotype engine +Icon=plover +Exec=plover +TryExec=Plover +Terminal=false +Type=Application +Categories=Office; diff --git a/office/plover/plover.info b/office/plover/plover.info new file mode 100644 index 0000000000..9a671383de --- /dev/null +++ b/office/plover/plover.info @@ -0,0 +1,10 @@ +PRGNAM="plover" +VERSION="4.0.0.dev8.66.g685bd33" +HOMEPAGE="https://www.openstenoproject.org/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/openstenoproject/plover/releases/download/weekly-v4.0.0.dev8%2B66.g685bd33/plover-4.0.0.dev8.66.g685bd33-x86_64.AppImage" +MD5SUM_x86_64="27253471cec234350ecbcc8cee6071ed" +REQUIRES="" +MAINTAINER="Alan Aversa" +EMAIL="alan.aveNOrsaSP@AMcox.net (remove NO and SPAM)" diff --git a/office/plover/plover.png b/office/plover/plover.png Binary files differnew file mode 100644 index 0000000000..dd301f1c3d --- /dev/null +++ b/office/plover/plover.png diff --git a/office/plover/slack-desc b/office/plover/slack-desc new file mode 100644 index 0000000000..de7d26b9be --- /dev/null +++ b/office/plover/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +plover: plover (Open source stenotype engine) +plover: +plover: Plover (rhymes with "lover") is a desktop application that allows +plover: anyone to use stenography to write on their computer, up to speeds of +plover: 200WPM and beyond. +plover: +plover: Plover is part of the Open Steno Project. The Open Steno Project's +plover: goal is to provide everything you need to learn machine shorthand on +plover: your own, from free software, to cheap hardware, to learning +plover: resources. +plover: diff --git a/office/pstoedit/README b/office/pstoedit/README index fe5f854345..f0e737bccd 100644 --- a/office/pstoedit/README +++ b/office/pstoedit/README @@ -6,4 +6,8 @@ NOIXML, PCB, PCL, RIB, RPL, RTF, SK, SVG, SVM, SWF, TGIF, XAML, WMF and variants of these. Output is also possible to text in different formats and Java or TK code. +This version has some incompatibilities with ghostscript versions +earlier than 9.50 (eg 9.26 as in Slackware 14.4). If you get errors try +using the option "-rdb". + libEMF, plotutils, and ming are optional dependencies. diff --git a/office/pstoedit/pstoedit.SlackBuild b/office/pstoedit/pstoedit.SlackBuild index 1448d71c5f..f708b464b4 100644 --- a/office/pstoedit/pstoedit.SlackBuild +++ b/office/pstoedit/pstoedit.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pstoedit -VERSION=${VERSION:-3.70} +VERSION=${VERSION:-3.75} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++14" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ diff --git a/office/pstoedit/pstoedit.info b/office/pstoedit/pstoedit.info index c55fece364..6a0347d4ef 100644 --- a/office/pstoedit/pstoedit.info +++ b/office/pstoedit/pstoedit.info @@ -1,8 +1,8 @@ PRGNAM="pstoedit" -VERSION="3.70" +VERSION="3.75" HOMEPAGE="http://www.pstoedit.net/" -DOWNLOAD="https://downloads.sourceforge.net/pstoedit/pstoedit-3.70.tar.gz" -MD5SUM="d3ad4657b4944a8400f7ca76f78cb943" +DOWNLOAD="https://downloads.sourceforge.net/pstoedit/pstoedit-3.75.tar.gz" +MD5SUM="a1965d0fcc4e151a265907865078d2c4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/pyspread/pyspread.SlackBuild b/office/pyspread/pyspread.SlackBuild index b2392b4502..dc2d022599 100644 --- a/office/pyspread/pyspread.SlackBuild +++ b/office/pyspread/pyspread.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pyspread -# Copyright 2014-2017 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pyspread -VERSION=${VERSION:-1.1.1} +VERSION=${VERSION:-1.1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/pyspread/pyspread.info b/office/pyspread/pyspread.info index 91f1b47f0e..3586ce7397 100644 --- a/office/pyspread/pyspread.info +++ b/office/pyspread/pyspread.info @@ -1,8 +1,8 @@ PRGNAM="pyspread" -VERSION="1.1.1" +VERSION="1.1.3" HOMEPAGE="https://manns.github.io/pyspread/" -DOWNLOAD="https://pypi.python.org/packages/4a/19/0447639d5bbf272b7d388a2ce9374d7f552966b90b66e108e8d7850b3628/pyspread-1.1.1.tar.gz" -MD5SUM="021921de5a49b9ab98ec845ee215b50b" +DOWNLOAD="https://files.pythonhosted.org/packages/4b/34/3ce362d78584274da5c418c9712d3cc53b9e19e7d8f22a141baa2a9da6b9/pyspread-1.1.3.tar.gz" +MD5SUM="854d1330ba8368ffea43107ae5a1329c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxPython matplotlib numpy" diff --git a/office/python-gcalcli/python-gcalcli.SlackBuild b/office/python-gcalcli/python-gcalcli.SlackBuild index f3a6720d9d..5cc034cf31 100644 --- a/office/python-gcalcli/python-gcalcli.SlackBuild +++ b/office/python-gcalcli/python-gcalcli.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for python-gcalcli -# Copyright 2014 David Woodfall <dave@dawoodfall.net> +# Copyright 2014 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,12 +21,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -SRCNAM=gcalcli -PRGNAM=python-$SRCNAM +PRGNAM=python-gcalcli VERSION=${VERSION:-git20140429} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +SRCNAM=gcalcli + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; diff --git a/office/python-gcalcli/python-gcalcli.info b/office/python-gcalcli/python-gcalcli.info index 27edbd1680..c2909ce91a 100644 --- a/office/python-gcalcli/python-gcalcli.info +++ b/office/python-gcalcli/python-gcalcli.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gdata python-dateutil python-elementtree" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/office/qpdfview-qt5/qpdfview-qt5.SlackBuild b/office/qpdfview-qt5/qpdfview-qt5.SlackBuild index d4be5a863a..9740486397 100644 --- a/office/qpdfview-qt5/qpdfview-qt5.SlackBuild +++ b/office/qpdfview-qt5/qpdfview-qt5.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for qpdfview -# Copyright 2017-2018 Donald Cooley South Haven, Indiana USA +# Copyright 2017-2020 Donald Cooley South Haven, Indiana USA # Copyright 2012 Mark Noman <smithmark347@gmail.com> # All rights reserved. # @@ -25,7 +25,7 @@ PRGNAM=qpdfview-qt5 SRCNAM=qpdfview -VERSION=${VERSION:-0.4.16} +VERSION=${VERSION:-0.4.18} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,6 +74,9 @@ find -L . \ sed -i "s|/usr/lib/qpdfview|/usr/lib${LIBDIRSUFFIX}/qpdfview|" qpdfview.pri +# From Arch pkgbuild. Fix build with texlive in Slackware current. +sed -e 's|2.0.0|1.21.0|' -i application.pro + # Add localizations lrelease-qt5 qpdfview.pro diff --git a/office/qpdfview-qt5/qpdfview-qt5.info b/office/qpdfview-qt5/qpdfview-qt5.info index b8e485eb5a..4d845835e3 100644 --- a/office/qpdfview-qt5/qpdfview-qt5.info +++ b/office/qpdfview-qt5/qpdfview-qt5.info @@ -1,8 +1,8 @@ PRGNAM="qpdfview-qt5" -VERSION="0.4.16" +VERSION="0.4.18" HOMEPAGE="https://launchpad.net/qpdfview" -DOWNLOAD="https://launchpad.net/qpdfview/trunk/0.4.16/+download/qpdfview-0.4.16.tar.gz" -MD5SUM="4b317c4536332a7fe437abe50eca1716" +DOWNLOAD="https://launchpad.net/qpdfview/trunk/0.4.18/+download/qpdfview-0.4.18.tar.gz" +MD5SUM="4d63ee0095e939602f9bf4759ae57953" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="poppler-qt5" diff --git a/office/qpdfview/README b/office/qpdfview/README index f91362fb34..67bc482efa 100644 --- a/office/qpdfview/README +++ b/office/qpdfview/README @@ -1 +1 @@ -qpdfview is a tabbed document viewer supporting djvu, pdf, and ps.
\ No newline at end of file +qpdfview is a tabbed document viewer supporting djvu, PDF, and ps. diff --git a/office/qpdfview/qpdfview.SlackBuild b/office/qpdfview/qpdfview.SlackBuild index a87f09d0ad..2663e99a42 100644 --- a/office/qpdfview/qpdfview.SlackBuild +++ b/office/qpdfview/qpdfview.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh # Slackware build script for qpdfview -# Copyright 2017-2018 Donald Cooley South Haven, Indiana USA -# Copyright 2012 Mark Noman <smithmark347@gmail.com> +# Copyright 2017-2020 Donald Cooley, South Haven, Indiana USA +# Copyright 2012 Mark Noman # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qpdfview -VERSION=${VERSION:-0.4.16} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.4.18} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -72,6 +72,9 @@ find -L . \ sed -i "s|/usr/lib/qpdfview|/usr/lib${LIBDIRSUFFIX}/qpdfview|" qpdfview.pri +# From Arch pkgbuild. Fix build with texlive in Slackware current. +sed -e 's|2.0.0|1.21.0|' -i application.pro + # Add localizations lrelease qpdfview.pro diff --git a/office/qpdfview/qpdfview.info b/office/qpdfview/qpdfview.info index 0b90b385dc..300932311d 100644 --- a/office/qpdfview/qpdfview.info +++ b/office/qpdfview/qpdfview.info @@ -1,8 +1,8 @@ PRGNAM="qpdfview" -VERSION="0.4.16" +VERSION="0.4.18" HOMEPAGE="https://launchpad.net/qpdfview" -DOWNLOAD="https://launchpad.net/qpdfview/trunk/0.4.16/+download/qpdfview-0.4.16.tar.gz" -MD5SUM="4b317c4536332a7fe437abe50eca1716" +DOWNLOAD="https://launchpad.net/qpdfview/trunk/0.4.18/+download/qpdfview-0.4.18.tar.gz" +MD5SUM="4d63ee0095e939602f9bf4759ae57953" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/qpdfview/slack-desc b/office/qpdfview/slack-desc index d8ce7da639..b8218d51d7 100644 --- a/office/qpdfview/slack-desc +++ b/office/qpdfview/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| qpdfview: qpdfview (tabbed document viewer) qpdfview: -qpdfview: qpdfview is a tabbed document viewer supporting djvu, pdf, and ps. +qpdfview: qpdfview is a tabbed document viewer supporting djvu, PDF, and ps. qpdfview: qpdfview: Current features include: qpdfview: Outline, properties, and thumbnail panes, scale, rotate, and fit, qpdfview: continuous and multiple-page layouts, fullscreen and presentation -qpdfview: views, search for text and support for links and forms in pdf files, +qpdfview: views, search for text and support for links and forms in PDF files, qpdfview: configurable toolbars and keyboard shortcuts, persistent per-file qpdfview: settings, rudimentary annotation and form support and more. qpdfview: diff --git a/office/rednotebook/rednotebook.SlackBuild b/office/rednotebook/rednotebook.SlackBuild index b0466950b8..f67010ac1f 100644 --- a/office/rednotebook/rednotebook.SlackBuild +++ b/office/rednotebook/rednotebook.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for rednotebook -# Copyright 2010 David Woodfall <dave@dawoodfall.net> +# Copyright 2010 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rednotebook -VERSION=${VERSION:-2.6.1} +VERSION=${VERSION:-2.15} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,7 +74,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG LICENSE README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md LICENSE README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/rednotebook/rednotebook.info b/office/rednotebook/rednotebook.info index 2c346e63c2..8e4fad2ee8 100644 --- a/office/rednotebook/rednotebook.info +++ b/office/rednotebook/rednotebook.info @@ -1,10 +1,10 @@ PRGNAM="rednotebook" -VERSION="2.6.1" +VERSION="2.15" HOMEPAGE="http://rednotebook.sourceforge.net" -DOWNLOAD="https://github.com/jendrikseipp/rednotebook/archive/v2.6.1/rednotebook-2.6.1.tar.gz" -MD5SUM="ce8bf80f6e4d4e427ea4d3d73ad18c86" +DOWNLOAD="https://github.com/jendrikseipp/rednotebook/archive/v2.15/rednotebook-2.15.tar.gz" +MD5SUM="465a7878a12940a152ed037d0634f100" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-PyYAML webkitgtk" -MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +REQUIRES="python3-PyYAML webkitgtk pygobject3-python3 gtksourceview3" +MAINTAINER="Dave Woodfall" +EMAIL="dave@slackbuilds.org" diff --git a/office/remind/README b/office/remind/README index 546a65f8f0..2adeec2bc5 100644 --- a/office/remind/README +++ b/office/remind/README @@ -22,6 +22,7 @@ See the SlackBuild for more information on these variables. DEFAULT_PAGE=Letter|A4 (default: Letter), set the default page size DATESEP=-|/ (default: -), set the date separator character TIMESEP=:|. (default: :), set the time separator character +DATETIMESEP=@|/|T (default: @), set the datetime separator character CHARSET=ASCII|ISOLATIN1|ISOLATIN2|IBMEXTENDED|IBM852 (default: ISOLATIN1), set the character set to use diff --git a/office/remind/remind.SlackBuild b/office/remind/remind.SlackBuild index cd7751cea3..eac93bf1d1 100644 --- a/office/remind/remind.SlackBuild +++ b/office/remind/remind.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Remind -# Copyright 2016 T3slider <t3slider@gmail.com> +# Copyright 2019 T3slider <t3slider@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=remind -VERSION=${VERSION:-03.01.15} +VERSION=${VERSION:-03.01.16} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -90,6 +90,10 @@ DATESEP=${DATESEP:--} # Default time separator. Options are : or . TIMESEP=${TIMESEP:-:} +# Default datetime separator. Standard options are @ or / but some may +# prefer T (any single character can be passed). +DATETIMESEP=${DATETIMESEP:-@} + # Character set to use. Options are ASCII, ISOLATIN1, ISOLATIN2, # IBMEXTENDED, or IBM852. CHARSET=${CHARSET:-ISOLATIN1} @@ -145,6 +149,12 @@ if [ "$TIMESEP" = "." ]; then sed -i "s|^#define TIMESEP ':'|/* & */|" src/custom.h sed -i "s|^\(/\* \)\(#define TIMESEP '\.'\)\( \*/\)|\2|" src/custom.h fi +if [ "$DATETIMESEP" = "/" ]; then + sed -i "s|^#define DATETIMESEP '@'|/* & */|" src/custom.h + sed -i "s|^\(/\* \)\(#define DATETIMESEP '/'\)\( \*/\)|\2|" src/custom.h +elif [ "$DATETIMESEP" != "@" ]; then + sed -i "s|^\(#define DATETIMESEP '\)\(@\)\('\)|\1${DATETIMESEP}\3|" src/custom.h +fi sed -i "s/^\(#define ISOLATIN1 \).*/\1 0/" src/custom.h if [ "$CHARSET" != "ASCII" ]; then sed -i "s/^\(#define $CHARSET \).*/\1 1/" src/custom.h diff --git a/office/remind/remind.info b/office/remind/remind.info index b27fc7b656..f1ddc699ae 100644 --- a/office/remind/remind.info +++ b/office/remind/remind.info @@ -1,8 +1,8 @@ PRGNAM="remind" -VERSION="03.01.15" -HOMEPAGE="https://www.roaringpenguin.com/products/remind" -DOWNLOAD="https://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz" -MD5SUM="089c51c060fdda2357a833800a5bfe39" +VERSION="03.01.16" +HOMEPAGE="https://dianne.skoll.ca/projects/remind/" +DOWNLOAD="https://dianne.skoll.ca/projects/remind/download/remind-03.01.16.tar.gz" +MD5SUM="17ba30c2aee7f3156cc8de308be123ed" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/sc-im/sc-im.SlackBuild b/office/sc-im/sc-im.SlackBuild index 25e318343e..b7d25c2915 100644 --- a/office/sc-im/sc-im.SlackBuild +++ b/office/sc-im/sc-im.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for sc-im -# Copyright 2016-2018 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2016-2018 Jostein Berntsen <jvbernts@online.no> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/office/sc-im/sc-im.info b/office/sc-im/sc-im.info index 69ea4bfb9b..ffae38a071 100644 --- a/office/sc-im/sc-im.info +++ b/office/sc-im/sc-im.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libxls libxlsxwriter" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/sigil/sigil.SlackBuild b/office/sigil/sigil.SlackBuild index f9cb433fcc..5f08a2f66f 100644 --- a/office/sigil/sigil.SlackBuild +++ b/office/sigil/sigil.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for sigil -# Copyright 2010-2018 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2010-2019 Larry Hajali <larryhaja[at]gmail[dot]com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=sigil SRCNAM=Sigil -VERSION=${VERSION:-0.9.10} +VERSION=${VERSION:-0.9.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/sigil/sigil.info b/office/sigil/sigil.info index e33b2d157a..81420125e3 100644 --- a/office/sigil/sigil.info +++ b/office/sigil/sigil.info @@ -1,10 +1,10 @@ PRGNAM="sigil" -VERSION="0.9.10" +VERSION="0.9.12" HOMEPAGE="https://sigil-ebook.com/" -DOWNLOAD="https://github.com/Sigil-Ebook/Sigil/archive/0.9.10/Sigil-0.9.10.tar.gz" -MD5SUM="22314e415220297782d27d85d7f1cce0" +DOWNLOAD="https://github.com/Sigil-Ebook/Sigil/archive/0.9.12/Sigil-0.9.12.tar.gz" +MD5SUM="c5f87461bf870da774e09a2d3864eacc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="qt5 lxml" +REQUIRES="qt5-webkit lxml" MAINTAINER="Larry Hajali" EMAIL="larryhaja[at]gmail[dot]com" diff --git a/office/smoffice2016/smoffice2016.info b/office/smoffice2016/smoffice2016.info index b15803289b..7f2c421189 100644 --- a/office/smoffice2016/smoffice2016.info +++ b/office/smoffice2016/smoffice2016.info @@ -6,5 +6,5 @@ MD5SUM="83369f5d044a81732e67ab37a87ca324" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Alexander Verbovetsky" -EMAIL="alik@ejik.org" +MAINTAINER="Donald Cooley" +EMAIL="chytraeu@sdf.org" diff --git a/office/smoffice2018/smoffice2018.SlackBuild b/office/smoffice2018/smoffice2018.SlackBuild index 6f2a2ec8e4..3055492412 100644 --- a/office/smoffice2018/smoffice2018.SlackBuild +++ b/office/smoffice2018/smoffice2018.SlackBuild @@ -4,7 +4,7 @@ # Based on the Arch Linux PKGBUILD. -# Copyright 2018, Alexander Verbovetsky, Moscow, Russia +# Copyright 2018-2020, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=smoffice2018 -VERSION=${VERSION:-2018_942} +VERSION=${VERSION:-2018_976} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/smoffice2018/smoffice2018.info b/office/smoffice2018/smoffice2018.info index 872b90d562..7ff978e17a 100644 --- a/office/smoffice2018/smoffice2018.info +++ b/office/smoffice2018/smoffice2018.info @@ -1,10 +1,10 @@ PRGNAM="smoffice2018" -VERSION="2018_942" +VERSION="2018_976" HOMEPAGE="https://www.softmaker.com/en/softmaker-office-linux" -DOWNLOAD="https://www.softmaker.net/down/softmaker-office-2018-942-i386.tgz" -MD5SUM="0e06e0790b0ac68e1cc7bf5ad7254c0e" -DOWNLOAD_x86_64="https://www.softmaker.net/down/softmaker-office-2018-942-amd64.tgz" -MD5SUM_x86_64="affc115ae96c8187a93f3f1a2940d60b" +DOWNLOAD="https://www.softmaker.net/down/softmaker-office-2018-976-i386.tgz" +MD5SUM="39b444fe84c6f83c2ca56f7647460604" +DOWNLOAD_x86_64="https://www.softmaker.net/down/softmaker-office-2018-976-amd64.tgz" +MD5SUM_x86_64="38f68ab6a54d19f733e86fecdd6b6fef" REQUIRES="" -MAINTAINER="Alexander Verbovetsky" -EMAIL="alik@ejik.org" +MAINTAINER="Donald Cooley" +EMAIL="chytraeu@sdf.org" diff --git a/office/smoffice2021/README b/office/smoffice2021/README new file mode 100644 index 0000000000..87741fd538 --- /dev/null +++ b/office/smoffice2021/README @@ -0,0 +1,11 @@ +SoftMaker Office 2021 is an office suite, it includes + + * TextMaker 2021, a word processor + * PlanMaker 2021, a spreadsheet program + * Presentations 2021, a presentation software + +The main feature of SoftMaker Office 2021 is the extremely high +compatibility with the MS Office file formats. + +SoftMaker Office 2021 is a commercial program. It is available in +Standard and Pro editions, and also as a free 30 days trial. diff --git a/office/smoffice2021/doinst.sh b/office/smoffice2021/doinst.sh new file mode 100644 index 0000000000..aea0f894eb --- /dev/null +++ b/office/smoffice2021/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/office/smoffice2021/planmaker-2021.desktop b/office/smoffice2021/planmaker-2021.desktop new file mode 100644 index 0000000000..3ab0beba53 --- /dev/null +++ b/office/smoffice2021/planmaker-2021.desktop @@ -0,0 +1,83 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +InitialPreference=10 +GenericName=Spreadsheet +GenericName[am]=ሠንጠረዥ አስሊ +GenericName[ar]=جدول +GenericName[az]=Hesab Cədvəli +GenericName[bg]=Електронна таблица +GenericName[bn]=স্প্রেডশিট +GenericName[bs]=Spreadsheet +GenericName[ca]=Full de càlcul +GenericName[cs]=Tabulkový kalkulátor +GenericName[da]=Regneark +GenericName[de]=Tabellenkalkulation +GenericName[dz]=ཤོག་ཁྲམ། +GenericName[el]=Λογιστικό φύλλο +GenericName[en_CA]=Spreadsheet +GenericName[en_GB]=Spreadsheet +GenericName[en_ZA]=Spreadsheet +GenericName[es]=Hoja de cálculo +GenericName[et]=Arvutustabel +GenericName[eu]=Kalkulu-orria +GenericName[fi]=Taulukkolaskenta +GenericName[fil]=Spreadsheet +GenericName[fr]=Tableur +GenericName[ga]=Scarbhileog +GenericName[gl]=Folla de cálculo +GenericName[gu]=સ્પ્રેડશીટ +GenericName[he]=גיליון עבודה +GenericName[hr]=Proračunska tablica +GenericName[hu]=Táblázatkezelő +GenericName[is]=Töflureiknir +GenericName[it]=Foglio di calcolo +GenericName[ja]=スプレッドシート +GenericName[ka]=ელცხრილი +GenericName[ko]=스프레드시트 +GenericName[ku]=Tabloya Hesêb +GenericName[mk]=Табели +GenericName[ms]=Hamparan +GenericName[nb]=Regneark +GenericName[ne]=स्प्रेडसिट +GenericName[nl]=Rekenblad +GenericName[nr]=Spredtjhiti +GenericName[nso]=Letlakala la go ala tsebišo +GenericName[oc]=Fuelha de calcul +GenericName[pa]=ਸਾਰਣੀ +GenericName[pl]=Arkusz kalkulacyjny +GenericName[pt]=Folha de Cálculo +GenericName[pt_BR]=Planilha Eletrônica +GenericName[ru]=Электронная таблица +GenericName[rw]=Urupapurorusesuye +GenericName[sk]=Tabuľka +GenericName[sq]=Fleta elektronike +GenericName[sr]=Табеле +GenericName[sr@Latn]=Tabele +GenericName[st]=Leqephe la ho ala boitsebiso +GenericName[sv]=Kalkylark +GenericName[th]=ตารางคำนวน +GenericName[tl]=Spreadsheet +GenericName[tr]=Hesap Çizelgesi +GenericName[ts]=Xipredxiti +GenericName[uk]=Електронні таблиці +GenericName[vi]=Bảng tính +GenericName[wa]=Tåvleu +GenericName[xh]=Icwecwe leeseli +GenericName[zh_CN]=电子表格 +GenericName[zh_TW]=試算表 +GenericName[zu]=Ispredshit +Comment=PlanMaker lets you create all kinds of spreadsheets -- from simple ones to the most complex ones. Includes a high-caliber charting module. +Comment[de]=Mit PlanMaker können Sie alle Arten von Arbeitsblättern erstellen -- von ganz einfachen bis zu den komplexesten. Inklusive eines leistungsstarken Diagrammmoduls. +Comment[ru]=PlanMaker позволяет создавать все виды электронных таблиц, от простых до сложных. Включает в себя мощный модуль для составления диаграмм. +Terminal=false +Categories=Application;Office;Spreadsheet; +MimeType=application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12; + +Version=1.0 +Name=PlanMaker 2021 +Icon=application-x-pml21 +TryExec=/usr/bin/planmaker21 +StartupWMClass=pm +Exec=/usr/bin/planmaker21 %F +Path=/opt/smoffice2021 diff --git a/office/smoffice2021/planmaker21 b/office/smoffice2021/planmaker21 new file mode 100644 index 0000000000..7786b613fb --- /dev/null +++ b/office/smoffice2021/planmaker21 @@ -0,0 +1,3 @@ +#!/bin/sh +# A script to run PlanMaker. +/opt/smoffice2021/planmaker "$@" diff --git a/office/smoffice2021/presentations-2021.desktop b/office/smoffice2021/presentations-2021.desktop new file mode 100644 index 0000000000..662f175431 --- /dev/null +++ b/office/smoffice2021/presentations-2021.desktop @@ -0,0 +1,82 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +InitialPreference=10 +GenericName=Presentation +GenericName[am]=ትዕይንት +GenericName[az]=Təqdimat +GenericName[bg]=Презентация +GenericName[bn]=প্রেজেন্টেশন +GenericName[bs]=Prezentacija +GenericName[ca]=Presentació +GenericName[cs]=Prezentace +GenericName[da]=Præsentation +GenericName[de]=Präsentation +GenericName[dz]=གསལ་སྟོན། +GenericName[el]=Παρουσίαση +GenericName[en_CA]=Presentation +GenericName[en_GB]=Presentation +GenericName[en_ZA]=Presentation +GenericName[es]=Presentación +GenericName[et]=Esitlus +GenericName[eu]=Aurkezpena +GenericName[fi]=Esitys +GenericName[fil]=Pagtatanghal +GenericName[fr]=Présentation +GenericName[ga]=Toirbeathas +GenericName[gl]=Presentación +GenericName[gu]=રજૂઆત +GenericName[he]=מצגות +GenericName[hr]=Prezentacija +GenericName[hu]=Bemutatókészítő +GenericName[is]=Impress framsetning +GenericName[it]=Presentazione +GenericName[ja]=プレゼンテーション +GenericName[ka]=პრეზენტაცია +GenericName[ko]=프리젠테이션 +GenericName[ku]=Pêşkêşî +GenericName[mk]=Презентација +GenericName[ms]=Persembahan +GenericName[nb]=Presentasjon +GenericName[ne]=प्रस्तुति +GenericName[nl]=Presentatie +GenericName[nr]=Phrizentheyitjhini +GenericName[nso]=Tlhagišo +GenericName[oc]=Presentacion +GenericName[pa]=ਪੇਸ਼ਕਾਰੀ +GenericName[pl]=Prezentacja +GenericName[pt]=Apresentação +GenericName[pt_BR]=Apresentação +GenericName[ru]=Презентация +GenericName[rw]=Iyerekana +GenericName[sk]=Prezentácia +GenericName[sq]=Prezantime +GenericName[sr]=Презентација +GenericName[sr@Latn]=Prezentacija +GenericName[st]=Nehelano +GenericName[sv]=Presentation +GenericName[th]=งานนำเสนอ +GenericName[tl]=Pagtatanghal +GenericName[tr]=Sunum +GenericName[ts]=Nkombiso +GenericName[uk]=Презентації +GenericName[vi]=Trình diễn +GenericName[wa]=Prezintåcion +GenericName[xh]=Umboniso wenkcazelo +GenericName[zh_CN]=演示文稿 +GenericName[zh_TW]=簡報 +GenericName[zu]=Iprezenteyshin +Comment=The Presentations software lets you design any kind of presentation - even including special effects, animations, and transitions. +Comment[de]=Presentations lässt Sie beliebige Präsentationen gestalten - mit Effekten, Animationen und Transitionen. +Comment[ru]=Presentations позволяет создавать все виды презентаций и добавлять в них специальные эффекты, анимацию и переходы. +Terminal=false +Categories=Application;Office;Presentation; +MimeType=application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow; + +Version=1.0 +Name=Presentations 2021 +Icon=application-x-prl21 +TryExec=/usr/bin/presentations21 +StartupWMClass=pr +Exec=/usr/bin/presentations21 %F +Path=/opt/smoffice2021 diff --git a/office/smoffice2021/presentations21 b/office/smoffice2021/presentations21 new file mode 100644 index 0000000000..b2b3ad7254 --- /dev/null +++ b/office/smoffice2021/presentations21 @@ -0,0 +1,10 @@ +#!/bin/sh +# A script to run Presentations. +ext="${@##*.}" +shopt -s nocasematch +case "$ext" in + "prs" ) /opt/smoffice2021/presentations -S\""$@"\";; + "pps" ) /opt/smoffice2021/presentations -S\""$@"\";; + "ppsx" ) /opt/smoffice2021/presentations -S\""$@"\";; + * ) /opt/smoffice2021/presentations "$@";; +esac diff --git a/office/smoffice2021/slack-desc b/office/smoffice2021/slack-desc new file mode 100644 index 0000000000..e0c63f48a0 --- /dev/null +++ b/office/smoffice2021/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +smoffice2021: smoffice2021 (office suite) +smoffice2021: +smoffice2021: SoftMaker Office 2021 includes +smoffice2021: * TextMaker 2021, a word processor +smoffice2021: * PlanMaker 2021, a spreadsheet program +smoffice2021: * Presentations 2021, a presentation software +smoffice2021: +smoffice2021: The main feature of SoftMaker Office 2021 is the extremely high +smoffice2021: compatibility with the MS Office file formats. +smoffice2021: +smoffice2021: Home page: https://www.softmaker.com/en/softmaker-office-linux diff --git a/office/smoffice2021/smoffice2021.SlackBuild b/office/smoffice2021/smoffice2021.SlackBuild new file mode 100644 index 0000000000..86a7395e3f --- /dev/null +++ b/office/smoffice2021/smoffice2021.SlackBuild @@ -0,0 +1,108 @@ +#!/bin/sh + +# Slackware build script for smoffice2021 + +# Based on the smoffice2018 SlackBuild by Alexander Verbovetsky +# Based on the Arch Linux PKGBUILD. + +# Copyright 2020, Donald Cooley, South Haven, Indiana, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=smoffice2021 +VERSION=${VERSION:-2021_1024} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +# Abort build if architecture is not 64-bit. +if [ "$ARCH" != "x86_64" ]; then + echo "$ARCH is not supported." +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG/opt/smoffice2021 $OUTPUT +cd $TMP +tar xvf $CWD/softmaker-office-${VERSION//_/-}-amd64.tgz +tar xvf office2021.tar.lzma -C $PKG/opt/smoffice2021 +cd $PKG + +mkdir -p usr/bin +install -m 0755 -o root -g root $CWD/planmaker21 usr/bin +install -m 0755 -o root -g root $CWD/presentations21 usr/bin +install -m 0755 -o root -g root $CWD/textmaker21 usr/bin + +for s in 16 24 32 48 64 128 256 512 1024; do + mkdir -p usr/share/icons/hicolor/${s}x${s}/apps + for a in pml prl tml; do + cp -a opt/smoffice2021/icons/${a}_${s}.png \ + usr/share/icons/hicolor/${s}x${s}/apps/application-x-${a}21.png + done +done +for s in 16 24 32 48 64 128 256 512 1024; do + mkdir -p usr/share/icons/hicolor/${s}x${s}/mimetypes + for a in pmd pmd_mso pmd_oth prd prd_mso prd_oth tmd tmd_mso tmd_oth; do + cp -a opt/smoffice2021/icons/${a}_${s}.png \ + usr/share/icons/hicolor/${s}x${s}/mimetypes/application-x-${a}.png + done +done + +mkdir -p usr/share/applications +cp -a $CWD/planmaker-2021.desktop usr/share/applications/ +cp -a $CWD/presentations-2021.desktop usr/share/applications/ +cp -a $CWD/textmaker-2021.desktop usr/share/applications/ + +mkdir -p usr/share/mime/packages/ +cp -a opt/smoffice2021/mime/softmaker-office-2021.xml \ + usr/share/mime/packages/ + +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 $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p usr/doc/$PRGNAM-$VERSION +mv opt/smoffice2021/*.pdf opt/smoffice2021/mime/copyright \ + usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p install +cat $CWD/slack-desc > install/slack-desc +cat $CWD/doinst.sh > install/doinst.sh + +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/smoffice2021/smoffice2021.info b/office/smoffice2021/smoffice2021.info new file mode 100644 index 0000000000..43812124a4 --- /dev/null +++ b/office/smoffice2021/smoffice2021.info @@ -0,0 +1,10 @@ +PRGNAM="smoffice2021" +VERSION="2021_1024" +HOMEPAGE="https://www.softmaker.com/en/softmaker-office-linux" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://www.softmaker.net/down/softmaker-office-2021-1024-amd64.tgz" +MD5SUM_x86_64="4fd374951ac0a4671a91acdca475d90b" +REQUIRES="" +MAINTAINER="Donald Cooley" +EMAIL="chytraeu@sdf.org" diff --git a/office/smoffice2021/textmaker-2021.desktop b/office/smoffice2021/textmaker-2021.desktop new file mode 100644 index 0000000000..5863f0cd04 --- /dev/null +++ b/office/smoffice2021/textmaker-2021.desktop @@ -0,0 +1,83 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +InitialPreference=10 +GenericName=Word Processor +GenericName[am]=ጽሁፍ አቀናጅ +GenericName[ar]=معالج نصوص +GenericName[az]=Kəlmə İşlədici +GenericName[bg]=Текстообработка +GenericName[bn]=ওয়ার্ড প্রসেসর +GenericName[bs]=Word Processor +GenericName[ca]=Processador de textos +GenericName[cs]=Textový procesor +GenericName[da]=Tekstbehandler +GenericName[de]=Textverarbeitung +GenericName[dz]=ཡིག་སྦྱོར་པ། +GenericName[el]=Επεξεργαστής κειμένου +GenericName[en_CA]=Word Processor +GenericName[en_GB]=Word Processor +GenericName[en_ZA]=Word Processor +GenericName[es]=Procesador de textos +GenericName[et]=Kirjutaja +GenericName[eu]=Testu-prozesadorea +GenericName[fi]=Tekstinkäsittely +GenericName[fil]=Tagaproseso ng Salita +GenericName[fr]=Traitement de texte +GenericName[ga]=Próiseálaithe Focal +GenericName[gl]=Procesador de textos +GenericName[gu]=વર્ડ પ્રોસેસર +GenericName[he]=מעבד תמלילים +GenericName[hr]=Obrada teksta +GenericName[hu]=Szövegszerkesztő +GenericName[is]=Ritvinnsla +GenericName[it]=Word processor +GenericName[ja]=ワープロ +GenericName[ka]=ტექსტის რედაქტორი +GenericName[ko]=워드 프로세서 +GenericName[ku]=Bernameya nivîsandinê +GenericName[mk]=Процесор за текст +GenericName[ms]=Pemproses Perkataan +GenericName[nb]=Tekstbehandling +GenericName[ne]=शब्द प्रशोधक +GenericName[nl]=Tekstverwerker +GenericName[nr]=Isenzi Mitlolo +GenericName[nso]=Sehlami sa Lentšu +GenericName[oc]=Tractament de tèxt +GenericName[pa]=ਸ਼ਬਦਕਾਰ +GenericName[pl]=Edytor tekstu +GenericName[pt]=Processador de texto +GenericName[pt_BR]=Editor de texto +GenericName[ru]=Текстовый процессор +GenericName[sk]=Textový editor +GenericName[sq]=Procesues teksti +GenericName[sr]=Обрада текста +GenericName[sr@Latn]=Obrada teksta +GenericName[st]=Word Processor +GenericName[sv]=Ordbehandlare +GenericName[th]=พิมพ์งาน +GenericName[tl]=Tagaproseso ng Salita +GenericName[tr]=Kelime İşlemci +GenericName[ts]=Xitirhisi xa marito +GenericName[uk]=Текстовий процесор +GenericName[vi]=Bộ xử lý từ +GenericName[wa]=Aspougneu d' tecse +GenericName[xh]=Inkqubo Yokuqhuba Amagama +GenericName[zh_CN]=文字处理 +GenericName[zh_TW]=文書處理器 +GenericName[zu]=Umshini Ohlela Amagama +Comment=The TextMaker word processor lets you work on any type of document. +Comment[de]=Die Textverarbeitung TextMaker ermöglicht es Ihnen, beliebige Arten von Dokumenten zu erstellen und zu bearbeiten. +Comment[ru]=TextMaker позволяет работать со всеми видами текстовых документов. +Terminal=false +Categories=Application;Office;WordProcessor; +MimeType=application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;application/x-dbf;application/msword-template; + + +Version=1.0 +Name=TextMaker 2021 +Icon=application-x-tml21 +TryExec=/usr/bin/textmaker21 +StartupWMClass=tm +Exec=/usr/bin/textmaker21 %F +Path=/opt/smoffice2021 diff --git a/office/smoffice2021/textmaker21 b/office/smoffice2021/textmaker21 new file mode 100644 index 0000000000..ef526982fb --- /dev/null +++ b/office/smoffice2021/textmaker21 @@ -0,0 +1,3 @@ +#!/bin/sh +# A script to run TextMaker. +/opt/smoffice2021/textmaker "$@" diff --git a/office/task/README b/office/task/README index 492df083fc..8c4fafc6fa 100644 --- a/office/task/README +++ b/office/task/README @@ -1,4 +1,6 @@ -task (a.k.a taskwarrior) is an advanced task manager for the console with an -extensive set of features. task manages your TODO list from the command line. -It is flexible, fast, and unobtrusive. It does its job then gets out of your -way. +task (a.k.a taskwarrior) is an advanced task manager for the console +with an extensive set of features. task manages your TODO list from the +command line. + +It is flexible, fast, and unobtrusive. It does its job then gets out of +your way. diff --git a/office/task/task.SlackBuild b/office/task/task.SlackBuild index 672c63caef..6ae935d172 100644 --- a/office/task/task.SlackBuild +++ b/office/task/task.SlackBuild @@ -2,10 +2,30 @@ # Slackware build script for task -# Written by Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2018-2021 by Jostein Berntsen <jvbernts@online.no> + +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + PRGNAM=task -VERSION=${VERSION:-2.5.1} +VERSION=${VERSION:-2.5.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,7 +91,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r find $PKG -depth -type d -empty -delete || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CMakeLists.txt COPYING ChangeLog DEVELOPER EXPOSITION INSTALL LICENSE NEWS README.md \ +cp -a AUTHORS CMakeLists.txt COPYING ChangeLog INSTALL LICENSE NEWS README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/office/task/task.info b/office/task/task.info index a92e20c587..bf3728e4a3 100644 --- a/office/task/task.info +++ b/office/task/task.info @@ -1,10 +1,10 @@ PRGNAM="task" -VERSION="2.5.1" +VERSION="2.5.3" HOMEPAGE="http://www.taskwarrior.org" -DOWNLOAD="https://taskwarrior.org/download/task-2.5.1.tar.gz" -MD5SUM="bcd984a00d6d1eb6b40faf567419f784" +DOWNLOAD="https://taskwarrior.org/download/task-2.5.3.tar.gz" +MD5SUM="41fa2b61f4de729e867b185ceac0a1a8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lua" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/taskjuggler/taskjuggler.SlackBuild b/office/taskjuggler/taskjuggler.SlackBuild index ad767d8338..a2d89411ed 100644 --- a/office/taskjuggler/taskjuggler.SlackBuild +++ b/office/taskjuggler/taskjuggler.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for taskjuggler -# Copyright 2015-02-10 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2015-2020 Jostein Berntsen <jvbernts@online.no> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=taskjuggler -VERSION=${VERSION:-3.6.0} +VERSION=${VERSION:-3.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/taskjuggler/taskjuggler.info b/office/taskjuggler/taskjuggler.info index 995f751e58..633e382ec2 100644 --- a/office/taskjuggler/taskjuggler.info +++ b/office/taskjuggler/taskjuggler.info @@ -1,10 +1,10 @@ PRGNAM="taskjuggler" -VERSION="3.6.0" +VERSION="3.7.1" HOMEPAGE="http://www.taskjuggler.org/" -DOWNLOAD="http://rubygems.org/downloads/taskjuggler-3.6.0.gem" -MD5SUM="dc10e48e806a7dfc01ae6233dc055382" +DOWNLOAD="http://rubygems.org/downloads/taskjuggler-3.7.1.gem" +MD5SUM="fe1b4ce6ee42605b20ea2ac4aed9e85a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="rubygem-term-ansicolor rubygem-mail" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/taskopen/README b/office/taskopen/README index 2d0a23f73e..1f1320ebf6 100644 --- a/office/taskopen/README +++ b/office/taskopen/README @@ -1 +1,6 @@ -Script for taking notes and open urls with taskwarrior +Taskopen allows you to link almost any file, webpage or command +to a taskwarrior task by adding a filepath, web-link or uri as an +annotation. Text notes, images, PDF files, web addresses, spreadsheets and +many other types of links can then be filtered, listed and opened by using +taskopen. Some actions are sane defaults, others can be custom-configured, +and everything else will use your systems mime-types to open the link. diff --git a/office/taskopen/taskopen.SlackBuild b/office/taskopen/taskopen.SlackBuild index 4308d1bb53..2d2cb24b9e 100644 --- a/office/taskopen/taskopen.SlackBuild +++ b/office/taskopen/taskopen.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for taskopen -# Copyright 2017 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2017-2021 Jostein Berntsen <jvbernts@online.no> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=taskopen -VERSION=${VERSION:-1.1.3} +VERSION=${VERSION:-1.1.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/taskopen/taskopen.info b/office/taskopen/taskopen.info index 6c0d8093c1..abbc667d5c 100644 --- a/office/taskopen/taskopen.info +++ b/office/taskopen/taskopen.info @@ -1,10 +1,10 @@ PRGNAM="taskopen" -VERSION="1.1.3" +VERSION="1.1.5" HOMEPAGE="https://github.com/ValiValpas/taskopen" -DOWNLOAD="https://github.com/ValiValpas/taskopen/archive/v1.1.3/taskopen-1.1.3.tar.gz" -MD5SUM="115fc8ee608caa6b3b77ff81592aa61a" +DOWNLOAD="https://github.com/ValiValpas/taskopen/archive/v1.1.5/taskopen-1.1.5.tar.gz" +MD5SUM="78a6eb6b823af85c457fedff79417953" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-JSON" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/teams-for-linux/README b/office/teams-for-linux/README new file mode 100644 index 0000000000..356f0fbff3 --- /dev/null +++ b/office/teams-for-linux/README @@ -0,0 +1,8 @@ +Microsoft Teams is a unified communications platform that combines +persistent workplace chat, video meetings and file storage. + +This is the unofficial Microsoft Teams client for Linux by Ivelin +Velkov. It uses the Web App and wrapps it as a standalone application +using Electron. + +Only the 64bit version is available. diff --git a/office/teams-for-linux/doinst.sh b/office/teams-for-linux/doinst.sh new file mode 100644 index 0000000000..65c7e2eeb9 --- /dev/null +++ b/office/teams-for-linux/doinst.sh @@ -0,0 +1,9 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/office/teams-for-linux/slack-desc b/office/teams-for-linux/slack-desc new file mode 100644 index 0000000000..d61b9c89c4 --- /dev/null +++ b/office/teams-for-linux/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +teams-for-linux: teams-for-linux (messaging, conferencing and collaboration program) +teams-for-linux: +teams-for-linux: Microsoft Teams is a unified communications platform that combines +teams-for-linux: persistent workplace chat, video meetings and file storage. +teams-for-linux: +teams-for-linux: This is the unofficial Microsoft Teams client for Linux by Ivelin +teams-for-linux: Velkov. It uses the Web App and wrapps it as a standalone application +teams-for-linux: using Electron. +teams-for-linux: +teams-for-linux: Only the 64bit version is available. +teams-for-linux: diff --git a/office/teams-for-linux/teams-for-linux.SlackBuild b/office/teams-for-linux/teams-for-linux.SlackBuild new file mode 100644 index 0000000000..5d3434d989 --- /dev/null +++ b/office/teams-for-linux/teams-for-linux.SlackBuild @@ -0,0 +1,76 @@ +#!/bin/sh + +# Slackware build script for teams-for-linux + +# Copyright 2019 Dario Nicodemi, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=teams-for-linux +VERSION=${VERSION:-0.0.7} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ "$ARCH" != "x86_64" ]; then + echo "$ARCH is not supported." + exit 1 +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $PKG +ar p $CWD/${PRGNAM}_${VERSION}_amd64.deb data.tar.xz | tar -xvJ + +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 {} \; + +mkdir -p $PKG/usr/bin +ln -s /opt/$PRGNAM/teams $PKG/usr/bin/teams + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION +ln -s $PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -rf $PKG/usr/share/doc + +mkdir -p $PKG/install +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} diff --git a/office/teams-for-linux/teams-for-linux.info b/office/teams-for-linux/teams-for-linux.info new file mode 100644 index 0000000000..10e868b455 --- /dev/null +++ b/office/teams-for-linux/teams-for-linux.info @@ -0,0 +1,10 @@ +PRGNAM="teams-for-linux" +VERSION="0.0.7" +HOMEPAGE="https://github.com/ivelkov/teams-for-linux" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/ivelkov/teams-for-linux/releases/download/v0.0.7/teams-for-linux_0.0.7_amd64.deb" +MD5SUM_x86_64="d069487a8350c3ae22381487897f2e76" +REQUIRES="" +MAINTAINER="Dario Nicodemi" +EMAIL="dario.sbo@gmail.com" 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/fix_fltk_build.diff b/office/teapot/fix_fltk_build.diff new file mode 100644 index 0000000000..3f4e2e3ed4 --- /dev/null +++ b/office/teapot/fix_fltk_build.diff @@ -0,0 +1,41 @@ +diff -Naur teapot-2.3.0/CMakeLists.txt teapot-2.3.0.patched/CMakeLists.txt +--- teapot-2.3.0/CMakeLists.txt 2020-11-19 00:18:02.217657446 -0500 ++++ teapot-2.3.0.patched/CMakeLists.txt 2020-11-19 00:22:05.201635357 -0500 +@@ -40,7 +40,7 @@ + install(TARGETS teapot DESTINATION bin) + endif () + +-find_package(FLTK NO_MODULE) ++find_package(FLTK) + if (FLTK_FOUND) + include("${FLTK_USE_FILE}") + +@@ -52,13 +52,13 @@ + if (ENABLE_STATIC) + target_link_libraries(fteapot teapotlib fltk fltk_images ${LIB_PORTABLEXDR}) + else () +- target_link_libraries(fteapot teapotlib fltk_SHARED fltk_images_SHARED ${LIB_PORTABLEXDR}) ++ target_link_libraries(fteapot teapotlib fltk fltk_images ${LIB_PORTABLEXDR}) + endif () + else () + if (ENABLE_STATIC) + target_link_libraries(fteapot teapotlib fltk fltk_images ${LIB_PORTABLEXDR}) + else () +- target_link_libraries(fteapot teapotlib fltk_SHARED ${LIB_PORTABLEXDR}) ++ target_link_libraries(fteapot teapotlib fltk fltk_images ${LIB_PORTABLEXDR}) + endif () + endif () + install(TARGETS fteapot DESTINATION bin) +diff -Naur teapot-2.3.0/fteapot.fl teapot-2.3.0.patched/fteapot.fl +--- teapot-2.3.0/fteapot.fl 2020-11-19 00:15:47.506669691 -0500 ++++ teapot-2.3.0.patched/fteapot.fl 2020-11-19 00:16:05.569668049 -0500 +@@ -11,6 +11,9 @@ + decl {\#include <fcntl.h>} {private global + } + ++decl {\#include <unistd.h>} {private global ++} ++ + decl {\#define shadow _shadow} {private global + } + diff --git a/office/teapot/fix_mbslen_warning.diff b/office/teapot/fix_mbslen_warning.diff new file mode 100644 index 0000000000..47b3539b8c --- /dev/null +++ b/office/teapot/fix_mbslen_warning.diff @@ -0,0 +1,11 @@ +diff -Naur teapot-2.3.0/scanner.c teapot-2.3.0.patched/scanner.c +--- teapot-2.3.0/scanner.c 2012-02-06 06:30:53.000000000 -0500 ++++ teapot-2.3.0.patched/scanner.c 2020-11-19 00:24:24.289622714 -0500 +@@ -25,6 +25,7 @@ + #include "main.h" + #include "misc.h" + #include "scanner.h" ++#include "utf8.h" + /*}}}*/ + + /* identcode -- return number of identifier */ /*{{{*/ diff --git a/office/teapot/teapot.SlackBuild b/office/teapot/teapot.SlackBuild index 85d8f4e7d6..8eb69bb072 100644 --- a/office/teapot/teapot.SlackBuild +++ b/office/teapot/teapot.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for teapot -# Copyright 2016 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2016 Jostein Berntsen <jvbernts@online.no> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20201122 bkw: Grr. Forgot to git add the diffs. +# 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 +75,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 +84,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 +116,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..3753609c61 100644 --- a/office/teapot/teapot.info +++ b/office/teapot/teapot.info @@ -1,10 +1,12 @@ 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="" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/tellico/tellico.info b/office/tellico/tellico.info index 3a7d9986e0..0e7fdd0310 100644 --- a/office/tellico/tellico.info +++ b/office/tellico/tellico.info @@ -1,7 +1,7 @@ PRGNAM="tellico" VERSION="2.3.12" -HOMEPAGE="http://tellico-project.org/" -DOWNLOAD="http://tellico-project.org/files/tellico-2.3.12.tar.bz2" +HOMEPAGE="https://tellico-project.org/" +DOWNLOAD="https://tellico-project.org/files/tellico-2.3.12.tar.bz2" MD5SUM="607e94e0141aadf741aab7fa6db15a5c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/office/texlive-docs/texlive-docs.SlackBuild b/office/texlive-docs/texlive-docs.SlackBuild index 972fe2cb60..cb60d47aa1 100644 --- a/office/texlive-docs/texlive-docs.SlackBuild +++ b/office/texlive-docs/texlive-docs.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2009 - 2014 Robby Workman, Northport, AL, USA -# Copyright 2016 - 2018 Johannes Schoepfer, Germany +# Copyright 2016 - 2020 Johannes Schoepfer, Germany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=texlive-docs -VERSION=${VERSION:-2018.180822} +VERSION=${VERSION:-2020.200608} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -36,19 +36,21 @@ OUTPUT=${OUTPUT:-/tmp} ARCH=noarch +TEXMFROOT=/usr/share + set -e rm -rf $PKG -mkdir -p $TMP $PKG/usr/share $OUTPUT $PKG/usr/doc/texlive-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -C $PKG/usr/share +mkdir -p $TMP $PKG$TEXMFROOT $OUTPUT $PKG/usr/doc/texlive-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -C $PKG$TEXMFROOT chown -R root:root $PKG chmod -R u+w,go-w,a+rX-st $PKG # No, we don't care about the pdf versions of the manual pages -rm -rf $PKG/usr/share/texmf-dist/doc/man +rm -rf $PKG$TEXMFROOT/texmf-dist/doc/man # Install index of provided tex packages to the docs -mv $PKG/usr/share/texmf-dist/packages.docs.gz $PKG/usr/doc/texlive-$VERSION +mv $PKG$TEXMFROOT/texmf-dist/packages.docs.gz $PKG/usr/doc/texlive-$VERSION mkdir -p $PKG/install cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/office/texlive-docs/texlive-docs.info b/office/texlive-docs/texlive-docs.info index 46ce34fe1d..79bb330e80 100644 --- a/office/texlive-docs/texlive-docs.info +++ b/office/texlive-docs/texlive-docs.info @@ -1,10 +1,10 @@ PRGNAM="texlive-docs" -VERSION="2018.180822" -HOMEPAGE="http://tug.org/texlive/" -DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/2018/texlive-docs/texlive-docs-2018.180822.tar.xz" -MD5SUM="15ff1c22c970b82150d84e92869acffd" +VERSION="2020.200608" +HOMEPAGE="https://tug.org/texlive/" +DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/texlive-docs-2020.200608.tar.xz" +MD5SUM="89c5212c1cae844188fca98f21acd938" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="texlive" +REQUIRES="" MAINTAINER="Johannes Schoepfer" -EMAIL="slackbuilds[at]schoepfer[dot]info" +EMAIL="slackbuilds@schoepfer.info" diff --git a/office/texlive-extra/README b/office/texlive-extra/README index 081fb60fde..d1e75df0cc 100644 --- a/office/texlive-extra/README +++ b/office/texlive-extra/README @@ -2,3 +2,5 @@ texlive-extra (extra texmf files for TeXLive) This package contains texmf files which don't fit in the texlive base package. Appropriate docs are included as well. + +Optional dependency: openjdk8 diff --git a/office/texlive-extra/doinst.sh b/office/texlive-extra/doinst.sh index 6bd3d2a58e..f3b57a1c9c 100644 --- a/office/texlive-extra/doinst.sh +++ b/office/texlive-extra/doinst.sh @@ -1,3 +1,5 @@ chroot . /usr/bin/mktexlsr 1>/dev/null 2>/dev/null printf "y\n" | chroot . /usr/bin/updmap-sys --syncwithtrees 1>/dev/null 2>/dev/null -chroot . /usr/bin/updmap-sys 1>/dev/null 2>/dev/null +cp usr/share/texmf-dist/web2c/updmap.cfg.extra usr/share/texmf-dist/web2c/updmap.cfg.extra.tmp +chroot . /usr/bin/updmap-sys --cnffile /usr/share/texmf-dist/web2c/updmap.cfg --cnffile /usr/share/texmf-dist/web2c/updmap.cfg.extra 1>/dev/null 2>/dev/null +mv usr/share/texmf-dist/web2c/updmap.cfg.extra.tmp usr/share/texmf-dist/web2c/updmap.cfg.extra diff --git a/office/texlive-extra/texlive-extra.SlackBuild b/office/texlive-extra/texlive-extra.SlackBuild index 9cb48640b0..c2cd1d0c75 100644 --- a/office/texlive-extra/texlive-extra.SlackBuild +++ b/office/texlive-extra/texlive-extra.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2009 - 2014 Robby Workman, Northport, AL, USA -# Copyright 2016 - 2018 Johannes Schoepfer, Germany +# Copyright 2016 - 2020 Johannes Schoepfer, Germany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=texlive-extra -VERSION=${VERSION:-2018.180822} +VERSION=${VERSION:-2020.200608} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -34,6 +34,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +set -e + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -42,27 +44,27 @@ if [ -z "$ARCH" ]; then esac fi -set -e +TEXMFROOT=/usr/share rm -rf $PKG -mkdir -p $TMP $PKG/usr/share $OUTPUT $PKG/usr/bin $PKG/usr/doc/texlive-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -C $PKG/usr/share +mkdir -p $TMP $PKG$TEXMFROOT $OUTPUT $PKG/usr/bin $PKG/usr/doc/texlive-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -C $PKG$TEXMFROOT chown -R root:root $PKG chmod -R u+w,go-w,a+rX-st $PKG # Put symlinks/scripts from tlnet in place -mv $PKG/usr/share/texmf-dist/linked_scripts/* $PKG/usr/bin -rmdir $PKG/usr/share/texmf-dist/linked_scripts +mv $PKG$TEXMFROOT/texmf-dist/linked_scripts/* $PKG/usr/bin +rmdir $PKG$TEXMFROOT/texmf-dist/linked_scripts # Move biber binary to $PATH case $ARCH in - "x86_64") mv $PKG/usr/share/texmf-dist/bin/x86_64-linux/biber $PKG/usr/bin ;; - "i586") mv $PKG/usr/share/texmf-dist/bin/i386-linux/biber $PKG/usr/bin ;; + "x86_64") mv $PKG$TEXMFROOT/texmf-dist/bin/x86_64-linux/biber $PKG/usr/bin ;; + "i586") mv $PKG$TEXMFROOT/texmf-dist/bin/i386-linux/biber $PKG/usr/bin ;; esac -rm -rf $PKG/usr/share/texmf-dist/bin +rm -rf $PKG$TEXMFROOT/texmf-dist/bin # Install index of provided tex packages to the docs -mv $PKG/usr/share/texmf-dist/packages.extra.gz $PKG/usr/doc/texlive-$VERSION +mv $PKG$TEXMFROOT/texmf-dist/packages.extra.gz $PKG/usr/doc/texlive-$VERSION mkdir -p $PKG/install cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/office/texlive-extra/texlive-extra.info b/office/texlive-extra/texlive-extra.info index 237880151d..5052c20d94 100644 --- a/office/texlive-extra/texlive-extra.info +++ b/office/texlive-extra/texlive-extra.info @@ -1,10 +1,10 @@ PRGNAM="texlive-extra" -VERSION="2018.180822" -HOMEPAGE="http://tug.org/texlive/" -DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/2018/texlive-extra/texlive-extra-2018.180822.tar.xz" -MD5SUM="6e40bc7ed4d73efa747ada7a45289c73" +VERSION="2020.200608" +HOMEPAGE="https://tug.org/texlive/" +DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/texlive-extra-2020.200608.tar.xz" +MD5SUM="34a8f19207ba77c6f86891eb3450e912" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="texlive" MAINTAINER="Johannes Schoepfer" -EMAIL="slackbuilds[at]schoepfer[dot]info" +EMAIL="slackbuilds@schoepfer.info" diff --git a/office/texlive/doinst.sh b/office/texlive/doinst.sh index d7af8f55c1..f864e767d6 100644 --- a/office/texlive/doinst.sh +++ b/office/texlive/doinst.sh @@ -1,5 +1,5 @@ chroot . /usr/bin/mktexlsr 1>/dev/null 2>/dev/null printf "y\n" | chroot . /usr/bin/updmap-sys --syncwithtrees 1>/dev/null 2>/dev/null chroot . /usr/bin/updmap-sys 1>/dev/null 2>/dev/null -chroot . /usr/bin/fmtutil-sys --missing 1>/dev/null 2>/dev/null +chroot . /usr/bin/fmtutil-sys --all 1>/dev/null 2>/dev/null chroot . /usr/bin/mtxrun --generate 1>/dev/null 2>/dev/null diff --git a/office/texlive/patches/20180625.diff b/office/texlive/patches/20180625.diff deleted file mode 100644 index 583d99486d..0000000000 --- a/office/texlive/patches/20180625.diff +++ /dev/null @@ -1,688 +0,0 @@ -diff -ur ./texk/dvipdfm-x/ChangeLog ../b18/texk/dvipdfm-x/ChangeLog ---- ./texk/dvipdfm-x/ChangeLog 2018-03-03 11:27:37.000000000 +0100 -+++ ../b18/texk/dvipdfm-x/ChangeLog 2018-06-25 22:07:46.343277185 +0200 -@@ -1,3 +1,16 @@ -+2018-05-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp> -+ -+ * tt_cmap.c: Revert a part of changes in 2017-12-09, -+ which breaks to give tounicode entries for ligatures. -+ http://tug.org/pipermail/tex-live/2018-May/041608.html. -+ * configure.ac: Version 20180506. -+ -+ 2018-04-28 Stefan Br\"uns <stefan.bruens@rwth-aachen.de> -+ -+ * pngimage.c: Fix a bug which causes a segfault with 1/2/4-bit -+ transparent indexed PNGs. -+ * configure.ac: Version 20180428. -+ - 2018-03-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp> - - * xbb.c: Remove unused lines. -diff -ur ./texk/dvipdfm-x/configure ../b18/texk/dvipdfm-x/configure ---- ./texk/dvipdfm-x/configure 2018-02-17 09:41:35.000000000 +0100 -+++ ../b18/texk/dvipdfm-x/configure 2018-06-25 22:07:47.183276612 +0200 -@@ -1,6 +1,6 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20180217. -+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20180506. - # - # Report bugs to <tex-k@tug.org>. - # -@@ -590,8 +590,8 @@ - # Identity of this package. - PACKAGE_NAME='dvipdfm-x (TeX Live)' - PACKAGE_TARNAME='dvipdfm-x--tex-live-' --PACKAGE_VERSION='20180217' --PACKAGE_STRING='dvipdfm-x (TeX Live) 20180217' -+PACKAGE_VERSION='20180506' -+PACKAGE_STRING='dvipdfm-x (TeX Live) 20180506' - PACKAGE_BUGREPORT='tex-k@tug.org' - PACKAGE_URL='' - -@@ -1350,7 +1350,7 @@ - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF --\`configure' configures dvipdfm-x (TeX Live) 20180217 to adapt to many kinds of systems. -+\`configure' configures dvipdfm-x (TeX Live) 20180506 to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... - -@@ -1421,7 +1421,7 @@ - - if test -n "$ac_init_help"; then - case $ac_init_help in -- short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20180217:";; -+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20180506:";; - esac - cat <<\_ACEOF - -@@ -1551,7 +1551,7 @@ - test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF --dvipdfm-x (TeX Live) configure 20180217 -+dvipdfm-x (TeX Live) configure 20180506 - generated by GNU Autoconf 2.69 - - Copyright (C) 2012 Free Software Foundation, Inc. -@@ -2390,7 +2390,7 @@ - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - --It was created by dvipdfm-x (TeX Live) $as_me 20180217, which was -+It was created by dvipdfm-x (TeX Live) $as_me 20180506, which was - generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ -@@ -8075,7 +8075,7 @@ - - # Define the identity of the package. - PACKAGE='dvipdfm-x--tex-live-' -- VERSION='20180217' -+ VERSION='20180506' - - - cat >>confdefs.h <<_ACEOF -@@ -14744,7 +14744,7 @@ - Report bugs to <bug-libtool@gnu.org>." - - lt_cl_version="\ --dvipdfm-x (TeX Live) config.lt 20180217 -+dvipdfm-x (TeX Live) config.lt 20180506 - configured by $0, generated by GNU Autoconf 2.69. - - Copyright (C) 2011 Free Software Foundation, Inc. -@@ -16624,7 +16624,7 @@ - # report actual input values of CONFIG_FILES etc. instead of their - # values after options handling. - ac_log=" --This file was extended by dvipdfm-x (TeX Live) $as_me 20180217, which was -+This file was extended by dvipdfm-x (TeX Live) $as_me 20180506, which was - generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES -@@ -16694,7 +16694,7 @@ - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ --dvipdfm-x (TeX Live) config.status 20180217 -+dvipdfm-x (TeX Live) config.status 20180506 - configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - -diff -ur ./texk/dvipdfm-x/configure.ac ../b18/texk/dvipdfm-x/configure.ac ---- ./texk/dvipdfm-x/configure.ac 2018-02-28 00:14:55.000000000 +0100 -+++ ../b18/texk/dvipdfm-x/configure.ac 2018-06-25 22:07:47.183276612 +0200 -@@ -7,7 +7,7 @@ - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - dnl --AC_INIT([dvipdfm-x (TeX Live)], [20180217], [tex-k@tug.org]) -+AC_INIT([dvipdfm-x (TeX Live)], [20180506], [tex-k@tug.org]) - AC_PREREQ([2.65]) - AC_CONFIG_SRCDIR([agl.c]) - AC_CONFIG_AUX_DIR([../../build-aux]) -diff -ur ./texk/dvipdfm-x/pngimage.c ../b18/texk/dvipdfm-x/pngimage.c ---- ./texk/dvipdfm-x/pngimage.c 2018-02-17 09:41:35.000000000 +0100 -+++ ../b18/texk/dvipdfm-x/pngimage.c 2018-06-25 22:07:49.306275165 +0200 -@@ -964,12 +964,16 @@ - png_bytep trans; - int num_trans; - png_uint_32 i; -+ png_byte bpc, mask, shift; - - if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) || - !png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, NULL)) { - WARN("%s: PNG does not have valid tRNS chunk but tRNS is requested.", PNG_DEBUG_STR); - return NULL; - } -+ bpc = png_get_bit_depth(png_ptr, info_ptr); -+ mask = 0xff >> (8 - bpc); -+ shift = 8 - bpc; - - smask = pdf_new_stream(STREAM_COMPRESS); - dict = pdf_stream_dict(smask); -@@ -981,7 +985,8 @@ - pdf_add_dict(dict, pdf_new_name("ColorSpace"), pdf_new_name("DeviceGray")); - pdf_add_dict(dict, pdf_new_name("BitsPerComponent"), pdf_new_number(8)); - for (i = 0; i < width*height; i++) { -- png_byte idx = image_data_ptr[i]; -+ /* data is packed for 1/2/4 bpc formats, msb first */ -+ png_byte idx = (image_data_ptr[bpc * i / 8] >> (shift - bpc * i % 8)) & mask; - smask_data_ptr[i] = (idx < num_trans) ? trans[idx] : 0xff; - } - pdf_add_stream(smask, (char *)smask_data_ptr, width*height); -diff -ur ./texk/dvipdfm-x/tt_cmap.c ../b18/texk/dvipdfm-x/tt_cmap.c ---- ./texk/dvipdfm-x/tt_cmap.c 2017-12-09 15:07:09.000000000 +0100 -+++ ../b18/texk/dvipdfm-x/tt_cmap.c 2018-06-25 22:07:49.617274953 +0200 -@@ -1,6 +1,6 @@ - /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - -- Copyright (C) 2007-2017 by Jin-Hwan Cho and Shunsaku Hirata, -+ Copyright (C) 2007-2018 by Jin-Hwan Cho and Shunsaku Hirata, - the dvipdfmx project team. - - This program is free software; you can redistribute it and/or modify -@@ -928,19 +928,12 @@ - } - #undef MAX_UNICODES - if (unicode_count == -1) { --#if defined(LIBDPX) - if(verbose > VERBOSE_LEVEL_MIN) { - if (name) - MESG("No Unicode mapping available: GID=%u, name=%s\n", gid, name); - else - MESG("No Unicode mapping available: GID=%u\n", gid); - } --#else -- if (name) -- MESG("No Unicode mapping available: GID=%u, name=%s\n", gid, name); -- else -- MESG("No Unicode mapping available: GID=%u\n", gid); --#endif /* LIBDPX */ - } else { - /* the Unicode characters go into wbuf[2] and following, in UTF16BE */ - /* we rely on WBUF_SIZE being more than adequate for MAX_UNICODES */ -@@ -1021,13 +1014,7 @@ - { - USHORT count = 0; - USHORT cid = cffont ? cff_charsets_lookup_inverse(cffont, gid) : gid; -- -- /* Skip PUA characters and alphabetic presentation forms, allowing -- * handle_subst_glyphs() as it might find better mapping. Fixes the -- * mapping of ligatures encoded in PUA in fonts like Linux Libertine -- * and old Adobe fonts. -- */ -- if (is_used_char2(used_chars, cid) && !is_PUA_or_presentation(ch)) { -+ if (is_used_char2(used_chars, cid)) { - int len; - unsigned char *p = wbuf + 2; - -@@ -1038,11 +1025,18 @@ - len = UC_UTF16BE_encode_char((int32_t) ch, &p, wbuf + WBUF_SIZE); - CMap_add_bfchar(cmap, wbuf, 2, wbuf + 2, len); - -- /* Avoid duplicate entry -- * There are problem when two Unicode code is mapped to -- * single glyph... -+ /* Skip PUA characters and alphabetic presentation forms, allowing -+ * handle_subst_glyphs() as it might find better mapping. Fixes the -+ * mapping of ligatures encoded in PUA in fonts like Linux Libertine -+ * and old Adobe fonts. - */ -- used_chars[cid / 8] &= ~(1 << (7 - (cid % 8))); -+ if (!is_PUA_or_presentation(ch)) { -+ /* Avoid duplicate entry -+ * There are problem when two Unicode code is mapped to -+ * single glyph... -+ */ -+ used_chars[cid / 8] &= ~(1 << (7 - (cid % 8))); -+ } - } - - return count; -diff -ur ./texk/web2c/ptexdir/ChangeLog ../b18/texk/web2c/ptexdir/ChangeLog ---- ./texk/web2c/ptexdir/ChangeLog 2018-02-05 13:35:05.000000000 +0100 -+++ ../b18/texk/web2c/ptexdir/ChangeLog 2018-06-25 22:08:39.566240911 +0200 -@@ -1,3 +1,16 @@ -+2018-05-06 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> -+ -+ * kanji.c: More strict check kanji token. -+ -+2018-04-14 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> -+ -+ * ptex-base.ch: Fix issue GitHub:texjporg/tex-jp-build#57 -+ that discontinuous KINSOKU/INHIBIT table cannot be -+ searched properly. -+ (regression caused by a commmit of 2017-09-11) -+ * tests/free_pena.tex, tests/free_ixsp.tex: Added. -+ * ptex_version.h: pTeX version p3.8.1. -+ - 2018-02-05 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - - * ptex-base.ch: Set subtype for JFM glue in math list. -diff -ur ./texk/web2c/ptexdir/kanji.c ../b18/texk/web2c/ptexdir/kanji.c ---- ./texk/web2c/ptexdir/kanji.c 2016-11-25 19:24:38.000000000 +0100 -+++ ../b18/texk/web2c/ptexdir/kanji.c 2018-06-25 22:08:39.675240837 +0200 -@@ -4,6 +4,7 @@ - */ - - #include "kanji.h" -+#define CS_TOKEN_FLAG 0xFFFF - - #if !defined(WIN32) - int sjisterminal; -@@ -12,7 +13,8 @@ - /* TOKEN */ - boolean check_kanji(integer c) - { -- return is_char_kanji(c); -+ if (c >= CS_TOKEN_FLAG) return false; -+ else return is_char_kanji(c); - } - - boolean is_char_ascii(integer c) -diff -ur ./texk/web2c/ptexdir/ptex-base.ch ../b18/texk/web2c/ptexdir/ptex-base.ch ---- ./texk/web2c/ptexdir/ptex-base.ch 2018-02-05 13:35:05.000000000 +0100 -+++ ../b18/texk/web2c/ptexdir/ptex-base.ch 2018-06-25 22:08:39.677240836 +0200 -@@ -58,6 +58,7 @@ - % pTeX p3.7.1. - % (2017-09-07) HK pTeX p3.7.2 More restrictions on direction change commands. - % (2018-01-21) HK Added \ptexversion primitive and co. pTeX p3.8. -+% (2018-04-14) HK pTeX p3.8.1 Bug fix for discontinuous KINSOKU table. - % - - @x -@@ -73,8 +74,8 @@ - @y - @d pTeX_version=3 - @d pTeX_minor_version=8 --@d pTeX_revision==".0" --@d pTeX_version_string=='-p3.8.0' {current \pTeX\ version} -+@d pTeX_revision==".1" -+@d pTeX_version_string=='-p3.8.1' {current \pTeX\ version} - @# - @d pTeX_banner=='This is pTeX, Version 3.14159265',pTeX_version_string - @d pTeX_banner_k==pTeX_banner -@@ -6397,6 +6398,8 @@ - @d inhibit_both=0 {disable to insert space before 2byte-char and after it} - @d inhibit_previous=1 {disable to insert space before 2byte-char} - @d inhibit_after=2 {disable to insert space after 2byte-char} -+@d inhibit_none=3 {enable to insert space before/after 2byte-char} -+@d inhibit_unused=4 {unused entry} - @d no_entry=1000 - @d new_pos=0 - @d cur_pos=1 -@@ -6427,14 +6430,15 @@ - begin s:=calc_pos(c); p:=s; - if n=new_pos then - begin repeat -- if (inhibit_xsp_code(p)=0)or(inhibit_xsp_code(p)=c) then goto done; -+ if (inhibit_xsp_type(p)=inhibit_unused)or(inhibit_xsp_code(p)=0) -+ or(inhibit_xsp_code(p)=c) then goto done; - incr(p); if p>255 then p:=0; - until s=p; p:=no_entry; - end - else - begin repeat -- if inhibit_xsp_code(p)=0 then goto done1; -- if inhibit_xsp_code(p)=c then goto done; -+ if inhibit_xsp_code(p)=0 then goto done1 -+ else if (inhibit_xsp_type(p)<>inhibit_unused)and(inhibit_xsp_code(p)=c) then goto done; - incr(p); if p>255 then p:=0; - until s=p; - done1: p:=no_entry; -@@ -6447,9 +6451,10 @@ - begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int; - if is_char_kanji(n) then - begin j:=get_inhibit_pos(tokanji(n),new_pos); -- if (j<>no_entry)and(cur_val>inhibit_after)and(global or cur_level=level_one) then -- begin n:=0; cur_val:=0 end -- { remove the entry from inhibit table } -+ if (j<>no_entry)and(cur_val>inhibit_after) then -+ begin if global or(cur_level=level_one) then cur_val:=inhibit_unused -+ { remove the entry from inhibit table } -+ else cur_val:=inhibit_none; end - else if j=no_entry then - begin print_err("Inhibit table is full!!"); - help1("I'm skipping this control sequences.");@/ -@@ -6466,7 +6471,7 @@ - - @ @<Fetch inhibit type from some table@>= - begin scan_int; q:=get_inhibit_pos(tokanji(cur_val),cur_pos); --cur_val_level:=int_val; cur_val:=3; -+cur_val_level:=int_val; cur_val:=inhibit_none; - if q<>no_entry then cur_val:=inhibit_xsp_type(q); - end - -@@ -6476,6 +6481,7 @@ - - @d pre_break_penalty_code=1 - @d post_break_penalty_code=2 -+@d kinsoku_unused_code=3 - - @<Put each...@>= - primitive("prebreakpenalty",assign_kinsoku,pre_break_penalty_code); -@@ -6502,15 +6508,16 @@ - gubed - if n=new_pos then - begin repeat -- if (kinsoku_type(p)=0)or(kinsoku_code(p)=c) then goto done; -+ if (kinsoku_type(p)=0)or(kinsoku_type(p)=kinsoku_unused_code) -+ or(kinsoku_code(p)=c) then goto done; - incr(p); if p>255 then p:=0; - until s=p; - p:=no_entry; - end - else - begin repeat -- if kinsoku_type(p)=0 then goto done1; -- if kinsoku_code(p)=c then goto done; -+ if kinsoku_type(p)=0 then goto done1 -+ else if (kinsoku_type(p)<>kinsoku_unused_code)and(kinsoku_code(p)=c) then goto done; - incr(p); if p>255 then p:=0; - until s=p; - done1: p:=no_entry; -@@ -6523,8 +6530,8 @@ - begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int; - if is_char_ascii(n) or is_char_kanji(n) then - begin j:=get_kinsoku_pos(tokanji(n),new_pos); -- if (j<>no_entry)and(cur_val=0)and(global or cur_level=level_one) then -- define(kinsoku_base+j,0,0) { remove the entry from KINSOKU table } -+ if (j<>no_entry)and(cur_val=0)and(global or(cur_level=level_one)) then -+ define(kinsoku_base+j,kinsoku_unused_code,0) { remove the entry from KINSOKU table } - else begin - if j=no_entry then begin - print_err("KINSOKU table is full!!"); -diff -ur ./texk/web2c/ptexdir/ptex_version.h ../b18/texk/web2c/ptexdir/ptex_version.h ---- ./texk/web2c/ptexdir/ptex_version.h 2018-01-21 04:48:06.000000000 +0100 -+++ ../b18/texk/web2c/ptexdir/ptex_version.h 2018-06-25 22:08:39.678240835 +0200 -@@ -1 +1 @@ --#define PTEX_VERSION "p3.8.0" -+#define PTEX_VERSION "p3.8.1" -diff -ur ./texk/web2c/uptexdir/kanji.c ../b18/texk/web2c/uptexdir/kanji.c ---- ./texk/web2c/uptexdir/kanji.c 2018-02-25 01:31:25.000000000 +0100 -+++ ../b18/texk/web2c/uptexdir/kanji.c 2018-06-25 22:08:41.864239345 +0200 -@@ -18,7 +18,7 @@ - /* TOKEN */ - boolean check_kanji (integer c) - { -- if (c > CS_TOKEN_FLAG) return false; -+ if (c >= CS_TOKEN_FLAG) return false; - else if (!(XXHi(c)>=KCAT_KANJI && XXHi(c)<=KCAT_HANGUL)) return false; - else return is_char_kanji(c); - } -diff -ur ./utils/README ../b18/utils/README ---- ./utils/README 2018-04-08 22:08:33.000000000 +0200 -+++ ../b18/utils/README 2018-06-25 22:08:45.738236705 +0200 -@@ -1,4 +1,4 @@ --$Id: README 47384 2018-04-08 20:08:33Z karl $ -+$Id: README 47642 2018-05-08 16:06:43Z karl $ - Public domain. Originally written 2005 by Karl Berry. - - Extra utilities we (optionally) compile for TeX Live. -@@ -16,7 +16,7 @@ - - lacheck - maintained here, by us - --m-tx 0.63 - checked 09jan18 -+m-tx 0.63a - checked 29apr18 - http://ctan.org/pkg/m-tx/ - - pmx 2.8.4 - checked 14feb18 -diff -ur ./utils/m-tx/ChangeLog ../b18/utils/m-tx/ChangeLog ---- ./utils/m-tx/ChangeLog 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/ChangeLog 2018-06-25 22:08:49.771233956 +0200 -@@ -1,3 +1,7 @@ -+2018-04-29 Akira Kakuto <kakuto@fuk.kindai.ac.jp> -+ -+ * Import m-tx 0.63a. -+ - 2018-01-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp> - - * Import m-tx 0.63. -diff -ur ./utils/m-tx/TLpatches/ChangeLog ../b18/utils/m-tx/TLpatches/ChangeLog ---- ./utils/m-tx/TLpatches/ChangeLog 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/TLpatches/ChangeLog 2018-06-25 22:08:49.772233956 +0200 -@@ -1,3 +1,7 @@ -+2018-04-29 Akira Kakuto <kakuto@fuk.kindai.ac.jp> -+ -+ * patch-01-write-bin: Update for 0.63a. -+ - 2018-01-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp> - - * patch-01-write-bin: Update for 0.63. -diff -ur ./utils/m-tx/TLpatches/TL-Changes ../b18/utils/m-tx/TLpatches/TL-Changes ---- ./utils/m-tx/TLpatches/TL-Changes 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/TLpatches/TL-Changes 2018-06-25 22:08:49.772233956 +0200 -@@ -1,4 +1,4 @@ --Changes applied to the mtx-0.63 tree as obtained from: -+Changes applied to the mtx-0.63a tree as obtained from: - http://www.ctan.org/tex-archive/support/m-tx/ - - Remove: -diff -ur ./utils/m-tx/TLpatches/patch-01-write-bin ../b18/utils/m-tx/TLpatches/patch-01-write-bin ---- ./utils/m-tx/TLpatches/patch-01-write-bin 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/TLpatches/patch-01-write-bin 2018-06-25 22:08:49.772233956 +0200 -@@ -1,6 +1,21 @@ --diff -ur mtx-0.63.orig/globals.c mtx-0.63/globals.c ----- mtx-0.63.orig/globals.c Tue Jan 09 01:39:42 2018 --+++ mtx-0.63/globals.c Tue Jan 09 08:46:40 2018 -+diff -ur mtx-0.63a/files.c mtx-src/files.c -+--- mtx-0.63a/files.c Tue Jan 09 01:39:42 2018 -++++ mtx-src/files.c Wed Apr 25 18:07:12 2018 -+@@ -289,9 +289,9 @@ -+ pushFile(infilename); -+ strcpy(outfile_NAME, outfilename); -+ if (outfile != NULL) -+- outfile = freopen(outfile_NAME, "w", outfile); -++ outfile = freopen(outfile_NAME, "wb", outfile); -+ else -+- outfile = fopen(outfile_NAME, "w"); -++ outfile = fopen(outfile_NAME, "wb"); -+ _SETIO(outfile != NULL, FileNotFound); -+ strcpy(stylefile_NAME, stylefilename); -+ if (stylefile != NULL) -+diff -ur mtx-0.63a/globals.c mtx-src/globals.c -+--- mtx-0.63a/globals.c Tue Jan 09 01:39:42 2018 -++++ mtx-src/globals.c Wed Apr 25 18:07:37 2018 - @@ -230,7 +230,7 @@ - if (outfile != NULL) - fclose(outfile); -diff -ur ./utils/m-tx/configure ../b18/utils/m-tx/configure ---- ./utils/m-tx/configure 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/configure 2018-06-25 22:08:49.879233883 +0200 -@@ -1,6 +1,6 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.69 for m-tx (TeX Live) 0.63. -+# Generated by GNU Autoconf 2.69 for m-tx (TeX Live) 0.63a. - # - # Report bugs to <tex-k@tug.org>. - # -@@ -580,8 +580,8 @@ - # Identity of this package. - PACKAGE_NAME='m-tx (TeX Live)' - PACKAGE_TARNAME='m-tx--tex-live-' --PACKAGE_VERSION='0.63' --PACKAGE_STRING='m-tx (TeX Live) 0.63' -+PACKAGE_VERSION='0.63a' -+PACKAGE_STRING='m-tx (TeX Live) 0.63a' - PACKAGE_BUGREPORT='tex-k@tug.org' - PACKAGE_URL='' - -@@ -1275,7 +1275,7 @@ - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF --\`configure' configures m-tx (TeX Live) 0.63 to adapt to many kinds of systems. -+\`configure' configures m-tx (TeX Live) 0.63a to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... - -@@ -1341,7 +1341,7 @@ - - if test -n "$ac_init_help"; then - case $ac_init_help in -- short | recursive ) echo "Configuration of m-tx (TeX Live) 0.63:";; -+ short | recursive ) echo "Configuration of m-tx (TeX Live) 0.63a:";; - esac - cat <<\_ACEOF - -@@ -1438,7 +1438,7 @@ - test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF --m-tx (TeX Live) configure 0.63 -+m-tx (TeX Live) configure 0.63a - generated by GNU Autoconf 2.69 - - Copyright (C) 2012 Free Software Foundation, Inc. -@@ -1861,7 +1861,7 @@ - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - --It was created by m-tx (TeX Live) $as_me 0.63, which was -+It was created by m-tx (TeX Live) $as_me 0.63a, which was - generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ -@@ -3784,7 +3784,7 @@ - - # Define the identity of the package. - PACKAGE='m-tx--tex-live-' -- VERSION='0.63' -+ VERSION='0.63a' - - - cat >>confdefs.h <<_ACEOF -@@ -5868,7 +5868,7 @@ - # report actual input values of CONFIG_FILES etc. instead of their - # values after options handling. - ac_log=" --This file was extended by m-tx (TeX Live) $as_me 0.63, which was -+This file was extended by m-tx (TeX Live) $as_me 0.63a, which was - generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES -@@ -5925,7 +5925,7 @@ - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ --m-tx (TeX Live) config.status 0.63 -+m-tx (TeX Live) config.status 0.63a - configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - -diff -ur ./utils/m-tx/mtx-src/Corrections ../b18/utils/m-tx/mtx-src/Corrections ---- ./utils/m-tx/mtx-src/Corrections 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/mtx-src/Corrections 2018-06-25 22:08:49.880233882 +0200 -@@ -3,6 +3,12 @@ - - Newest items at top. You might also want to look at file `MAINTENANCE`. - -+Version 0.63a -+------------- -+ -+Commented out apparently spurious begin...end block in preambleDefaults -+in preamble.pas. (RDT) -+ - Version 0.63 - ------------ - -diff -ur ./utils/m-tx/mtx-src/files.c ../b18/utils/m-tx/mtx-src/files.c ---- ./utils/m-tx/mtx-src/files.c 2016-11-25 19:24:43.000000000 +0100 -+++ ../b18/utils/m-tx/mtx-src/files.c 2018-06-25 22:08:49.882233881 +0200 -@@ -289,9 +289,9 @@ - pushFile(infilename); - strcpy(outfile_NAME, outfilename); - if (outfile != NULL) -- outfile = freopen(outfile_NAME, "w", outfile); -+ outfile = freopen(outfile_NAME, "wb", outfile); - else -- outfile = fopen(outfile_NAME, "w"); -+ outfile = fopen(outfile_NAME, "wb"); - _SETIO(outfile != NULL, FileNotFound); - strcpy(stylefile_NAME, stylefilename); - if (stylefile != NULL) -diff -ur ./utils/m-tx/mtx-src/libp2c/p2clib.c ../b18/utils/m-tx/mtx-src/libp2c/p2clib.c ---- ./utils/m-tx/mtx-src/libp2c/p2clib.c 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/mtx-src/libp2c/p2clib.c 2018-06-25 22:08:49.883233880 +0200 -@@ -73,8 +73,8 @@ - { - register char *dd = (char *)d, *ss = (char *)s; - if (dd < ss || dd - ss >= n) { --#if defined(bcopy) && defined(memcpy) -- my_memcpy(dd, ss, n); -+#if defined(bcopy) && defined(memcpy) -+ Anyptr my_memcpy(Anyptr d, Const Anyptr s, size_t n); - #else - memcpy(dd, ss, n); - #endif -diff -ur ./utils/m-tx/mtx-src/preamble.c ../b18/utils/m-tx/mtx-src/preamble.c ---- ./utils/m-tx/mtx-src/preamble.c 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/mtx-src/preamble.c 2018-06-25 22:08:49.953233832 +0200 -@@ -801,8 +801,8 @@ - stave_size[i] = unspec; - for (i = 0; i <= maxstaves; i++) - nspace[i] = unspec; -- nspace[i] = unspec; -- stave_size[i-1] = unspec; -+ /* next line seems to be spurious. 0.63a RDT */ -+ /* begin nspace[i]:=unspec; stave_size[i]:=unspec; end; */ - n_pages = 1; - n_systems = 1; - readStyles(); -diff -ur ./utils/m-tx/mtx-src/preamble.pas ../b18/utils/m-tx/mtx-src/preamble.pas ---- ./utils/m-tx/mtx-src/preamble.pas 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/mtx-src/preamble.pas 2018-06-25 22:08:49.953233832 +0200 -@@ -501,7 +501,8 @@ - for i:=1 to maxvoices do setVocal(i,false); - for i:=1 to maxstaves do stave_size[i]:=unspec; - for i:=0 to maxstaves do nspace[i]:=unspec; -- begin nspace[i]:=unspec; stave_size[i]:=unspec; end; -+ { next line seems to be spurious. 0.63a RDT } -+ { begin nspace[i]:=unspec; stave_size[i]:=unspec; end; } - n_pages:=1; n_systems:=1; - readStyles; old_known_styles := known_styles; - for i:=1 to lines_in_paragraph do omit_line[i]:=false; -diff -ur ./utils/m-tx/mtx-src/prepmx.c ../b18/utils/m-tx/mtx-src/prepmx.c ---- ./utils/m-tx/mtx-src/prepmx.c 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/mtx-src/prepmx.c 2018-06-25 22:08:49.954233832 +0200 -@@ -66,8 +66,8 @@ - - /** M-Tx preprocessor to PMX Dirk Laurie */ - --#define version "0.63" --#define version_date "<7 January 2018>" -+#define version "0.63a" -+#define version_date "<8 April 2018>" - - /** See file "Corrections" for updates */ - -@@ -758,7 +758,7 @@ - Static void topOfPMXfile(void) - { - Char STR2[24]; -- Char STR3[32]; -+ Char STR3[30]; - - putLine("---"); - sprintf(STR2, "\\def\\mtxversion{%s}", version); -diff -ur ./utils/m-tx/mtx-src/prepmx.pas ../b18/utils/m-tx/mtx-src/prepmx.pas ---- ./utils/m-tx/mtx-src/prepmx.pas 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/mtx-src/prepmx.pas 2018-06-25 22:08:49.954233832 +0200 -@@ -5,8 +5,8 @@ - { CMO: addition/change by Christian Mondrup } - - {* M-Tx preprocessor to PMX Dirk Laurie } --const version = '0.63'; -- version_date = '<7 January 2018>'; -+const version = '0.63a'; -+ version_date = '<8 April 2018>'; - - {* See file "Corrections" for updates } - -diff -ur ./utils/m-tx/tests/mozart.pmx ../b18/utils/m-tx/tests/mozart.pmx ---- ./utils/m-tx/tests/mozart.pmx 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/tests/mozart.pmx 2018-06-25 22:08:50.059233760 +0200 -@@ -1,6 +1,6 @@ - --- --\def\mtxversion{0.63} --\def\mtxdate{<7 January 2018>} -+\def\mtxversion{0.63a} -+\def\mtxdate{<8 April 2018>} - \input mtx - \mtxComposerLine{}{W. A. Mozart (1756--1791)} - \mtxTitleLine{Riff in C} -diff -ur ./utils/m-tx/version.ac ../b18/utils/m-tx/version.ac ---- ./utils/m-tx/version.ac 2018-01-09 04:41:12.000000000 +0100 -+++ ../b18/utils/m-tx/version.ac 2018-06-25 22:08:50.059233760 +0200 -@@ -8,4 +8,4 @@ - dnl -------------------------------------------------------- - dnl - dnl m4-include this file to define the current mtx version --m4_define([mtx_version], [0.63]) -+m4_define([mtx_version], [0.63a]) diff --git a/office/texlive/patches/synctex-missing-header.patch b/office/texlive/patches/synctex-missing-header.patch deleted file mode 100644 index e783bd0bc1..0000000000 --- a/office/texlive/patches/synctex-missing-header.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- texk/web2c/Makefile.in.orig 2018-07-23 11:03:30.763277046 +0200 -+++ texk/web2c/Makefile.in 2018-07-23 11:04:53.940224054 +0200 -@@ -1762,6 +1762,7 @@ - MANS = $(dist_man_MANS) $(nodist_man_MANS) - DATA = $(pkgconfig_DATA) - am__syncinclude_HEADERS_DIST = synctexdir/synctex_parser.h \ -+ synctexdir/synctex_version.h \ - synctexdir/synctex_parser_utils.h - HEADERS = $(syncinclude_HEADERS) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -@@ -4021,6 +4022,7 @@ - pkgconfigdir = ${libdir}/pkgconfig - @SYNCTEX_TRUE@syncinclude_HEADERS = \ - @SYNCTEX_TRUE@ synctexdir/synctex_parser.h \ -+@SYNCTEX_TRUE@ synctexdir/synctex_version.h \ - @SYNCTEX_TRUE@ synctexdir/synctex_parser_utils.h - - @SYNCTEX_TRUE@pkgconfig_DATA = synctexdir/synctex.pc diff --git a/office/texlive/patches/tabu.sty.diff b/office/texlive/patches/tabu.sty.diff new file mode 100644 index 0000000000..8ebe034d18 --- /dev/null +++ b/office/texlive/patches/tabu.sty.diff @@ -0,0 +1,32 @@ +--- ./tabu.sty.orig 2019-01-14 16:10:48.000000000 -0600 ++++ ./tabu.sty 2019-06-30 16:24:01.975474339 -0500 +@@ -57,7 +57,7 @@ + %% + + \NeedsTeXFormat{LaTeX2e} +-\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-fixed)] ++\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-fixed) + intermediate FMi] + \RequirePackage{array}[2008/09/09] + \RequirePackage{varwidth}[2009/03/30] + \AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined} +@@ -727,6 +727,10 @@ + \tabu@currentgrouptype\expandafter{\the\currentgrouptype}}% + \fi + }% \tabu@init ++%%TABU-FIXED set up \tabu@currentgrouptype ++%FMi cancel for nested arrays ... ++\def\@tabarray{\m@th\def\tabu@currentgrouptype{\currentgrouptype}\@ifnextchar[\@array{\@array[c]}} ++ + \def\tabu@indent{% correction for indentation + \ifdim \parindent>\z@\ifx \linewidth\tabudefaulttarget + \everypar\expandafter{% +@@ -1663,6 +1667,9 @@ + \ifdim \tabu@temp\p@>\z@ \ifdim \tabu@temp\tabucolX<\tabu@target + \tabu@target=\tabu@temp\tabucolX \fi\fi + \setbox\tabu@box \hbox \bgroup ++%%TABU-FIXED add \color@begingroup ++%%FMi not yet understood why this one is also needed ... ++ \color@begingroup + \begin{varwidth}\tabu@target + \let\FV@ListProcessLine \tabu@FV@ListProcessLine % \hbox to natural width... + \narrowragged \arraybackslash \parfillskip \@flushglue diff --git a/office/texlive/prep/texmf_get.sh b/office/texlive/prep/texmf_get.sh index fa4f3f752d..c66a71b7f2 100644 --- a/office/texlive/prep/texmf_get.sh +++ b/office/texlive/prep/texmf_get.sh @@ -1,6 +1,8 @@ #!/bin/bash -# texmf_get.sh (c) 2016 - 2018 Johannes Schoepfer, Germany, slackbuilds[at]schoepfer[dot]info +# texmf_get.sh +# +# Copyright 2016 - 2020 Johannes Schoepfer, Germany, slackbuilds@schoepfer.info # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,7 +22,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# V 15.0.2 +# V 15.0.4 # # Prepare xz-compressed tarballs of texlive-texmf-trees based on texlive.tlpdb # This script takes care of dependencies(as far as these are present in texlive.tlpdb) @@ -31,56 +33,50 @@ # -docs: -base documentation only, no manpages/GNU infofiles # -extra: remaining stuff and corresponding docs # -# texlive netarchive policy: Every package is included as dependency +# texlive netarchive policy: Every package is included as dependency # in exactly one collection. A package may have dependencies on other # packages from any collection. -# package source: http://mirror.ctan.org/systems/texlive/tlnet/archive/ - #set -e -MAJORVERSION=2018 +MAJORVERSION=2020 mirror="http://mirror.ctan.org/systems/texlive/tlnet/" -TMP=$PWD/tmp +TMP=${TMP:-$PWD/tmp} # Globally excluded packages, which are/contain # -useless without tlmgr-installer -# -non-linux +# -non-linux, e.g. texworks # -covered by an external package, e.g. asymptote on SBo # -obsolete, e.g. omega -# -java dependend packages # -binaries provided already by texlive.Slackbuild -# -binaries provided already other system packages, e.g. texlive-scripts.ARCH -# -only sources, or hyphen directives, e.g. metatype1, patch, ... -# -only hyphen directives, e.g. hyphen-farsi ... +# -binaries which texlive upstream recommends to build natively, e.g. dvisvgm on SBo +# -only sources, e.g. metatype1, patch, ... global_exclude=" + 00texlive.config + 00texlive.image + 00texlive.installation + 00texlive.installer aleph antomega asymptote bibtexu cslatex dviout.win32 - hyphen-arabic - hyphen-farsi lambda - metatype1 ocherokee oinuit omega omegaware otibet - patch texlive-common texlive-docindex texlive-msg-translations - texlive-scripts - texlive.infra - texliveonfly texosquery texworks tlcockpit tlshell wintools.win32 + dvisvgm " # special packages, move their type1 fonts(if metafonts are present) @@ -103,42 +99,45 @@ special_packages=" #Todo: split type1 fonts, or keep subset of type1 fonts in base # cm-super -# keep precompiled binaries, list binary, not package name +# keep precompiled binaries, list binary, not package name keep_precompiled=" biber " texmf_editions () { - + # "excludes from -base", also dependencies are excluded PACKAGES=" cm-super biber bib2gls knitting - pgfornament - pgfplots pst-cox pst-poker pst-vectorian pst-geo bclogo - $(grep ^"name .*biblatex" $db | cut -d' ' -f2 ) + texplate + texliveonfly + kerkis " texmfget extra || exit 1 - + # packages/collections and their dependencies for -base PACKAGES=" - $(cat $corepackages) + $(grep ^"name hyphen-.*" $db | cut -d' ' -f2 ) + $special_packages etoolbox - xcolor memoir - velthuis - wasy ptex platex revtex - uptex + ucs uplatex + uptex + velthuis + wasy + xcolor + xypic collection-basic collection-latex collection-metapost @@ -150,17 +149,23 @@ texmf_editions () { collection-langeuropean collection-langenglish collection-langfrench + collection-langgreek collection-langitalian collection-langpolish collection-langportuguese collection-langspanish collection-latexrecommended - $(collection_by_size fontsextra 70000 || exit 1) - $(collection_by_size publishers 10000 || exit 1) + $(collection_by_size fontsextra 70000 || exit 1) + $(collection_by_size latexextra 1000 || exit 1) + $(collection_by_size langchinese 5000 || exit 1) + $(collection_by_size langcjk 3000 || exit 1) + $(collection_by_size pictures 100000 || exit 1) + $(collection_by_size publishers 10000 || exit 1) " texmfget base # packages/collections and their dependencies for -extra PACKAGES=" + $(grep ^"name .*biblatex" $db | cut -d' ' -f2 ) amiri arabi arabi-add @@ -170,16 +175,17 @@ texmf_editions () { beamer2thesis beamertheme-detlevcm beamertheme-epyt + beamertheme-npbt beamertheme-saintpetersburg beebe bhcexam bxtexlogo - churchslavonic collection-fontsextra collection-langchinese collection-langcjk collection-langjapanese collection-langkorean + collection-pictures collection-publishers collection-texworks collection-wintools @@ -187,6 +193,7 @@ texmf_editions () { ctanify ctanupload dad + duckuments ethiop-t1 fibeamer fithesis @@ -214,8 +221,10 @@ texmf_editions () { pdfwin pdfx powerdot-tuliplab - powerdot-FUBerlin + powerdot-fuberlin quran + quran-de + realhats resumecls sanskrit-t1 sapthesis @@ -225,30 +234,28 @@ texmf_editions () { skaknew stellenbosch suanpan + texdoctk tudscr uantwerpendocs - ucs udesoftec universalis uowthesis - wasy2-ps + wasy-type1 xduthesis - xetexko + xetexko xq " texmfget extra || exit 1 - - # What's left, for base again + + # What's left, for base again PACKAGES=" collection-fontsrecommended collection-xetex collection-langcyrillic collection-langarabic collection-langgerman - collection-langgreek collection-langother collection-humanities collection-mathscience - collection-pictures collection-pstricks collection-music collection-games @@ -273,9 +280,9 @@ usage () { echo "-extra: remaining texfiles and docs" echo "[lint]: compare filename contents of all generated editions," echo " to detect overlapping files" - echo + echo echo "Only new/updated/missing tex packages are downloaded." - echo "The first run takes \"long\", tex packages(about 2500Mb)" + echo "The first run takes \"long\", tex packages(about 3Gb)" echo "need to be downloaded." echo "To check out a new version/release, delete" echo "$db" @@ -288,7 +295,7 @@ usage () { } collection_by_size () { - # from collection $1, pull packages smaller $2 bytes + # from collection $1, pull packages smaller $2 bytes start_n="$(grep -n ^"name collection-$1"$ $db | cut -d':' -f1)" # find end of package/collection for emptyline in $emptylines @@ -300,7 +307,7 @@ collection_by_size () { fi done extrapackages="$(sed "${start_n},${end_n}!d" $db | grep ^"depend " | grep -v ^"depend collection" | sed "s/^depend//g" )" - + # add if smaller than ... for checksize in $extrapackages do @@ -327,53 +334,48 @@ package_meta () { fi done # Don't handle collections as dependency of other collections - sed "${start_n},${end_n}!d;/^depend collection/d" $db > $texmf/$1.meta + sed "${start_n},${end_n}!d;/^depend collection/d" $db > $texmf/$1.meta fi } download () { # Download packages, if not already available. Not every packages has a corresponding .doc package. - # Try three times if package isn't present, with -t1 to get another mirror the second time - cd $texmf - if [ ! -s "${1}${flavour}.tar.xz" ] - then - for run in {1..10} - do - wget -t1 -c ${mirror}archive/${1}${flavour}.tar.xz - [ -s "${1}${flavour}.tar.xz" ] && break - done - fi - # If no success by downloading, write error log - [ ! -s ${1}${flavour}.tar.xz ] && echo "Downloading ${1}${flavour}.tar.xz did not work, writing to $errorlog" && echo "$VERSION" >> $errorlog && echo "Error downloading ${1}${flavour}.tar.xz" >> $errorlog && exit 1 - - # check sha512, give three tries for downloading again(diffrent mirrors are used automatically) + # Try multiple times if package isn't present or checksum fails + + unset checksum_ok if [ "$flavour" = ".doc" ] then sha512="$(grep ^doccontainerchecksum $texmf/$1.meta | cut -d' ' -f2 )" else sha512="$(grep ^containerchecksum $texmf/$1.meta | cut -d' ' -f2 )" fi - - for run in {1..10} + + cd $texmf + + for run in {1..8} do + [ ! -s "${1}${flavour}.tar.xz" ] && \ + wget -q --show-progress -t1 -c ${mirror}archive/${1}${flavour}.tar.xz + [ ! -s "${1}${flavour}.tar.xz" ] && continue if [ "$(sha512sum ${1}${flavour}.tar.xz | cut -d' ' -f1 )" != "$sha512" ] then - # Download (hopefully) newer file + echo "sha512sum of ${1}${flavour}.tar.xz doesn't match $texmf/$1.meta" + echo "deleting ${1}${flavour}.tar.xz" rm ${1}${flavour}.tar.xz - wget -t1 -c ${mirror}archive/${1}${flavour}.tar.xz else + checksum_ok=yes break fi done - # check sha512 again, exit if it fails - if [ "$(sha512sum ${1}${flavour}.tar.xz | cut -d' ' -f1 )" != "$sha512" ] + + # If no success by downloading, write error log + if [ -z "$checksum_ok" ] then - echo "sha512sum $(sha512sum ${1}${flavour}.tar.xz | cut -d' ' -f1 ) of" - echo "${package}${flavour}.tar.xz doesn't match with $db" - # delete metafile on failure to get generated again on next run, where new $db may be in use - rm $texmf/$1.meta - echo "sha512sum $sha512" - echo "Delete ${db}* to be current again, and try again." + echo "Downloading ${1}${flavour}.tar.xz or sh512sum check was not successful,\\ + writing to $errorlog" + echo "Delete ${db}* and try again." + echo "$VERSION" >> $errorlog + echo "Error downloading ${1}${flavour}.tar.xz" >> $errorlog exit 1 fi } @@ -384,10 +386,10 @@ untar () { then while read package do - echo "untar $package" + echo "untar $package$flavour" # untar all packages, check for relocation, "relocate 1" -> untar in texmf-dist download $package || exit 1 - # untar the tex package, relocate to texmf-dist if necessary, binpackages always need relocation + # untar package, relocate to texmf-dist if necessary, binary packages always need relocation relocated='.' [ -n "$(grep -w ^"relocated 1" $texmf/$package.meta)" -o -n "$(grep ^"binfiles " $texmf/$package.meta)" ] && relocated="texmf-dist" # if not .doc package, investigate files for dependencies/provides @@ -395,8 +397,9 @@ untar () { then tar xf ${package}${flavour}.tar.xz --exclude tlpkg -C $relocated || exit 1 else - #tar vxf ${package}${flavour}.tar.xz --exclude tlpkg -C $relocated - tar vxf ${package}${flavour}.tar.xz --exclude tlpkg -C $relocated | egrep '\.sty$|\.bbx$|\.cls$' > $texmf/$package.deps + tar vxf ${package}${flavour}.tar.xz \ + --exclude tlpkg/tlpobj \ + -C $relocated | grep -E '\.sty$|\.bbx$|\.cls$' > $texmf/$package.deps if [ -n "$texmf/$package.deps" ] then unset provide @@ -418,7 +421,6 @@ untar () { done if [ -n "$provide" ] then - #echo "$package $provide | sort -u | tr '\n' ',' " >> $TMP/provides.run.$edition echo "$package $provide" >> $TMP/provides.run.$edition fi if [ -n "$depends" ] @@ -429,64 +431,109 @@ untar () { fi # Delete binaries, these are provided - # by texlive.Slackbuild, keep symlinks and scripts - + # by the buildscript, keep symlinks and scripts + for arch in $platforms do if [ -d $texmf/texmf-dist/bin/$arch ] then - [ ! -d $texmf/texmf-dist/linked_scripts ] \ - && mkdir $texmf/texmf-dist/linked_scripts - # rewrite link target to fit systemwide installation + [ ! -d $texmf/texmf-dist/linked_scripts ] && \ + mkdir $texmf/texmf-dist/linked_scripts + # remove the unfortunate "man" link + [ -L "$texmf/texmf-dist/bin/$arch/man" ] && \ + rm $texmf/texmf-dist/bin/$arch/man for link in $(find $texmf/texmf-dist/bin/$arch -type l) do - ln -sf $(readlink $link | sed "s/^..\/..\(.*\)/..\/share\1/" ) $link || exit 1 + link_valid_dest=$texmf/texmf-dist/linked_scripts/${link##*/} + # move symlink to linked_scripts + mv $link $link_valid_dest + # some links have to dangle, because target binaries are coming from the buildscript + # fix SELFAUTOPARENT in some scripts + if [ -e "$link_valid_dest" ] + then + sed -i "s/kpsewhich -var-value=SELFAUTOPARENT/kpsewhich -var-value=TEXMFROOT/g" \ + $link_valid_dest || exit 1 + fi done - # move symlinks to linked_scripts - find $texmf/texmf-dist/bin/$arch -type l -exec mv '{}' $texmf/texmf-dist/linked_scripts/ \; - + # keep only binaries of special packages # remove xindy.mem(gzip compresses data) to prevent overwriting - for bin in $(find $texmf/texmf-dist/bin/$arch \ - -type f -exec file '{}' + | \ - grep -e "executable" -e "shared object" -e "gzip compressed data" | \ - grep -e ELF -e "gzip compressed data" | cut -f 1 -d : ) + for bin in $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + | \ + grep -e "executable" -e "shared object" -e ELF -e "gzip compressed data" | cut -f 1 -d : ) do for binary in $keep_precompiled do if [ "$(echo $bin | rev | cut -d'/' -f1 | rev)" != "$binary" ] then rm $bin + echo -n "$package:" >> $binary_removed.$edition echo $bin | rev | cut -d'/' -f1 | rev >> $binary_removed.$edition fi done done # move scripts to linked-scripts - scripts="$(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + | grep -wv ELF | cut -f 1 -d : )" - for script in $scripts + for script in \ + $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + |\ + grep -wv ELF | cut -f 1 -d : ) do + echo "Moving script/bin $script to $texmf/texmf-dist/linked_scripts/" mv $script $texmf/texmf-dist/linked_scripts/ done fi done + + for tlpkg_dir in $texmf/tlpkg $texmf/texmf-dist/tlpkg + do + if [ -d $tlpkg_dir ] + then + for bin in $(find $tlpkg_dir -type f -exec file '{}' + | \ + grep -e "executable" -e "shared object" -e ELF -e "gzip compressed data" | cut -f 1 -d : ) + do + echo "Deleting binary $bin found in $tlpkg_dir" + rm $bin + echo -n "$package:" >> $binary_removed.$edition + echo $bin | rev | cut -d'/' -f1 | rev >> $binary_removed.$edition + done + [ -d $tlpkg_dir/TeXLive ] && \ + mkdir -p $texmf/texmf-dist/scripts/texlive && \ + mv $tlpkg_dir/TeXLive $texmf/texmf-dist/scripts/texlive + fi + done if [ "$flavour" = ".doc" ] then - size=$(grep ^doccontainersize $texmf/$package.meta | cut -d' ' -f2) + size=$(grep ^doccontainersize $texmf/$package.meta | cut -d' ' -f2) else size=$(grep ^containersize $texmf/$package.meta | cut -d' ' -f2) + # add maps to updmap.cfg, don't add special_packages map files to -base + add_map=yes + if [ $edition = base ] + then + for no_map in $special_packages + do + [ $no_map = $package ] && add_map=no && break + done + fi + [ $add_map = yes ] && grep ^'execute ' $texmf/$package.meta | grep Map | cut -d' ' -f2- | sed "s/^add//g" >> $updmap.$edition fi shortdesc="$(grep ^shortdesc $texmf/$package.meta | cut -d' ' -f2- )" echo "$size byte, $package$flavour: $shortdesc" >> $output.meta # make index of uncompressed size of each package - echo "$(xz -l --verbose ${package}${flavour}.tar.xz | grep "Uncompressed size" | cut -d'(' -f2 | cut -d' ' -f1 ) byte, $package$flavour: $shortdesc" >> $output.meta.uncompressed + echo "$(xz -l --verbose ${package}${flavour}.tar.xz | grep "Uncompressed size" | \ + cut -d'(' -f2 | cut -d' ' -f1 ) byte, $package$flavour: $shortdesc" >> $output.meta.uncompressed done < $1 - - # copy packages index to texmf-dist, so included packages are known in later installation + + # add a path to updmap + if [ -s "$texmf/texmf-dist/linked_scripts/updmap" ] + then + sed -i '/unshift.*@INC.*/a unshift(@INC, "$TEXMFROOT/texmf-dist/scripts/texlive");' $texmf/texmf-dist/linked_scripts/updmap || exit 1 + fi + + # copy packages index to texmf-dist, to have a list of included packages in the final installation # don't list binary packages, as the binaries itself are not contained, only the symlinks. cat $output.meta | grep -v '\-linux:' >> $output.$edition.meta cat $output.meta.uncompressed | grep -v '\-linux:' >> $output.$edition.meta.uncompressed - + # cleanup [ -f $output.meta ] && rm $output.meta [ -f $output.meta.uncompressed ] && rm $output.meta.uncompressed @@ -494,27 +541,25 @@ untar () { } remove_cruft () { - # Remove m$-stuff, ConTeXt single-user-system stuff, source leftovers and pdf-versions of manpages - rm -rf texmf-dist/source - rm -rf texmf-dist/scripts/context/stubs/source/ - find texmf-dist/ -type d -name 'win32' -exec rm -rf {} + - find texmf-dist/ -type d -name 'win64' -exec rm -rf {} + - find texmf-dist/ -type d -name 'mswin' -exec rm -rf {} + - find texmf-dist/ -type d -name 'win' -exec rm -rf {} + - find texmf-dist/ -type d -name 'setup' -exec rm -rf {} + - find texmf-dist/ -type d -name 'install' -exec rm -rf {} + - find texmf-dist/ -type f -name 'uninstall*.sh' -delete - find texmf-dist/ -type f -name '*.bat' -delete - find texmf-dist/ -type f -name '*.bat.w95' -delete - find texmf-dist/ -type f -name '*win32*' -delete - find texmf-dist/ -type f -name 'winansi*' -delete - find texmf-dist/ -type f -name '*man1.pdf' -delete - find texmf-dist/ -type f -name '*man5.pdf' -delete - # Remove zero-length files, as these appear e.g. in hyph-utf8 tex-package. - # find texmf-dist/ -type f -size 0c -delete - find texmf-dist/ -type f -empty -delete - # Remove empty directories recursively - find texmf-dist/ -type d -empty -delete + # Remove m$-stuff, ConTeXt single-user-system stuff, empty files/directories and pdf-manpages + rm -rf $texmf/texmf-dist/source + rm -rf $texmf/texmf-dist/scripts/context/stubs/source/ + find $texmf/texmf-dist/ -type d -name 'win32' -exec rm -rf {} + + find $texmf/texmf-dist/ -type d -name 'win64' -exec rm -rf {} + + find $texmf/texmf-dist/ -type d -name 'mswin' -exec rm -rf {} + + find $texmf/texmf-dist/ -type d -name 'win' -exec rm -rf {} + + find $texmf/texmf-dist/ -type d -name 'setup' -exec rm -rf {} + + find $texmf/texmf-dist/ -type d -name 'install' -exec rm -rf {} + + find $texmf/texmf-dist/ -type f -name 'uninstall*.sh' -delete + find $texmf/texmf-dist/ -type f -name '*.bat' -delete + find $texmf/texmf-dist/ -type f -name '*.bat.w95' -delete + find $texmf/texmf-dist/ -type f -name '*.vbs' -delete + find $texmf/texmf-dist/ -type f -name '*win32*' -delete + find $texmf/texmf-dist/ -type f -name 'winansi*' -delete + find $texmf/texmf-dist/ -type f -name '*man1.pdf' -delete + find $texmf/texmf-dist/ -type f -name '*man5.pdf' -delete + find $texmf/texmf-dist/ -type f -empty -delete + find $texmf/texmf-dist/ -type d -empty -delete } texmfget () { @@ -524,12 +569,12 @@ texmfget () { # Remove outputfile if already present >$output >$output_doc - + # Only do something if $collection wasn't already done before while [ -s $collections_tobedone ] do collection=$(tail -n1 $collections_tobedone) - + # continue with next collection if collection was already done if [ -s "$collections_done" ] then @@ -545,40 +590,51 @@ texmfget () { continue fi fi - + package_meta $collection || exit 1 - + # If $collection is a singel package(not a collection-), add it here - if [ -n "$(head -n1 $texmf/$collection.meta | fgrep -v "name collection" )" ] + if [ -n "$(head -n1 $texmf/$collection.meta | grep -v "name collection" )" ] then - addpackage=no - # if package contains docs, add to docpackages + unset addpackage + # if package contains docs, add to docs-packages if [ -n "$(grep ^docfiles $texmf/$collection.meta)" ] then echo "$collection" >> $output_doc echo "$collection added to docs $1" >> $logfile - addpackage=yes + addpackage=yes fi - if [ -n "$(grep ^runfiles $texmf/$collection.meta)" -o -n "$(grep ^binfiles $texmf/$collection.meta)" ] + # if package contains runfiles, binfiles or depend, add to edition + if [ \ + -n "$(grep ^runfiles $texmf/$collection.meta)" -o \ + -n "$(grep ^binfiles $texmf/$collection.meta)" -o \ + -n "$(grep ^depend $texmf/$collection.meta)" \ + ] then echo "$collection" >> $output echo "$collection added to -$1" >> $logfile + addpackage=yes + fi + # if package contains only srcfiles, don't add to a edition + if [ -n "$(grep ^srcfiles $texmf/$collection.meta)" -a -z "$addpackage" ] + then + echo "$collection only contains srcfiles, added nowhere" >> $logfile addpackage=yes fi - # very package should be added to one edition, abort if that didn't work - if [ $addpackage = no ] + # abort if package seems broken + if [ -z "$addpackage" ] then - echo "$collection doesn't contain any docfiles/runfiles/binfiles" + echo "$collection doesn't contain any docfiles/runfiles/binfiles/depends or srcfiles" echo "Please exclude package/report to upstream mailinglist tex-live@tug.org, bye." exit 1 fi fi # Don't handle collections as dependency of other collections, as this destroys control over what packages to be added - # add dependend packages, but no binary(ARCH) and no packages conataining a '.'. Packges with dot indicate binary/texlive-manager/windows packages - + # add dependend packages, but no binary(ARCH) and no packages containing a '.'. Packges with dot indicate binary/texlive-manager/windows packages + grep ^"depend " $texmf/$collection.meta | cut -d' ' -f2- > $dependencies - + if [ -s "$dependencies" ] then # check for .ARCH packages which may be binaries, scripts or links @@ -586,7 +642,7 @@ texmfget () { for dependency in $(cat $dependencies) do echo $dependency | grep '\.ARCH'$ &>/dev/null - if [ $? = 0 ] + if [ $? = 0 ] then for arch in $platforms do @@ -629,7 +685,7 @@ texmfget () { cat $dependencies >> $collections_tobedone echo "----------------" >> $logfile fi - + sed -i "/^${collection}$/d" $collections_tobedone echo "$collection" >> $collections_done done @@ -642,13 +698,14 @@ texmfget () { if [ "$1" = $edition -o docs = $edition ] then cd $texmf - # Cleanup tar-directory [ -d $texmf/texmf-dist ] && rm -rf $texmf/texmf-dist mkdir $texmf/texmf-dist - - # Make tarball/checksum reproducible by setting mtime(clamp-mtime), owner, group and sort content - # --clamp-mtime --mtime doesn't work with tar 1.13, when makepkg creates the tarball: + + # Make tarball/checksum reproducible by setting mtime(clamp-mtime), + # owner, group and sort content. + # --clamp-mtime --mtime doesn't work with tar 1.13, + # when makepkg creates the tarball: # tar-1.13: time_t value 9223372036854775808 too large (max=68719476735) echo "Adding files to $( echo $tarball | rev | cut -d'/' -f1 | rev ) ..." case $edition in @@ -676,7 +733,7 @@ texmfget () { then untar $output_doc || exit 1 remove_cruft || exit 1 - #tar vrf $tarball --clamp-mtime --mtime --owner=0 --group=0 --sort=name texmf-dist || exit 1 + #tar vrf $tarball --clamp-mtime --mtime --owner=0 --group=0 --sort=name texmf-dist || exit 1 tar rf $tarball --owner=0 --group=0 --sort=name texmf-dist || exit 1 rm -rf texmf-dist fi @@ -687,7 +744,7 @@ texmfget () { lint () { -echo "Comparing content of all editions, this may take a while ..."; +echo "Comparing content of all editions, this may take a while ..." cd $TMP # check if all editions of same VERSION are there, take -base as reference lint_version=$( ls texlive-base-*tar.xz | head -n1 | cut -d'.' -f2 || exit 1) @@ -705,16 +762,15 @@ then for edition in base extra docs do >$TMP/packages.$edition.lint.dup - case $edition in - base) - echo "check if files of base are present in another edition" - while read line - do - grep ^"$line"$ $TMP/packages.extra.lint >> $TMP/packages.base.lint.dup - grep ^"$line"$ $TMP/packages.docs.lint >> $TMP/packages.base.lint.dup - done < $TMP/packages.$edition.lint - ;; - esac + if [ $edition = base ] + then + echo "check if files of base are present in another edition" + while read line + do + grep ^"$line"$ $TMP/packages.extra.lint >> $TMP/packages.base.lint.dup + grep ^"$line"$ $TMP/packages.docs.lint >> $TMP/packages.base.lint.dup + done < $TMP/packages.$edition.lint + fi done else echo "Not all editions are present to lint them. Create them first by" @@ -738,7 +794,6 @@ db=$TMP/texlive.tlpdb tmpfile=$TMP/tmpfile collections_done=$TMP/done collections_tobedone=$TMP/tobedone -corepackages=$TMP/corepackages allcollections=$TMP/allcollections binary_removed=$TMP/binaries.removed manpages=$TMP/manpages @@ -746,6 +801,7 @@ dependencies=$TMP/deps packages_base=$TMP/packages.base packages_extra=$TMP/packages.extra packages_manpages=$TMP/packages.manpages +updmap=$TMP/updmap.cfg files_split=$TMP/files.split platforms="x86_64-linux i386-linux" @@ -760,27 +816,28 @@ esac echo "Building $edition tarball ..." -# Set VERSION, get texlive.tlpdb and keep unshorten $db.orig +# Set VERSION, get texlive.tlpdb and keep unshorten $db.orig if [ ! -s ${db}.orig -o ! -s $db -o ! -s VERSION ] then echo $MAJORVERSION.$(date +%y%m%d) > VERSION - wget -c -O ${db}.orig ${mirror}tlpkg/texlive.tlpdb - # remove most content from $db to be faster on later processing. + #wget -q --show-progress -c -O ${db}.orig ${mirror}tlpkg/texlive.tlpdb + wget -q --show-progress -c -O ${db}.orig.xz ${mirror}tlpkg/texlive.tlpdb.xz + unxz ${db}.orig.xz + + # remove most content from $db to be faster on later processing. # keep dependencies/manpages/binfiles/shortdesc/sizes - egrep \ + grep -E \ '^\S|^ RELOC/doc/man|^ texmf-dist/doc/man/man|^ RELOC/doc/info/|^ texmf-dist/doc/info/|^ bin|^$' \ ${db}.orig | grep -v ^longdesc > $db - - # As $db (might be)/is new, remove the meta-files, might created again with (pontentionally) new content + + # As $db might be renewed, remove the all package meta-files + # to make them be created again based on (new) $db rm -rf $texmf/*.meta fi # Get linenumbers of empty lines from $db emptylines="$(grep -n ^$ $db | cut -d':' -f1)" -# Provide TLCore packages for -base, as these packages(and their dependencies) should be present in any case. -grep -B1 ^'category TLCore' $db | grep -v ^'category TLCore' | grep -v ^-- | grep -v '\.' | cut -d' ' -f2 > $corepackages - # Make a list of all collections grep ^"name collection-" $db | cut -d' ' -f2 > $allcollections @@ -796,12 +853,7 @@ do global_exclude=${global_exclude/$exclude/} fi done -# globally exclude from $corepackages -for exclude in $global_exclude -do - sed -i "/^${exclude}$/d" $corepackages -done - + VERSION=$(cat $TMP/VERSION) tarball=$TMP/texlive-$edition-$VERSION.tar # set logfile @@ -814,6 +866,7 @@ logfile=$TMP/$VERSION.log >$files_split >$manpages >$packages_manpages +>$updmap.$edition >$packages_base >$packages_extra >$packages_base.doc @@ -839,9 +892,8 @@ do fi done < $allcollections -# cleanup +# cleanup rm $allcollections -rm $corepackages rm $collections_done rm $collections_tobedone rm $output @@ -860,8 +912,8 @@ do if [ -z "$( grep ^"$package"$ $packages_base )" ] then echo "$package was not found to be part of -base" - echo "Edit \$special_packages in $0" - echo "to contain only packages from -base, bye." + echo "Edit \$special_packages in $0," + echo "it should contain only packages from -base, bye." exit 1 fi unset relocated @@ -870,7 +922,7 @@ do relocated="-C texmf-dist" && unset pathprefix # avoid big pdf docs which are also present as html # move (big)type1 fonts to -extra - # $files_split lists files to be moved from -base -extra + # $files_split lists files to be moved from -base to -extra if [ $package = "cm-super" ] then # cm-super minimal for -base, create index of extended cm-super @@ -904,7 +956,7 @@ do $output.base.meta.uncompressed rm -rf calculate fi - + if [ $edition = extra ] then mkdir -p calculate/texmf-dist @@ -913,7 +965,7 @@ do size_extended=$(du -bc calculate/calc.tar.xz | tail -n1 | sed "s/[[:space:]].*//") size_extended_uncompressed="$(xz -l --verbose calculate/calc.tar.xz | \ grep "Uncompressed size" | cut -d'(' -f2 | cut -d' ' -f1 )" - + # put new sizes in package index uncompressed sed -i \ -e "s/^[0-9]* byte, $package: /$size_extended byte, $package-extended: /" \ @@ -922,8 +974,15 @@ do -e "s/^[0-9]* byte, $package: /$size_extended_uncompressed byte, $package-extended: /" \ $output.extra.meta.uncompressed rm -rf calculate + + # put map files from splitted packages in -extra + mkdir meta_tmp + tar xf $texmf/${package}.tar.xz -C meta_tmp tlpkg/tlpobj/$package.tlpobj + grep ^'execute ' meta_tmp/tlpkg/tlpobj/$package.tlpobj | \ + grep Map | cut -d' ' -f2- | sed "s/^add//g" >> $updmap.$edition + rm -rf meta_tmp fi - + # untar to provide files for -extra tar xf $texmf/${package}.tar.xz $relocated $(paste $files_split.tmp) if [ $package = "cm-super" ] @@ -934,16 +993,15 @@ do for map in t1 t2a t2b t2c ts1 x2 do grep 1000 $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-$map.map \ - > $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-minimal-$map.map - sed -i "/.*1000\.pfb/d" $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-$map.map + > $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-minimal-$map.map + sed -i "/.*1000\.pfb/d" $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-$map.map done fi - done - # cleanup rm $files_split.tmp + # fix relocation in index for splitted packages sed -i \ -e "s|^doc|texmf-dist\/doc|g" \ @@ -953,19 +1011,19 @@ sed -i \ # sort meta data about added packages sort -n $output.$edition.meta > $tmpfile -mv $tmpfile $output.$edition.meta +mv $tmpfile $output.$edition.meta sort -n $output.$edition.meta.uncompressed > $tmpfile -mv $tmpfile $output.$edition.meta.uncompressed +mv $tmpfile $output.$edition.meta.uncompressed sort -u $binary_removed.$edition > $tmpfile mv $tmpfile $binary_removed.$edition -# include manpages/GNU infofiles in -base, write index for later exclution from other editions. +# include manpages/GNU infofiles in -base, write index for later exclusion from other editions. # In -extra/-docs there should not be any manpage left. echo "Looking for manpages/GNU infofiles to be included in -base ..." for package in $(paste -s $packages_base.doc | sort -u) do - if [ -n "$(egrep "(doc/man/man|doc/info/)" $texmf/$package.meta )" ] + if [ -n "$(grep -E "(doc/man/man|doc/info/)" $texmf/$package.meta )" ] then echo "Adding manpage from $package.doc to -base" flavour=".doc" download $package || exit 1 @@ -982,49 +1040,56 @@ do tar xf $texmf/${package}.doc.tar.xz $relocated $(paste $manpages.tmp) echo "$package" >> $packages_manpages fi -done +done # cleanup rm $manpages.tmp sed -i \ -e "s/^doc/texmf-dist\/doc/g" \ $manpages - + case $edition in - base) + base) # Content info cat << EOF | gzip -9 >> $texmf/texmf-dist/packages.$edition.gz Content of -$edition: $(sed "/-linux$/d" $packages_base | sort) EOF - # add texdoc cache file + # create texdoc cache file if [ $(command -v texdoc) ] then - mkdir -p $texmf/texmf-dist/tlpkg - mkdir -p texmf-dist/scripts/texdoc - ln -s ${db}.orig $texmf/texmf-dist/tlpkg/texlive.tlpdb + mkdir -p texmf-dist/scripts/texdoc || exit 1 TEXMFVAR=$texmf/texmf-dist \ - texdoc -lM texlive-en >/dev/null + texdoc -c texlive_tlpdb=$TMP/texlive.tlpdb.orig \ + -DlM texlive-en >/dev/null 2>&1 mv texmf-dist/texdoc/cache-tlpdb.lua \ - texmf-dist/scripts/texdoc/Data.tlpdb.lua - rm -rf $texmf/texmf-dist/tlpkg + texmf-dist/scripts/texdoc/Data.tlpdb.lua || exit 1 + # add cache to tarball + tar rf $tarball --owner=0 --group=0 --sort=name \ + texmf-dist/scripts/texdoc/Data.tlpdb.lua || exit 1 else - echo "WARNING: texdoc/texlive is not installed, the texdoc cache" + echo "WARNING: texdoc binary(comming with texlive) is not installed, the texdoc cache" echo "Data.tlpdb.lua can't be created and wont't be available." - echo "texdoc will not wotk without this." + echo "Texdoc will not wotk without this." echo "" echo "Continue with any key or abort with ctrl-c" read -n1 fi -#Splitted packages, type1 fonts/docs moved to -extra: -#$(echo $special_packages) -#EOF + # prepare updmap.cfg + tar xf $tarball texmf-dist/web2c/updmap.cfg + end_n="$(grep -n 'end of updmap-hdr' texmf-dist/web2c/updmap.cfg | cut -d':' -f1)" + + sed "1,${end_n}!d" texmf-dist/web2c/updmap.cfg > $TMP/updmap.cfg.tmp + cat $updmap.$edition >> $TMP/updmap.cfg.tmp + mv $TMP/updmap.cfg.tmp texmf-dist/web2c/updmap.cfg + tar f $tarball --delete texmf-dist/web2c/updmap.cfg + tar rf $tarball --owner=0 --group=0 --sort=name \ + texmf-dist/web2c/updmap.cfg # add manpages/GNU infofiles to the tarball tar rf $tarball --owner=0 --group=0 --sort=name \ texmf-dist/doc/man/ texmf-dist/doc/info/ \ texmf-dist/packages.$edition.gz \ - texmf-dist/scripts/texdoc/Data.tlpdb.lua \ || exit 1 # # add cm-super minimal maps/config # tar rf $tarball --owner=0 --group=0 --sort=name \ @@ -1035,8 +1100,8 @@ EOF tar f $tarball --delete $(paste $files_split) || exit 1 ;; extra) - echo "Removing manpages from $edition which now reside in -base" - tar f $tarball --delete $(paste $manpages) 2>/dev/null + echo "Removing manpages from $edition which now reside in -base" + tar f $tarball --delete $(paste $manpages) 2>/dev/null # content info echo "Content of -$edition, including documentation:" > $texmf/texmf-dist/packages.$edition sed "/-linux$/d" $TMP/packages.$edition | sort >> $texmf/texmf-dist/packages.$edition @@ -1044,7 +1109,11 @@ EOF # # remove cm-super minimal config, which resides in -base # rm \ # $texmf/texmf-dist/dvips/cm-super/config-minimal.cm-super \ -# $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-minimal-*.map +# $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-minimal-*.map + + # add -extra updmap.cfg + mkdir -p $texmf/texmf-dist/web2c + mv $updmap.$edition $texmf/texmf-dist/web2c tar rf $tarball --owner=0 --group=0 --sort=name \ --exclude texmf-dist/doc \ texmf-dist \ @@ -1060,12 +1129,13 @@ EOF texmf-dist/doc/ \ texmf-dist/packages.$edition.gz \ || exit 1 - echo "Removing manpages from $edition which now reside in -base" + echo "Removing manpages from $edition which now reside in -base" tar f $tarball --delete $(paste $manpages) || exit 1 ;; esac - + rm -rf texmf-dist +[ -f $updmap.$edition ] && rm $updmap.$edition # compress the tarball as everything is in place now echo "Compressing $tarball ..." diff --git a/office/texlive/slack-desc b/office/texlive/slack-desc index 4e573a1608..5feea19c55 100644 --- a/office/texlive/slack-desc +++ b/office/texlive/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| texlive: texlive (TeX binaries, support files, and formats) texlive: -texlive: This package contains binaries, support files, TeX formats and -texlive: packages,and other files included in the TeXLive TeX distribution. -texlive: Included are input files for TeX, runtime configuration files, +texlive: This package contains binaries, support files, TeX formats and +texlive: packages,and other files included in the TeXLive TeX distribution. +texlive: Included are input files for TeX, runtime configuration files, texlive: hyphenation tables, manpages, and the computer modern fonts. -texlive: -texlive: SlackBuilds.org has more texmf files and documentation in the +texlive: +texlive: SlackBuilds.org has more texmf files and documentation in the texlive: texlive-extra and texlive-docs packages. texlive: texlive: diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild index 527747254d..f33177ed05 100644 --- a/office/texlive/texlive.SlackBuild +++ b/office/texlive/texlive.SlackBuild @@ -2,7 +2,7 @@ # TeXLive build script for Slackware -# Copyright 2009, 2017 - 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2017 - 2020 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2009 - 2014 Robby Workman, Northport, AL, USA # Copyright 2016 - 2017 Johannes Schoepfer, Germany # All rights reserved. @@ -26,12 +26,12 @@ # URL: ftp://tug.org/historic/systems/texlive/ # Testrelease: ftp://tug.org/texlive/Images/test/ -# Upstream stable fixes: svn://tug.org/texlive/branches/branch2018/Build/source +# Upstream stable fixes: svn://tug.org/texlive/branches/branch2020/Build/source PRGNAM=texlive -SOURCEVERSION=20180414 -VERSION=${VERSION:-2018.180822} -BUILD=${BUILD:-1} +SOURCEVERSION=20200327 +VERSION=${VERSION:-2020.200608} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -60,6 +60,8 @@ else LIBDIRSUFFIX="" fi +TEXMFROOT=/usr/share + # NOTE: Using the system version of poppler will require texlive to be # recompiled with pretty much every poppler update, as they almost always # bump the shared library version. But sometimes you do what you have @@ -86,28 +88,13 @@ export LD_LIBRARY_PATH="$PKG/usr/lib${LIBDIRSUFFIX}:$LD_LIBRARY_PATH" # set TEXMFROOT and TEXMFLOCAL sed -i \ - -e 's|^TEXMFROOT.*|TEXMFROOT = $SELFAUTODIR/share|' \ - -e 's|^TEXMFLOCAL.*|TEXMFLOCAL = $TEXMFROOT/texmf-local|' \ + -e "s|^TEXMFROOT.*|TEXMFROOT = $TEXMFROOT|" \ + -e "s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" \ texk/kpathsea/texmf.cnf -# Upstream stable fixes -patch -Np0 -i $CWD/patches/20180625.diff || exit 1 -# Add missing synctex header -patch -Np0 -i $CWD/patches/synctex-missing-header.patch || exit 1 - # prevent compiling Xdvi with libXp sed -i 's|-lXp ||' texk/xdvik/configure -# Needed on -current, 2018-05-06 -# The 2018 version of texlive ships with support for poppler-0.57.0 and older, -# but it includes alternative newpoppler files which enable building with -# poppler-0.62.0 or newer. -#if [ ! "$SYSTEMPOPPLER" = "NO" ]; then -# mv -v texk/web2c/pdftexdir/pdftoepdf{-newpoppler,}.cc || exit 1 -# mv -v texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc || exit 1 -#fi - -# --with-system-harfbuzz requires graphite2 (and harfbuzz linked to it) mkdir build cd build CFLAGS="$SLKCFLAGS" \ @@ -129,6 +116,7 @@ cd build --disable-bibtexu \ --disable-xz \ --with-x \ + --disable-dvisvgm \ --enable-xindy \ --disable-xindy-docs \ --disable-xindy-rules \ @@ -155,7 +143,7 @@ cd build --build=$ARCH-slackware-linux || exit 1 make || exit 1 - # make check || exit 1 + #make check || exit 1 make install-strip DESTDIR=$PKG || exit 1 cd .. @@ -164,24 +152,32 @@ cd .. rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la # Remove all files which are covered by tlnet -rm -rf $PKG/usr/share $PKG/usr/man $PKG/usr/info +rm -rf $PKG$TEXMFROOT $PKG/usr/man $PKG/usr/info # install the tlnet stuff -mkdir -p $PKG/usr/share -tar xvf $CWD/texlive-base-$VERSION.tar.xz -C $PKG/usr/share || exit 1 +mkdir -p $PKG$TEXMFROOT +tar xvf $CWD/texlive-base-$VERSION.tar.xz -C $PKG$TEXMFROOT || exit 1 chown -R root:root $PKG chmod -R u+w,go-w,a+rX-st $PKG # use symlinks/scripts from tlnet -mv $PKG/usr/share/texmf-dist/linked_scripts/* $PKG/usr/bin -rmdir $PKG/usr/share/texmf-dist/linked_scripts +for link in $PKG$TEXMFROOT/texmf-dist/linked_scripts/* ;do \ + if [ -e "$link" ]; then + ln -sf $TEXMFROOT/texmf-dist/linked_scripts/bin/${link##*/} $PKG/usr/bin/${link##*/} + else + mv $link $PKG/usr/bin/${link##*/} + fi +done +mkdir -p $PKG$TEXMFROOT/texmf-dist/bin +mv $PKG$TEXMFROOT/texmf-dist/linked_scripts/* $PKG$TEXMFROOT/texmf-dist/bin +mv $PKG$TEXMFROOT/texmf-dist/bin $PKG$TEXMFROOT/texmf-dist/linked_scripts # set some paths sed -i \ - -e 's|^TEXMFROOT.*|TEXMFROOT = $SELFAUTODIR/share|' \ - -e 's|^TEXMFLOCAL.*|TEXMFLOCAL = $TEXMFROOT/texmf-local|' \ - -e 's|^OSFONTDIR.*|OSFONTDIR = ~/.fonts:/usr/share/fonts|' \ - $PKG/usr/share/texmf-dist/web2c/texmf.cnf + -e "s|^TEXMFROOT.*|TEXMFROOT = $TEXMFROOT|" \ + -e "s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" \ + -e "s|^OSFONTDIR.*|OSFONTDIR = ~/.fonts:/usr/share/fonts|" \ + $PKG$TEXMFROOT/texmf-dist/web2c/texmf.cnf # disable obsolete aleph/lamed/cslatex/pdfcslatex sed -i \ @@ -189,15 +185,13 @@ sed -i \ -e 's|^lamed|#! lamed|' \ -e 's|^cslatex|#! cslatex|' \ -e 's|^pdfcslatex|#! pdfcslatex|' \ - $PKG/usr/share/texmf-dist/web2c/fmtutil.cnf + $PKG$TEXMFROOT/texmf-dist/web2c/fmtutil.cnf -# make ConTeXt work, and remove unused settings +# make ConTeXt work sed -i \ - -e 's|selfautoparent:|/usr/share/|g' \ - -e 's|\(TEXMFLOCAL[ ]*=[ ]*\)[^,]*|\1"/usr/share/texmf-local"|' \ - -e '/selfautodir/d' \ - -e '/texmflocal/d' \ - $PKG/usr/share/texmf-dist/web2c/texmfcnf.lua + -e "s|selfautoparent:|$TEXMFROOT/|g" \ + -e "s|\(TEXMFLOCAL[ ]*=[ ]*\)[^,]*|\1\"$TEXMFROOT/texmf-local\"|" \ + $PKG$TEXMFROOT/texmf-dist/web2c/texmfcnf.lua # provide texlive fonts optionally for other system apps mkdir -p $PKG/etc/fonts/conf.avail @@ -205,8 +199,8 @@ cat > $PKG/etc/fonts/conf.avail/09-texlive.conf << EOF <?xml version='1.0'?> <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <fontconfig> - <dir>/usr/share/texmf-dist/fonts/opentype</dir> - <dir>/usr/share/texmf-dist/fonts/truetype</dir> + <dir>$TEXMFROOT/texmf-dist/fonts/opentype</dir> + <dir>$TEXMFROOT/texmf-dist/fonts/truetype</dir> </fontconfig> EOF @@ -214,36 +208,41 @@ EOF mkdir -p $PKG/usr/doc/texlive-$VERSION cp -a ChangeLog README* $PKG/usr/doc/texlive-$VERSION # Install index of provided tex packages to the docs -mv $PKG/usr/share/texmf-dist/packages.base.gz $PKG/usr/doc/texlive-$VERSION +mv $PKG$TEXMFROOT/texmf-dist/packages.base.gz $PKG/usr/doc/texlive-$VERSION -# Put a symlink to /usr/share/texmf-dist/doc in our Slackware docdir -ln -s ../../share/texmf-dist/doc $PKG/usr/doc/texlive-$VERSION/doc +# Put a symlink to $TEXMFROOT/texmf-dist/doc in our Slackware docdir +ln -sf $TEXMFROOT/texmf-dist/doc $PKG/usr/doc/texlive-$VERSION/doc # We won't make tlmgr easily available; it's still there, but # we'll make it harder to void the warranty :-) -rm -f $PKG/usr/bin/tlmgr +rm $PKG/usr/bin/tlmgr cat $CWD/README.tlpkg > $PKG/usr/doc/texlive-$VERSION/README.tlpkg # Create some directories to make it clear that they're owned by this package -mkdir -p $PKG/usr/share/{texmf-config,texmf-var,texmf-local} +mkdir -p $PKG$TEXMFROOT/{texmf-config,texmf-var,texmf-local} + +# Use patch for tabu.sty from https://github.com/tabu-fixed/tabu to fix +# breakage when compiling doxygen: +( cd $PKG$TEXMFROOT/texmf-dist/tex/latex/tabu + cat $CWD/patches/tabu.sty.diff | patch -p1 --verbose || exit 1 + ) || exit 1 -# Add some perl modules, at least one of which is required by updmap +# Add texlive perl modules mkdir -p $PKG/usr/share/perl5 -mv texk/tests/TeXLive $PKG/usr/share/perl5/ +mv $PKG$TEXMFROOT/texmf-dist/scripts/texlive/TeXLive $PKG/usr/share/perl5/ # Move manual pages to the correct place mkdir $PKG/usr/man -mv $PKG/usr/share/texmf-dist/doc/man/man1 $PKG/usr/man -mv $PKG/usr/share/texmf-dist/doc/man/man5 $PKG/usr/man -rmdir $PKG/usr/share/texmf-dist/doc/man -mv $PKG/usr/share/texmf-dist/doc/info $PKG/usr +mv $PKG$TEXMFROOT/texmf-dist/doc/man/man1 $PKG/usr/man +mv $PKG$TEXMFROOT/texmf-dist/doc/man/man5 $PKG/usr/man +rmdir $PKG$TEXMFROOT/texmf-dist/doc/man # Handle the man pages find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done # Handle the GNU info pages -rm -f $PKG/usr/info/dir +mv $PKG$TEXMFROOT/texmf-dist/doc/info $PKG/usr gzip -9 $PKG/usr/info/* mkdir -p $PKG/install diff --git a/office/texlive/texlive.info b/office/texlive/texlive.info index 616d092ddc..af079541e7 100644 --- a/office/texlive/texlive.info +++ b/office/texlive/texlive.info @@ -1,12 +1,12 @@ PRGNAM="texlive" -VERSION="2018.180822" -HOMEPAGE="http://tug.org/texlive/" -DOWNLOAD="http://mirrors.ctan.org/systems/texlive/Source/texlive-20180414-source.tar.xz \ - http://slackware.schoepfer.info/slackbuilds/texlive/2018/texlive/texlive-base-2018.180822.tar.xz" -MD5SUM="41d1e8874d266935c656fe51b440a413 \ - ad0cf3240342615167baf2c119bb3063" +VERSION="2020.200608" +HOMEPAGE="https://tug.org/texlive/" +DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/texlive-20200327-source.tar.xz \ + http://slackware.schoepfer.info/slackbuilds/texlive/texlive-base-2020.200608.tar.xz" +MD5SUM="02963bd8eae94b278407e86c9604e761 \ + 448c337b359fdfc44321cd7928176b74" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Johannes Schoepfer" -EMAIL="slackbuilds[at]schoepfer[dot]info" +EMAIL="slackbuilds@schoepfer.info" diff --git a/office/texmacs/texmacs.SlackBuild b/office/texmacs/texmacs.SlackBuild index d271c806f9..f8991c36b1 100644 --- a/office/texmacs/texmacs.SlackBuild +++ b/office/texmacs/texmacs.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Texmacs -# Copyright 2013-2018 Zhu Qun-Ying +# Copyright 2013-2020 Zhu Qun-Ying # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=texmacs -VERSION=${VERSION:-1.99.7} +VERSION=${VERSION:-1.99.17} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/texmacs/texmacs.info b/office/texmacs/texmacs.info index ca343e8111..34499bcafc 100644 --- a/office/texmacs/texmacs.info +++ b/office/texmacs/texmacs.info @@ -1,10 +1,10 @@ PRGNAM="texmacs" -VERSION="1.99.7" +VERSION="1.99.17" HOMEPAGE="http://www.texmacs.org" -DOWNLOAD="http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-1.99.7-src.tar.gz" -MD5SUM="39e6502cdb959b4bf6faea4764608809" +DOWNLOAD="https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-1.99.17-src.tar.gz" +MD5SUM="d04afa1984339e6db7872ea82e13370c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="guile1.8" MAINTAINER="Zhu Qun-Ying" -EMAIL="zhu.qunying at gmail dot com" +EMAIL="zhu.qunying@gmail.com" diff --git a/office/texmaker/texmaker.SlackBuild b/office/texmaker/texmaker.SlackBuild index 20bdda9aab..f2118f6a3c 100644 --- a/office/texmaker/texmaker.SlackBuild +++ b/office/texmaker/texmaker.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for texmaker -# Copyright 2013-2018 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2013-2020 Larry Hajali <larryhaja[at]gmail[dot]com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=texmaker -VERSION=${VERSION:-5.0.3} +VERSION=${VERSION:-5.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/texmaker/texmaker.info b/office/texmaker/texmaker.info index 8e1d8bda0e..2ef1173322 100644 --- a/office/texmaker/texmaker.info +++ b/office/texmaker/texmaker.info @@ -1,8 +1,8 @@ PRGNAM="texmaker" -VERSION="5.0.3" -HOMEPAGE="http://www.xm1math.net/texmaker/index.html" -DOWNLOAD="http://www.xm1math.net/texmaker/texmaker-5.0.3.tar.bz2" -MD5SUM="75beb11c4f5cfdd2a73dc5737cfcd61f" +VERSION="5.0.4" +HOMEPAGE="https://www.xm1math.net/texmaker/index.html" +DOWNLOAD="https://www.xm1math.net/texmaker/texmaker-5.0.4.tar.bz2" +MD5SUM="9e9676a300d0e5932c0172a1f732485c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" diff --git a/office/texstudio/texstudio.SlackBuild b/office/texstudio/texstudio.SlackBuild index 9b8dd61ef7..2065adb090 100644 --- a/office/texstudio/texstudio.SlackBuild +++ b/office/texstudio/texstudio.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for texstudio -# Copyright 2013-2018 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2013-2020 Larry Hajali <larryhaja[at]gmail[dot]com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=texstudio -VERSION=${VERSION:-2.12.14} +VERSION=${VERSION:-2.12.22} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/texstudio/texstudio.info b/office/texstudio/texstudio.info index 9b549d5fd5..6d6f70dbc4 100644 --- a/office/texstudio/texstudio.info +++ b/office/texstudio/texstudio.info @@ -1,8 +1,8 @@ PRGNAM="texstudio" -VERSION="2.12.14" +VERSION="2.12.22" HOMEPAGE="http://texstudio.sourceforge.net/" -DOWNLOAD="https://github.com/texstudio-org/texstudio/archive/2.12.14/texstudio-2.12.14.tar.gz" -MD5SUM="3bee209555bfa10f225a9ff56d6c62a4" +DOWNLOAD="https://github.com/texstudio-org/texstudio/archive/2.12.22/texstudio-2.12.22.tar.gz" +MD5SUM="7b586664a7490b411a5e0e9cc4e5ce87" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/texworks/texworks.SlackBuild b/office/texworks/texworks.SlackBuild index 7fb4fb4a7c..d62286ebfb 100644 --- a/office/texworks/texworks.SlackBuild +++ b/office/texworks/texworks.SlackBuild @@ -4,7 +4,7 @@ # Written by digwtx (wtx358@qq.com) # Updated by Willy Sudiarto Raharjo -# Copyright 2016 - 2017 Johannes Schoepfer +# Copyright 2016 - 2019 Johannes Schoepfer, Germany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=texworks -VERSION=${VERSION:-0.6.2} +VERSION=${VERSION:-0.6.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/texworks/texworks.info b/office/texworks/texworks.info index 7f44a787ed..cf0f75ddfe 100644 --- a/office/texworks/texworks.info +++ b/office/texworks/texworks.info @@ -1,10 +1,10 @@ PRGNAM="texworks" -VERSION="0.6.2" -HOMEPAGE="http://tug.org/texworks/" -DOWNLOAD="https://github.com/TeXworks/texworks/archive/release-0.6.2/texworks-release-0.6.2.tar.gz" -MD5SUM="0a7ef804e613255d099c62d1d69d788d" +VERSION="0.6.3" +HOMEPAGE="https://tug.org/texworks/" +DOWNLOAD="https://github.com/TeXworks/texworks/archive/release-0.6.3/texworks-release-0.6.3.tar.gz" +MD5SUM="bbdc620150fa5bda8bb52db0e6a533e9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="texlive" MAINTAINER="Johannes Schoepfer" -EMAIL="slackbuilds[at]schoepfer[dot]info" +EMAIL="slackbuilds@schoepfer.info" diff --git a/office/timetrap/timetrap.SlackBuild b/office/timetrap/timetrap.SlackBuild index 3751674657..eec7389ba8 100644 --- a/office/timetrap/timetrap.SlackBuild +++ b/office/timetrap/timetrap.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for timetrap -# Copyright 2013-2016 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2013-2021 Jostein Berntsen <jvbernts@online.no> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=timetrap -VERSION=${VERSION:-1.15.1} +VERSION=${VERSION:-1.15.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/timetrap/timetrap.info b/office/timetrap/timetrap.info index 0a31d07137..2541e17922 100644 --- a/office/timetrap/timetrap.info +++ b/office/timetrap/timetrap.info @@ -1,10 +1,10 @@ PRGNAM="timetrap" -VERSION="1.15.1" +VERSION="1.15.2" HOMEPAGE="https://github.com/samg/timetrap" -DOWNLOAD="http://rubygems.org/downloads/timetrap-1.15.1.gem" -MD5SUM="9774a155ed5a6f454739e397929b51dd" +DOWNLOAD="http://rubygems.org/downloads/timetrap-1.15.2.gem" +MD5SUM="c7c84dc593201b1764268ca46dc06c2c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="sequel4 sqlite3 chronic" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/timew/README b/office/timew/README new file mode 100644 index 0000000000..20d80ed8b6 --- /dev/null +++ b/office/timew/README @@ -0,0 +1,3 @@ +timew (a.k.a Timewarrior) is a command line time tracking application +which allows you to record time spent on activities. You may +be tracking your time for curiosity, or because your work requires it. diff --git a/office/timew/slack-desc b/office/timew/slack-desc new file mode 100644 index 0000000000..922f46bfa0 --- /dev/null +++ b/office/timew/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +timew: timew (command-line time tracker) +timew: +timew: Timewarrior is a command line time tracking application, which allows +timew: you to record time spent on activities. You may be tracking your time +timew: for curiosity, or because your work requires it. +timew: +timew: Home: https://taskwarrior.org/docs/timewarrior/ +timew: +timew: +timew: +timew: diff --git a/office/timew/timew.SlackBuild b/office/timew/timew.SlackBuild new file mode 100644 index 0000000000..94d61ca642 --- /dev/null +++ b/office/timew/timew.SlackBuild @@ -0,0 +1,100 @@ +#!/bin/sh -e +# Slackware build script for timewarrior +# Copyright <2019> <Christian Schneider> <Austria> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#Set initial variables +PRGNAM=timew +VERSION=${VERSION:-1.3.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \ + -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 {} \; + +# Build +cmake \ + -DCMAKE_BUILD_TYPE=release . \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr + +make clean +make +make install DESTDIR=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mv $PKG/usr/share/man $PKG/usr +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +find $PKG -depth -type d -empty -delete || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS CMakeLists.txt COPYING ChangeLog INSTALL LICENSE NEWS README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/timew/timew.info b/office/timew/timew.info new file mode 100644 index 0000000000..919edf0a31 --- /dev/null +++ b/office/timew/timew.info @@ -0,0 +1,10 @@ +PRGNAM="timew" +VERSION="1.3.0" +HOMEPAGE="https://timewarrior.net/" +DOWNLOAD="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v1.3.0/timew-1.3.0.tar.gz" +MD5SUM="06b08fb9f256818d95d6b9572333dfd9" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Christian Schneider" +EMAIL="christian_schneider@gmx.at" diff --git a/office/tnote/tnote.SlackBuild b/office/tnote/tnote.SlackBuild index bda3da73ed..f653f6f51e 100644 --- a/office/tnote/tnote.SlackBuild +++ b/office/tnote/tnote.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tnote -# Written by Jostein Berntsen <jbernts@broadpark.no> +# Written by Jostein Berntsen <jvbernts@online.no> PRGNAM=tnote diff --git a/office/tnote/tnote.info b/office/tnote/tnote.info index 31b030c351..006934824a 100644 --- a/office/tnote/tnote.info +++ b/office/tnote/tnote.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/todo.txt-cli/README b/office/todo.txt-cli/README new file mode 100644 index 0000000000..5dbb331bc2 --- /dev/null +++ b/office/todo.txt-cli/README @@ -0,0 +1,13 @@ +A simple and extensible shell script for managing your todo.txt file. + +After installing the package, copy the default config file to your home +directory and adjust it accordingly, otherwise todo.txt-cli will +misbehave: + +$ mkdir ~/.todo +$ cp /etc/todo.cfg ~/.todo/config +$ mkdir ~/todo + +Then edit ~/.todo/config: + +export TODO_DIR=/home/$USER/todo diff --git a/office/todo.txt-cli/slack-desc b/office/todo.txt-cli/slack-desc new file mode 100644 index 0000000000..ca569b6708 --- /dev/null +++ b/office/todo.txt-cli/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +todo.txt-cli: todo.txt-cli (CLI frontend for todo.txt) +todo.txt-cli: +todo.txt-cli: A simple and extensible shell script for managing your todo.txt file. +todo.txt-cli: +todo.txt-cli: +todo.txt-cli: +todo.txt-cli: +todo.txt-cli: +todo.txt-cli: +todo.txt-cli: +todo.txt-cli: diff --git a/office/todo.txt-cli/todo.txt-cli.SlackBuild b/office/todo.txt-cli/todo.txt-cli.SlackBuild new file mode 100644 index 0000000000..84b762ba9b --- /dev/null +++ b/office/todo.txt-cli/todo.txt-cli.SlackBuild @@ -0,0 +1,66 @@ +#!/bin/sh + +# Slackware build script for todo.txt-cli + +# Copyright 2021 toolonely <lonely_@tutanota.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=todo.txt-cli +VERSION=${VERSION:-2.12.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \ + -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 {} \; + +install -D -m 0644 todo.cfg $PKG/etc/todo.cfg +install -D -m 0755 todo.sh $PKG/usr/bin/todo.sh +install -D -m 0644 todo_completion $PKG/usr/share/bash-completion/completions/todo_completion + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + CHANGELOG.md LICENSE README.md USAGE.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/todo.txt-cli/todo.txt-cli.info b/office/todo.txt-cli/todo.txt-cli.info new file mode 100644 index 0000000000..aafacea2f3 --- /dev/null +++ b/office/todo.txt-cli/todo.txt-cli.info @@ -0,0 +1,10 @@ +PRGNAM="todo.txt-cli" +VERSION="2.12.0" +HOMEPAGE="https://github.com/todotxt/todo.txt-cli/" +DOWNLOAD="https://github.com/todotxt/todo.txt-cli/archive/v2.12.0/todo.txt-cli-2.12.0.tar.gz" +MD5SUM="e8d4edd8214b0d1df68667caa449a28c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="toolonely" +EMAIL="lonely_@tutanota.com" diff --git a/office/tpp/tpp.SlackBuild b/office/tpp/tpp.SlackBuild index ca39ac7d10..b7daafc0cf 100644 --- a/office/tpp/tpp.SlackBuild +++ b/office/tpp/tpp.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tpp -# Copyright 2016 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2016 Jostein Berntsen <jvbernts@online.no> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/office/tpp/tpp.info b/office/tpp/tpp.info index e37db1ec65..1802c0e903 100644 --- a/office/tpp/tpp.info +++ b/office/tpp/tpp.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ncurses-ruby" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/treesheets/treesheets.info b/office/treesheets/treesheets.info index 1cf26da34f..13ab017b69 100644 --- a/office/treesheets/treesheets.info +++ b/office/treesheets/treesheets.info @@ -2,9 +2,9 @@ PRGNAM="treesheets" VERSION="150616" HOMEPAGE="http://strlen.com/treesheets/" DOWNLOAD="http://strlen.com/treesheets/treesheets_linux.tar.gz" -MD5SUM="ca54da21fbdc1aa2146f5bf77bbb6687" +MD5SUM="2d33dd853c6470bf971a510b84889123" DOWNLOAD_x86_64="http://strlen.com/treesheets/treesheets_linux64.tar.gz" -MD5SUM_x86_64="1c2485fec9a564f222843a2df196eccd" +MD5SUM_x86_64="f8b4c2a0b93aece6e5a0189ffed0745f" REQUIRES="" -MAINTAINER="Luke Williams" -EMAIL="xocel@iquidus.org" +MAINTAINER="Glenn Becker" +EMAIL="glenn.becker@gmail.com" diff --git a/office/trello-cli/README b/office/trello-cli/README new file mode 100644 index 0000000000..1b35c117da --- /dev/null +++ b/office/trello-cli/README @@ -0,0 +1 @@ +trello-cli is a CLI tool for [Trello] diff --git a/office/trello-cli/slack-desc b/office/trello-cli/slack-desc new file mode 100644 index 0000000000..1263125f61 --- /dev/null +++ b/office/trello-cli/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +trello-cli: trello-cli (cli tool for trello) +trello-cli: +trello-cli: +trello-cli: trello-cli is a CLI tool for Trello +trello-cli: +trello-cli: +trello-cli: +trello-cli: +trello-cli: +trello-cli: +trello-cli: diff --git a/office/trello-cli/trello-cli.SlackBuild b/office/trello-cli/trello-cli.SlackBuild new file mode 100644 index 0000000000..28ac7ca532 --- /dev/null +++ b/office/trello-cli/trello-cli.SlackBuild @@ -0,0 +1,70 @@ +#!/bin/sh + +# Slackware build script for trello-cli + +# Copyright 2020 Tonus +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=trello-cli +VERSION=${VERSION:-0.3.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \ + -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 {} \; + +DESTDIR=$PKG npm install -g $CWD/$PRGNAM-$VERSION.tar.gz + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + LICENSE README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/trello-cli/trello-cli.info b/office/trello-cli/trello-cli.info new file mode 100644 index 0000000000..de6fc99a45 --- /dev/null +++ b/office/trello-cli/trello-cli.info @@ -0,0 +1,10 @@ +PRGNAM="trello-cli" +VERSION="0.3.2" +HOMEPAGE="https://github.com/mheap/trello-cli/" +DOWNLOAD="https://github.com/mheap/trello-cli/archive/v0.3.2/trello-cli-0.3.2.tar.gz" +MD5SUM="9e64954b61533d03f8184eddce836145" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="google-go-lang" +MAINTAINER="Tonus" +EMAIL="tonus1@gmail.com" diff --git a/office/tudu/tudu.SlackBuild b/office/tudu/tudu.SlackBuild index 947b42762a..93a828683c 100644 --- a/office/tudu/tudu.SlackBuild +++ b/office/tudu/tudu.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tudu -# Copyright 2016 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2016 Jostein Berntsen <jvbernts@online.no> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/office/tudu/tudu.info b/office/tudu/tudu.info index 6441844fc8..cfeaa7bedb 100644 --- a/office/tudu/tudu.info +++ b/office/tudu/tudu.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/turtl/README b/office/turtl/README new file mode 100644 index 0000000000..346e0182de --- /dev/null +++ b/office/turtl/README @@ -0,0 +1,9 @@ +Turtl is an online collaborative notebook, similar to Evernote. + +Organize and share your notes on this secure platform. All data is +encrypted locally and nothing clear is stored on the server. + +- Supports Markdown formatting and Tex Math rendering. +- Full text search, filter by tag and create/edit date sorting. +- Differente note types: text, bookmark, password, image and files +- Client-side cryptography to keep all of your data safe diff --git a/office/turtl/slack-desc b/office/turtl/slack-desc new file mode 100644 index 0000000000..f4eaa79489 --- /dev/null +++ b/office/turtl/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +turtl: turtl (A secure, collaborative notebook) +turtl: +turtl: Organize and share your notes on this secure platform. All data is +turtl: encrypted locally and nothing clear is stored on the server. +turtl: +turtl: - Supports Markdown formatting and Tex Math rendering. +turtl: - Full text search, filter by tag and create/edit date sorting. +turtl: - Differente note types: text, bookmark, password, image and files +turtl: - Client-side cryptography to keep all of your data safe +turtl: +turtl: https://turtlapp.com diff --git a/office/turtl/turtl.SlackBuild b/office/turtl/turtl.SlackBuild new file mode 100644 index 0000000000..451bc91110 --- /dev/null +++ b/office/turtl/turtl.SlackBuild @@ -0,0 +1,125 @@ +#!/bin/sh + +# Slackware build script for turtl + +# Copyright 2019 Jeff Parent <jeff+SBo@sh0.xyz> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=turtl +VERSION=${VERSION:-0.7.2.6} +SUFFIX=-pre-sync-fix +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +case "$( uname -m )" in + x86_64) + OS="linux64" + ARCH="x86_64" + ;; + i?86) + OS="linux32" + ARCH="i586" + ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +echo "Decompressing archive" +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION-$OS +tar xvf $CWD/$PRGNAM-$VERSION$SUFFIX-$OS.tar.bz2 +cd $PRGNAM-$OS +HERE=$(dirname $(readlink -e ./install.sh)) + +echo "Preparing pkg dir" +# Install +ROOT=$PKG/opt/turtl +BIN_DIR=$PKG/usr/bin +SHARE=$PKG/usr/share +DESKTOP_DIR=${SHARE}/applications +DESKTOP_FILE=${DESKTOP_DIR}/turtl.desktop +ICON_DIR=${SHARE}/icons/hicolor/128x128/apps +ICON_FILE=${ICON_DIR}/turtl.png +mkdir -p "${ROOT}" +mkdir -p "${BIN_DIR}" +mkdir -p "${SHARE}" +mkdir -p "${DESKTOP_DIR}" +mkdir -p "${ICON_DIR}" + +echo "Making Desktop file" +cat >${DESKTOP_FILE} <<EOF +[Desktop Entry] +Type=Application +Name=Turtl +GenericName=Secture notes +Comment=Private notes and bookmarks with collaboration. +Exec=${ROOT}/turtl +Path=${ROOT} +Icon=${ROOT}/icon.png +Terminal=false +Categories=Office;Utility; +Keywords=secure;security;privacy;private;notes;bookmarks;collaborate;research; +StartupNotify=true +EOF + +echo "Copying files" +pushd "${HERE}/turtl" > /dev/null +cp -R . ${ROOT} +chmod 755 ${ROOT} +pushd ${ROOT} >/dev/null +find . -type d -exec chmod 755 {} \; +find . -type f -exec chmod 644 {} \; +chmod 755 turtl +popd >/dev/null + +mkdir -p "$(dirname "${DESKTOP_FILE}")" +echo "${DESKTOP}" > "${DESKTOP_FILE}" +mkdir -p "${ICON_DIR}" +cp "${HERE}/turtl/icon.png" "${ICON_FILE}" + +ln -sf /opt/turtl/turtl ${BIN_DIR}/turtl + +echo "Setting permissions" +find "${ROOT}" -perm 700 -exec chmod 755 '{}' \; +find "${ROOT}" -perm 600 -exec chmod 644 '{}' \; + +echo "Stripping" +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +echo "Docs" +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat ${HERE}/turtl/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +echo "Install files" +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +echo "Making package" +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/turtl/turtl.info b/office/turtl/turtl.info new file mode 100644 index 0000000000..18041c6bd3 --- /dev/null +++ b/office/turtl/turtl.info @@ -0,0 +1,10 @@ +PRGNAM="turtl" +VERSION="0.7.2.6" +HOMEPAGE="https://turtlapp.com" +DOWNLOAD="https://github.com/turtl/desktop/releases/download/v0.7.2.6-pre-sync-fix/turtl-0.7.2.6-pre-sync-fix-linux32.tar.bz2" +MD5SUM="83f0727e4588dc6a59b5eb8b1c9b01e1" +DOWNLOAD_x86_64="https://github.com/turtl/desktop/releases/download/v0.7.2.6-pre-sync-fix/turtl-0.7.2.6-pre-sync-fix-linux64.tar.bz2" +MD5SUM_x86_64="f230de6e01bcdbe4ac38dfb0359a2b8a" +REQUIRES="" +MAINTAINER="Jeff Parent" +EMAIL="jeff+SBo@sh0.xyz" diff --git a/office/uncsv/README b/office/uncsv/README new file mode 100644 index 0000000000..ae0a234860 --- /dev/null +++ b/office/uncsv/README @@ -0,0 +1,11 @@ +uncsv (convert to or from CSV streams) + +uncsv is a filter command converting the lines of a CSV file into +non-escaped, non-quoted delimited file (pipe by default). This program +will error out if it encounters a character matching the delimiter, it +will also replace the carriage return and new-line characters found in +quoted values allowing you to use awk to play with your CSVs. + +csv is the opposite of this command. It takes an unquoted stream of +values, separated by the delimiter of your choice (default: pipe '|') +and produces a "standard" CSV file. diff --git a/office/uncsv/slack-desc b/office/uncsv/slack-desc new file mode 100644 index 0000000000..f53a93d44b --- /dev/null +++ b/office/uncsv/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +uncsv: uncsv (convert to or from CSV streams) +uncsv: +uncsv: uncsv is a filter command converting the lines of a CSV file into +uncsv: non-escaped, non-quoted delimited file (pipe by default). This program +uncsv: will error out if it encounters a character matching the delimiter, it +uncsv: will also replace the carriage return and new-line characters found in +uncsv: quoted values allowing you to use awk to play with your CSVs. +uncsv: +uncsv: csv is the opposite of this command. It takes an unquoted stream of +uncsv: values, separated by the delimiter of your choice (default: pipe '|') +uncsv: and produces a "standard" CSV file. diff --git a/office/uncsv/uncsv.SlackBuild b/office/uncsv/uncsv.SlackBuild new file mode 100644 index 0000000000..d78743520b --- /dev/null +++ b/office/uncsv/uncsv.SlackBuild @@ -0,0 +1,73 @@ +#!/bin/sh + +# Slackware build script for uncsv + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=uncsv +VERSION=${VERSION:-0.9.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +sed -i "s|-O2|$SLKCFLAGS|" configure + +# NOT a standard autoconf configure script, doesn't take all args. +./configure +make PREFIX=/usr LDFLAGS=-s +make PREFIX=$PKG/usr MANDEST=man install + +# same man page gets installed under 2 names +rm -f $PKG/usr/man/man1/csv.1 +gzip -9 $PKG/usr/man/man?/*.? +ln -s $PRGNAM.1.gz $PKG/usr/man/man1/csv.1.gz + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a ChangeLog* LICENSE* README* $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/uncsv/uncsv.info b/office/uncsv/uncsv.info new file mode 100644 index 0000000000..c940515871 --- /dev/null +++ b/office/uncsv/uncsv.info @@ -0,0 +1,10 @@ +PRGNAM="uncsv" +VERSION="0.9.1" +HOMEPAGE="https://tamentis.com/projects/uncsv/" +DOWNLOAD="https://tamentis.com/projects/uncsv/files/uncsv-0.9.1.tar.gz" +MD5SUM="35e68764e9933754a70ebc233e42c07f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/office/vmd/README b/office/vmd/README new file mode 100644 index 0000000000..d3404bf4f5 --- /dev/null +++ b/office/vmd/README @@ -0,0 +1,10 @@ +vmd (Terminal Markdown Viewer) + +Render markdown in a terminal! Why? Because although Markdown is still +readable as-is, if you use Markdown a lot, it's nice to have something to +render it with the proper formatting - with bold text and emphasis, etc. + +This package requires Markdown compiled with python3 support + +Also, this version is patched to ignore img tags, which make vmd fail +parsing certain markdown documents. diff --git a/office/vmd/slack-desc b/office/vmd/slack-desc new file mode 100644 index 0000000000..72cf8197ee --- /dev/null +++ b/office/vmd/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +vmd: vmd (Terminal Markdown Viewer) +vmd: +vmd: Render markdown in a terminal! Why? Because although Markdown is +vmd: still readable as-is, if you use Markdown a lot, it's nice to have +vmd: something to render it with the proper formatting - with bold text +vmd: and emphasis, etc. +vmd: +vmd: Homegage: https://github.com/cpascoe95/vmd +vmd: +vmd: +vmd: diff --git a/office/vmd/vmd.SlackBuild b/office/vmd/vmd.SlackBuild new file mode 100644 index 0000000000..20ad482a58 --- /dev/null +++ b/office/vmd/vmd.SlackBuild @@ -0,0 +1,93 @@ +#!/bin/sh + +# Slackware build script for vmd + +# Copyright 2019 Ricardo J. Barberis <ricardo.barberis@gmail.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=vmd +VERSION=${VERSION:-0.1.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \ + -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 {} \; + +# Fix required Markdown version +sed -i -e 's/Markdown==2.6.8/Markdown>=2.6.8, <3/' requirements.txt setup.py + +# Fix, or rather skip, img tags +patch -p1 < $CWD/vmd.img.patch + +python3 setup.py install --root=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + LICENSE README.md requirements.txt \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/vmd/vmd.img.patch b/office/vmd/vmd.img.patch new file mode 100644 index 0000000000..3747468550 --- /dev/null +++ b/office/vmd/vmd.img.patch @@ -0,0 +1,13 @@ +diff --git a/vmd/parser.py b/vmd/parser.py +index 2f4f992..df18d07 100644 +--- a/vmd/parser.py ++++ b/vmd/parser.py +@@ -81,6 +81,8 @@ class TreeBuilder(HTMLParser): + self.current_element.add_child(HorizontalRule()) + elif tag == 'blockquote': + self.new_element(tag, Blockquote()) ++ elif tag == 'img': ++ pass + else: + self.logger.warning('Unhandled tag type \'%s\' found in %s', tag, self.current_element.tag_ancestry()) + self.unknown_tag_stack.append(tag) diff --git a/office/vmd/vmd.info b/office/vmd/vmd.info new file mode 100644 index 0000000000..99926d8135 --- /dev/null +++ b/office/vmd/vmd.info @@ -0,0 +1,10 @@ +PRGNAM="vmd" +VERSION="0.1.1" +HOMEPAGE="https://github.com/cpascoe95/vmd" +DOWNLOAD="https://github.com/cpascoe95/vmd/archive/v0.1.1/vmd-0.1.1.tar.gz" +MD5SUM="5dba1bf366780eb2e6bd1ce87e664517" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="python3 Markdown" +MAINTAINER="Ricardo J. Barberis" +EMAIL="ricardo.barberis@gmail.com" diff --git a/office/watson/watson.SlackBuild b/office/watson/watson.SlackBuild index ca5e85b745..189bc9072a 100644 --- a/office/watson/watson.SlackBuild +++ b/office/watson/watson.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for watson -# Copyright 2017-2018 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2017-2019 Jostein Berntsen <jvbernts@online.no> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,11 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Written by Jostein Berntsen <jbernts@broadpark.no> +# Written by Jostein Berntsen <jvbernts@online.no> PRGNAM=watson SRCNAM=Watson -VERSION=${VERSION:-1.6.0} +VERSION=${VERSION:-1.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/watson/watson.info b/office/watson/watson.info index ca63339a7a..e710e56d13 100644 --- a/office/watson/watson.info +++ b/office/watson/watson.info @@ -1,10 +1,10 @@ PRGNAM="watson" -VERSION="1.6.0" +VERSION="1.8.0" HOMEPAGE="http://tailordev.github.io/Watson/" -DOWNLOAD="https://github.com/TailorDev/Watson/archive/1.6.0/Watson-1.6.0.tar.gz" -MD5SUM="6d6479915a19fd3143e27372fb27e219" +DOWNLOAD="https://github.com/TailorDev/Watson/archive/1.8.0.tar.gz" +MD5SUM="4352a8ae25a37270f30b1aa6e034fa1f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="arrow click" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/office/when/README b/office/when/README new file mode 100644 index 0000000000..0cfa8e4ce7 --- /dev/null +++ b/office/when/README @@ -0,0 +1,13 @@ +When is an extremely simple personal calendar program, aimed at the Unix +geek who wants something minimalistic. It can keep track of things you +need to do on particular dates. There are a lot of calendar and +"personal information manager" programs out there, so what reasons are +there to use When? + +- It's a very short and simple program, so you can easily tinker with it + yourself. +- It doesn't depend on any libraries, so it's easy to install. You + should be able to install it on any system where Perl is available, + even if you don't have privileges for installing libraries. +- Its file format is a simple text file, which you can edit in your + favorite editor. diff --git a/office/when/slack-desc b/office/when/slack-desc new file mode 100644 index 0000000000..66936e9cd1 --- /dev/null +++ b/office/when/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +when: when (an extremely simple personal calendar program) +when: +when: When is an extremely simple personal calendar program, aimed at the +when: Unix geek who wants something minimalistic. It can keep track of +when: things you need to do on particular dates. +when: +when: Homepage: http://www.lightandmatter.com/when/when.html +when: +when: +when: +when: diff --git a/office/when/when.SlackBuild b/office/when/when.SlackBuild new file mode 100644 index 0000000000..5e744b4b04 --- /dev/null +++ b/office/when/when.SlackBuild @@ -0,0 +1,71 @@ +#!/bin/sh + +# Slackware build script for when + +# Copyright 2020 Ján Sučan, Stará Turá, Slovakia +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified by slackbuilds.org + +PRGNAM=when +VERSION=${VERSION:-1.1.40} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \ + -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 {} \; + +make install DESTDIR=$PKG MANDIR=/usr/man/man1 +install -m 755 $PRGNAM $PKG/usr/bin/ + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/when/when.info b/office/when/when.info new file mode 100644 index 0000000000..4c116378af --- /dev/null +++ b/office/when/when.info @@ -0,0 +1,10 @@ +PRGNAM="when" +VERSION="1.1.40" +HOMEPAGE="http://www.lightandmatter.com/when/when.html" +DOWNLOAD="https://github.com/bcrowell/when/archive/1.1.40/when-1.1.40.tar.gz" +MD5SUM="970b4ec6b81dc35d7bb59211b1d0c8a1" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Ján Sučan" +EMAIL="jan@jansucan.com" diff --git a/office/wps-office/slack-desc b/office/wps-office/slack-desc index 6835588a52..c6ff3abf0e 100644 --- a/office/wps-office/slack-desc +++ b/office/wps-office/slack-desc @@ -15,5 +15,5 @@ wps-office: the documents created with Microsoft Office. wps-office: wps-office: wps-office: -wps-office: Homepage: http://www.wps.com/linux +wps-office: Homepage: https://linux.wps.com/ wps-office: diff --git a/office/wps-office/wps-office.SlackBuild b/office/wps-office/wps-office.SlackBuild index 1f1ef95ecc..878b6f3996 100644 --- a/office/wps-office/wps-office.SlackBuild +++ b/office/wps-office/wps-office.SlackBuild @@ -23,61 +23,53 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wps-office -VERSION=${VERSION:-10.1.0.6757} +VERSION=${VERSION:-11.1.0.9719.XA} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -ARCH=${ARCH:-$(uname -m)} -case "$ARCH" in - i?86) ARCH=i586; SRCARCH=x86 ;; - x86_64) SRCARCH=x86_64 ;; - *) echo "$ARCH is not supported"; exit 1 ;; -esac +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=x86_64 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +SRCVER=${VERSION} + +case "$ARCH" in + i?86) SRCARCH=i386 ;; + x86_64) SRCARCH=amd64 ;; + *) printf "\n\n$ARCH is not supported.\n"; exit 1 ;; +esac + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT - -SRCNAM=wps-office -SRCVER=_10.1.0.6757_$SRCARCH -DESTDIR=$PKG/opt/kingsoft - -mkdir -p $DESTDIR/$PRGNAM cd $TMP -tar xJvf $CWD/$PRGNAM$SRCVER.tar.xz -chown -R root:root $PRGNAM$SRCVER -find -L $PRGNAM$SRCVER \ +rm -rf $PRGNAM +mkdir -p $PRGNAM +cd $PRGNAM +ar -x $CWD/${PRGNAM}_${SRCVER}_${SRCARCH}.deb +tar xvf data.tar.xz -C $PKG +cd $PKG +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 {} \; -mkdir -p $PKG/usr/bin/ -install -D -m 0755 $PRGNAM$SRCVER/wps $PKG/usr/bin/wps -install -D -m 0755 $PRGNAM$SRCVER/wpp $PKG/usr/bin/wpp -install -D -m 0755 $PRGNAM$SRCVER/et $PKG/usr/bin/et - -mkdir -p $PKG/usr/share/applications -mv $PRGNAM$SRCVER/resource/applications/* $PKG/usr/share/applications - -mkdir -p $PKG/usr/share/icons -mv $PRGNAM$SRCVER/resource/icons/* $PKG/usr/share/icons - -mkdir -p $PKG/usr/share/mime -mv $PRGNAM$SRCVER/resource/mime/* $PKG/usr/share/mime - -mkdir -p $PKG/usr/share/licenses/$PRGNAM-$VERSION -install -D -m 0644 $PRGNAM$SRCVER/office6/mui/default/EULA.txt $PKG/usr/share/licenses/$PRGNAM-$VERSION/EULA.txt -mv $PRGNAM$SRCVER/office6 $DESTDIR/$PRGNAM +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $PRGNAM$SRCVER/README.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/wps-office/wps-office.info b/office/wps-office/wps-office.info index 71f2125154..c4ac2d04b9 100644 --- a/office/wps-office/wps-office.info +++ b/office/wps-office/wps-office.info @@ -1,10 +1,10 @@ PRGNAM="wps-office" -VERSION="10.1.0.6757" -HOMEPAGE="http://wps-community.org/" -DOWNLOAD="http://kdl.cc.ksosoft.com/wps-community/download/6757/wps-office_10.1.0.6757_x86.tar.xz" -MD5SUM="d327c8761ad79b125889ade867651f28" -DOWNLOAD_x86_64="http://kdl.cc.ksosoft.com/wps-community/download/6757/wps-office_10.1.0.6757_x86_64.tar.xz" -MD5SUM_x86_64="f51334a6f524b903eb396d6fe3782863" -REQUIRES="libpng-legacy12" +VERSION="11.1.0.9719.XA" +HOMEPAGE="https://linux.wps.com/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9719/wps-office_11.1.0.9719.XA_amd64.deb" +MD5SUM_x86_64="d53605b66a112f549ab87565547c0117" +REQUIRES="" MAINTAINER="Andre Fernando" EMAIL="ando344@gmail.com" diff --git a/office/x_x/README b/office/x_x/README new file mode 100644 index 0000000000..847f2f0e6f --- /dev/null +++ b/office/x_x/README @@ -0,0 +1,12 @@ +x_x (view Excel or CSV files in the terminal) + +x_x (The Dead Guy CLI) is a command line reader that displays either +Excel files or CSVs in your terminal. The purpose of this is to not +break the workflow of people who live on the command line and need to +access a spreadsheet generated using Microsoft Excel. + +By default, x_x is built for python2. If you have python3 installed +and would prefer to use it, run the script with 'export PYVER=3' in +the environment. There's apparently no functional difference in x_x +between the python 2 and 3 builds, although the python2 version emits +warnings about unicode_literals. diff --git a/office/x_x/git2tarxz.sh b/office/x_x/git2tarxz.sh new file mode 100644 index 0000000000..3fc5993f69 --- /dev/null +++ b/office/x_x/git2tarxz.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +# Create source tarball from git repo, with generated version +# number. + +# Note that this script doesn't need to be run as root. It does +# need to be able to write to the current directory it's run from. + +# Takes one optional argument, which is the commit or tag to create +# a tarball of. With no arg, HEAD is used. + +PRGNAM=x_x +CLONE_URL=https://github.com/krockode/x_x + +set -e + +GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX ) +rm -rf $GITDIR +git clone $CLONE_URL $GITDIR + +CWD="$( pwd )" +cd $GITDIR + +if [ "$1" != "" ]; then + git reset --hard "$1" || exit 1 +fi + +GIT_SHA=$( git rev-parse --short HEAD ) + +DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 ) + +VERSION=${DATE}_${GIT_SHA} + +rm -rf .git +find . -name .gitignore -print0 | xargs -0 rm -f + +cd "$CWD" +rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz +mv $GITDIR $PRGNAM-$VERSION +tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION + +echo +echo "Created tarball: $PRGNAM-$VERSION.tar.xz" +echo "VERSION=$VERSION" diff --git a/office/x_x/slack-desc b/office/x_x/slack-desc new file mode 100644 index 0000000000..233f66cba1 --- /dev/null +++ b/office/x_x/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +x_x: x_x (view Excel or CSV files in the terminal) +x_x: +x_x: x_x (The Dead Guy CLI) is a command line reader that displays either +x_x: Excel files or CSVs in your terminal. The purpose of this is to not +x_x: break the workflow of people who live on the command line and need to +x_x: access a spreadsheet generated using Microsoft Excel. +x_x: +x_x: +x_x: +x_x: +x_x: diff --git a/office/x_x/x_x.1 b/office/x_x/x_x.1 new file mode 100644 index 0000000000..fb7529c462 --- /dev/null +++ b/office/x_x/x_x.1 @@ -0,0 +1,184 @@ +.\" Man page generated from reStructuredText. +. +.TH X_X 1 "2020-11-15" "20150330_d236f8f" "SlackBuilds.org" +.SH NAME +x_x \- display Excel and CSV files on a terminal +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.\" RST source for x_x(1) man page. Convert with: +. +.\" rst2man.py x_x.rst > x_x.1 +. +.\" rst2man.py comes from the SBo development/docutils package. +. +.\" converting from pod: +. +.\" s/B<\([^>]*\)>/**\1**/g +. +.\" s/I<\([^>]*\)>/*\1*/g +. +.SH SYNOPSIS +.sp +x_x [\fB\-h\fP \fIrow\fP] [\fB\-f\fP \fIcsv|excel\fP] [\fB\-d\fP \fIdelimiter\fP] [\fB\-q\fP \fIquotechar\fP] [\fB\-e\fP \fIencoding\fP] +.SH DESCRIPTION +.sp +x_x (the Dead Guy CLI) is a command line reader that displays either +Excel files or CSVs in your terminal. The purpose of this is to not +break the workflow of people who live on the command line and need to +access a spreadsheet generated using Microsoft Excel. +.SH OPTIONS +.INDENT 0.0 +.TP +.B \fB\-h\fP, \fB\-\-heading\fP \fIrow\fP +Row number containing the headings (default: none). Note: the first row is +numbered 0, not 1! +.TP +.B \fB\-f\fP, \fB\-\-file\-type\fP \fIcsv|excel\fP +Override autodetection of input file type. +.TP +.B \fB\-d\fP, \fB\-\-delimiter\fP \fIcharacter\fP +Delimiter (only applicable to CSV files) [default: \(aq,\(aq]. +.TP +.B \fB\-q\fP, \fB\-\-quotechar\fP +Quote character (only applicable to CSV files) [default: \(aq"\(aq]. +.TP +.B \fB\-e\fP, \fB\-\-encoding\fP \fIencoding\fP +Encoding [default: UTF\-8]. +.TP +.B \fB\-\-version\fP +Show the version and exit. +.TP +.B \fB\-\-help\fP +Show built\-in help and exit. +.UNINDENT +.SH EXAMPLES +.sp +So, for example: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +$ x_x dead_guys.xlsx ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| A | B | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| Person | Age at Death | +| Harrold Holt | 59.0 | +| Harry Houdini | 52.0 | +| Howard Hughes | 70.0 | +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +Or to specify a specific row as the header which will be visible on each page: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +$ x_x \-h 0 dead_guys.xlsx ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| Person | Age at Death | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| Harrold Holt | 59.0 | +| Harry Houdini | 52.0 | +| Howard Hughes | 70.0 | +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +Weird CSVs? No problem! +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +$ cat dead_guys.csv +person;age_at_death +Harrold Holt;59 +Harry Houdini;52 +Howard Hughes;70 +|Not some guy, but just a string with ; in it|;0 +.ft P +.fi +.UNINDENT +.UNINDENT +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +$ x_x \-h 0 \-\-delimiter=\(aq;\(aq \-\-quotechar=\(aq|\(aq dead_guys.csv ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| person | age_at_death | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| Harrold Holt | 59 | +| Harry Houdini | 52 | +| Howard Hughes | 70 | +| Not some guy, but just a string with ; in it | 0 | +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +Does your CSV file not end in "csv"? Again, no problem: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +$ mv dead_guys.csv dead_guys.some_other_extension +$ x_x \-h 0 \-\-file\-type=csv \-\-delimiter=\(aq;\(aq \-\-quotechar=\(aq|\(aq dead_guys.some_other_extension ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| person | age_at_death | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| Harrold Holt | 59 | +| Harry Houdini | 52 | +| Howard Hughes | 70 | +| Not some guy, but just a string with ; in it | 0 | +.ft P +.fi +.UNINDENT +.UNINDENT +.SH COPYRIGHT +.sp +See the file /usr/doc/x_x\-20150330_d236f8f/LICENSE for license information. +.SH AUTHORS +.sp +x_x was written by krockode. +.sp +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. +.SH SEE ALSO +.sp +The x_x homepage: \fI\%https://github.com/krockode/x_x\fP +.\" Generated by docutils manpage writer. +. diff --git a/office/x_x/x_x.SlackBuild b/office/x_x/x_x.SlackBuild new file mode 100644 index 0000000000..9d1079939b --- /dev/null +++ b/office/x_x/x_x.SlackBuild @@ -0,0 +1,74 @@ +#!/bin/sh + +# Slackware build script for x_x + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=x_x +VERSION=${VERSION:-20150330_d236f8f} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# 20201115 bkw: at some point, Slackware's /usr/bin/python will be python3. +# This stuff can go away then. +case "${PYVER:-auto}" in + 2|3) ;; # use as-is + auto) PYVER=2; python3 -c 'import sys' 2>/dev/null && PYVER=3 ;; +esac + +python$PYVER setup.py install --root=$PKG + +# man page manually converted from README.rst by SlackBuild author. +mkdir -p $PKG/usr/man/man1 +gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE README* $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/x_x/x_x.info b/office/x_x/x_x.info new file mode 100644 index 0000000000..44ad3a8e67 --- /dev/null +++ b/office/x_x/x_x.info @@ -0,0 +1,10 @@ +PRGNAM="x_x" +VERSION="20150330_d236f8f" +HOMEPAGE="https://github.com/krockode/x_x" +DOWNLOAD="https://slackware.uk/~urchlay/src/x_x-20150330_d236f8f.tar.xz" +MD5SUM="ebde396990ac5197e59f658eafdecb76" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="six click python-xlrd python-unicodecsv" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/office/x_x/x_x.rst b/office/x_x/x_x.rst new file mode 100644 index 0000000000..8ff6e18a9b --- /dev/null +++ b/office/x_x/x_x.rst @@ -0,0 +1,143 @@ +.. RST source for x_x(1) man page. Convert with: +.. rst2man.py x_x.rst > x_x.1 +.. rst2man.py comes from the SBo development/docutils package. + +.. |version| replace:: 20150330_d236f8f +.. |date| date:: + +.. converting from pod: +.. s/B<\([^>]*\)>/**\1**/g +.. s/I<\([^>]*\)>/*\1*/g + +=== +x_x +=== + +----------------------------------------- +display Excel and CSV files on a terminal +----------------------------------------- + +:Manual section: 1 +:Manual group: SlackBuilds.org +:Date: |date| +:Version: |version| + +SYNOPSIS +======== + +x_x [**-h** *row*] [**-f** *csv|excel*] [**-d** *delimiter*] [**-q** *quotechar*] [**-e** *encoding*] + +DESCRIPTION +=========== + +x_x (the Dead Guy CLI) is a command line reader that displays either +Excel files or CSVs in your terminal. The purpose of this is to not +break the workflow of people who live on the command line and need to +access a spreadsheet generated using Microsoft Excel. + +OPTIONS +======= + +**-h**, **--heading** *row* + Row number containing the headings (default: none). Note: the first row is + numbered 0, not 1! + +**-f**, **--file-type** *csv|excel* + Override autodetection of input file type. + +**-d**, **--delimiter** *character* + Delimiter (only applicable to CSV files) [default: ',']. + +**-q**, **--quotechar** + Quote character (only applicable to CSV files) [default: '"']. + +**-e**, **--encoding** *encoding* + Encoding [default: UTF-8]. + +**--version** + Show the version and exit. + +**--help** + Show built-in help and exit. + +EXAMPLES +======== + +So, for example: + +:: + + $ x_x dead_guys.xlsx + +---------------+--------------+ + | A | B | + +---------------+--------------+ + | Person | Age at Death | + | Harrold Holt | 59.0 | + | Harry Houdini | 52.0 | + | Howard Hughes | 70.0 | + +Or to specify a specific row as the header which will be visible on each page: + +:: + + $ x_x -h 0 dead_guys.xlsx + +---------------+--------------+ + | Person | Age at Death | + +---------------+--------------+ + | Harrold Holt | 59.0 | + | Harry Houdini | 52.0 | + | Howard Hughes | 70.0 | + +Weird CSVs? No problem! + +:: + + $ cat dead_guys.csv + person;age_at_death + Harrold Holt;59 + Harry Houdini;52 + Howard Hughes;70 + |Not some guy, but just a string with ; in it|;0 + +:: + + $ x_x -h 0 --delimiter=';' --quotechar='|' dead_guys.csv + +----------------------------------------------+--------------+ + | person | age_at_death | + +----------------------------------------------+--------------+ + | Harrold Holt | 59 | + | Harry Houdini | 52 | + | Howard Hughes | 70 | + | Not some guy, but just a string with ; in it | 0 | + +Does your CSV file not end in "csv"? Again, no problem: + +:: + + $ mv dead_guys.csv dead_guys.some_other_extension + $ x_x -h 0 --file-type=csv --delimiter=';' --quotechar='|' dead_guys.some_other_extension + +----------------------------------------------+--------------+ + | person | age_at_death | + +----------------------------------------------+--------------+ + | Harrold Holt | 59 | + | Harry Houdini | 52 | + | Howard Hughes | 70 | + | Not some guy, but just a string with ; in it | 0 | + +COPYRIGHT +========= + +See the file /usr/doc/x_x-|version|/LICENSE for license information. + +AUTHORS +======= + +x_x was written by krockode. + +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. + +SEE ALSO +======== + +The x_x homepage: https://github.com/krockode/x_x diff --git a/office/xlsx2csv/README b/office/xlsx2csv/README new file mode 100644 index 0000000000..b74d5b813f --- /dev/null +++ b/office/xlsx2csv/README @@ -0,0 +1,4 @@ +Converts xlsx files to csv format. Handles large XLSX files. Fast and +easy to use. + +Python3 is an optional autodetected dependency diff --git a/office/org-mode/slack-desc b/office/xlsx2csv/slack-desc index 93d6f3ab85..67694ec6f9 100644 --- a/office/org-mode/slack-desc +++ b/office/xlsx2csv/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -org-mode: org-mode ("An Emacs mode for Notes, Project Planning, and Authoring") -org-mode: -org-mode: Org-mode is for keeping notes, maintaining ToDo lists, doing project -org-mode: planning, and authoring with a fast and effective plain-text system. -org-mode: -org-mode: -org-mode: -org-mode: -org-mode: Org-mode home page is: https://orgmode.org -org-mode: -org-mode: +xlsx2csv: xlsx2csv (xlsx to csv converter) +xlsx2csv: +xlsx2csv: Converts xlsx files to csv format. Handles large XLSX files. Fast and +xlsx2csv: easy to use. +xlsx2csv: +xlsx2csv: +xlsx2csv: +xlsx2csv: +xlsx2csv: +xlsx2csv: Homepage: https://github.com/dilshod/xlsx2csv +xlsx2csv: diff --git a/office/xlsx2csv/xlsx2csv.SlackBuild b/office/xlsx2csv/xlsx2csv.SlackBuild new file mode 100644 index 0000000000..491b6b30c4 --- /dev/null +++ b/office/xlsx2csv/xlsx2csv.SlackBuild @@ -0,0 +1,98 @@ +#!/bin/sh + +# Slackware build script for xlsx2csv + +# Copyright 2020 Leonardo Citrolo, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=xlsx2csv +VERSION=${VERSION:-0.7.4} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \ + -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 {} \; + +python setup.py install --root=$PKG + +# Python 3 support. +if $(python3 -c 'import sys' 2>/dev/null); then + python3 setup.py install --root=$PKG +fi + +make -C man +mkdir -p $PKG/usr/man/man1 +cp -a man/$PRGNAM.1 $PKG/usr/man/man1 + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG COPYING LICENSE.txt README \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/xlsx2csv/xlsx2csv.info b/office/xlsx2csv/xlsx2csv.info new file mode 100644 index 0000000000..93bf25627d --- /dev/null +++ b/office/xlsx2csv/xlsx2csv.info @@ -0,0 +1,10 @@ +PRGNAM="xlsx2csv" +VERSION="0.7.4" +HOMEPAGE="https://github.com/dilshod/xlsx2csv" +DOWNLOAD="https://github.com/dilshod/xlsx2csv/archive/0.7.4/xlsx2csv-0.7.4.tar.gz" +MD5SUM="c1fb8b22936bfb696158fba9bc0fae2e" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Leo C." +EMAIL="leoc@gmx.com" diff --git a/office/xournal/xournal.SlackBuild b/office/xournal/xournal.SlackBuild index a74ddd439a..195f68fdee 100644 --- a/office/xournal/xournal.SlackBuild +++ b/office/xournal/xournal.SlackBuild @@ -2,9 +2,10 @@ # Slackware build script for xournal # Written by Michael Filz <the_emmel@gmx.net> +# Updated by Rob van Nues <sborg63@disroot.org> PRGNAM=xournal -VERSION=${VERSION:-0.4.7} +VERSION=${VERSION:-0.4.8.2016} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/xournal/xournal.info b/office/xournal/xournal.info index eac8134ee0..270db3bcc2 100644 --- a/office/xournal/xournal.info +++ b/office/xournal/xournal.info @@ -1,10 +1,10 @@ PRGNAM="xournal" -VERSION="0.4.7" -HOMEPAGE="http://xournal.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/xournal/xournal-0.4.7.tar.gz" -MD5SUM="ad3e8e6c3a8c707e777806bca05c0cd1" +VERSION="0.4.8.2016" +HOMEPAGE="https://sourceforge.net/p/xournal/wiki/Home/" +DOWNLOAD="https://downloads.sourceforge.net/xournal/xournal-0.4.8.2016.tar.gz" +MD5SUM="a594f475d9b93fbca0aac43d47c2de22" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libgnomecanvas" -MAINTAINER="Michael Filz" -EMAIL="the_emmel@gmx.net" +MAINTAINER="Rob van Nues" +EMAIL="sborg63@disroot.org" diff --git a/office/xournalpp/README b/office/xournalpp/README new file mode 100644 index 0000000000..4ce93bed43 --- /dev/null +++ b/office/xournalpp/README @@ -0,0 +1,7 @@ +Xournal++ is a handwriting notetaking software with PDF annotation +support. Written in C++ with GTK3, supporting Linux (e.g. Ubuntu, +Debian, Arch, Suse), macOS and Windows 10. + +Supports pen input from devices such as Wacom Tablets. + +texlive is an optional dependency. diff --git a/office/xournalpp/doinst.sh b/office/xournalpp/doinst.sh new file mode 100644 index 0000000000..65c7e2eeb9 --- /dev/null +++ b/office/xournalpp/doinst.sh @@ -0,0 +1,9 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/office/xournalpp/slack-desc b/office/xournalpp/slack-desc new file mode 100644 index 0000000000..36aa17fbd4 --- /dev/null +++ b/office/xournalpp/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +xournalpp: xournalpp (handwriting software) +xournalpp: +xournalpp: Xournal++ is a handwriting notetaking software with PDF annotation +xournalpp: support. +xournalpp: Written in C++ with GTK3, supporting Linux (e.g. Ubuntu, Debian, +xournalpp: Arch, Suse), macOS and Windows 10. +xournalpp: Supports pen input from devices such as Wacom Tablets. +xournalpp: +xournalpp: Homepage: https://github.com/xournalpp/xournalpp +xournalpp: +xournalpp: diff --git a/office/xournalpp/xournalpp.SlackBuild b/office/xournalpp/xournalpp.SlackBuild new file mode 100644 index 0000000000..c53c6c6626 --- /dev/null +++ b/office/xournalpp/xournalpp.SlackBuild @@ -0,0 +1,100 @@ +#!/bin/sh + +# Slackware build script for xournalpp + +# Copyright (c) 2019 Cristiano Urban, Gonars, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=xournalpp +VERSION=${VERSION:-1.0.20} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \ + -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 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_BUILD_TYPE=Release .. + cmake --build . --target pot + cmake --build . --target translations + cmake --build . + make install DESTDIR=$PKG +cd .. + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +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} diff --git a/office/xournalpp/xournalpp.info b/office/xournalpp/xournalpp.info new file mode 100644 index 0000000000..912713d561 --- /dev/null +++ b/office/xournalpp/xournalpp.info @@ -0,0 +1,10 @@ +PRGNAM="xournalpp" +VERSION="1.0.20" +HOMEPAGE="https://github.com/xournalpp/xournalpp" +DOWNLOAD="https://github.com/xournalpp/xournalpp/archive/1.0.20/xournalpp-1.0.20.tar.gz" +MD5SUM="88376d2584dda7ba9c46733b706139bc" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="graphviz lua portaudio" +MAINTAINER="Cristiano Urban" +EMAIL="cristiano.urban.slack@gmail.com" diff --git a/office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild b/office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild index 76d6f5d09b..e9c0d17097 100644 --- a/office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild +++ b/office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild @@ -8,7 +8,7 @@ PRGNAM=zathura-pdf-mupdf VERSION=${VERSION:-0.3.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -40,6 +40,15 @@ fi set -e +if [ ! -d /opt/mupdf-legacy ]; then + echo "*** Missing required dependency 'mupdf-legacy'" 1>&2 + exit 1 +fi + +# Use old libs/headers. Works even if a newer mupdf is installed in /usr. +PKG_CONFIG_PATH=/opt/mupdf-legacy/lib$LIBDIRSUFFIX/pkgconfig:$PKG_CONFIG_PATH +export PKG_CONFIG_PATH + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -47,11 +56,8 @@ 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 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -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 {} \+ # Upstream left the README out of the release tarball for some reason. cat $CWD/upstream.README > README @@ -61,11 +67,12 @@ cat $CWD/upstream.README > README sed -i \ -e "s,-fPIC,$SLKCFLAGS," \ -e '/^MUPDF_LIB/s,-.*,$(shell pkg-config --libs mupdf),' \ + -e '/^INCS/s,= ,&$(shell pkg-config --cflags mupdf) ,' \ config.mk PLUGDIR=/usr/lib$LIBDIRSUFFIX/zathura -make +make VERBOSE=1 strip *.so make install DESTDIR=$PKG PLUGINDIR="$PLUGDIR/pdf-mupdf" diff --git a/office/zathura-pdf-mupdf/zathura-pdf-mupdf.info b/office/zathura-pdf-mupdf/zathura-pdf-mupdf.info index 61fee92bf3..eb8961c45d 100644 --- a/office/zathura-pdf-mupdf/zathura-pdf-mupdf.info +++ b/office/zathura-pdf-mupdf/zathura-pdf-mupdf.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/pwmt/zathura-pdf-mupdf/archive/0.3.2/zathura-pdf-mu MD5SUM="b9659efbc5c04c06c5e986248d3dec19" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="mupdf zathura" +REQUIRES="mupdf-legacy zathura" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" diff --git a/office/zim/README b/office/zim/README index 438f131310..1d303ff71e 100644 --- a/office/zim/README +++ b/office/zim/README @@ -1,18 +1,25 @@ -Zim is a graphical text editor used to maintain a collection of wiki pages. -Each page can contain links to other pages, simple formatting and images. -Pages are stored in a folder structure, like in an outliner, and can have -attachments. Creating a new page is as easy as linking to a nonexistent page. -All data is stored in plain text files with wiki formatting. Various plugins -provide additional functionality, like a task list manager, an equation -editor, a tray icon, and support for version control. +Zim aims to bring the concept of a wiki to your desktop. Every page is +saved as a text file with wiki markup. Pages can contain links to other +pages, and are saved automatically. Creating a new page is as easy as +linking to a non-existing page. This tool is intended to keep track of +TODO lists or to serve as a personal scratch book. But it will also +serve you when writing longer and more complicated documents. -Zim can be used to: -* Keep an archive of notes -* Take notes during meetings or lectures -* Organize task lists -* Draft blog entries and emails -* Do brainstorming +A "desktop wiki" means that we try to capture the idea of a wiki, not +as a webpage but as a collection of files on your local file system +that can be edited with a GUI application. The main focus is a kind +of personal wiki that serves for all kind of notes: todo-lists, +addresses, brainstorm ideas etc. -Optional Dependencies: -* pyxdg - Provides further freedesktop.org standard support -* See README.Plugins for a list of optional dependencies for plugins +But we want to go further then just a wiki filled with random content. +It should also be possible to use you random notes as the basis for +more structured data: articles, presentations etc. Zim will not include +tools to layout a presentation or something like that, you should use +your office suite of choice for that, but it should be a tool that can +deliver all the content for a presentation in a form that only needs a +template and some layout before usage. Therefore certain features +normally not found in wikis will be added. + +NOTE: Zim can be expanded with plugins. From 'preferences' go to +'plugins' and anything marked 'failed' can be installed either +from SBo or pip. These aren't dependencies; Zim runs without them. diff --git a/office/zim/README.Plugins b/office/zim/README.Plugins deleted file mode 100644 index c372fc051a..0000000000 --- a/office/zim/README.Plugins +++ /dev/null @@ -1,10 +0,0 @@ -This file lists Zim plugins that require optional dependencies to -function. Plugins that work out of the box with Slackware are not -listed. Plugins that require a dependency unavailable from -SlackBuilds.org are not listed either. - -* Insert Diagram: Graphviz -* Insert Score: lilypond -* Link Map: Graphviz -* Source View: pygtksourceview -* Spell Checker: pygtkspell diff --git a/office/zim/doinst.sh b/office/zim/doinst.sh index 9a8ded3c60..aea0f894eb 100644 --- a/office/zim/doinst.sh +++ b/office/zim/doinst.sh @@ -5,3 +5,9 @@ fi if [ -x /usr/bin/update-mime-database ]; then /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/office/zim/slack-desc b/office/zim/slack-desc index f854aa4fb8..271522b845 100644 --- a/office/zim/slack-desc +++ b/office/zim/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -zim: zim (Desktop wiki editor) +zim: zim (A Desktop Wiki Editor) zim: -zim: Zim is a graphical text editor and organizer with wiki-like features -zim: such as linking to other pages in a notebook. Zim stores data in -zim: plain text for simplicity and transparency. -zim: -zim: Among other uses, zim can be effective for brainstorming, -zim: note-taking, and making task lists. +zim: Zim aims to bring the concept of a wiki to your desktop. Every page +zim: is saved as a text file with wiki markup. Pages can contain links to +zim: other pages, and are saved automatically. Creating a new page is as +zim: easy as linking to a non-existing page. This tool is intended to keep +zim: track of TODO lists or to serve as a personal scratch book. But it +zim: will also serve you when writing longer and more complicated +zim: documents. zim: zim: Homepage: http://zim-wiki.org/ -zim: diff --git a/office/zim/zim.SlackBuild b/office/zim/zim.SlackBuild index c924515c04..ef669825e0 100644 --- a/office/zim/zim.SlackBuild +++ b/office/zim/zim.SlackBuild @@ -2,8 +2,9 @@ # Slackware build script for zim -# Copyright 2013 Michael Ren <micron33@gmail.com> +# Copyright 2019-2021 Andrew Payne <phalange@komputermatrix.com> # Copyright 2015-2017 Brenton Earl <brent@exitstatusone.com> +# Copyright 2013 Michael Ren <micron33@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=zim -VERSION=${VERSION:-0.68} +VERSION=${VERSION:-0.73.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -41,7 +42,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="CHANGELOG.txt LICENSE.txt PKG-INFO README.txt" +DOCS="CHANGELOG.md CONTRIBUTING.md LICENSE PLUGIN_WRITING.md README.md" if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -70,23 +71,23 @@ 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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# zim's setup.py subclasses distutil's install class, adding a flag to disable -# running update-desktop-database and update-mime-database during the install -# ("automation"), hence --skip-xdg-cmd -python setup.py install --root=$PKG --skip-xdg-cmd +./setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mv $PKG/usr/share/man $PKG/usr +mv $PKG/usr/share/man $PKG/usr/ + find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +mkdir -p $PKG/usr/share/icons +cp -r xdg/hicolor/ $PKG/usr/share/icons/ + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/README.Plugins > $PKG/usr/doc/$PRGNAM-$VERSION/README.Plugins cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/zim/zim.info b/office/zim/zim.info index 1b98172ac9..1fc455a0c7 100644 --- a/office/zim/zim.info +++ b/office/zim/zim.info @@ -1,10 +1,10 @@ PRGNAM="zim" -VERSION="0.68" +VERSION="0.73.5" HOMEPAGE="http://zim-wiki.org/" -DOWNLOAD="http://zim-wiki.org/downloads/zim-0.68.tar.gz" -MD5SUM="336041a16687abb66fd9f604b98407e8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Brenton Earl" -EMAIL="brent@exitstatusone.com" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://zim-wiki.org/downloads/zim-0.73.5.tar.gz" +MD5SUM_x86_64="fa76ceb8ac7d7354fb0e2bc5607e9faa" +REQUIRES="pygobject3-python3" +MAINTAINER="Andrew Payne" +EMAIL="phalange@komputermatrix.com" |
