From 25740ba5c6d7684cb92fc1af5739ced51f88d5dc Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 15 Apr 2021 08:42:22 +0000 Subject: grive2: update to 0.5.1. grive2 (0.5.1+git20160731) unstable; urgency=medium * Newer dev version grive2 (0.5+git20160114) unstable; urgency=medium * Newer release, with support for faster sync and rename detection --- net/grive2/Makefile | 12 ++++++------ net/grive2/PLIST | 6 +++++- net/grive2/distinfo | 13 +++++++------ net/grive2/patches/patch-libgrive_src_util_OS.cc | 14 +++++++------- net/grive2/patches/patch-libgrive_src_util_OS.hh | 17 +++++++++++++++++ 5 files changed, 42 insertions(+), 20 deletions(-) create mode 100644 net/grive2/patches/patch-libgrive_src_util_OS.hh (limited to 'net') diff --git a/net/grive2/Makefile b/net/grive2/Makefile index 9302c1c150b..8220c90085e 100644 --- a/net/grive2/Makefile +++ b/net/grive2/Makefile @@ -1,19 +1,17 @@ -# $NetBSD: Makefile,v 1.24 2021/01/01 08:24:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.25 2021/04/15 08:42:22 wiz Exp $ -DISTNAME= grive2-0.4.1 -PKGREVISION= 19 +DISTNAME= grive2-0.5.1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=vitalif/} +GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/vitalif/Grive2 COMMENT= Independent open source implementation of Google Drive client LICENSE= gnu-gpl-v2 -GITHUB_TAG= v${PKGVERSION_NOREV} - USE_CMAKE= yes -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config bash:run USE_LANGUAGES= c c++ SUBST_CLASSES+= manpath @@ -22,6 +20,8 @@ SUBST_STAGE.manpath= pre-configure SUBST_FILES.manpath= grive/CMakeLists.txt SUBST_SED.manpath= -e 's,DESTINATION share/man,DESTINATION ${PKGMANDIR},g' +REPLACE_BASH+= systemd/grive-sync.sh + .include "../../security/libgcrypt/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" diff --git a/net/grive2/PLIST b/net/grive2/PLIST index 763568fc95c..a03aaebc7eb 100644 --- a/net/grive2/PLIST +++ b/net/grive2/PLIST @@ -1,3 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2015/06/16 16:15:37 abs Exp $ +@comment $NetBSD: PLIST,v 1.2 2021/04/15 08:42:22 wiz Exp $ bin/grive +lib/grive/grive-sync.sh +lib/systemd/user/grive-changes@.service +lib/systemd/user/grive-timer@.service +lib/systemd/user/grive-timer@.timer man/man1/grive.1 diff --git a/net/grive2/distinfo b/net/grive2/distinfo index 773f4414877..6a18672f5b7 100644 --- a/net/grive2/distinfo +++ b/net/grive2/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.3 2015/11/09 14:52:34 abs Exp $ +$NetBSD: distinfo,v 1.4 2021/04/15 08:42:22 wiz Exp $ -SHA1 (grive2-0.4.1.tar.gz) = f20da164b63f0acb1d15620d44f5596feed3344b -RMD160 (grive2-0.4.1.tar.gz) = 46ecbfa294e5e804c8837e3ba2667a13a54a57a8 -SHA512 (grive2-0.4.1.tar.gz) = 55523f09afaad3e249fad6a085bcbb19d785f200bbe4ef45d48e6f6a44a41d13f0b8e77de348def819bf5409f1a995147fbb058191cda991aef023c76f2dbcf0 -Size (grive2-0.4.1.tar.gz) = 158861 bytes +SHA1 (grive2-0.5.1.tar.gz) = 581915a653fdbd0076c69a4c4aa06eab2fa041cf +RMD160 (grive2-0.5.1.tar.gz) = 71b0929a252d2a18b8b7b822696a30eedc34d422 +SHA512 (grive2-0.5.1.tar.gz) = 609837fc93ad78d143dcb4d1f558743d413c887fec2e9aaac81edd58549b812db859aab5ce7f664f06564779cff4bae32d43529e47fcc36640f1a9b52c5b5888 +Size (grive2-0.5.1.tar.gz) = 169929 bytes SHA1 (patch-libgrive_CMakeLists.txt) = fa81eae7f6c70478c757c897fab3fb1d297b25b0 -SHA1 (patch-libgrive_src_util_OS.cc) = ac5a59b717af6029134eb299b36a5862df193c38 +SHA1 (patch-libgrive_src_util_OS.cc) = 1f8b250000f96ab21e3a75fbaca3ec934cb4b344 +SHA1 (patch-libgrive_src_util_OS.hh) = 113c3661afa302014b3084eaec0c352651b2392c diff --git a/net/grive2/patches/patch-libgrive_src_util_OS.cc b/net/grive2/patches/patch-libgrive_src_util_OS.cc index eada43138c9..f0f2286cba5 100644 --- a/net/grive2/patches/patch-libgrive_src_util_OS.cc +++ b/net/grive2/patches/patch-libgrive_src_util_OS.cc @@ -1,15 +1,15 @@ -$NetBSD: patch-libgrive_src_util_OS.cc,v 1.1.1.1 2015/06/16 16:15:37 abs Exp $ +$NetBSD: patch-libgrive_src_util_OS.cc,v 1.2 2021/04/15 08:42:23 wiz Exp $ Add __NetBSD__ to the 64bit Apple ctimespec stat case ---- libgrive/src/util/OS.cc.orig 2015-05-31 19:35:15.000000000 +0000 +--- libgrive/src/util/OS.cc.orig 2019-11-12 22:05:31.000000000 +0000 +++ libgrive/src/util/OS.cc -@@ -57,7 +57,7 @@ DateTime FileCTime( const std::string& f - ) ; - } +@@ -59,7 +59,7 @@ void Stat( const std::string& filename, + if ( t ) + { -#if defined __APPLE__ && defined __DARWIN_64_BIT_INO_T +#if defined __NetBSD__ || ( defined __APPLE__ && defined __DARWIN_64_BIT_INO_T ) - return DateTime( s.st_ctimespec.tv_sec, s.st_ctimespec.tv_nsec ) ; + *t = DateTime( s.st_ctimespec.tv_sec, s.st_ctimespec.tv_nsec ) ; #else - return DateTime( s.st_ctim.tv_sec, s.st_ctim.tv_nsec); + *t = DateTime( s.st_ctim.tv_sec, s.st_ctim.tv_nsec); diff --git a/net/grive2/patches/patch-libgrive_src_util_OS.hh b/net/grive2/patches/patch-libgrive_src_util_OS.hh new file mode 100644 index 00000000000..2b49802f5d1 --- /dev/null +++ b/net/grive2/patches/patch-libgrive_src_util_OS.hh @@ -0,0 +1,17 @@ +$NetBSD: patch-libgrive_src_util_OS.hh,v 1.1 2021/04/15 08:42:23 wiz Exp $ + +off64_t is not universally available. + +--- libgrive/src/util/OS.hh.orig 2019-11-12 22:05:31.000000000 +0000 ++++ libgrive/src/util/OS.hh +@@ -31,6 +31,10 @@ class Path ; + + enum FileType { FT_FILE = 1, FT_DIR = 2, FT_UNKNOWN = 3 } ; + ++#ifndef off64_t ++#define off64_t off_t ++#endif ++ + namespace os + { + struct Error : virtual Exception {} ; -- cgit v1.2.3