[arch-commits] Commit in gnuradio-iqbal/trunk (PKGBUILD float-complex.patch)

[Kyle Keen]

    Date: Tuesday, August 12, 2014 @ 14:03:22
  Author: kkeen
Revision: 117295

upgpkg: gnuradio-iqbal 0.37.2-1 boost rebuild

Modified:
  gnuradio-iqbal/trunk/PKGBUILD
Deleted:
  gnuradio-iqbal/trunk/float-complex.patch

---------------------+
 PKGBUILD            |   12 ++++--------
 float-complex.patch |   22 ----------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-12 11:49:33 UTC (rev 117294)
+++ PKGBUILD	2014-08-12 12:03:22 UTC (rev 117295)
@@ -3,8 +3,8 @@
 # Contributor: Dominik Heidler <dheidler at gmail.com>
 pkgname=gnuradio-iqbal
 _pkgname=gr-iqbal
-pkgver=0.37.1
-pkgrel=4
+pkgver=0.37.2
+pkgrel=1
 pkgdesc="Gnuradio I/Q balancing"
 arch=('i686' 'x86_64')
 url="http://cgit.osmocom.org/gr-iqbal/"
@@ -12,17 +12,13 @@
 depends=('gnuradio' 'fftw')
 replaces=('gr-iqbal')
 makedepends=('git' 'cmake' 'boost' 'swig')
-source=("git://git.osmocom.org/gr-iqbal/#tag=v$pkgver"
-        float-complex.patch)
-md5sums=('SKIP'
-         '6417f4c064b44e8875fbb783c3a2c308')
+source=("git://git.osmocom.org/gr-iqbal/#tag=v$pkgver")
+md5sums=('SKIP')
 
 build() {
   cd "$srcdir/$_pkgname"
   git submodule init
   git submodule update
-  # patches are already in git, only applies to 0.37.1
-  patch -p1 -i "$srcdir/float-complex.patch"
   sed -i 's/LIBOSMODSP_LIBRARIES ""/LIBOSMODSP_LIBRARIES ${FFTW3F_LIBRARIES}/' CMakeLists.txt 
   mkdir build
   cd build

Deleted: float-complex.patch
===================================================================
--- float-complex.patch	2014-08-12 11:49:33 UTC (rev 117294)
+++ float-complex.patch	2014-08-12 12:03:22 UTC (rev 117295)
@@ -1,22 +0,0 @@
-diff --git a/lib/optimize_c.cc b/lib/optimize_c.cc
-index 318a996..2cad998 100644
---- a/lib/optimize_c.cc
-+++ b/lib/optimize_c.cc
-@@ -25,6 +25,17 @@
- #include <gnuradio/io_signature.h>
- #include <gnuradio/iqbalance/optimize_c.h>
- 
-+#define GCC_VERSION (		\
-+	__GNUC__ * 10000 +  \
-+	__GNUC_MINOR__ * 100 +	\
-+	__GNUC_PATCHLEVEL__ \
-+   )
-+
-+#if GCC_VERSION >= 40800
-+# define complex _Complex
-+# undef _GLIBCXX_HAVE_COMPLEX_H
-+#endif
-+
- extern "C" {
- #include <osmocom/dsp/cxvec.h>
- #include <osmocom/dsp/iqbal.h>