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

[Antonio Rojas]

    Date: Friday, August 24, 2018 @ 08:44:47
  Author: arojas
Revision: 373562

Drop PyQt4 dependencies, but still build Qt4 UI so it works after installing PyQt4 from AUR

Modified:
  gnuradio/trunk/PKGBUILD

----------+
 PKGBUILD |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-24 08:44:11 UTC (rev 373561)
+++ PKGBUILD	2018-08-24 08:44:47 UTC (rev 373562)
@@ -5,7 +5,7 @@
 pkgbase=gnuradio
 pkgname=(gnuradio gnuradio-companion)
 pkgver=3.7.13.4
-pkgrel=1
+pkgrel=2
 pkgdesc="General purpose DSP and SDR toolkit.  With drivers for usrp and fcd."
 arch=('x86_64')
 url="http://gnuradio.org"
@@ -13,7 +13,7 @@
 depends=('fftw' 'python2-numpy' 'cppunit' 'gsl' 'blas' 'boost-libs>=1.53'
     'libusbx' 'portaudio' 'libuhd' 'zeromq' 'libvolk')
 makedepends=('boost' 'cmake' 'python2-lxml' 'python2-cheetah' 'glu' 'swig'
-    'pygtk' 'wxpython' 'python2-pyqwt' 'qwtplot3d')
+    'pygtk' 'wxpython' 'qwtplot3d' 'qwt5')
 
 # todo
 # split the gui components?
@@ -58,6 +58,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
+  sed -e '/PyQt4/d' -i gr-qtgui/CMakeLists.txt # Build PyQt4 UI even if PyQt4 is not installed
 }
 
 build() {
@@ -77,6 +78,7 @@
     -DENABLE_GRC=ON \
     -DENABLE_GR_WXGUI=ON \
     -DENABLE_GR_QTGUI=ON \
+    -DPYQT4_FOUND=ON \
     -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ../
   make
 }
@@ -103,7 +105,7 @@
 package_gnuradio-companion() {
   pkgdesc="GUI frontend for gnuradio and SDR."
   depends=('gnuradio' 'python2-cheetah' 'python2-lxml'
-      'pygtk' 'wxpython' 'python2-opengl' 'python2-pyqwt' 'qwtplot3d'
+      'pygtk' 'wxpython' 'python2-opengl' 'qwt5' 'qwtplot3d'
       'python2-numarray')
   # Yup, nothing in the package except dependencies,
   # because more than five optdeps is too many for most people.