diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-10-18 04:51:47 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-10-18 04:52:37 +1100 |
| commit | 199fea5278c4469ac9db9236a5242f1261e54214 (patch) | |
| tree | 8c58677e024ae099305915f097fce922676d91c0 /dev-qt/qtnetwork/files | |
| parent | sci-geosciences/grass: revbump to -7.0.1-r1 wrt the gentoo bugs. By wraeth. (diff) | |
| download | gentoo-199fea5278c4469ac9db9236a5242f1261e54214.tar.gz gentoo-199fea5278c4469ac9db9236a5242f1261e54214.tar.bz2 gentoo-199fea5278c4469ac9db9236a5242f1261e54214.zip | |
dev-qt: version bump 5.5.1
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'dev-qt/qtnetwork/files')
| -rw-r--r-- | dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch b/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch new file mode 100644 index 000000000000..dd8c33527f8b --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch @@ -0,0 +1,40 @@ +From 813f468a14fb84af43c1f8fc0a1430277358eba2 Mon Sep 17 00:00:00 2001 +From: Dave Flogeras <dflogeras2@gmail.com> +Date: Tue, 29 Sep 2015 08:52:31 -0300 +Subject: [PATCH] Fix for platform socklen_t on other C libraries than glibc. + +Rather than treating >=glibc-2 specially, we treat <glibc-2 specially +and all other libc implementations as POSIX. + +This was found here http://patchwork.openembedded.org/patch/94947/ and +tested with armv6j-hardfloat-linux-uclibceabi and +armv6j-hardfloat-linux-musleabi. + +Change-Id: I3850b1561a2e240f6564afedd80ce39407cc50b6 +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +--- + mkspecs/linux-g++/qplatformdefs.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h +index 5c18632..95a5758 100644 +--- a/mkspecs/linux-g++/qplatformdefs.h ++++ b/mkspecs/linux-g++/qplatformdefs.h +@@ -78,10 +78,10 @@ + + #undef QT_SOCKLEN_T + +-#if defined(__GLIBC__) && (__GLIBC__ >= 2) +-#define QT_SOCKLEN_T socklen_t +-#else ++#if defined(__GLIBC__) && (__GLIBC__ < 2) + #define QT_SOCKLEN_T int ++#else ++#define QT_SOCKLEN_T socklen_t + #endif + + #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) +-- +2.6.0 + |