head	1.5;
access;
symbols
	pkgsrc-2014Q2:1.4.0.20
	pkgsrc-2014Q2-base:1.4
	pkgsrc-2014Q1:1.4.0.18
	pkgsrc-2014Q1-base:1.4
	pkgsrc-2013Q4:1.4.0.16
	pkgsrc-2013Q4-base:1.4
	pkgsrc-2013Q3:1.4.0.14
	pkgsrc-2013Q3-base:1.4
	pkgsrc-2013Q2:1.4.0.12
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2013Q1:1.4.0.10
	pkgsrc-2013Q1-base:1.4
	pkgsrc-2012Q4:1.4.0.8
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2012Q3:1.4.0.6
	pkgsrc-2012Q3-base:1.4
	pkgsrc-2012Q2:1.4.0.4
	pkgsrc-2012Q2-base:1.4
	pkgsrc-2012Q1:1.4.0.2
	pkgsrc-2012Q1-base:1.4
	pkgsrc-2011Q4:1.3.0.8
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.6
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.4
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.3.0.2
	pkgsrc-2011Q1-base:1.3
	pkgsrc-2009Q4:1.1.0.2
	pkgsrc-2009Q4-base:1.1;
locks; strict;
comment	@# @;


1.5
date	2014.07.22.17.01.51;	author wiz;	state dead;
branches;
next	1.4;
commitid	530NgQ7X3HwZzoJx;

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

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

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

1.1
date	2010.01.08.09.56.09;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Update qt4 packages to 4.8.6.

Qt 4.8.6 provides overall over 200 improvements and bug fixes, for
example:

    Security Fix for XML Entity Expansion Denial of Service (the
    "Billion Laughs" attack)
    Better support for Mac OS X 10.9 Mavericks
    Many customer requested bug fixes, for example QTBUG-15116,
    QTBUG-21371, QTBUG-8990, QTBUG-28601, QTBUG-20946, QTBUG-30276,
    QTBUG-29572 and QTBUG-13237 (just to name a few)
    MinGW binary packages are now built with MinGW-w64 based
    toolchain with gcc 4.8.2
    Basque translation added and many other translations improved
@
text
@$NetBSD: patch-cb,v 1.4 2012/01/12 22:59:58 adam Exp $

--- src/gui/kernel/qapplication_mac.mm.orig	2011-12-08 05:06:02.000000000 +0000
+++ src/gui/kernel/qapplication_mac.mm
@@@@ -1257,12 +1257,14 @@@@ void qt_init(QApplicationPrivate *priv, 
         [cocoaApp setDelegate:newDelegate];
 
         QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader = [[QT_MANGLE_NAMESPACE(QCocoaMenuLoader) alloc] init];
-        if ([NSBundle loadNibNamed:@@"qt_menu" owner:qtMenuLoader] == false) {
+        NSNib *qtNib = [[NSNib alloc] initWithContentsOfURL:[NSURL fileURLWithPath:@@"@@QTPREFIX@@/qt_menu.nib"]];
+        if ([qtNib instantiateNibWithOwner:qtMenuLoader topLevelObjects:nil] == false) {
             qFatal("Qt internal error: qt_menu.nib could not be loaded. The .nib file"
                    " should be placed in QtGui.framework/Versions/Current/Resources/ "
                    " or in the resources directory of your application bundle.");
         }
 
+        [qtNib release];
         [cocoaApp setMenu:[qtMenuLoader menu]];
         [newDelegate setMenuLoader:qtMenuLoader];
         [qtMenuLoader release];
@


1.4
log
@Changes 4.8.0:
Featuring Qt Platform Abstraction, threaded OpenGL support, multithreaded HTTP
and optimized file system access.
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@* Install libphonon.
* On Mac OS X build Qt with Cocoa, but don't install as a framework.
@
text
@d3 1
a3 1
--- src/gui/kernel/qapplication_mac.mm.orig	2010-12-30 14:07:53.000000000 +0000
d5 1
a5 9
@@@@ -1244,6 +1244,7 @@@@ void qt_init(QApplicationPrivate *priv, 
 #ifdef QT_MAC_USE_COCOA
     NSApplication *cocoaApp = [QNSApplication sharedApplication];
     QMacCocoaAutoReleasePool pool;
+    NSNib *qtNib;
     NSObject *oldDelegate = [cocoaApp delegate];
     QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) *newDelegate = [QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate];
     Q_ASSERT(newDelegate);
@@@@ -1254,12 +1255,14 @@@@ void qt_init(QApplicationPrivate *priv, 
d10 1
a10 1
+        qtNib = [[NSNib alloc] initWithContentsOfURL:[NSURL fileURLWithPath:@@"@@QTPREFIX@@/qt_menu.nib"]];
@


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
@d1 1
a1 1
$NetBSD: patch-cb,v 1.1 2010/01/08 09:56:09 drochner Exp $
d3 12
a14 4
--- src/3rdparty/webkit/WebCore/xml/XMLHttpRequest.cpp.orig	2009-09-29 11:01:37.000000000 +0000
+++ src/3rdparty/webkit/WebCore/xml/XMLHttpRequest.cpp
@@@@ -735,7 +735,6 @@@@ void XMLHttpRequest::makeCrossSiteAccess
             }
d16 7
a22 2
             preflightRequest.setHTTPHeaderField("Access-Control-Request-Headers", String::adopt(headerBuffer));
-            preflightRequest.addHTTPHeaderFields(m_requestHeaders);
d25 4
a28 1
         if (m_async) {
@


1.1
log
@ass patches from webkit CVS to fix security problems
(CVE-2009-2816, CVE-2009-3384), bump PKGREVISION
@
text
@d1 1
a1 1
$NetBSD$
@