cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r552897

Browse Source 
misc/iio-oscilloscope: fix build on GCC architectures

Use C11 compiler:
cc1: warnings being treated as errors
In file included from /usr/local/include/glib-2.0/glib/gthread.h:34,
                 from /usr/local/include/glib-2.0/glib/gasyncqueue.h:32,
                 from /usr/local/include/glib-2.0/glib.h:32,
                 from /usr/local/include/glib-2.0/gmodule.h:28,
                 from /wrkdirs/usr/ports/misc/iio-oscilloscope/work/iio-oscilloscope-0.11-master/iio_utils.h:11,
                 from /wrkdirs/usr/ports/misc/iio-oscilloscope/work/iio-oscilloscope-0.11-master/iio_utils.c:1:
/usr/local/include/glib-2.0/glib/gutils.h:336: warning: 'GVoidFunc' is deprecated

Also remove previous patches that fixed build with base GCC of previous version of the port.

Approved by:	portmgr (fix build blanket)
This commit is contained in:
Piotr Kubaj 2020-10-21 20:54:56 +00:00
parent 630b73a5f5
commit 2dc1627fc0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=552898
3 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/iio-oscilloscope/Makefile
View File

@ -23,7 +23,7 @@ LIB_DEPENDS= libad9361.so:misc/libad9361-iio \
libjansson.so:devel/jansson \
libmatio.so:math/matio
USES= cmake gnome localbase:ldflags pkgconfig
USES= cmake compiler:c11 gnome localbase:ldflags pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= analogdevicesinc
USE_GNOME= atk cairo gdkpixbuf2 gtk20 libxml2 pango

11
misc/iio-oscilloscope/files/patch-osc.c
View File

@ -1,11 +0,0 @@
--- osc.c.orig 2019-10-31 18:10:02 UTC
+++ osc.c
@@ -573,7 +573,7 @@ int plugin_data_capture_of_plot(OscPlot *plot, const c
struct iio_device *dev, *tmp_dev = NULL;
struct extra_dev_info *dev_info;
struct marker_type *markers_copy = NULL;
- GMutex *markers_lock;
+ GMutex *markers_lock = NULL;
unsigned int i, j;
bool new = FALSE;
const char *tmp = NULL;

11
misc/iio-oscilloscope/files/patch-plugins_lidar.c
View File

@ -1,11 +0,0 @@
--- plugins/lidar.c.orig 2019-10-31 18:10:53 UTC
+++ plugins/lidar.c
@@ -112,7 +112,7 @@ static void auto_cfg_set_cb(void)
static void auto_cfg_button_changed_cb(GtkSpinButton *btn)
{
// Force the buttons value to have a valid permutation of (0, 1, 2, 3)
- int i, j, idx;
+ int i, j, idx = 0;
int old_val;
int crt_val = gtk_spin_button_get_value_as_int(btn);