Compare commits

...

7 Commits

4 changed files with 111 additions and 8 deletions

View File

@ -0,0 +1,26 @@
--- grive2-0.5.1/libgrive/src/bfd/SymbolInfo.cc.orig 2020-02-29 15:32:16.688000000 +0100
+++ grive2-0.5.1/libgrive/src/bfd/SymbolInfo.cc 2020-02-29 15:35:04.408000000 +0100
@@ -34,6 +34,14 @@
#include <iomanip>
#include <algorithm>
+#ifndef bfd_get_section_flags
+#define bfd_get_section_flags(H, S) bfd_section_flags(S)
+#endif /* bfd_get_section_flags */
+
+#ifndef bfd_get_section_vma
+#define bfd_get_section_vma(H, S) bfd_section_vma(S)
+#endif /* bfd_get_section_vma */
+
namespace gr {
struct SymbolInfo::Impl
@@ -124,7 +132,7 @@
if ( address < vma )
return;
- bfd_size_type size = bfd_section_size(abfd, section);
+ bfd_size_type size = bfd_section_size(section);
if ( address > (vma + size))
return ;

View File

@ -0,0 +1,21 @@
From 3cf1c058a3e61deb370dde36024a106a213ab2c6 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@gentoo.org>
Date: Sat, 21 May 2022 09:36:52 -0600
Subject: [PATCH] Syncer.hh: fix build with gcc-12
---
libgrive/src/base/Syncer.hh | 1 +
1 file changed, 1 insertion(+)
diff --git a/libgrive/src/base/Syncer.hh b/libgrive/src/base/Syncer.hh
index 237b8949..9b6ae4f7 100644
--- a/libgrive/src/base/Syncer.hh
+++ b/libgrive/src/base/Syncer.hh
@@ -21,6 +21,7 @@
#include "util/FileSystem.hh"
+#include <memory>
#include <string>
#include <vector>
#include <iosfwd>

View File

@ -0,0 +1,23 @@
From 5c8e87ee9a201123bbab30e1a238f7e67fa9ff0a Mon Sep 17 00:00:00 2001
From: Jasper Young <jasper.c.young@gmail.com>
Date: Tue, 20 Sep 2022 20:10:28 -0400
Subject: [PATCH] Fix CMake CMP0004 Error
---
cmake/Modules/FindLibGcrypt.cmake | 3 +++
1 file changed, 3 insertions(+)
diff --git a/cmake/Modules/FindLibGcrypt.cmake b/cmake/Modules/FindLibGcrypt.cmake
index 0e1727f2..1cbc10a0 100644
--- a/cmake/Modules/FindLibGcrypt.cmake
+++ b/cmake/Modules/FindLibGcrypt.cmake
@@ -27,6 +27,9 @@ IF(LIBGCRYPTCONFIG_EXECUTABLE)
EXEC_PROGRAM(${LIBGCRYPTCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE LIBGCRYPT_CFLAGS)
+ string(REPLACE "fgrep: warning: fgrep is obsolescent; using grep -F" "" LIBGCRYPT_LIBRARIES "${LIBGCRYPT_LIBRARIES}")
+ string(STRIP "${LIBGCRYPT_LIBRARIES}" LIBGCRYPT_LIBRARIES)
+
IF(${LIBGCRYPT_CFLAGS} MATCHES "\n")
SET(LIBGCRYPT_CFLAGS " ")
ENDIF(${LIBGCRYPT_CFLAGS} MATCHES "\n")

View File

@ -1,31 +1,33 @@
Name: grive2 Name: grive2
Version: 0.5.0 Version: 0.5.3
Release: 2mamba Release: 1mamba
Summary: Google Drive client Summary: Google Drive client
Group: Applications/Networking Group: Applications/Networking
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://github.com/vitalif/grive2 URL: https://github.com/vitalif/grive2
## GITSOURCE https://github.com/vitalif/grive2.git v0.5.0
Source: https://github.com/vitalif/grive2.git/v%{version}/grive2-%{version}.tar.bz2 Source: https://github.com/vitalif/grive2.git/v%{version}/grive2-%{version}.tar.bz2
Patch0: grive2-0.5.1-binutils-2.34.patch
Patch1: grive2-0.5.3-grep-3.11.patch
Patch2: grive2-0.5.3-fix-syncer-compilation.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libbinutils-devel BuildRequires: libbinutils-devel
BuildRequires: libboost-devel BuildRequires: libboost-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libexpat-devel
BuildRequires: libgcc BuildRequires: libgcc
BuildRequires: libgcrypt-devel BuildRequires: libgcrypt-devel
BuildRequires: libgpg-error-devel BuildRequires: libgpg-error-devel
BuildRequires: libjson-c-devel
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
BuildRequires: libyajl-devel BuildRequires: libyajl-devel
BuildRequires: libz-devel BuildRequires: libz-devel
BuildRequires: libzstd-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: libbinutils-devel >= 2.27-1mamba BuildRequires: libbinutils-devel >= 2.34
BuildRequires: cmake BuildRequires: cmake
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description %description
Google Drive client with the support for the new Drive REST API and partial sync. Google Drive client with the support for the new Drive REST API and partial sync.
@ -34,9 +36,14 @@ Google Drive client with the support for the new Drive REST API and partial sync
%prep %prep
%setup -q %setup -q
#%patch0 -p1
%patch 1 -p1 -b .grep-3.11
%patch 2 -p1 -b .fix-syncer-compilation
%build %build
%cmake -d build %cmake -d build \
-DCMAKE_EXE_LINKER_FLAGS="-lzstd -ljson-c -lsframe"
%make %make
%install %install
@ -49,10 +56,36 @@ Google Drive client with the support for the new Drive REST API and partial sync
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/grive %{_bindir}/grive
%{_mandir}/man1/grive.1.gz %{_prefix}/libexec/grive/grive-sync.sh
%{_userunitdir}/grive@.service
%{_userunitdir}/grive-changes@.service
%{_userunitdir}/grive-timer@.service
%{_userunitdir}/grive-timer@.timer
%{_mandir}/man1/grive.1*
%doc COPYING %doc COPYING
%changelog %changelog
* Fri Sep 22 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 0.5.3-1mamba
- update to 0.5.3
* Sat Feb 29 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.5.1-1mamba
- update to 0.5.1
* Sat Nov 23 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 0.5.0-7mamba
- rebuilt by autoport with build requirements: libbinutils-devel>=2.33.1-2mamba
* Fri Feb 15 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 0.5.0-6mamba
- rebuilt by autoport with build requirements: libbinutils-devel>=2.32-1mamba
* Sat Sep 22 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 0.5.0-5mamba
- rebuilt by autoport with build requirements: libbinutils-devel>=2.31.1-1mamba
* Mon Nov 06 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 0.5.0-4mamba
- rebuilt by autoport with build requirements: libbinutils-devel>=2.29.1-1mamba
* Sun Jun 18 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 0.5.0-3mamba
- rebuilt by autoport with build requirements: libbinutils-devel>=2.28-1mamba
* Sat Aug 20 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 0.5.0-2mamba * Sat Aug 20 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 0.5.0-2mamba
- rebuilt by autoport with build requirements: libbinutils-devel>=2.27-1mamba - rebuilt by autoport with build requirements: libbinutils-devel>=2.27-1mamba