diff --git a/gnuradio-3.7.10.tar.gz b/gnuradio-3.7.10.tar.gz new file mode 100644 index 0000000..2b5dc09 --- /dev/null +++ b/gnuradio-3.7.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4c88851be1a9dc682781586a24a0e3f57abb28f1cbdfd25680945664cf31b49 +size 4332494 diff --git a/gnuradio-3.7.9.2-gcc6.patch b/gnuradio-3.7.9.2-gcc6.patch deleted file mode 100644 index 268ea34..0000000 --- a/gnuradio-3.7.9.2-gcc6.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: b/gr-fec/include/gnuradio/fec/polar_decoder_common.h -=================================================================== ---- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h -+++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h -@@ -28,10 +28,6 @@ - #include - #include - --#ifndef BOOST_CONSTEXPR_OR_CONST --#define BOOST_CONSTEXPR_OR_CONST const --#endif -- - namespace gr { - namespace fec { - namespace code { -@@ -68,7 +64,11 @@ namespace gr { - bool set_frame_size(unsigned int frame_size){return false;}; - - private: -- static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR = -2.19722458f; -+#if defined(__GNUC__) && (( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 600) -+ static constexpr float D_LLR_FACTOR = -2.19722458f; -+#else -+ static const float D_LLR_FACTOR = -2.19722458f; -+#endif - unsigned int d_frozen_bit_counter; - - protected: diff --git a/gnuradio-3.7.9.3.tar.gz b/gnuradio-3.7.9.3.tar.gz deleted file mode 100644 index 0f0a6f4..0000000 --- a/gnuradio-3.7.9.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20b40044d04ae252a7a7f42dabb033a1b291ea93f3d3fabfbefb39e7a876fbba -size 4158777 diff --git a/gnuradio.changes b/gnuradio.changes index 1df552a..811917f 100644 --- a/gnuradio.changes +++ b/gnuradio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 7 19:47:23 UTC 2016 - wk@ire.pw.edu.pl + +- update to version 3.7.10 +- patch gnuradio-3.7.9.2-gcc6.patch removed + * breaks build on Leap 42.2 and Tumbleweed + ------------------------------------------------------------------- Mon Jul 25 13:39:02 UTC 2016 - wk@ire.pw.edu.pl diff --git a/gnuradio.spec b/gnuradio.spec index 58538e1..ea12ed9 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -17,10 +17,10 @@ Name: gnuradio -Version: 3.7.9.3 +Version: 3.7.10 Release: 0 -%define soname 3_7_9-0_0_0 -%define soname_volk 1_2_3 +%define soname 3_7_10-0_0_0 +%define soname_volk 1_3 Summary: GNU software radio License: GPL-3.0+ Group: Productivity/Hamradio/Other @@ -29,9 +29,6 @@ Source: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz Source1: %{name}-rpmlintrc # http://www.nathanwest.us/grc_to_37.sh Source2: grc_to_37.sh -#PATCH-FIX-UPSTREAM marguerite@opensuse.org - 'constexpr' needed for in-class initialization of static data member -# of non-integral type -Patch: gnuradio-3.7.9.2-gcc6.patch BuildRequires: alsa-devel BuildRequires: boost-devel BuildRequires: cmake @@ -188,7 +185,6 @@ This package contains the examples of using GNU Radio depending on wxWidgets. %prep %setup -q -%patch -p1 # remove buildtime from documentation sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.in sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.swig_doc.in