diff options
| -rw-r--r-- | gis/therion/README | 37 | ||||
| -rw-r--r-- | gis/therion/therion.SlackBuild | 14 | ||||
| -rw-r--r-- | gis/therion/therion.info | 10 |
3 files changed, 27 insertions, 34 deletions
diff --git a/gis/therion/README b/gis/therion/README index f4b4f85aad9c..c7be4893b45b 100644 --- a/gis/therion/README +++ b/gis/therion/README @@ -36,23 +36,8 @@ environment variables: - GUI=no This disables the build of Xtherion. - BOOK=no This disables the build of thbook.pdf. -If you leave enabled the build of Loch, the compilation works also -if you have wxGTK3 (without the dependency wxWidgets) installed in -your system. Other libraries based on wxWidgets (like wxPython3 or -wxPython4 for example) could be detected and used but they are not -tested. - -The build requires the library {fmt} as dependency and the source -uses by default an internal {fmt}. This library is available as -slackbuild in Slackbuilds.org (for Slackware 15.0) and a prebuild -package in the official release (for Slackware current). If the -library is installed in your system you would use it. In this case -you can set the build for use of the external library passing an -environment variable to the script as following: - - FMT=yes ./therion.SlackBuild - WARNINGS + Note that the platform works only with some standards, interpreters or programs (like METAPOST, TEX, tcl/tk, ImageMagick, ecc.) that are available in a full installation of Slackware, and some extensions of @@ -61,11 +46,23 @@ Slackbuilds.org. Without these dependencies Therion fails during the package build (almost) or in runtime for some features (e.g. tkImg, that is not detected by the build process). -After the installation, a full and extended integrated behavior, -optimized with the custom configuration, requires to set or uncomment -appropriate values in the initialization files in /etc/therion. +Since version 6.1.7, Therion no longer includes an internal {fmt} +library, so this library is a required dependency. In Slackware 15.0, +this library must be installed by the slackbuild available in +Slackbuilds.org whereas in Slackware current it must be installed +from the package released with the official current. + +Since version 6.1.8, the build of LOCH fails if wxGTK3 is installed +instead of wxWidgets 3.2.2.1, so wxWidgets is strictly required. If +both wxGTK3 and wxWidgets are installed, the build process will use +wxWidgets, so these libraries can coexist. Other libraries based on +wxWidgets (like wxPython3 or wxPython4 for example) are not tested. + +After the installation, a full and extended integrated behavior, +optimized with the custom configuration, requires to set or uncomment +appropriate values in the initialization files in /etc/therion. -Sample data can be downloaded from the project homepage. They can be +Sample data can be downloaded from the project homepage. They can be used to practice about Therion. See the thbook.pdf for more information. diff --git a/gis/therion/therion.SlackBuild b/gis/therion/therion.SlackBuild index 14716f618796..b2d0bc68f953 100644 --- a/gis/therion/therion.SlackBuild +++ b/gis/therion/therion.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=therion -VERSION=${VERSION:-6.1.6} +VERSION=${VERSION:-6.1.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -48,12 +48,9 @@ BUILDLOCH="" ; [ "${LOCH:-yes}" = "no" ] && BUILDLOCH=" -DBUILD_LOCH=OFF" BUILDBOOK=" -DTHBOOK_FORMAT=3" ; [ "${BOOK:-yes}" = "no" ] && BUILDBOOK=" -DBUILD_THBOOK=OFF" BUILDX=""; [ "${GUI:-yes}" = "no" ] && BUILDX=" -DBUILD_XTHERION=OFF" -# Set internal (default) or system library {fmt} -EXT_FMT=""; [ "${FMT:-no}" = "yes" ] && EXT_FMT=" -DUSE_BUNDLED_FMT=OFF" - -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -91,7 +88,6 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_SYSCONFDIR=/etc/therion \ - $EXT_FMT \ $BUILDLOCH \ $BUILDBOOK \ $BUILDX \ @@ -122,7 +118,7 @@ if [ "$BOOK" != "no" ] ; then fi if [ "$LOCH" != "no" ] ; then mv $PKG/usr/share/doc/therion-viewer $PKG/usr/doc/$PRGNAM-$VERSION - rm -rf $PKG/usr/share/doc + rm -rf $PKG/usr/share/doc fi #Make and install a copy of the application icon in PNG format @@ -137,7 +133,7 @@ Type=Application Name=Therion GenericName=Cave survey software GenericName[de]=Höhlenstudienprogramm -GenericName[es]=Programa de estudio de las cuevas +GenericName[es]=Programa de estudio de las cuevas GenericName[fr]=Programme d'étude des grottes GenericName[it]=Programma di studio delle grotte GenericName[pt]=Programa de estudo de caverna diff --git a/gis/therion/therion.info b/gis/therion/therion.info index 6b749ec4ab21..160e83eca89e 100644 --- a/gis/therion/therion.info +++ b/gis/therion/therion.info @@ -1,10 +1,10 @@ PRGNAM="therion" -VERSION="6.1.6" +VERSION="6.1.8" HOMEPAGE="https://therion.speleo.sk/" -DOWNLOAD="https://github.com/therion/therion/archive/v6.1.6/therion-6.1.6.tar.gz" -MD5SUM="b5a9809efd5c2c71c81ceca27c0e0c52" +DOWNLOAD="https://github.com/therion/therion/archive/v6.1.8/therion-6.1.8.tar.gz" +MD5SUM="b10723c8505dec3dd45d8479c2024129" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="bwidget lcdf-typetools proj tkimg VTK wxWidgets" -MAINTAINER="Giancarlo Dessì" +REQUIRES="bwidget fmt lcdf-typetools proj tkimg VTK wxWidgets" +MAINTAINER="Giancarlo Dessi" EMAIL="slack@giand.it" |