From 731e5c49f0584f4ecdb3fc48761a53d14b2858f1 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 9 Dec 2018 05:15:09 -0200 Subject: [PATCH] cclive: update to 0.9.3. --- srcpkgs/cclive/patches/fix-boost-067.patch | 12 ++++++ .../fix-missing-iostream-includes.patch | 38 +++++++++++++++++++ srcpkgs/cclive/template | 21 ++++++---- srcpkgs/cclive/update | 2 - 4 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/cclive/patches/fix-boost-067.patch create mode 100644 srcpkgs/cclive/patches/fix-missing-iostream-includes.patch delete mode 100644 srcpkgs/cclive/update diff --git a/srcpkgs/cclive/patches/fix-boost-067.patch b/srcpkgs/cclive/patches/fix-boost-067.patch new file mode 100644 index 0000000000..0acd06ab0e --- /dev/null +++ b/srcpkgs/cclive/patches/fix-boost-067.patch @@ -0,0 +1,12 @@ +--- src/cc/progressbar.h 2013-11-23 11:46:27.000000000 +0200 ++++ src/cc/progressbar.h 2018-06-03 02:23:36.603414837 +0300 +@@ -316,7 +316,7 @@ private: + + static inline std::string eta_from_seconds(const double s) + { +- const pt::time_duration& td = pt::seconds(s); ++ const pt::time_duration& td = pt::seconds(long(s)); + return pt::to_simple_string(td); + } + + diff --git a/srcpkgs/cclive/patches/fix-missing-iostream-includes.patch b/srcpkgs/cclive/patches/fix-missing-iostream-includes.patch new file mode 100644 index 0000000000..305bd7e147 --- /dev/null +++ b/srcpkgs/cclive/patches/fix-missing-iostream-includes.patch @@ -0,0 +1,38 @@ +diff --git a/src/cc/error.h b/src/cc/error.h +index c1d80ab..98a4a10 100644 +--- src/cc/error.h ++++ src/cc/error.h +@@ -21,6 +21,7 @@ + #ifndef cc__error_h + #define cc__error_h + ++#include + #include + + #include +diff --git a/src/cc/log.h b/src/cc/log.h +index 2b2c986..77708f5 100644 +--- src/cc/log.h ++++ src/cc/log.h +@@ -21,6 +21,7 @@ + #ifndef cc__log_h + #define cc__log_h + ++#include + #include + + #include +diff --git a/src/cc/options.h b/src/cc/options.h +index 6c45ce8..d757bfb 100644 +--- src/cc/options.h ++++ src/cc/options.h +@@ -21,6 +21,8 @@ + #ifndef cc__options_h + #define cc__options_h + ++#include ++ + #include + + #include + diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template index c10522bf5f..292690d486 100644 --- a/srcpkgs/cclive/template +++ b/srcpkgs/cclive/template @@ -1,15 +1,22 @@ # Template file for 'cclive' pkgname=cclive -version=0.7.16 -revision=11 +version=0.9.3 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel" -depends="libquvi>=0.4.1_4" short_desc="Commandline downloader for popular video websites" maintainer="Juan RP " -license="AGPL-3" -homepage="http://cclive.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=586a120faddcfa16f5bb058b5c901f1659336c6fc85a0d3f1538882a44ee10e1 +license="AGPL-3.0-or-later" +homepage="https://cclive.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" +checksum=2edeaf5d76455723577e0b593f0322a97f1e0c8b0cffcc70eca8b5d17374a495 CPPFLAGS="-P" + +case "$XBPS_TARGET_MACHINE" in + *-musl) broken="./cc/error.h:43:20: error: could not convert 'strerror_r(((int)ec), ((char*)(& buf)), sizeof (buf))' from 'int' to 'std::__cxx11::string' {aka 'std::__cxx11::basic_string'} " ;; +esac + +post_install() { + vlicense COPYING +} diff --git a/srcpkgs/cclive/update b/srcpkgs/cclive/update deleted file mode 100644 index 29368d2574..0000000000 --- a/srcpkgs/cclive/update +++ /dev/null @@ -1,2 +0,0 @@ -site="$homepage" -pattern='cclive v\K[\d.]+(?= \(stable\))'