Date: Tue, 10 Jun 2014 19:58:41 +0000 (UTC) From: Henrik Brix Andersen <brix@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357371 - in head/net-mgmt/spectools: . files Message-ID: <201406101958.s5AJwfSt086520@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brix Date: Tue Jun 10 19:58:40 2014 New Revision: 357371 URL: http://svnweb.freebsd.org/changeset/ports/357371 QAT: https://qat.redports.org/buildarchive/r357371/ Log: - Fix compilation with GTK+ front end enabled Added: head/net-mgmt/spectools/files/patch-spectool_gtk.c (contents, props changed) head/net-mgmt/spectools/files/patch-spectool_gtk_channel.c (contents, props changed) head/net-mgmt/spectools/files/patch-spectool_gtk_hw_registry.c (contents, props changed) head/net-mgmt/spectools/files/patch-spectool_gtk_planar.c (contents, props changed) head/net-mgmt/spectools/files/patch-spectool_gtk_spectral.c (contents, props changed) head/net-mgmt/spectools/files/patch-spectool_gtk_topo.c (contents, props changed) head/net-mgmt/spectools/files/patch-spectool_gtk_widget.c (contents, props changed) head/net-mgmt/spectools/files/patch-spectool_gtk_widget.h (contents, props changed) Modified: head/net-mgmt/spectools/Makefile Modified: head/net-mgmt/spectools/Makefile ============================================================================== --- head/net-mgmt/spectools/Makefile Tue Jun 10 19:34:13 2014 (r357370) +++ head/net-mgmt/spectools/Makefile Tue Jun 10 19:58:40 2014 (r357371) @@ -3,7 +3,7 @@ PORTNAME= spectools PORTVERSION= 201108.r1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= http://www.kismetwireless.net/code/ \ ${MASTER_SITE_LOCAL} @@ -31,7 +31,7 @@ ALL_TARGET= spectool_net spectool_raw .if ${PORT_OPTIONS:MGTK2} ALL_TARGET+= spectool_gtk -LIB_DEPENDS+= gtk:${PORTSDIR}/x11-toolkits/gtk20 +LIB_DEPENDSOC+= libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 PLIST_SUB+= GTK="" .else PLIST_SUB+= GTK="@comment " Added: head/net-mgmt/spectools/files/patch-spectool_gtk.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/spectools/files/patch-spectool_gtk.c Tue Jun 10 19:58:40 2014 (r357371) @@ -0,0 +1,11 @@ +--- spectool_gtk.c.orig 2014-06-10 21:22:30.000000000 +0200 ++++ spectool_gtk.c 2014-06-10 21:22:51.000000000 +0200 +@@ -182,7 +182,7 @@ static gboolean main_nodev_menu_button_p + GtkWidget *menu; + nb_aux *nbaux = (nb_aux *) aux; + +- g_return_if_fail(aux != NULL); ++ g_return_val_if_fail(aux != NULL, FALSE); + + if (event->type == GDK_BUTTON_PRESS) { + GdkEventButton *bevent = (GdkEventButton *) event; Added: head/net-mgmt/spectools/files/patch-spectool_gtk_channel.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/spectools/files/patch-spectool_gtk_channel.c Tue Jun 10 19:58:40 2014 (r357371) @@ -0,0 +1,75 @@ +--- spectool_gtk_channel.c.orig 2014-06-10 21:11:26.000000000 +0200 ++++ spectool_gtk_channel.c 2014-06-10 21:30:00.000000000 +0200 +@@ -39,12 +39,12 @@ static gboolean spectool_channel_mouse_m + + G_DEFINE_TYPE(SpectoolChannel, spectool_channel, SPECTOOL_TYPE_WIDGET); + +-inline int spectool_channel_find_chan_pt(SpectoolChannel *cwidget, int x, int y) { ++static inline int spectool_channel_find_chan_pt(SpectoolChannel *cwidget, int x, int y) { + int dbm, maxy, nchannels; + SpectoolWidget *wwidget; + +- g_return_if_fail(cwidget != NULL); +- g_return_if_fail(IS_SPECTOOL_WIDGET(cwidget)); ++ g_return_val_if_fail(cwidget != NULL, 0); ++ g_return_val_if_fail(IS_SPECTOOL_WIDGET(cwidget), 0); + wwidget = SPECTOOL_WIDGET(cwidget); + + /* Only compute if we know a chanset and if we're inside the bounding +@@ -224,17 +224,17 @@ static gint spectool_channel_button_pres + int ch; + GList *upd_iter; + +- g_return_if_fail(aux != NULL); +- g_return_if_fail(IS_SPECTOOL_CHANNEL(aux)); +- g_return_if_fail(IS_SPECTOOL_WIDGET(aux)); ++ g_return_val_if_fail(aux != NULL, 0); ++ g_return_val_if_fail(IS_SPECTOOL_CHANNEL(aux), 0); ++ g_return_val_if_fail(IS_SPECTOOL_WIDGET(aux), 0); + + channel = SPECTOOL_CHANNEL(aux); + wwidget = SPECTOOL_WIDGET(aux); + +- g_return_if_fail(wwidget->chanopts != NULL); +- g_return_if_fail(wwidget->chanopts->chanset != NULL); +- g_return_if_fail(wwidget->sweepcache != NULL); +- g_return_if_fail(wwidget->sweepcache->latest != NULL); ++ g_return_val_if_fail(wwidget->chanopts != NULL, 0); ++ g_return_val_if_fail(wwidget->chanopts->chanset != NULL, 0); ++ g_return_val_if_fail(wwidget->sweepcache != NULL, 0); ++ g_return_val_if_fail(wwidget->sweepcache->latest != NULL, 0); + + if (event->button != 1) + return TRUE; +@@ -278,15 +278,15 @@ static gboolean spectool_channel_mouse_m + SpectoolWidget *wwidget; + GList *upd_iter; + +- g_return_if_fail(aux != NULL); +- g_return_if_fail(IS_SPECTOOL_CHANNEL(aux)); +- g_return_if_fail(IS_SPECTOOL_WIDGET(aux)); ++ g_return_val_if_fail(aux != NULL, FALSE); ++ g_return_val_if_fail(IS_SPECTOOL_CHANNEL(aux), FALSE); ++ g_return_val_if_fail(IS_SPECTOOL_WIDGET(aux), FALSE); + + channel = SPECTOOL_CHANNEL(aux); + wwidget = SPECTOOL_WIDGET(aux); + +- g_return_if_fail(wwidget->sweepcache != NULL); +- g_return_if_fail(wwidget->sweepcache->latest != NULL); ++ g_return_val_if_fail(wwidget->sweepcache != NULL, FALSE); ++ g_return_val_if_fail(wwidget->sweepcache->latest != NULL, FALSE); + + if (event->is_hint) { + gdk_window_get_pointer(event->window, &x, &y, &state); +@@ -298,8 +298,8 @@ static gboolean spectool_channel_mouse_m + + /* Search for the channel positions, update the graph if we've changed + * the highlighted channel */ +- g_return_if_fail(wwidget->chanopts != NULL); +- g_return_if_fail(wwidget->chanopts->chanset != NULL); ++ g_return_val_if_fail(wwidget->chanopts != NULL, FALSE); ++ g_return_val_if_fail(wwidget->chanopts->chanset != NULL, FALSE); + + if ((ch = spectool_channel_find_chan_pt(channel, x, y)) >= -1) { + if (ch != wwidget->chanopts->hi_chan) { Added: head/net-mgmt/spectools/files/patch-spectool_gtk_hw_registry.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/spectools/files/patch-spectool_gtk_hw_registry.c Tue Jun 10 19:58:40 2014 (r357371) @@ -0,0 +1,37 @@ +--- spectool_gtk_hw_registry.c.orig 2014-06-10 21:02:47.000000000 +0200 ++++ spectool_gtk_hw_registry.c 2014-06-10 21:05:11.000000000 +0200 +@@ -326,10 +326,10 @@ gboolean wdr_bcpoll(GIOChannel *ioch, GI + + spectool_phy *wdr_get_phy(spectool_device_registry *wdr, int slot) { + if (slot < 0 || slot > wdr->max_dev) +- return; ++ return NULL; + + if (wdr->devices[slot] == NULL) +- return; ++ return NULL; + + return wdr->devices[slot]->phydev; + } +@@ -523,10 +523,10 @@ gboolean wdr_netrpoll(GIOChannel *ioch, + char err[SPECTOOL_ERROR_MAX]; + + if (wdrpr->slot < 0 || wdrpr->slot > wdrpr->wdr->max_dev) +- return; ++ return FALSE; + + if (wdrpr->wdr->netservers[wdrpr->slot] == NULL) +- return; ++ return FALSE; + + sr = wdrpr->wdr->netservers[wdrpr->slot]->srv; + +@@ -537,7 +537,7 @@ gboolean wdr_netrpoll(GIOChannel *ioch, + Spectool_Alert_Dialog(err); + + wdr_close_net(wdrpr->wdr, wdrpr->slot); +- return; ++ return FALSE; + } + + } while ((r & SPECTOOL_NETCLI_POLL_ADDITIONAL)); Added: head/net-mgmt/spectools/files/patch-spectool_gtk_planar.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/spectools/files/patch-spectool_gtk_planar.c Tue Jun 10 19:58:40 2014 (r357371) @@ -0,0 +1,44 @@ +--- spectool_gtk_planar.c.orig 2014-06-10 21:16:11.000000000 +0200 ++++ spectool_gtk_planar.c 2014-06-10 21:17:52.000000000 +0200 +@@ -351,15 +351,15 @@ static gint spectool_planar_button_press + SpectoolWidget *wwidget; + int ch; + +- g_return_if_fail(aux != NULL); +- g_return_if_fail(IS_SPECTOOL_PLANAR(aux)); +- g_return_if_fail(IS_SPECTOOL_WIDGET(aux)); ++ g_return_val_if_fail(aux != NULL, 0); ++ g_return_val_if_fail(IS_SPECTOOL_PLANAR(aux), 0); ++ g_return_val_if_fail(IS_SPECTOOL_WIDGET(aux), 0); + + planar = SPECTOOL_PLANAR(aux); + wwidget = SPECTOOL_WIDGET(aux); + +- g_return_if_fail(wwidget->sweepcache != NULL); +- g_return_if_fail(wwidget->sweepcache->avg != NULL); ++ g_return_val_if_fail(wwidget->sweepcache != NULL, 0); ++ g_return_val_if_fail(wwidget->sweepcache->avg != NULL, 0); + + if (event->button != 1) + return TRUE; +@@ -379,15 +379,15 @@ static gboolean spectool_planar_mouse_mo + SpectoolPlanar *planar; + SpectoolWidget *wwidget; + +- g_return_if_fail(aux != NULL); +- g_return_if_fail(IS_SPECTOOL_PLANAR(aux)); +- g_return_if_fail(IS_SPECTOOL_WIDGET(aux)); ++ g_return_val_if_fail(aux != NULL, FALSE); ++ g_return_val_if_fail(IS_SPECTOOL_PLANAR(aux), FALSE); ++ g_return_val_if_fail(IS_SPECTOOL_WIDGET(aux), FALSE); + + planar = SPECTOOL_PLANAR(aux); + wwidget = SPECTOOL_WIDGET(aux); + +- g_return_if_fail(wwidget->sweepcache != NULL); +- g_return_if_fail(wwidget->sweepcache->avg != NULL); ++ g_return_val_if_fail(wwidget->sweepcache != NULL, FALSE); ++ g_return_val_if_fail(wwidget->sweepcache->avg != NULL, FALSE); + + if (event->is_hint) { + gdk_window_get_pointer(event->window, &x, &y, &state); Added: head/net-mgmt/spectools/files/patch-spectool_gtk_spectral.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/spectools/files/patch-spectool_gtk_spectral.c Tue Jun 10 19:58:40 2014 (r357371) @@ -0,0 +1,15 @@ +--- spectool_gtk_spectral.c.orig 2014-06-10 21:19:12.000000000 +0200 ++++ spectool_gtk_spectral.c 2014-06-10 21:19:47.000000000 +0200 +@@ -415,9 +415,9 @@ static gboolean spectool_spectral_legend + cairo_pattern_t *pattern; + int cp; + +- g_return_if_fail(widget != NULL); +- g_return_if_fail(aux != NULL); +- g_return_if_fail(IS_SPECTOOL_SPECTRAL(aux)); ++ g_return_val_if_fail(widget != NULL, FALSE); ++ g_return_val_if_fail(aux != NULL, FALSE); ++ g_return_val_if_fail(IS_SPECTOOL_SPECTRAL(aux), FALSE); + + spectral = SPECTOOL_SPECTRAL(aux); + Added: head/net-mgmt/spectools/files/patch-spectool_gtk_topo.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/spectools/files/patch-spectool_gtk_topo.c Tue Jun 10 19:58:40 2014 (r357371) @@ -0,0 +1,15 @@ +--- spectool_gtk_topo.c.orig 2014-06-10 21:20:53.000000000 +0200 ++++ spectool_gtk_topo.c 2014-06-10 21:21:27.000000000 +0200 +@@ -379,9 +379,9 @@ static gboolean spectool_topo_legend_exp + cairo_pattern_t *pattern; + int cp; + +- g_return_if_fail(widget != NULL); +- g_return_if_fail(aux != NULL); +- g_return_if_fail(IS_SPECTOOL_TOPO(aux)); ++ g_return_val_if_fail(widget != NULL, FALSE); ++ g_return_val_if_fail(aux != NULL, FALSE); ++ g_return_val_if_fail(IS_SPECTOOL_TOPO(aux), FALSE); + + topo = SPECTOOL_TOPO(aux); + Added: head/net-mgmt/spectools/files/patch-spectool_gtk_widget.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/spectools/files/patch-spectool_gtk_widget.c Tue Jun 10 19:58:40 2014 (r357371) @@ -0,0 +1,48 @@ +--- spectool_gtk_widget.c.orig 2014-06-10 21:07:11.000000000 +0200 ++++ spectool_gtk_widget.c 2014-06-10 21:09:56.000000000 +0200 +@@ -184,8 +184,8 @@ static gboolean spectool_widget_menu_but + SpectoolWidgetController *con = (SpectoolWidgetController *) widget; + char alt_title_text[32]; + +- g_return_if_fail(widget != NULL); +- g_return_if_fail(event != NULL); ++ g_return_val_if_fail(widget != NULL, FALSE); ++ g_return_val_if_fail(event != NULL, FALSE); + + if (event->type == GDK_BUTTON_PRESS) { + GdkEventButton *bevent = (GdkEventButton *) event; +@@ -231,8 +231,8 @@ SpectoolWidgetController *spectool_widge + GdkColor c; + GtkStyle *style; + +- g_return_if_fail(widget != NULL); +- g_return_if_fail(IS_SPECTOOL_WIDGET(widget)); ++ g_return_val_if_fail(widget != NULL, NULL); ++ g_return_val_if_fail(IS_SPECTOOL_WIDGET(widget), NULL); + + wwidget = SPECTOOL_WIDGET(widget); + +@@ -294,9 +294,9 @@ gint spectool_widget_mouse_click(GtkWidg + GtkWidget *menu; + GdkEvent *event = (GdkEvent *) button; + +- g_return_if_fail(widget != NULL); +- g_return_if_fail(aux != NULL); +- g_return_if_fail(IS_SPECTOOL_WIDGET(aux)); ++ g_return_val_if_fail(widget != NULL, 0); ++ g_return_val_if_fail(aux != NULL, 0); ++ g_return_val_if_fail(IS_SPECTOOL_WIDGET(aux), 0); + + wwidget = SPECTOOL_WIDGET(aux); + +@@ -780,8 +780,8 @@ static gint spectool_widget_expose(GtkWi + SpectoolWidget *wwidget; + cairo_t *cr; + +- g_return_if_fail(widget != NULL); +- g_return_if_fail(IS_SPECTOOL_WIDGET(aux)); ++ g_return_val_if_fail(widget != NULL, 0); ++ g_return_val_if_fail(IS_SPECTOOL_WIDGET(aux), 0); + wwidget = SPECTOOL_WIDGET(aux); + + cr = gdk_cairo_create(widget->window); Added: head/net-mgmt/spectools/files/patch-spectool_gtk_widget.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/spectools/files/patch-spectool_gtk_widget.h Tue Jun 10 19:58:40 2014 (r357371) @@ -0,0 +1,22 @@ +--- spectool_gtk_widget.h.orig 2014-06-10 21:28:10.000000000 +0200 ++++ spectool_gtk_widget.h 2014-06-10 21:27:46.000000000 +0200 +@@ -196,16 +196,16 @@ void spectool_widget_link_channel(GtkWid + gint spectool_widget_timeout(gpointer *data); + + /* Calculate the channel clicked in */ +-inline int spectool_widget_find_chan_pt(SpectoolWidget *wwidget, int x, int y); ++int spectool_widget_find_chan_pt(SpectoolWidget *wwidget, int x, int y); + + void spectool_widget_context_channels(gpointer *aux); + void spectool_widget_context_dbm(gpointer *aux); + void spectool_widget_context_dbmlines(gpointer *aux); + + /* Color space conversion tools */ +-inline void rgb_to_hsv(double r, double g, double b, ++void rgb_to_hsv(double r, double g, double b, + double *h, double *s, double *v); +-inline void hsv_to_rgb(double *r, double *g, double *b, ++void hsv_to_rgb(double *r, double *g, double *b, + double h, double s, double v); + + G_END_DECLS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406101958.s5AJwfSt086520>