From 8351c8b9b468a6a1e9f39c0a73101b434f4d5c7e Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Fri, 17 Jan 2020 23:12:42 -0600 Subject: [PATCH] misc/goldencheetah: Updated for version 3.5. Signed-off-by: Kyle Guinn --- misc/goldencheetah/goldencheetah.SlackBuild | 27 ++++++++++++--------- misc/goldencheetah/goldencheetah.info | 10 ++++---- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/misc/goldencheetah/goldencheetah.SlackBuild b/misc/goldencheetah/goldencheetah.SlackBuild index f2bbd60578..e76bc48c74 100644 --- a/misc/goldencheetah/goldencheetah.SlackBuild +++ b/misc/goldencheetah/goldencheetah.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for GoldenCheetah -# Copyright 2018 Kyle Guinn , USA +# Copyright 2018-2020 Kyle Guinn # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=goldencheetah SRCNAM=GoldenCheetah -VERSION=${VERSION:-3.4} +VERSION=${VERSION:-3.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -82,18 +82,23 @@ cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri cp src/gcconfig.pri.in src/gcconfig.pri # Set up the build configuration. -sed -i 's|^#\(CONFIG += release\)|\1|' src/gcconfig.pri -sed -i 's|^#\(QMAKE_LEX = flex\)|\1|' src/gcconfig.pri -sed -i 's|^#\(QMAKE_YACC = bison\)|\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|^#\(CONFIG += release\)|\1|' src/gcconfig.pri +sed -i 's|^#\(QMAKE_LEX = flex\)|\1|' src/gcconfig.pri +sed -i 's|^#\(QMAKE_YACC = bison\)|\1|' src/gcconfig.pri +sed -i 's|^#\(LIBZ_INCLUDE =\)|\1|' src/gcconfig.pri +sed -i 's|^#\(LIBZ_LIBS = -lz\)|\1|' src/gcconfig.pri # Enable optional dependencies found in stock Slackware. -# TODO: Enable other optional dependencies (VLC, qwtplot3d, others?) -sed -i 's|^#\(ICAL_INSTALL =\).*|\1 /usr|' src/gcconfig.pri -sed -i 's|^#\(LIBUSB_INSTALL =\).*|\1 /usr|' src/gcconfig.pri +# Also enable optional video from QT5 since QT5 is required. +# TODO: Enable other optional dependencies (python3, R, libsamplerate, ...) +sed -i 's|^#\(ICAL_INSTALL =\).*|\1 /usr|' src/gcconfig.pri +sed -i 's|^#\(LIBUSB_INSTALL =\).*|\1 /usr|' src/gcconfig.pri +sed -i 's|^#\(CONFIG += link_pkgconfig\)|\1|' src/gcconfig.pri +sed -i 's|^#\(PKGCONFIG =\)|\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 -qmake \ +qmake-qt5 \ -recursive \ QMAKE_CFLAGS_RELEASE="$SLKCFLAGS" \ QMAKE_CXXFLAGS_RELEASE="$SLKCFLAGS" \ diff --git a/misc/goldencheetah/goldencheetah.info b/misc/goldencheetah/goldencheetah.info index e1aa0f2271..324df46ea8 100644 --- a/misc/goldencheetah/goldencheetah.info +++ b/misc/goldencheetah/goldencheetah.info @@ -1,10 +1,10 @@ PRGNAM="goldencheetah" -VERSION="3.4" -HOMEPAGE="http://www.goldencheetah.org/" -DOWNLOAD="https://github.com/GoldenCheetah/GoldenCheetah/archive/V3.4/GoldenCheetah-3.4.tar.gz" -MD5SUM="41da7559e546b5fdedfbee962356c072" +VERSION="3.5" +HOMEPAGE="https://www.goldencheetah.org/" +DOWNLOAD="https://github.com/GoldenCheetah/GoldenCheetah/archive/V3.5/GoldenCheetah-3.5.tar.gz" +MD5SUM="ed25ef3dfb447b1c4d9cc7387da5d7e7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="qt5" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com"