aboutsummaryrefslogtreecommitdiff
path: root/devel/ice/files
diff options
context:
space:
mode:
authorMichael Gmelin <grembo@FreeBSD.org>2015-07-13 21:53:23 +0000
committerMichael Gmelin <grembo@FreeBSD.org>2015-07-13 21:53:23 +0000
commitf23aae075b6b2b443d9e0486828d9cc36794bf40 (patch)
tree6740cefef1110724a18aebc6f7cd1556c2f01870 /devel/ice/files
parent9ce8c1bf2d7aa0e75779885df022f64591657145 (diff)
downloadports-f23aae075b6b2b443d9e0486828d9cc36794bf40.tar.gz
ports-f23aae075b6b2b443d9e0486828d9cc36794bf40.zip
Bring back support for new iconv from r384038.
This fixes builds on FreeBSD versions without native iconv. This had been lost due to changes in the Ice code structure (iconv support moved from Ice to IceUtil). Approved by: mentors (implicit)
Notes
Notes: svn path=/head/; revision=391964
Diffstat (limited to 'devel/ice/files')
-rw-r--r--devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h b/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h
new file mode 100644
index 000000000000..ba55870f7a0b
--- /dev/null
+++ b/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h
@@ -0,0 +1,15 @@
+--- cpp/include/IceUtil/IconvStringConverter.h.orig 2013-10-04 15:48:14 UTC
++++ cpp/include/IceUtil/IconvStringConverter.h
+@@ -14,11 +14,11 @@
+ #include <IceUtil/UndefSysMacros.h>
+
+ #include <algorithm>
+ #include <iconv.h>
+ #include <langinfo.h>
+ #include <string.h> // For strerror
+
+-#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || defined(__FreeBSD__)
++#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B)
+ //
+ // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962
+ //