| 1 |
commit: 308de0e56a84ea0f808d1f0690130945d754fa1a |
| 2 |
Author: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net> |
| 3 |
AuthorDate: Sat Jul 4 23:23:31 2015 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 5 00:08:22 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=308de0e5 |
| 7 |
|
| 8 |
dev-qt/qt3support: Fix socklen_t detection. Bug #553936 |
| 9 |
|
| 10 |
dev-qt/qt3support/Manifest | 4 + |
| 11 |
.../qt3support-4.8.7-fix-socklent-for-musl.patch | 119 +++++++++++++++++++++ |
| 12 |
dev-qt/qt3support/metadata.xml | 13 +++ |
| 13 |
dev-qt/qt3support/qt3support-4.8.7-r99.ebuild | 38 +++++++ |
| 14 |
4 files changed, 174 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-qt/qt3support/Manifest b/dev-qt/qt3support/Manifest |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..166d528 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-qt/qt3support/Manifest |
| 21 |
@@ -0,0 +1,4 @@ |
| 22 |
+AUX qt3support-4.8.7-fix-socklent-for-musl.patch 3982 SHA256 905bc36d1f94cd66984a64253cbda84655d350b34255f0cae10fc9d6df788051 SHA512 54dc653bd480b1b860f5b97f615ddd19470721244e809669ae988138bc04a5788b1ffc704153b2ab7a35c047ae5bb51cf94420f72a368735e6ec5688b9b093a9 WHIRLPOOL 9cb0aa6b92b1d26b17996f444dc7f5937a4e1c36ae98fa79312da3b68020dbf2efde6b2d4fd7d1d9513cb42425b58560d3c1d67403fc4fc44b6d08cf3dc575cc |
| 23 |
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2 |
| 24 |
+EBUILD qt3support-4.8.7-r99.ebuild 1072 SHA256 63bbe62c13465d14707e3e278c7575259b71a59b9084f95d17be1c372105e60b SHA512 1066cd6f8cf109073a3cdf6be429189c60cf5a307b76ffdddbd5a51af337eeb35ede21112a82e84adc1b4b78eadd6862d5cb0b3f9f845782d494e6cf56f0b95b WHIRLPOOL 7a8f000b4eabf9d1dab50602063d30254668ba5c1b7c04950a218d3b00214c383b7836441474a9a05f73d58e6ca20b7497677af69d69c34d766b04e23fab8eaa |
| 25 |
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b |
| 26 |
|
| 27 |
diff --git a/dev-qt/qt3support/files/qt3support-4.8.7-fix-socklent-for-musl.patch b/dev-qt/qt3support/files/qt3support-4.8.7-fix-socklent-for-musl.patch |
| 28 |
new file mode 100644 |
| 29 |
index 0000000..29031ae |
| 30 |
--- /dev/null |
| 31 |
+++ b/dev-qt/qt3support/files/qt3support-4.8.7-fix-socklent-for-musl.patch |
| 32 |
@@ -0,0 +1,119 @@ |
| 33 |
+diff -ru a/mkspecs/linux-cxx/qplatformdefs.h b/mkspecs/linux-cxx/qplatformdefs.h |
| 34 |
+--- a/mkspecs/linux-cxx/qplatformdefs.h 2015-05-07 14:14:41.000000000 +0000 |
| 35 |
++++ b/mkspecs/linux-cxx/qplatformdefs.h 2015-07-04 22:28:58.203016692 +0000 |
| 36 |
+@@ -87,10 +87,10 @@ |
| 37 |
+ |
| 38 |
+ #undef QT_SOCKLEN_T |
| 39 |
+ |
| 40 |
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2) |
| 41 |
+-#define QT_SOCKLEN_T socklen_t |
| 42 |
+-#else |
| 43 |
++#if defined(__GLIBC__) && (__GLIBC__ < 2) |
| 44 |
+ #define QT_SOCKLEN_T int |
| 45 |
++#else |
| 46 |
++#define QT_SOCKLEN_T socklen_t |
| 47 |
+ #endif |
| 48 |
+ |
| 49 |
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) |
| 50 |
+diff -ru a/mkspecs/linux-ecc-64/qplatformdefs.h b/mkspecs/linux-ecc-64/qplatformdefs.h |
| 51 |
+--- a/mkspecs/linux-ecc-64/qplatformdefs.h 2015-05-07 14:14:42.000000000 +0000 |
| 52 |
++++ b/mkspecs/linux-ecc-64/qplatformdefs.h 2015-07-04 22:29:05.627017526 +0000 |
| 53 |
+@@ -87,10 +87,10 @@ |
| 54 |
+ |
| 55 |
+ #undef QT_SOCKLEN_T |
| 56 |
+ |
| 57 |
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2) |
| 58 |
+-#define QT_SOCKLEN_T socklen_t |
| 59 |
+-#else |
| 60 |
++#if defined(__GLIBC__) && (__GLIBC__ < 2) |
| 61 |
+ #define QT_SOCKLEN_T int |
| 62 |
++#else |
| 63 |
++#define QT_SOCKLEN_T socklen_t |
| 64 |
+ #endif |
| 65 |
+ |
| 66 |
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) |
| 67 |
+diff -ru a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h |
| 68 |
+--- a/mkspecs/linux-g++/qplatformdefs.h 2015-05-07 14:14:41.000000000 +0000 |
| 69 |
++++ b/mkspecs/linux-g++/qplatformdefs.h 2015-07-04 22:29:09.427017954 +0000 |
| 70 |
+@@ -86,10 +86,10 @@ |
| 71 |
+ |
| 72 |
+ #undef QT_SOCKLEN_T |
| 73 |
+ |
| 74 |
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2) |
| 75 |
+-#define QT_SOCKLEN_T socklen_t |
| 76 |
+-#else |
| 77 |
++#if defined(__GLIBC__) && (__GLIBC__ < 2) |
| 78 |
+ #define QT_SOCKLEN_T int |
| 79 |
++#else |
| 80 |
++#define QT_SOCKLEN_T socklen_t |
| 81 |
+ #endif |
| 82 |
+ |
| 83 |
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) |
| 84 |
+diff -ru a/mkspecs/linux-kcc/qplatformdefs.h b/mkspecs/linux-kcc/qplatformdefs.h |
| 85 |
+--- a/mkspecs/linux-kcc/qplatformdefs.h 2015-05-07 14:14:41.000000000 +0000 |
| 86 |
++++ b/mkspecs/linux-kcc/qplatformdefs.h 2015-07-04 22:29:12.705018322 +0000 |
| 87 |
+@@ -90,10 +90,10 @@ |
| 88 |
+ |
| 89 |
+ #undef QT_SOCKLEN_T |
| 90 |
+ |
| 91 |
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2) |
| 92 |
+-#define QT_SOCKLEN_T socklen_t |
| 93 |
+-#else |
| 94 |
++#if defined(__GLIBC__) && (__GLIBC__ < 2) |
| 95 |
+ #define QT_SOCKLEN_T int |
| 96 |
++#else |
| 97 |
++#define QT_SOCKLEN_T socklen_t |
| 98 |
+ #endif |
| 99 |
+ |
| 100 |
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) |
| 101 |
+diff -ru a/mkspecs/linux-llvm/qplatformdefs.h b/mkspecs/linux-llvm/qplatformdefs.h |
| 102 |
+--- a/mkspecs/linux-llvm/qplatformdefs.h 2015-05-07 14:14:42.000000000 +0000 |
| 103 |
++++ b/mkspecs/linux-llvm/qplatformdefs.h 2015-07-04 22:29:16.239018720 +0000 |
| 104 |
+@@ -87,10 +87,10 @@ |
| 105 |
+ |
| 106 |
+ #undef QT_SOCKLEN_T |
| 107 |
+ |
| 108 |
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2) |
| 109 |
+-#define QT_SOCKLEN_T socklen_t |
| 110 |
+-#else |
| 111 |
++#if defined(__GLIBC__) && (__GLIBC__ < 2) |
| 112 |
+ #define QT_SOCKLEN_T int |
| 113 |
++#else |
| 114 |
++#define QT_SOCKLEN_T socklen_t |
| 115 |
+ #endif |
| 116 |
+ |
| 117 |
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) |
| 118 |
+diff -ru a/mkspecs/linux-lsb-g++/qplatformdefs.h b/mkspecs/linux-lsb-g++/qplatformdefs.h |
| 119 |
+--- a/mkspecs/linux-lsb-g++/qplatformdefs.h 2015-05-07 14:14:42.000000000 +0000 |
| 120 |
++++ b/mkspecs/linux-lsb-g++/qplatformdefs.h 2015-07-04 22:29:19.529019090 +0000 |
| 121 |
+@@ -94,10 +94,10 @@ |
| 122 |
+ |
| 123 |
+ #define QT_OPEN_LARGEFILE 0 |
| 124 |
+ |
| 125 |
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2) |
| 126 |
+-#define QT_SOCKLEN_T socklen_t |
| 127 |
+-#else |
| 128 |
++#if defined(__GLIBC__) && (__GLIBC__ < 2) |
| 129 |
+ #define QT_SOCKLEN_T int |
| 130 |
++#else |
| 131 |
++#define QT_SOCKLEN_T socklen_t |
| 132 |
+ #endif |
| 133 |
+ |
| 134 |
+ #ifndef SIOCGIFBRDADDR |
| 135 |
+diff -ru a/mkspecs/linux-pgcc/qplatformdefs.h b/mkspecs/linux-pgcc/qplatformdefs.h |
| 136 |
+--- a/mkspecs/linux-pgcc/qplatformdefs.h 2015-05-07 14:14:42.000000000 +0000 |
| 137 |
++++ b/mkspecs/linux-pgcc/qplatformdefs.h 2015-07-04 22:29:24.101019604 +0000 |
| 138 |
+@@ -87,10 +87,10 @@ |
| 139 |
+ |
| 140 |
+ #undef QT_SOCKLEN_T |
| 141 |
+ |
| 142 |
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2) |
| 143 |
+-#define QT_SOCKLEN_T socklen_t |
| 144 |
+-#else |
| 145 |
++#if defined(__GLIBC__) && (__GLIBC__ < 2) |
| 146 |
+ #define QT_SOCKLEN_T int |
| 147 |
++#else |
| 148 |
++#define QT_SOCKLEN_T socklen_t |
| 149 |
+ #endif |
| 150 |
+ |
| 151 |
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) |
| 152 |
|
| 153 |
diff --git a/dev-qt/qt3support/metadata.xml b/dev-qt/qt3support/metadata.xml |
| 154 |
new file mode 100644 |
| 155 |
index 0000000..258aee1 |
| 156 |
--- /dev/null |
| 157 |
+++ b/dev-qt/qt3support/metadata.xml |
| 158 |
@@ -0,0 +1,13 @@ |
| 159 |
+<?xml version="1.0" encoding="UTF-8"?> |
| 160 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 161 |
+<pkgmetadata> |
| 162 |
+ <herd>qt</herd> |
| 163 |
+ <use> |
| 164 |
+ <flag name="exceptions">Add support for exceptions - like catching them |
| 165 |
+ inside the event loop (recommended by upstream)</flag> |
| 166 |
+ </use> |
| 167 |
+ <upstream> |
| 168 |
+ <bugs-to>https://bugreports.qt.io/</bugs-to> |
| 169 |
+ <doc>http://doc.qt.io/</doc> |
| 170 |
+ </upstream> |
| 171 |
+</pkgmetadata> |
| 172 |
|
| 173 |
diff --git a/dev-qt/qt3support/qt3support-4.8.7-r99.ebuild b/dev-qt/qt3support/qt3support-4.8.7-r99.ebuild |
| 174 |
new file mode 100644 |
| 175 |
index 0000000..018a8c1 |
| 176 |
--- /dev/null |
| 177 |
+++ b/dev-qt/qt3support/qt3support-4.8.7-r99.ebuild |
| 178 |
@@ -0,0 +1,38 @@ |
| 179 |
+# Copyright 1999-2015 Gentoo Foundation |
| 180 |
+# Distributed under the terms of the GNU General Public License v2 |
| 181 |
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/qt3support-4.8.7.ebuild,v 1.1 2015/05/26 18:13:20 pesa Exp $ |
| 182 |
+ |
| 183 |
+EAPI=5 |
| 184 |
+inherit qt4-build-multilib |
| 185 |
+ |
| 186 |
+DESCRIPTION="The Qt3Support module for the Qt toolkit" |
| 187 |
+ |
| 188 |
+if [[ ${QT4_BUILD_TYPE} == release ]]; then |
| 189 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 190 |
+fi |
| 191 |
+ |
| 192 |
+IUSE="+accessibility" |
| 193 |
+ |
| 194 |
+DEPEND=" |
| 195 |
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}] |
| 196 |
+ ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}] |
| 197 |
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}] |
| 198 |
+" |
| 199 |
+RDEPEND="${DEPEND}" |
| 200 |
+ |
| 201 |
+QT4_TARGET_DIRECTORIES=" |
| 202 |
+ src/qt3support |
| 203 |
+ src/tools/uic3 |
| 204 |
+ tools/porting" |
| 205 |
+ |
| 206 |
+PATCHES=( |
| 207 |
+ "${FILESDIR}/${PN}-4.8.7-fix-socklent-for-musl.patch" |
| 208 |
+) |
| 209 |
+ |
| 210 |
+multilib_src_configure() { |
| 211 |
+ local myconf=( |
| 212 |
+ -qt3support |
| 213 |
+ $(qt_use accessibility) |
| 214 |
+ ) |
| 215 |
+ qt4_multilib_src_configure |
| 216 |
+} |
Archives