head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.64 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.62 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.60 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.58 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.56 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.54 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.52 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.50 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.48 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.46 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.44 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.42 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.40 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.38 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.36 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.34 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.32 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.30 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.28 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.26 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.24 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.22 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.20 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.18 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.14 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.16 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.12 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.10 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.8 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.6 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.4 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.2 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.2.0.2 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.1.0.26 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.24 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.20 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.18 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.16 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.14 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.12 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.10 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.8 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.6 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.4 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.2 pkgsrc-2015Q1-base:1.1; locks; strict; comment @// @; 1.3 date 2018.06.19.07.21.23; author adam; state Exp; branches; next 1.2; commitid enrlWWFS5dg7sRGA; 1.2 date 2018.01.17.19.30.47; author markd; state Exp; branches; next 1.1; commitid spdRQpEmKELRpgnA; 1.1 date 2014.12.30.17.23.46; author adam; state Exp; branches; next ; commitid 1jIE5UF7705yw54y; desc @@ 1.3 log @qt5: updated to 5.11.0 Qt 5.11 comes with quite a few new features as well as many bug fixes to existing functionality. @ text @$NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.2 2018/01/17 19:30:47 markd Exp $ Add DragonFly support Add NetBSD support --- src/corelib/codecs/qiconvcodec.cpp.orig 2018-05-14 04:46:28.000000000 +0000 +++ src/corelib/codecs/qiconvcodec.cpp @@@@ -51,9 +51,14 @@@@ QT_REQUIRE_CONFIG(iconv); #include #include +// for __DragonFly_version +#if defined(__DragonFly__) +#include +#endif + // unistd.h is needed for the _XOPEN_UNIX macro #include -#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) +#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) || defined(Q_OS_NETBSD) || defined(__DragonFly__) # include #endif @@@@ -70,6 +75,9 @@@@ QT_REQUIRE_CONFIG(iconv); # else # define UTF16 "UTF-16LE" # endif +#elif defined(__DragonFly__) && __DragonFly_version__ < 197700 +# define NO_BOM +# define UTF16 "UTF-16" #else # define UTF16 "UTF-16" #endif @@@@ -447,7 +455,7 @@@@ iconv_t QIconvCodec::createIconv_t(const char *codeset = 0; #endif -#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) +#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) || defined(Q_OS_NETBSD) || defined(__DragonFly__) if (cd == (iconv_t) -1) { codeset = nl_langinfo(CODESET); if (codeset) @ 1.2 log @qt5: update to 5.10.0 2+ years worth of bug fixes and feature enhancements @ text @d1 1 a1 1 $NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ d3 2 a4 2 * Add DragonFly support * Add NetBSD support d6 1 a6 1 --- src/corelib/codecs/qiconvcodec.cpp.orig 2017-01-18 14:20:58.000000000 +0000 d8 1 a8 1 @@@@ -52,9 +52,14 @@@@ QT_REQUIRE_CONFIG(iconv); d19 2 a20 2 -#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) +#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) || defined(Q_OS_NETBSD) || defined(__DragonFly__) d24 1 a24 1 @@@@ -71,6 +76,9 @@@@ QT_REQUIRE_CONFIG(iconv); d34 1 a34 7 @@@@ -444,11 +452,13 @@@@ iconv_t QIconvCodec::createIconv_t(const #endif const char *codeset = empty_codeset; cd = iconv_open(to ? to : codeset, from ? from : codeset); +#elif defined(__NetBSD) + const char *codeset = 0; #else d38 2 a39 2 -#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) +#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) @ 1.1 log @Changes 5.4.0: Chromium-based browser engine Qt WebEngine Qt WebView for showing web content using the native OS web engine on mobile Full support on Qt for Windows Store Apps, including WinRT and Windows Phone 8.1 Improved Compliance with iOS 8 and Xcode 6 Improved OS X 10.10 ‘Yosemite’ support and new Mac AppStore signing High-DPI support for Windows and OS X Dynamic GL switching between OpenGL and ANGLE on Windows Mix OpenGL and Qt Quick with QOpenGLWidget Android Look-and-Feel for Qt Quick Controls Qt Creator 3.3 with new Qt Quick Designer Bluetooth now supports BlueZ5 with tech preview on Bluetooth LE @ text @d1 1 a1 1 $NetBSD: patch-qtbase_src_corelib_codecs_qiconvcodec.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ d6 1 a6 1 --- src/corelib/codecs/qiconvcodec.cpp.orig 2013-11-27 01:01:15.000000000 +0000 d8 1 a8 1 @@@@ -52,9 +52,14 @@@@ d24 1 a24 1 @@@@ -71,6 +76,9 @@@@ d34 1 a34 28 @@@@ -223,7 +231,7 @@@@ QString QIconvCodec::convertToUnicode(co IconvState *state = *pstate; size_t inBytesLeft = len; // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM -#ifdef GNU_LIBICONV +#if defined(GNU_LIBICONV) || defined(__NetBSD__) // GNU doesn't disagree with POSIX :/ const char *inBytes = chars; #else @@@@ -322,7 +330,7 @@@@ static bool setByteOrder(iconv_t cd) size_t outBytesLeft = sizeof buf; size_t inBytesLeft = sizeof bom; -#if defined(GNU_LIBICONV) +#if defined(GNU_LIBICONV) || defined(__NetBSD__) const char **inBytesPtr = const_cast(&inBytes); #else char **inBytesPtr = &inBytes; @@@@ -342,7 +350,7 @@@@ QByteArray QIconvCodec::convertFromUnico char *outBytes; size_t inBytesLeft; -#if defined(GNU_LIBICONV) +#if defined(GNU_LIBICONV) || defined(__NetBSD__) const char **inBytesPtr = const_cast(&inBytes); #else char **inBytesPtr = &inBytes; @@@@ -482,11 +490,13 @@@@ iconv_t QIconvCodec::createIconv_t(const @