From 7b613920635a2e4fdf8467ed16d4d9dba25829c7 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 6 Sep 2013 21:20:28 +0000
Subject: Fix build with libc++

---
 .../nucleo/files/patch-nucleo__helpers__Phone.cxx     | 10 ++++++++++
 .../files/patch-nucleo__image__encoding__PNGenc.cxx   | 19 +++++++++++++++++++
 .../patch-nucleo__image__sink__bufferedImageSink.cxx  | 10 ++++++++++
 .../files/patch-nucleo__image__sink__novImageSink.cxx | 10 ++++++++++
 .../patch-nucleo__image__sink__nserverImageSink.H     | 10 ++++++++++
 .../patch-nucleo__image__sink__nudppImageSink.cxx     | 12 ++++++++++++
 .../files/patch-nucleo__network__NetworkUtils.cxx     | 10 ++++++++++
 .../files/patch-nucleo__network__udp__UdpSocket.cxx   | 10 ++++++++++
 .../nucleo/files/patch-nucleo__utils__AppUtils.cxx    | 10 ++++++++++
 .../nucleo/files/patch-tests__test-Base64.cxx         | 10 ++++++++++
 x11-toolkits/nucleo/files/patch-tests__test-MD5.cxx   | 10 ++++++++++
 11 files changed, 121 insertions(+)
 create mode 100644 x11-toolkits/nucleo/files/patch-nucleo__helpers__Phone.cxx
 create mode 100644 x11-toolkits/nucleo/files/patch-nucleo__image__encoding__PNGenc.cxx
 create mode 100644 x11-toolkits/nucleo/files/patch-nucleo__image__sink__bufferedImageSink.cxx
 create mode 100644 x11-toolkits/nucleo/files/patch-nucleo__image__sink__novImageSink.cxx
 create mode 100644 x11-toolkits/nucleo/files/patch-nucleo__image__sink__nserverImageSink.H
 create mode 100644 x11-toolkits/nucleo/files/patch-nucleo__image__sink__nudppImageSink.cxx
 create mode 100644 x11-toolkits/nucleo/files/patch-nucleo__network__NetworkUtils.cxx
 create mode 100644 x11-toolkits/nucleo/files/patch-nucleo__network__udp__UdpSocket.cxx
 create mode 100644 x11-toolkits/nucleo/files/patch-nucleo__utils__AppUtils.cxx
 create mode 100644 x11-toolkits/nucleo/files/patch-tests__test-Base64.cxx
 create mode 100644 x11-toolkits/nucleo/files/patch-tests__test-MD5.cxx

(limited to 'x11-toolkits')

diff --git a/x11-toolkits/nucleo/files/patch-nucleo__helpers__Phone.cxx b/x11-toolkits/nucleo/files/patch-nucleo__helpers__Phone.cxx
new file mode 100644
index 000000000000..aada2d93d413
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-nucleo__helpers__Phone.cxx
@@ -0,0 +1,10 @@
+--- ./nucleo/helpers/Phone.cxx.orig	2009-06-11 10:48:06.000000000 +0200
++++ ./nucleo/helpers/Phone.cxx	2013-09-06 23:16:41.291467318 +0200
+@@ -18,6 +18,7 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ #include <iostream>
+ #include <sstream>
diff --git a/x11-toolkits/nucleo/files/patch-nucleo__image__encoding__PNGenc.cxx b/x11-toolkits/nucleo/files/patch-nucleo__image__encoding__PNGenc.cxx
new file mode 100644
index 000000000000..39f78781be95
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-nucleo__image__encoding__PNGenc.cxx
@@ -0,0 +1,19 @@
+--- ./nucleo/image/encoding/PNGenc.cxx.orig	2008-06-05 14:52:33.000000000 +0200
++++ ./nucleo/image/encoding/PNGenc.cxx	2013-09-06 23:12:11.842483995 +0200
+@@ -16,6 +16,7 @@
+ #include <nucleo/image/encoding/PNGenc.H>
+ 
+ #include <png.h>
++#include <pngpriv.h>
+ 
+ namespace nucleo {
+ 
+@@ -170,7 +171,7 @@
+ 			  &compression_type, &filter_type) ;
+ 
+     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+-	 png_set_gray_1_2_4_to_8(png_ptr);
++	 png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 
+     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ 	 png_set_tRNS_to_alpha(png_ptr);
diff --git a/x11-toolkits/nucleo/files/patch-nucleo__image__sink__bufferedImageSink.cxx b/x11-toolkits/nucleo/files/patch-nucleo__image__sink__bufferedImageSink.cxx
new file mode 100644
index 000000000000..16ffbe98458f
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-nucleo__image__sink__bufferedImageSink.cxx
@@ -0,0 +1,10 @@
+--- ./nucleo/image/sink/bufferedImageSink.cxx.orig	2008-06-05 14:52:33.000000000 +0200
++++ ./nucleo/image/sink/bufferedImageSink.cxx	2013-09-06 23:16:07.949467532 +0200
+@@ -10,6 +10,7 @@
+  */
+ 
+ #include <nucleo/image/sink/bufferedImageSink.H>
++#include <unistd.h>
+ 
+ #define DEBUG_LEVEL 1
+ 
diff --git a/x11-toolkits/nucleo/files/patch-nucleo__image__sink__novImageSink.cxx b/x11-toolkits/nucleo/files/patch-nucleo__image__sink__novImageSink.cxx
new file mode 100644
index 000000000000..527ad2ea9192
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-nucleo__image__sink__novImageSink.cxx
@@ -0,0 +1,10 @@
+--- ./nucleo/image/sink/novImageSink.cxx.orig	2008-06-05 14:52:33.000000000 +0200
++++ ./nucleo/image/sink/novImageSink.cxx	2013-09-06 23:15:36.719237812 +0200
+@@ -18,6 +18,7 @@
+ #include <nucleo/image/encoding/Conversion.H>
+ 
+ #include <sys/uio.h>
++#include <unistd.h>
+ 
+ #include <stdexcept>
+ 
diff --git a/x11-toolkits/nucleo/files/patch-nucleo__image__sink__nserverImageSink.H b/x11-toolkits/nucleo/files/patch-nucleo__image__sink__nserverImageSink.H
new file mode 100644
index 000000000000..45e8317b73bf
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-nucleo__image__sink__nserverImageSink.H
@@ -0,0 +1,10 @@
+--- ./nucleo/image/sink/nserverImageSink.H.orig	2008-06-05 14:52:33.000000000 +0200
++++ ./nucleo/image/sink/nserverImageSink.H	2013-09-06 23:18:00.405460374 +0200
+@@ -24,6 +24,7 @@
+ #include <stdexcept>
+ 
+ #include <sys/socket.h>
++#include <unistd.h>
+ 
+ namespace nucleo {
+ 
diff --git a/x11-toolkits/nucleo/files/patch-nucleo__image__sink__nudppImageSink.cxx b/x11-toolkits/nucleo/files/patch-nucleo__image__sink__nudppImageSink.cxx
new file mode 100644
index 000000000000..e0b23b21db3e
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-nucleo__image__sink__nudppImageSink.cxx
@@ -0,0 +1,12 @@
+--- ./nucleo/image/sink/nudppImageSink.cxx.orig	2008-07-21 13:47:54.000000000 +0200
++++ ./nucleo/image/sink/nudppImageSink.cxx	2013-09-06 23:12:11.854095550 +0200
+@@ -18,6 +18,9 @@
+ #include <unistd.h>
+ #include <sys/socket.h>
+ #include <sys/uio.h>
++#if defined(__FreeBSD__) && __FreeBSD_version < 701104
++#  include <netinet/in_systm.h>
++#endif
+ #include <netinet/ip.h>
+ 
+ #include <stdexcept>
diff --git a/x11-toolkits/nucleo/files/patch-nucleo__network__NetworkUtils.cxx b/x11-toolkits/nucleo/files/patch-nucleo__network__NetworkUtils.cxx
new file mode 100644
index 000000000000..0c9a1aea514e
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-nucleo__network__NetworkUtils.cxx
@@ -0,0 +1,10 @@
+--- ./nucleo/network/NetworkUtils.cxx.orig	2008-06-05 14:52:33.000000000 +0200
++++ ./nucleo/network/NetworkUtils.cxx	2013-09-06 23:14:48.950072240 +0200
+@@ -15,6 +15,7 @@
+ 
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <unistd.h>
+ 
+ #include <iostream>
+ #include <string>
diff --git a/x11-toolkits/nucleo/files/patch-nucleo__network__udp__UdpSocket.cxx b/x11-toolkits/nucleo/files/patch-nucleo__network__udp__UdpSocket.cxx
new file mode 100644
index 000000000000..ec9f765a8f2d
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-nucleo__network__udp__UdpSocket.cxx
@@ -0,0 +1,10 @@
+--- ./nucleo/network/udp/UdpSocket.cxx.orig	2009-06-11 10:48:06.000000000 +0200
++++ ./nucleo/network/udp/UdpSocket.cxx	2013-09-06 23:14:02.591758270 +0200
+@@ -16,6 +16,7 @@
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include <sys/errno.h>
++#include <unistd.h>
+ 
+ #include <stdexcept>
+ #include <iostream>
diff --git a/x11-toolkits/nucleo/files/patch-nucleo__utils__AppUtils.cxx b/x11-toolkits/nucleo/files/patch-nucleo__utils__AppUtils.cxx
new file mode 100644
index 000000000000..98c2288fa837
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-nucleo__utils__AppUtils.cxx
@@ -0,0 +1,10 @@
+--- ./nucleo/utils/AppUtils.cxx.orig	2008-06-09 14:09:05.000000000 +0200
++++ ./nucleo/utils/AppUtils.cxx	2013-09-06 23:13:03.857491952 +0200
+@@ -20,6 +20,7 @@
+ #include <stdexcept>
+ #include <cstdlib>
+ #include <cstring>
++#include <unistd.h>
+ 
+ extern char* optarg ;
+ extern int optind ;
diff --git a/x11-toolkits/nucleo/files/patch-tests__test-Base64.cxx b/x11-toolkits/nucleo/files/patch-tests__test-Base64.cxx
new file mode 100644
index 000000000000..d37099bced50
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-tests__test-Base64.cxx
@@ -0,0 +1,10 @@
+--- ./tests/test-Base64.cxx.orig	2008-06-09 15:21:20.000000000 +0200
++++ ./tests/test-Base64.cxx	2013-09-06 23:18:36.765608410 +0200
+@@ -11,6 +11,7 @@
+ 
+ #include <nucleo/utils/AppUtils.H>
+ #include <nucleo/utils/Base64.H>
++#include <unistd.h>
+ 
+ #include <iostream>
+ #include <cstdlib>
diff --git a/x11-toolkits/nucleo/files/patch-tests__test-MD5.cxx b/x11-toolkits/nucleo/files/patch-tests__test-MD5.cxx
new file mode 100644
index 000000000000..5d5096bbcf88
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-tests__test-MD5.cxx
@@ -0,0 +1,10 @@
+--- ./tests/test-MD5.cxx.orig	2008-06-05 14:52:33.000000000 +0200
++++ ./tests/test-MD5.cxx	2013-09-06 23:19:05.863746755 +0200
+@@ -10,6 +10,7 @@
+  */
+ 
+ #include <nucleo/utils/MD5.H>
++#include <unistd.h>
+ 
+ #include <iostream>
+ 
-- 
cgit v1.2.3