head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.4
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.2
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.3.0.10
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.8
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.6
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.3.0.4
	pkgsrc-2011Q1-base:1.3
	pkgsrc-2010Q4:1.3.0.2
	pkgsrc-2010Q4-base:1.3
	pkgsrc-2010Q3:1.2.0.6
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.4
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.2
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.1.0.6
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.4
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.2
	pkgsrc-2009Q2-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2012.01.12.22.59.58;	author adam;	state dead;
branches;
next	1.3;

1.3
date	2010.11.15.13.05.45;	author adam;	state Exp;
branches;
next	1.2;

1.2
date	2010.01.29.18.19.09;	author adam;	state Exp;
branches;
next	1.1;

1.1
date	2009.06.13.11.55.51;	author hasso;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Changes 4.8.0:
Featuring Qt Platform Abstraction, threaded OpenGL support, multithreaded HTTP
and optimized file system access.
@
text
@$NetBSD: patch-ax,v 1.3 2010/11/15 13:05:45 adam Exp $

--- src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp.orig	2010-09-10 09:05:20.000000000 +0000
+++ src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp
@@@@ -286,7 +286,11 @@@@ int WebSocketHandshake::readServerHandsh
         p += sizeof(webSocketConnectionHeader) - 1;
     }
 
+#if defined(__NetBSD__)
+    if (!strstr(p, "\r\n\r\n")) {
+#else
     if (!strnstr(p, "\r\n\r\n", end - p)) {
+#endif
         // Just hasn't been received fully yet.
         m_mode = Incomplete;
         return -1;
@


1.3
log
@Changes 4.7.1:
Qt 4.7.1 is a bug-fix release. It maintains both forward and backward
compatibility (source and binary) with Qt 4.7.0.  For more details,
refer to the online documentation included in this distribution. The
documentation is also available online:

  http://qt.nokia.com/doc/4.7

The Qt version 4.7 series is binary compatible with the 4.6.x series.
Applications compiled for 4.6 will continue to run with 4.7.


Changes 4.7.0:
Qt 4.7 introduces many new features and improvements as well as bugfixes
over the 4.6.x series. For more details, refer to the online documentation
included in this distribution. The documentation is also available online:

  http://qt.nokia.com/doc/4.7

The Qt version 4.7 series is binary compatible with the 4.6.x series.
Applications compiled for 4.6 will continue to run with 4.7.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
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/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp.orig	2010-01-28 06:27:43.000000000 +0000
d5 1
a5 1
@@@@ -252,7 +252,11 @@@@ int WebSocketHandshake::readServerHandsh
d15 1
a16 1
     }
@


1.1
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 5
a7 5
--- src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp.orig	2009-04-22 02:57:38 +0300
+++ src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	2009-05-01 19:45:48 +0300
@@@@ -76,9 +76,7 @@@@ extern int *__libc_stack_end;
 #include <thread.h>
 #endif
d9 8
a16 6
-#if PLATFORM(OPENBSD)
 #include <pthread.h>
-#endif
 
 #if HAVE(PTHREAD_NP_H)
 #include <pthread_np.h>
@