From 8e60d32831fae4934836da2f760b8026ce6c2d2d Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sun, 21 Dec 2014 02:01:45 +0000
Subject: remove some warnings from freebsd build

---
 Makefile            | 93 +++++++++++++++++++++++++++--------------------------
 gtk/Makefile.target | 10 +++---
 utils/nsoption.c    |  1 +
 utils/nsurl.c       |  1 +
 4 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/Makefile b/Makefile
index b37dcba22..c1d91181d 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ HOST := $(shell uname -s)
 # TODO: Ideally, we want the equivalent of s/[^A-Za-z0-9]/_/g here
 HOST := $(subst .,_,$(subst -,_,$(subst /,_,$(HOST))))
 
+
 ifeq ($(HOST),)
   HOST := riscos
   $(warning Build platform determination failed but that's a known problem for RISC OS so we're assuming a native RISC OS build.)
@@ -51,21 +52,21 @@ else
     HOST := riscos
   endif
 endif
-
 ifeq ($(HOST),riscos)
   # Build happening on RO platform, default target is RO backend
   ifeq ($(TARGET),)
     TARGET := riscos
   endif
-else
-  ifeq ($(HOST),BeOS)
-    HOST := beos
-  endif
-  ifeq ($(HOST),Haiku)
-    # Haiku implements the BeOS API
-    HOST := beos
-  endif
-  ifeq ($(HOST),beos)
+endif
+
+ifeq ($(HOST),BeOS)
+  HOST := beos
+endif
+ifeq ($(HOST),Haiku)
+  # Haiku implements the BeOS API
+  HOST := beos
+endif
+ifeq ($(HOST),beos)
     # Build happening on BeOS platform, default target is BeOS backend
     ifeq ($(TARGET),)
       TARGET := beos
@@ -73,44 +74,46 @@ else
     ifeq ($(TARGET),haiku)
       TARGET := beos
     endif
-  else
-    ifeq ($(HOST),AmigaOS)
-      HOST := amiga
-      ifeq ($(TARGET),)
-        TARGET := amiga
-      endif
-    else
-      ifeq ($(HOST),Darwin)
-        HOST := macosx
-        ifeq ($(TARGET),)
-          TARGET := cocoa
-        endif
-      endif  
-      ifeq ($(HOST),FreeMiNT)
-        HOST := mint
-      endif
-      ifeq ($(HOST),mint)
-        ifeq ($(TARGET),)
-          TARGET := atari
-        endif
-      endif
-      ifeq ($(findstring MINGW,$(HOST)),MINGW)
-        # MSYS' uname reports the likes of "MINGW32_NT-6.0"
-        HOST := windows
-      endif
-      ifeq ($(HOST),windows)
-        ifeq ($(TARGET),)
-          TARGET := windows
-        endif
-      endif
+endif
 
-      # Default target is GTK backend
-      ifeq ($(TARGET),)
-        TARGET := gtk
-      endif
-    endif
+ifeq ($(HOST),AmigaOS)
+  HOST := amiga
+  ifeq ($(TARGET),)
+    TARGET := amiga
+  endif
+endif
+
+ifeq ($(HOST),Darwin)
+  HOST := macosx
+  ifeq ($(TARGET),)
+    TARGET := cocoa
+  endif
+endif
+
+ifeq ($(HOST),FreeMiNT)
+  HOST := mint
+endif
+ifeq ($(HOST),mint)
+  ifeq ($(TARGET),)
+    TARGET := atari
+  endif
+endif
+
+ifeq ($(findstring MINGW,$(HOST)),MINGW)
+  # MSYS' uname reports the likes of "MINGW32_NT-6.0"
+  HOST := windows
+endif
+ifeq ($(HOST),windows)
+  ifeq ($(TARGET),)
+    TARGET := windows
   endif
 endif
+
+# Default target is GTK backend
+ifeq ($(TARGET),)
+  TARGET := gtk
+endif
+
 SUBTARGET =
 RESOURCES =
 
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index e7952bbb5..805488bd0 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -38,8 +38,10 @@ GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
 	       	-DGTK_DISABLE_SINGLE_INCLUDES \
 	       	-DGTK_DISABLE_DEPRECATED \
 		-DGTK_MULTIHEAD_SAFE \
-		-DPANGO_DISABLE_DEPRECATED \
-	       	-DGDK_PIXBUF_DISABLE_DEPRECATED
+		-DPANGO_DISABLE_DEPRECATED
+
+# later editions of gtk 2 deprecate interfaces we rely upon for cursors
+# -DGDK_PIXBUF_DISABLE_DEPRECATED
 
 # libsexy currently means we cannot enable this
 #		-DGDK_DISABLE_DEPRECATED 
@@ -88,11 +90,7 @@ define convert_image
 S_PIXBUF += $(2)
 
 $(2): $(1)
-ifeq ($(HOST),FreeBSD)
-	$(Q)echo "#include <gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h>" > $(2)
-else
 	$(Q)echo "#include <gdk-pixbuf/gdk-pixdata.h>" > $(2)
-endif
 	$(Q)gdk-pixbuf-csource --extern --struct --name=$(3) $(1) >> $(2) || \
 	( rm -f $(2) && false )
 
diff --git a/utils/nsoption.c b/utils/nsoption.c
index e987a4316..72a591d04 100644
--- a/utils/nsoption.c
+++ b/utils/nsoption.c
@@ -29,6 +29,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 #include "desktop/plot_style.h"
 #include "utils/errors.h"
diff --git a/utils/nsurl.c b/utils/nsurl.c
index 3b5337350..041699dbd 100644
--- a/utils/nsurl.c
+++ b/utils/nsurl.c
@@ -31,6 +31,7 @@
 #include <libwapcaplet/libwapcaplet.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 #include "utils/corestrings.h"
 #include "utils/errors.h"
-- 
cgit v1.2.3