[143945] trunk/dports/science/gqrx

[michaelld at macports.org]

Revision: 143945
          https://trac.macports.org/changeset/143945
Author:   michaelld at macports.org
Date:     2015-12-28 09:03:24 -0800 (Mon, 28 Dec 2015)
Log Message:
-----------
gqrx: update to fa6ff70a (20151227), adding in +qt4 patch to remove Qt5-specific UI code.

Modified Paths:
--------------
    trunk/dports/science/gqrx/Portfile
    trunk/dports/science/gqrx/files/patch-gqrx.pro.diff

Added Paths:
-----------
    trunk/dports/science/gqrx/files/patch-src_qtgui_dockrds.ui.diff

Modified: trunk/dports/science/gqrx/Portfile
===================================================================
--- trunk/dports/science/gqrx/Portfile	2015-12-28 16:30:44 UTC (rev 143944)
+++ trunk/dports/science/gqrx/Portfile	2015-12-28 17:03:24 UTC (rev 143945)
@@ -20,11 +20,10 @@
     long_description    ${description}  \
         This port is kept up with the Gqrx GIT 'master' branch, is typically updated weekly to monthly, and provides compatibility with the GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports.  ${description_common}
 
-    github.setup        csete gqrx 9e4716b9952a415cf19488811640fc582bcfaf22
-    version             20151212
-    revision            1
-    checksums           rmd160 1ede04f493dba719c4f144dcf6470083d0287c11 \
-                        sha256 809dd4623d2e3e0d46f90611d78d82839f15ef2af602d3f4f0bf0f7b3565faf1
+    github.setup        csete gqrx fa6ff70a8d956c4c41c7d485c5232ab3361caaed
+    version             20151227
+    checksums           rmd160 f166319b77be4e680bc64594c240db9ac4a23138 \
+                        sha256 9ed7f56f883bc9a070104573eb1ddccb51948a20a7552befc0370da30d32f1d4
 
     conflicts           gqrx-legacy
 
@@ -99,6 +98,9 @@
 
     variant qt4 conflicts qt5 description {Build ${subport} using Qt4} {
         PortGroup qmake 1.0
+
+        # remove Qt5-specific UI code
+        patchfiles-append patch-src_qtgui_dockrds.ui.diff
     }
 
     variant qt5 conflicts qt4 description {Build ${subport} using Qt5} {

Modified: trunk/dports/science/gqrx/files/patch-gqrx.pro.diff
===================================================================
--- trunk/dports/science/gqrx/files/patch-gqrx.pro.diff	2015-12-28 16:30:44 UTC (rev 143944)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro.diff	2015-12-28 17:03:24 UTC (rev 143945)
@@ -1,6 +1,6 @@
---- gqrx.pro.orig
-+++ gqrx.pro
-@@ -48,10 +48,12 @@
+--- gqrx.pro.orig	2015-12-28 11:30:47.000000000 -0500
++++ gqrx.pro	2015-12-28 11:32:39.000000000 -0500
+@@ -48,24 +48,26 @@
      PREFIX=/usr/local
  }
  
@@ -9,25 +9,26 @@
  INSTALLS    += target 
  
 -#CONFIG += debug
+-
 +CONFIG -= debug
 +VER = @VERSION@
 +CONFIG += @ARCHES@
- 
++ 
  # disable debug messages in release
  CONFIG(debug, debug|release) {
-@@ -60,13 +62,13 @@
+     # Use for valgrind
+     #QMAKE_CFLAGS_DEBUG += '-g -O0'
  
      # Define version string (see below for releases)
-     ## VER = $$system(git describe --abbrev=8)
--    VER = 2.4
-+    # VER = 2.4
+-    VER = $$system(git describe --abbrev=8)
++    # VER = $$system(git describe --abbrev=8)
+     ##VER = 2.4
  
  } else {
      DEFINES += QT_NO_DEBUG
      DEFINES += QT_NO_DEBUG_OUTPUT
-     ## VER = $$system(git describe --abbrev=1)
--    VER = 2.4
-+    # VER = 2.4
+-    VER = $$system(git describe --abbrev=1)
++    # VER = $$system(git describe --abbrev=1)
+     ##VER = 2.4
  
      # Release binaries with gr bundled
-     # QMAKE_RPATH & co won't work with origin

Added: trunk/dports/science/gqrx/files/patch-src_qtgui_dockrds.ui.diff
===================================================================
--- trunk/dports/science/gqrx/files/patch-src_qtgui_dockrds.ui.diff	                        (rev 0)
+++ trunk/dports/science/gqrx/files/patch-src_qtgui_dockrds.ui.diff	2015-12-28 17:03:24 UTC (rev 143945)
@@ -0,0 +1,12 @@
+--- src/qtgui/dockrds.ui.orig
++++ src/qtgui/dockrds.ui
+@@ -50,9 +50,6 @@
+       <property name="frameShadow">
+        <enum>QFrame::Sunken</enum>
+       </property>
+-      <property name="sizeAdjustPolicy">
+-       <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
+-      </property>
+       <property name="widgetResizable">
+        <bool>true</bool>
+       </property>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151228/bab407da/attachment.html>