diff options
Diffstat (limited to 'misc/goldencheetah/goldencheetah.SlackBuild')
| -rw-r--r-- | misc/goldencheetah/goldencheetah.SlackBuild | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/misc/goldencheetah/goldencheetah.SlackBuild b/misc/goldencheetah/goldencheetah.SlackBuild index 3d3c8545a8..c92061c31c 100644 --- a/misc/goldencheetah/goldencheetah.SlackBuild +++ b/misc/goldencheetah/goldencheetah.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for GoldenCheetah -# Copyright 2018-2021 Kyle Guinn <elyk03@gmail.com> +# Copyright 2018-2023 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=goldencheetah SRCNAM=GoldenCheetah -VERSION=${VERSION:-3.5} -BUILD=${BUILD:-4} +VERSION=${VERSION:-3.6} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -78,36 +75,21 @@ cd $SRCNAM-$VERSION chown -R root:root . chmod -R u+w,go-w,a+rX-st . -# Fixes from release_3.5.0 branch. 0003 and 0004 contain images treated as -# text since `patch` doesn't decode git binary patches. Comment them out if -# they won't apply. -patch -p1 < $CWD/patches/0001-SEGV-on-Overview-Chart.patch -patch -p1 < $CWD/patches/0002-View-on-Strava.patch -patch -p1 < $CWD/patches/0003-Compatible-with-Strava.patch -patch -p1 < $CWD/patches/0004-Connect-with-Strava.patch -patch -p1 < $CWD/patches/0005-3.5-BUILD-INCREMENT.patch - # GoldenCheetah statically links its own version of qwt, which is likely a fork # from around version 6.1.0 or 6.1.1. The build system uses -L/-l flags to # refer to the static lib, but due to other -L flags and symlinked directories, # it might find the system qwt instead. Replace the flags with a filename. sed -i 's|-L\(\$\${PWD}/\.\./qwt/lib\) -l\(qwtd\?\)|\1/lib\2.a|' src/src.pro -# Fixes for qwt and Qt5 compatibility. -patch -p1 < $CWD/patches/0001-Fix-Qwt-incompatibilities-with-Qt-5.15.0.patch - # Use the system levmar if available. # Builtin copy is version 2.6 without lapack support. # TODO: Replace other builtins (qzip?, qxt, lmfit). if [ -f /usr/include/levmar/levmar.h ]; then - sed -i 's|\.\./levmar[^ ]* *||g' src/src.pro + sed -i 's|\.\./contrib/levmar[^ ]* *||g' src/src.pro echo "INCLUDEPATH += /usr/include/levmar" >> src/src.pro echo "LIBS += -llevmar" >> src/src.pro fi -# We don't have a '-qt4' suffix on lrelease. -sed -i 's|\(lrelease\)-qt4|\1|' src/src.pro - # Copy the default config files, then modify them below. cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri cp src/gcconfig.pri.in src/gcconfig.pri @@ -125,7 +107,11 @@ sed -i 's|^#\(QMAKE_YACC = bison\)\>|\1|' src/gcconfig.pri #echo "QMAKE_YACC_SOURCE = y.tab.cpp" >> src/gcconfig.pri # But that breaks parallel builds (multiple build steps produce temporary files # with the same y.tab.{h,cpp} names). Make the files available by both names. -sed -i 's|^#\( QMAKE_MOVE =\).*|\1 ln -sf|' src/gcconfig.pri +sed -i 's|^#\(QMAKE_MOVE =\) cp|\1 ln -sf|' src/gcconfig.pri + +# Required GSL support. +echo "GSL_INCLUDES = $(pkg-config --cflags gsl)" >> src/gcconfig.pri +echo "GSL_LIBS = $(pkg-config --libs gsl)" >> src/gcconfig.pri # Enable optional dependencies found in stock Slackware. sed -i 's|^#\(ICAL_INSTALL =\).*|\1 /usr|' src/gcconfig.pri @@ -136,16 +122,14 @@ sed -i 's|^#\(CONFIG += link_pkgconfig\)\>|\1|' src/gcconfig.pri sed -i 's|^#\(PKGCONFIG =\).*|\1|' src/gcconfig.pri sed -i 's|^#\(LIBZ_INCLUDE =\).*|\1|' src/gcconfig.pri sed -i 's|^#\(LIBZ_LIBS = -lz\)\>|\1|' src/gcconfig.pri -sed -i 's|^#\(HTPATH = \.\./httpserver\)\>|\1|' src/gcconfig.pri sed -i 's|^\(DEFINES += GC_VIDEO_NONE\)\>|#\1|' src/gcconfig.pri sed -i 's|^#\(DEFINES += GC_VIDEO_QT5\)\>|\1|' src/gcconfig.pri -sed -i 's|^#\(DEFINES += NOWEBKIT\)\>|\1|' src/gcconfig.pri -# Python support. Regenerate the SIP files. +# Optional Python support. Regenerate the SIP files. echo "DEFINES += GC_WANT_PYTHON" >> src/gcconfig.pri echo "PYTHONINCLUDES = $(pkg-config --cflags python3-embed)" >> src/gcconfig.pri echo "PYTHONLIBS = $(pkg-config --libs python3-embed)" >> src/gcconfig.pri -make -C src/Python/SIP -f Makefile.hack clean +rm -f src/Python/SIP/sip* make -C src/Python/SIP -f Makefile.hack # Optional KML support. |