- bix building with binutils 2.34

- rel 30

diff --git a/binutils-2.34.patch b/binutils-2.34.patch
new file mode 100644 (file)
index 0000000..dc06fc7
--- /dev/null
+++ b/binutils-2.34.patch
@@ -0,0 +1,18 @@
+--- grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/libgrive/src/bfd/SymbolInfo.cc~     2013-05-02 18:40:04.000000000 +0200
++++ grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/libgrive/src/bfd/SymbolInfo.cc      2020-03-23 18:17:48.516723904 +0100
+@@ -117,13 +117,13 @@
+       if ((section->flags & SEC_ALLOC) == 0)
+               return ;
+       
+-      bfd_vma vma = bfd_get_section_vma(abfd, section);
++      bfd_vma vma = bfd_section_vma(section);
+       
+       unsigned long address = (unsigned long)(info->m_addr);
+       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 ;
+       

diff --git a/grive.spec b/grive.spec
index dc386001db8806799cf79d55e33e277826b30b67..1eb9b637465129d0792f30e18ae2bf68e719333f 100644 (file)
--- a/grive.spec
+++ b/grive.spec
@@ -2,7 +2,7 @@
 # bash: %%(c=%{commit}; echo ${c:0:7})
 %define                shortcommit     27817e8
 %define                cdate           20130702
-%define                rel             29
+%define                rel             30
 Summary:       An open source Linux client for Google Drive
 Summary(pl.UTF-8):     Linuksowy, mające otwarte źródła klient Google Drive
 Name:          grive
@@ -16,6 +16,7 @@ Source0:      https://github.com/Grive/grive/archive/%{commit}/%{name}-%{version}-%{s
 Patch0:                json-c.patch
 Patch1:                %{name}-bgrive_cmake_fix.patch
 Patch2:                build.patch
+Patch3:                binutils-2.34.patch
 URL:           http://www.lbreda.com/grive/
 BuildRequires: QtCore-devel
 BuildRequires: QtGui-devel
@@ -58,6 +59,7 @@ Graficzny interfejs użytkownika do Grive.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d build