[arch-commits] Commit in gnuradio/trunk (PKGBUILD)

[Kyle Keen]

    Date: Wednesday, August 15, 2018 @ 08:53:58
  Author: kkeen
Revision: 371680

upgpkg: gnuradio 3.7.13.4-1

Modified:
  gnuradio/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-15 07:05:59 UTC (rev 371679)
+++ PKGBUILD	2018-08-15 08:53:58 UTC (rev 371680)
@@ -4,8 +4,8 @@
 # Contributor:	Jonatan Sastre <jsastreh [ at ] hotmail.com>
 pkgbase=gnuradio
 pkgname=(gnuradio gnuradio-companion)
-pkgver=3.7.11
-pkgrel=6
+pkgver=3.7.13.4
+pkgrel=1
 pkgdesc="General purpose DSP and SDR toolkit.  With drivers for usrp and fcd."
 arch=('x86_64')
 url="http://gnuradio.org"
@@ -32,8 +32,9 @@
         "https://gnuradio.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz.asc"
         "21-fcd.rules" "gnuradio-gcc7.patch"
         "boost-1.67.patch" "boost-1.67-pthread.patch")
-validpgpkeys=('B90DDFAC56989BF62262EB812987C77CBB8ED9B2') # GNU Radio Project
-md5sums=('7b7b871237ae6fc109d203f78c4654ef'
+validpgpkeys=('B90DDFAC56989BF62262EB812987C77CBB8ED9B2'  # GNU Radio Project
+              'D74F9F146E7F755783583158B343B2BA293E5174') # Marcus Müller
+md5sums=('b38d9cfa7cb4dcb97f5d19ebcabe8dcb'
          'SKIP'
          '465e12c454c6a22ebec9849181af7bdc'
          'c510104fa2ad9852a683c265c42ae1da'
@@ -49,10 +50,14 @@
   sed -i -e "s|#![ ]*/usr/bin/env /usr/bin/python$|#!/usr/bin/env python2|" \
     $(find ./ -name '*.py')
   # fix build with GCC 7 (Fedora)
-  patch -p1 -i ../gnuradio-gcc7.patch
+  #patch -p1 -N -i ../gnuradio-gcc7.patch
   # https://github.com/gnuradio/gnuradio/pull/1733
-  patch -p1 -i ../boost-1.67.patch
-  patch -p1 -i ../boost-1.67-pthread.patch
+  #patch -p1 -N -i ../boost-1.67.patch
+  #patch -p1 -N -i ../boost-1.67-pthread.patch
+  # GCC 7? 
+  #sed -i 's|SET(CMAKE_CXX_STANDARD 98)|#&|' CMakeLists.txt
+  #sed -i 's|SET(CMAKE_C_FLAGS .* -std=gnu99"|#&|' CMakeLists.txt
+  sed -i '333i ${CMAKE_THREAD_LIBS_INIT}' gr-blocks/lib/CMakeLists.txt
 }
 
 build() {