diff options
Diffstat (limited to 'devel/qt4-corelib/files')
3 files changed, 0 insertions, 135 deletions
diff --git a/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp b/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp deleted file mode 100644 index 8cffda435ef0..000000000000 --- a/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- config.tests/unix/gnu-libiconv/gnu-libiconv.cpp.orig 2014-04-10 18:37:08 UTC -+++ config.tests/unix/gnu-libiconv/gnu-libiconv.cpp -@@ -48,7 +48,7 @@ int main(int, char **) - { - iconv_t x = iconv_open("", ""); - -- const char *inp; -+ char *inp; - char *outp; - size_t inbytes, outbytes; - iconv(x, &inp, &inbytes, &outp, &outbytes); diff --git a/devel/qt4-corelib/files/patch-configure b/devel/qt4-corelib/files/patch-configure deleted file mode 100644 index d914c19e98c0..000000000000 --- a/devel/qt4-corelib/files/patch-configure +++ /dev/null @@ -1,85 +0,0 @@ ---- ./configure.orig 2012-11-23 10:11:23.000000000 +0000 -+++ ./configure 2013-02-26 23:15:08.632185943 +0000 -@@ -7191,7 +7191,6 @@ - QT_CONFIG="$QT_CONFIG phonon-backend" - fi - else -- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON" - fi - - # disable accessibility -@@ -7248,7 +7247,6 @@ - - # enable opengl - if [ "$CFG_OPENGL" = "no" ]; then -- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL" - else - QT_CONFIG="$QT_CONFIG opengl" - fi -@@ -7776,7 +7774,6 @@ - if [ "$CFG_XMLPATTERNS" = "yes" ]; then - QT_CONFIG="$QT_CONFIG xmlpatterns" - else -- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS" - fi - - if [ "$CFG_MULTIMEDIA" = "no" ]; then -@@ -7817,7 +7814,6 @@ - fi - else - rm -f "$outpath/mkspecs/modules/qt_webkit_version.pri" -- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT" - fi - - if [ "$CFG_SCRIPT" = "yes" -a "$canBuildQtScript" = "no" ]; then -@@ -8399,10 +8395,8 @@ - [ "$CFG_MNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG" - [ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB" - [ "$CFG_S60" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_S60" --[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" - [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" - [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" --[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" - - if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then - [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" -@@ -8419,36 +8413,22 @@ - # X11/Unix/Mac only configs - [ "$CFG_ICONV" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV" - [ "$CFG_GLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB" --[ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK" -+%%QGTKSTYLE%%[ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK" - if [ "$XPLATFORM_SYMBIAN" = "no" ]; then - # Do not apply following negative X11/Unix/Mac only flags on Symbian, so that - # configuration matches with the one generated by configure executable tool -- [ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS" -- [ "$CFG_GSTREAMER" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GSTREAMER" -+ %%CUPS%%[ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS" - [ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC" - [ "$CFG_MREMAP" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP" - [ "$CFG_GETADDRINFO" = "no" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETADDRINFO" - [ "$CFG_IPV6IFNAME" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6IFNAME" - [ "$CFG_GETIFADDRS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETIFADDRS" - [ "$CFG_INOTIFY" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_INOTIFY" -- [ "$CFG_NAS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NAS" -+ %%NAS%%[ "$CFG_NAS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NAS" - [ "$CFG_NIS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NIS" - [ "$CFG_OPENSSL" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENSSL" - [ "$CFG_OPENSSL" = "linked" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_LINKED_OPENSSL" - -- [ "$CFG_SM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SESSIONMANAGER" -- [ "$CFG_XCURSOR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XCURSOR" -- [ "$CFG_XFIXES" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XFIXES" -- [ "$CFG_FONTCONFIG" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FONTCONFIG" -- [ "$CFG_XINERAMA" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINERAMA" -- [ "$CFG_XKB" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XKB" -- [ "$CFG_XRANDR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRANDR" -- [ "$CFG_XRENDER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRENDER" -- [ "$CFG_MITSHM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM" -- [ "$CFG_XSHAPE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE" -- [ "$CFG_XVIDEO" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XVIDEO" -- [ "$CFG_XSYNC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XSYNC" -- [ "$CFG_XINPUT" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINPUT QT_NO_TABLET" - - [ "$CFG_XCURSOR" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XCURSOR" - [ "$CFG_XINERAMA" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINERAMA" diff --git a/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp b/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp deleted file mode 100644 index 6a7c231eef99..000000000000 --- a/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp +++ /dev/null @@ -1,39 +0,0 @@ ---- src/corelib/codecs/qiconvcodec.cpp.orig 2014-04-10 18:37:11 UTC -+++ src/corelib/codecs/qiconvcodec.cpp -@@ -219,12 +219,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 -- // GNU doesn't disagree with POSIX :/ -- const char *inBytes = chars; --#else - char *inBytes = const_cast<char *>(chars); --#endif - - QByteArray in; - if (remainingCount) { -@@ -318,11 +313,7 @@ static bool setByteOrder(iconv_t cd) - size_t outBytesLeft = sizeof buf; - size_t inBytesLeft = sizeof bom; - --#if defined(GNU_LIBICONV) -- const char **inBytesPtr = const_cast<const char **>(&inBytes); --#else - char **inBytesPtr = &inBytes; --#endif - - if (iconv(cd, inBytesPtr, &inBytesLeft, &outBytes, &outBytesLeft) == (size_t) -1) { - return false; -@@ -338,11 +329,7 @@ QByteArray QIconvCodec::convertFromUnico - char *outBytes; - size_t inBytesLeft; - --#if defined(GNU_LIBICONV) -- const char **inBytesPtr = const_cast<const char **>(&inBytes); --#else - char **inBytesPtr = &inBytes; --#endif - - IconvState *temporaryState = 0; - QThreadStorage<QIconvCodec::IconvState *> *ts = fromUnicodeState(); |