head 1.11; access; symbols pkgsrc-2026Q1:1.11.0.52 pkgsrc-2026Q1-base:1.11 pkgsrc-2025Q4:1.11.0.50 pkgsrc-2025Q4-base:1.11 pkgsrc-2025Q3:1.11.0.48 pkgsrc-2025Q3-base:1.11 pkgsrc-2025Q2:1.11.0.46 pkgsrc-2025Q2-base:1.11 pkgsrc-2025Q1:1.11.0.44 pkgsrc-2025Q1-base:1.11 pkgsrc-2024Q4:1.11.0.42 pkgsrc-2024Q4-base:1.11 pkgsrc-2024Q3:1.11.0.40 pkgsrc-2024Q3-base:1.11 pkgsrc-2024Q2:1.11.0.38 pkgsrc-2024Q2-base:1.11 pkgsrc-2024Q1:1.11.0.36 pkgsrc-2024Q1-base:1.11 pkgsrc-2023Q4:1.11.0.34 pkgsrc-2023Q4-base:1.11 pkgsrc-2023Q3:1.11.0.32 pkgsrc-2023Q3-base:1.11 pkgsrc-2023Q2:1.11.0.30 pkgsrc-2023Q2-base:1.11 pkgsrc-2023Q1:1.11.0.28 pkgsrc-2023Q1-base:1.11 pkgsrc-2022Q4:1.11.0.26 pkgsrc-2022Q4-base:1.11 pkgsrc-2022Q3:1.11.0.24 pkgsrc-2022Q3-base:1.11 pkgsrc-2022Q2:1.11.0.22 pkgsrc-2022Q2-base:1.11 pkgsrc-2022Q1:1.11.0.20 pkgsrc-2022Q1-base:1.11 pkgsrc-2021Q4:1.11.0.18 pkgsrc-2021Q4-base:1.11 pkgsrc-2021Q3:1.11.0.16 pkgsrc-2021Q3-base:1.11 pkgsrc-2021Q2:1.11.0.14 pkgsrc-2021Q2-base:1.11 pkgsrc-2021Q1:1.11.0.12 pkgsrc-2021Q1-base:1.11 pkgsrc-2020Q4:1.11.0.10 pkgsrc-2020Q4-base:1.11 pkgsrc-2020Q3:1.11.0.8 pkgsrc-2020Q3-base:1.11 pkgsrc-2020Q2:1.11.0.6 pkgsrc-2020Q2-base:1.11 pkgsrc-2020Q1:1.11.0.2 pkgsrc-2020Q1-base:1.11 pkgsrc-2019Q4:1.11.0.4 pkgsrc-2019Q4-base:1.11 pkgsrc-2019Q3:1.10.0.62 pkgsrc-2019Q3-base:1.10 pkgsrc-2019Q2:1.10.0.60 pkgsrc-2019Q2-base:1.10 pkgsrc-2019Q1:1.10.0.58 pkgsrc-2019Q1-base:1.10 pkgsrc-2018Q4:1.10.0.56 pkgsrc-2018Q4-base:1.10 pkgsrc-2018Q3:1.10.0.54 pkgsrc-2018Q3-base:1.10 pkgsrc-2018Q2:1.10.0.52 pkgsrc-2018Q2-base:1.10 pkgsrc-2018Q1:1.10.0.50 pkgsrc-2018Q1-base:1.10 pkgsrc-2017Q4:1.10.0.48 pkgsrc-2017Q4-base:1.10 pkgsrc-2017Q3:1.10.0.46 pkgsrc-2017Q3-base:1.10 pkgsrc-2017Q2:1.10.0.42 pkgsrc-2017Q2-base:1.10 pkgsrc-2017Q1:1.10.0.40 pkgsrc-2017Q1-base:1.10 pkgsrc-2016Q4:1.10.0.38 pkgsrc-2016Q4-base:1.10 pkgsrc-2016Q3:1.10.0.36 pkgsrc-2016Q3-base:1.10 pkgsrc-2016Q2:1.10.0.34 pkgsrc-2016Q2-base:1.10 pkgsrc-2016Q1:1.10.0.32 pkgsrc-2016Q1-base:1.10 pkgsrc-2015Q4:1.10.0.30 pkgsrc-2015Q4-base:1.10 pkgsrc-2015Q3:1.10.0.28 pkgsrc-2015Q3-base:1.10 pkgsrc-2015Q2:1.10.0.26 pkgsrc-2015Q2-base:1.10 pkgsrc-2015Q1:1.10.0.24 pkgsrc-2015Q1-base:1.10 pkgsrc-2014Q4:1.10.0.22 pkgsrc-2014Q4-base:1.10 pkgsrc-2014Q3:1.10.0.20 pkgsrc-2014Q3-base:1.10 pkgsrc-2014Q2:1.10.0.18 pkgsrc-2014Q2-base:1.10 pkgsrc-2014Q1:1.10.0.16 pkgsrc-2014Q1-base:1.10 pkgsrc-2013Q4:1.10.0.14 pkgsrc-2013Q4-base:1.10 pkgsrc-2013Q3:1.10.0.12 pkgsrc-2013Q3-base:1.10 pkgsrc-2013Q2:1.10.0.10 pkgsrc-2013Q2-base:1.10 pkgsrc-2013Q1:1.10.0.8 pkgsrc-2013Q1-base:1.10 pkgsrc-2012Q4:1.10.0.6 pkgsrc-2012Q4-base:1.10 pkgsrc-2012Q3:1.10.0.4 pkgsrc-2012Q3-base:1.10 pkgsrc-2012Q2:1.10.0.2 pkgsrc-2012Q2-base:1.10 pkgsrc-2012Q1:1.9.0.2 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.8.0.12 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.10 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.8 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.6 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.4 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.2 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.7.0.4 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.2 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.6.0.6 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.4 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.2 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.5.0.4 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.2 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.4.0.4 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.2 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.3.0.4 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.2 pkgsrc-2008Q1:1.2.0.4 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.2 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.1.0.2 pkgsrc-2007Q3-base:1.1; locks; strict; comment @# @; 1.11 date 2019.10.28.19.37.41; author maya; state Exp; branches; next 1.10; commitid wOQECJceSgqWAFIB; 1.10 date 2012.04.09.09.12.49; author adam; state Exp; branches; next 1.9; 1.9 date 2012.01.12.22.59.58; author adam; state Exp; branches; next 1.8; 1.8 date 2010.07.04.06.00.14; author adam; state Exp; branches; next 1.7; 1.7 date 2010.01.29.18.19.09; author adam; state Exp; branches; next 1.6; 1.6 date 2009.06.13.11.55.51; author hasso; state Exp; branches; next 1.5; 1.5 date 2008.10.26.14.02.33; author adam; state Exp; branches; next 1.4; 1.4 date 2008.07.24.12.55.20; author markd; state Exp; branches; next 1.3; 1.3 date 2008.05.13.18.35.19; author drochner; state Exp; branches; next 1.2; 1.2 date 2007.11.22.18.51.25; author drochner; state Exp; branches; next 1.1; 1.1 date 2007.09.03.09.35.17; author drochner; state Exp; branches; next ; desc @@ 1.11 log @qt4-libs: fix build on netbsd-current, where the prototype of iconv is no longer unusual. This mostly consists of making our local patches only apply for older netbsd. @ text @$NetBSD: patch-ao,v 1.10 2012/04/09 09:12:49 adam Exp $ Fix build on netbsd, which has an unusual prototype for iconv --- src/corelib/codecs/qiconvcodec.cpp.orig 2012-03-14 14:01:18.000000000 +0000 +++ src/corelib/codecs/qiconvcodec.cpp @@@@ -50,9 +50,14 @@@@ #include #include +// for __DragonFly_version +#if defined(__DragonFly__) || defined(__NetBSD__) +#include +#endif + // unistd.h is needed for the _XOPEN_UNIX macro #include -#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__) # include #endif @@@@ -69,6 +74,9 @@@@ # 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 @@@@ -219,7 +227,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__) && __NetBSD_Version__ < 999001700) // GNU doesn't disagree with POSIX :/ const char *inBytes = chars; #else @@@@ -318,7 +326,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__) && __NetBSD_Version__ < 999001700) const char **inBytesPtr = const_cast(&inBytes); #else char **inBytesPtr = &inBytes; @@@@ -338,7 +346,7 @@@@ QByteArray QIconvCodec::convertFromUnico char *outBytes; size_t inBytesLeft; -#if defined(GNU_LIBICONV) +#if defined(GNU_LIBICONV) || (defined(__NetBSD__) && __NetBSD_Version__ < 999001700) const char **inBytesPtr = const_cast(&inBytes); #else char **inBytesPtr = &inBytes; @@@@ -475,11 +483,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__) && __NetBSD_Version__ < 999001700 + const char *codeset = 0; #else char *codeset = 0; #endif -#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__) if (cd == (iconv_t) -1) { codeset = nl_langinfo(CODESET); if (codeset) @ 1.10 log @Changes 4.8.1: Qt 4.8.1 is the first patch release to the 4.8 series with over 200 functional improvements to the desktop and embedded platforms. The majority of the error corrections, made primarily by Digia, have been on desktop and embedded platforms with a large number of fixes with focus on QtCore, QtGUI and QtNetwork. These fixes benefit all desktop platforms. Qt 4.8.1 also includes Mac App Store support. @ text @d1 3 a3 1 $NetBSD$ d12 1 a12 1 +#if defined(__DragonFly__) d38 1 a38 1 +#if defined(GNU_LIBICONV) || defined(__NetBSD__) d47 1 a47 1 +#if defined(GNU_LIBICONV) || defined(__NetBSD__) d56 1 a56 1 +#if defined(GNU_LIBICONV) || defined(__NetBSD__) d64 1 a64 1 +#elif defined(__NetBSD) @ 1.9 log @Changes 4.8.0: Featuring Qt Platform Abstraction, threaded OpenGL support, multithreaded HTTP and optimized file system access. @ text @d3 1 a3 1 --- src/corelib/codecs/qiconvcodec.cpp.orig 2011-12-08 05:06:03.000000000 +0000 d40 1 a40 1 @@@@ -314,7 +322,7 @@@@ static bool setByteOrder(iconv_t cd) d49 1 a49 1 @@@@ -334,7 +342,7 @@@@ QByteArray QIconvCodec::convertFromUnico d58 2 a59 2 @@@@ -466,11 +474,13 @@@@ iconv_t QIconvCodec::createIconv_t(const static const char empty_codeset[] = ""; @ 1.8 log @Changes 4.6.3: * Added Spectrum analyzer demo application. * Added exit softkey to Wiggly example. * Added close button to Anomaly demo. * Fixed Anomaly demo controlstrip icon placement for very small screens. * Ensure history configuration is cleared when a state machine is restarted. For more read: http://qt.nokia.com/developer/changes/changes-4.6.3 @ text @d3 1 a3 1 --- src/corelib/codecs/qiconvcodec.cpp.orig 2010-06-02 02:03:17.000000000 +0000 d31 1 a31 1 @@@@ -218,7 +226,7 @@@@ QString QIconvCodec::convertToUnicode(co d40 1 a40 1 @@@@ -311,7 +319,7 @@@@ static bool setByteOrder(iconv_t cd) d49 1 a49 1 @@@@ -331,7 +339,7 @@@@ QByteArray QIconvCodec::convertFromUnico d58 1 a58 1 @@@@ -468,11 +476,13 @@@@ iconv_t QIconvCodec::createIconv_t(const @ 1.7 log @Changes 4.6.1: * Optimized empty QUrl creation * Improve performance of getting the canonical filename on Linux and Symbian by using realpath() system call. * Avoid stat() when opening a file. * Do not look at the Qt patch-level version embedded in plugins' buildkeys when trying to determine if the plugin is compatible * Bug-fixes * load() and loadFromData() can now support compressed GL textures in the DDS, ETC1, PVRTC2, and PVRTC4 formats if the OpenGL graphics system is active and the appropriate extensions are present in the GL implementation. * Fixed a small leak when using the new QPixmapCache::Key based API. @ text @d3 1 a3 1 --- src/corelib/codecs/qiconvcodec.cpp.orig 2010-01-15 17:01:36.000000000 +0000 d40 10 a49 1 @@@@ -305,7 +313,7 @@@@ QByteArray QIconvCodec::convertFromUnico d58 1 a58 1 @@@@ -451,11 +459,13 @@@@ iconv_t QIconvCodec::createIconv_t(const @ 1.6 log @Update to 4.5.1. Most of work done by Matthias Drochner. Upstream changelog is too massive, see http://doc.qtsoftware.com/4.5/qt4-5-intro.html as starting point. @ text @d3 1 a3 1 --- src/corelib/codecs/qiconvcodec.cpp.orig 2009-02-25 22:09:21.000000000 +0100 d16 2 a17 2 -#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) +#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) d40 1 a40 1 @@@@ -306,7 +314,7 @@@@ QByteArray QIconvCodec::convertFromUnico d49 1 a49 1 @@@@ -454,11 +462,13 @@@@ iconv_t QIconvCodec::createIconv_t(const d59 2 a60 2 -#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) +#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) @ 1.5 log @Changes 4.4.3: * Updated application icons and other graphics to reflect the look and feel of the new Qt brand. * Copyright of Qt has been transferred to Nokia Corporation. @ text @d3 1 a3 1 --- src/corelib/codecs/qiconvcodec.cpp.orig 2008-09-27 10:58:46.000000000 +0200 d5 1 a5 1 @@@@ -44,9 +44,14 @@@@ d21 1 a21 1 @@@@ -63,6 +68,9 @@@@ d31 4 a34 4 @@@@ -146,7 +154,7 @@@@ QString QIconvCodec::convertToUnicode(co QByteArray ba; size_t outBytesLeft = len * 2 + 2; ba.resize(outBytesLeft); d40 3 a42 3 @@@@ -206,7 +214,7 @@@@ QByteArray QIconvCodec::convertFromUnico ba.resize(outBytesLeft); char *outBytes = ba.data(); d46 1 a46 1 const char *inBytes; d48 7 a54 18 char *inBytes; @@@@ -216,7 +224,7 @@@@ QByteArray QIconvCodec::convertFromUnico #if !defined(NO_BOM) // give iconv() a BOM QChar bom[] = { QChar(QChar::ByteOrderMark) }; -#ifdef GNU_LIBICONV +#if defined(GNU_LIBICONV) || defined(__NetBSD__) // GNU doesn't disagree with POSIX :/ inBytes = reinterpret_cast(bom); #else @@@@ -230,7 +238,7 @@@@ QByteArray QIconvCodec::convertFromUnico #endif // NO_BOM // now feed iconv() the real data -#ifdef GNU_LIBICONV +#if defined(GNU_LIBICONV) || defined(__NetBSD__) // GNU doesn't disagree with POSIX :/ inBytes = reinterpret_cast(uc); a55 1 @@@@ -296,7 +304,7 @@@@ iconv_t QIconvCodec::createIconv_t(const @ 1.4 log @Update qt4 to 4.4.0 Qt 4.4 introduces many new features as well as many improvements and bugfixes over the 4.3.x series. For more details, see the online documentation which is included in this distribution. The documentation is also available at http://doc.trolltech.com/4.4 The Qt version 4.4 series is binary compatible with the 4.3.x series. A long list of changes can be found in the changes-4.4.0 file in the distribution. Update OKed (and initial work provided) by adam@@.. @ text @d3 1 a3 1 --- src/corelib/codecs/qiconvcodec.cpp.orig 2008-04-28 15:11:18.000000000 +0200 d5 1 a5 1 @@@@ -50,9 +50,14 @@@@ d21 1 a21 1 @@@@ -69,6 +74,9 @@@@ @ 1.3 log @The citrix i18n code in DragonFly had some issues wrt BOM handling which are fixed now. Enable BOM handling for newer versions only. From Hasso Tepper per PM. @ text @d3 3 a5 3 --- src/corelib/codecs/qiconvcodec.cpp.orig 2007-12-04 18:42:55 +0200 +++ src/corelib/codecs/qiconvcodec.cpp 2008-05-13 09:47:40 +0300 @@@@ -43,9 +43,14 @@@@ d21 5 a25 5 @@@@ -55,6 +60,9 @@@@ #elif defined(Q_OS_AIX) # define NO_BOM # define UTF16 "UCS-2" +#elif defined(__DragonFly__) && __DragonFly_version < 197700 d31 1 a31 1 @@@@ -129,7 +137,7 @@@@ QString QIconvCodec::convertToUnicode(co d40 1 a40 1 @@@@ -189,7 +197,7 @@@@ QByteArray QIconvCodec::convertFromUnico d49 1 a49 1 @@@@ -199,7 +207,7 @@@@ QByteArray QIconvCodec::convertFromUnico d58 1 a58 1 @@@@ -213,7 +221,7 @@@@ QByteArray QIconvCodec::convertFromUnico d67 1 a67 1 @@@@ -278,7 +286,7 @@@@ iconv_t QIconvCodec::createIconv_t(const @ 1.2 log @-Deal with the iconv(3) mess a bit differently: allow NetBSD'd imake(3) to be recognized as non-gnu, otherwise the make system tries to pull in an additional libiconv which for some unknown reason does not break the standard build but leads to trouble with addon components. Specialcase NetBSD (which has different const'ification than what they consider classical iconv) in the code calling iconv(3) instead. -Don't build TIFF support which was using an internal copy of libtiff. I'll commit a plugin for TIFF support in a minute. -bump PKGREVISION @ text @d3 5 a7 3 --- ./src/corelib/codecs/qiconvcodec.cpp.orig 2007-10-01 15:06:02.000000000 +0200 +++ ./src/corelib/codecs/qiconvcodec.cpp @@@@ -44,7 +44,7 @@@@ d9 5 d17 1 a17 1 +#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) d21 11 a31 1 @@@@ -95,7 +95,7 @@@@ QString QIconvCodec::convertToUnicode(co d40 1 a40 1 @@@@ -155,7 +155,7 @@@@ QByteArray QIconvCodec::convertFromUnico d49 1 a49 1 @@@@ -165,7 +165,7 @@@@ QByteArray QIconvCodec::convertFromUnico d58 1 a58 1 @@@@ -179,7 +179,7 @@@@ QByteArray QIconvCodec::convertFromUnico d67 1 a67 1 @@@@ -244,7 +244,7 @@@@ iconv_t QIconvCodec::createIconv_t(const d72 1 a72 1 +#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) @ 1.1 log @-make sqlite support an extra pkg instead of an option -work around iconv(3) incompatibilities: while NetBSD's iconv() is probed as GNU iconv (due to its signature), it doesn't support empty strings as encoding (interpreted as "current locale's encoding" by GNU iconv). Enable some code which uses nl_langinfo(CODESET) to make it work as expected. -update to 4.3.1 changes: -bugfixes -Updated the German translation to provide complete coverage of Qt @ text @d3 1 a3 1 --- ./src/corelib/codecs/qiconvcodec.cpp.orig 2007-08-07 15:08:39.000000000 +0200 d14 36 @