From e25c01d1c568cfab9da5b351b8f0421b966a70ba Mon Sep 17 00:00:00 2001 From: Kirill Ponomarev Date: Sat, 9 Oct 2004 07:51:12 +0000 Subject: Fix build with gcc-3.4 PR: ports/71941 Submitted by: maintainer Approved by: portmgr (implicit) --- comms/grig/Makefile | 6 +----- comms/grig/files/patch-aa | 18 ++++++++++++++++++ comms/grig/files/patch-ab | 18 ++++++++++++++++++ comms/grig/files/patch-ac | 18 ++++++++++++++++++ comms/grig/files/patch-ad | 18 ++++++++++++++++++ comms/grig/files/patch-ae | 19 +++++++++++++++++++ comms/grig/files/patch-src::grig-druid-loc.c | 13 ------------- 7 files changed, 92 insertions(+), 18 deletions(-) create mode 100644 comms/grig/files/patch-aa create mode 100644 comms/grig/files/patch-ab create mode 100644 comms/grig/files/patch-ac create mode 100644 comms/grig/files/patch-ad create mode 100644 comms/grig/files/patch-ae delete mode 100644 comms/grig/files/patch-src::grig-druid-loc.c (limited to 'comms/grig') diff --git a/comms/grig/Makefile b/comms/grig/Makefile index d8610828580e..40cffd825a9e 100644 --- a/comms/grig/Makefile +++ b/comms/grig/Makefile @@ -6,7 +6,7 @@ PORTNAME= grig PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= groundstation @@ -27,10 +27,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ .include -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif - post-patch: @${REINPLACE_CMD} -e 's|GCONF_LIBS="`|GCONF_LIBS="-lgconf-gtk-1 `|' ${WRKSRC}/configure diff --git a/comms/grig/files/patch-aa b/comms/grig/files/patch-aa new file mode 100644 index 000000000000..a0312ceb5bda --- /dev/null +++ b/comms/grig/files/patch-aa @@ -0,0 +1,18 @@ +--- ./src/gnome-hamlib-rig.c.orig Mon Sep 20 15:35:02 2004 ++++ ./src/gnome-hamlib-rig.c Mon Sep 20 15:38:35 2004 +@@ -495,6 +495,7 @@ + case 2: pbwidth = rig_passband_narrow (GNOME_HAMLIB_RIG (ghr)->rig, mode); + break; + default: /* THIS SHOULD NEVER HAVE HAPPENED ERROR */ ++ break; + } + retcode = rig_set_mode (GNOME_HAMLIB_RIG (ghr)->rig, RIG_VFO_CURR, mode, pbwidth); + if (retcode != RIG_OK) { +@@ -1367,6 +1368,7 @@ + case 2: pbwidth = rig_passband_narrow (ghr->rig, mode); + break; + default: /* THIS SHOULD NEVER HAVE HAPPENED ERROR */ ++ break; + } + retcode = rig_set_mode (ghr->rig, RIG_VFO_CURR, mode, pbwidth); + if (retcode == RIG_OK) { diff --git a/comms/grig/files/patch-ab b/comms/grig/files/patch-ab new file mode 100644 index 000000000000..e3606929be20 --- /dev/null +++ b/comms/grig/files/patch-ab @@ -0,0 +1,18 @@ +--- ./src/grig-config-rig.c.orig Mon Sep 20 15:36:13 2004 ++++ ./src/grig-config-rig.c Mon Sep 20 15:37:42 2004 +@@ -433,6 +433,7 @@ + case 1: /* Cancel */ + break; + default: ++ break; + } + gnome_dialog_close (GNOME_DIALOG (dialog)); + } +@@ -575,6 +576,7 @@ + case 1: /* Cancel */ + break; + default: ++ break; + } + gnome_dialog_close (GNOME_DIALOG (dialog)); + } diff --git a/comms/grig/files/patch-ac b/comms/grig/files/patch-ac new file mode 100644 index 000000000000..75e7c16f1dc5 --- /dev/null +++ b/comms/grig/files/patch-ac @@ -0,0 +1,18 @@ +--- ./src/grig-config-rot.c.orig Mon Sep 20 15:39:11 2004 ++++ ./src/grig-config-rot.c Mon Sep 20 15:40:07 2004 +@@ -429,6 +429,7 @@ + case 1: /* Cancel */ + break; + default: ++ break; + } + gnome_dialog_close (GNOME_DIALOG (dialog)); + } +@@ -571,6 +572,7 @@ + case 1: /* Cancel */ + break; + default: ++ break; + } + gnome_dialog_close (GNOME_DIALOG (dialog)); + } diff --git a/comms/grig/files/patch-ad b/comms/grig/files/patch-ad new file mode 100644 index 000000000000..470ddb30889c --- /dev/null +++ b/comms/grig/files/patch-ad @@ -0,0 +1,18 @@ +--- ./src/grig-config.c.orig Mon Sep 20 15:40:26 2004 ++++ ./src/grig-config.c Mon Sep 20 15:41:25 2004 +@@ -161,6 +161,7 @@ + break; + #endif + default: ++ break; + } + } + +@@ -209,6 +210,7 @@ + break; + #endif + default: ++ break; + } + } + diff --git a/comms/grig/files/patch-ae b/comms/grig/files/patch-ae new file mode 100644 index 000000000000..d11aaae5dee5 --- /dev/null +++ b/comms/grig/files/patch-ae @@ -0,0 +1,19 @@ +--- ./src/grig-druid-loc.c.orig Sun May 9 07:18:50 2004 ++++ ./src/grig-druid-loc.c Sat Aug 14 15:39:16 2004 +@@ -294,7 +294,7 @@ + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (radll))) { + longlat2locator (g_strtod (gtk_entry_get_text (GTK_ENTRY (lonwdg)), NULL), + g_strtod (gtk_entry_get_text (GTK_ENTRY (latwdg)), NULL), +- loc); ++ loc, 3); + gtk_entry_set_text (GTK_ENTRY (locatorwdg), g_strdup (loc)); + } + #endif +@@ -342,6 +342,7 @@ + gtk_widget_set_sensitive (locatorwdg, FALSE); + break; + default: ++ break; + } + } + } diff --git a/comms/grig/files/patch-src::grig-druid-loc.c b/comms/grig/files/patch-src::grig-druid-loc.c deleted file mode 100644 index 6d0f307914ff..000000000000 --- a/comms/grig/files/patch-src::grig-druid-loc.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/grig-druid-loc.c.orig Sun May 9 07:18:50 2004 -+++ src/grig-druid-loc.c Sun May 9 07:16:04 2004 -@@ -293,9 +293,9 @@ - */ - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (radll))) { - longlat2locator (g_strtod (gtk_entry_get_text (GTK_ENTRY (lonwdg)), NULL), - g_strtod (gtk_entry_get_text (GTK_ENTRY (latwdg)), NULL), -- loc); -+ loc, 3); - gtk_entry_set_text (GTK_ENTRY (locatorwdg), g_strdup (loc)); - } - #endif - } -- cgit v1.2.3