Changes 4.8.0:

Featuring Qt Platform Abstraction, threaded OpenGL support, multithreaded HTTP and optimized file system access.
jsonn · Jan 12, 2012 · 8ba07be · 8ba07be
1 parent bebace2
commit 8ba07be
Show file tree

Hide file tree

Showing 53 changed files with 300 additions and 389 deletions.
diff --git a/x11/qt4-docs/Makefile b/x11/qt4-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2011/11/01 06:03:07 sbd Exp $
+# $NetBSD: Makefile,v 1.19 2012/01/12 22:59:58 adam Exp $
 
 PKGNAME=	qt4-docs-${QTVERSION}
-PKGREVISION=	2
 COMMENT=	Documentation for the QT C++ X GUI toolkit
 
 .include "../../x11/qt4-libs/Makefile.common"

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2011/11/01 06:03:07 sbd Exp $
+# $NetBSD: Makefile,v 1.67 2012/01/12 22:59:58 adam Exp $
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	2
 COMMENT=	C++ X GUI toolkit
 
 .include "../../x11/qt4-libs/Makefile.common"
@@ -66,12 +65,12 @@ do-install:
 	 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/imports/QtWebKit/libqmlwebkitplugin.la \
 		${DESTDIR}${QTPREFIX}/imports/QtWebKit/
-.for incl in corelib declarative gui multimedia network opengl qt3support script scripttools sql svg testlib xml xmlpatterns 3rdparty/webkit/WebCore
+.for incl in corelib declarative gui multimedia network opengl qt3support script scripttools sql svg testlib xml xmlpatterns 3rdparty/webkit/Source/WebKit/qt
 	cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \
 		${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers
 .endfor
 	cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST
-.for lib in Qt3Support QtCore QtDeclarative QtGui QtMultimedia QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtWebKit QtXml QtXmlPatterns jscore
+.for lib in Qt3Support QtCore QtDeclarative QtGui QtMultimedia QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtWebKit QtXml QtXmlPatterns jscore webcore
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
 		${DESTDIR}${QTPREFIX}/lib/
 	sed	-e "s:${WRKSRC}:${QTPREFIX}:g" \
@@ -101,7 +100,7 @@ do-install:
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/plugins/iconengines/libqsvgicon.la \
 		${DESTDIR}/${QTPREFIX}/plugins/iconengines/
-.for plug in qgif qico qjpeg qsvg
+.for plug in qgif qico qjpeg qsvg qtga
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/plugins/imageformats/lib${plug}.la \
 		${DESTDIR}${QTPREFIX}/plugins/imageformats/

diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2011/09/18 09:01:30 adam Exp $
+# $NetBSD: Makefile.common,v 1.30 2012/01/12 22:59:58 adam Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -11,8 +11,6 @@
 DISTNAME=	qt-everywhere-opensource-src-${QTVERSION}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.qt.nokia.com/qt/source/
-# XXX the distfile for 4.7.4 has been changed; remove this for future releases
-DIST_SUBDIR=	qt4
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -38,7 +36,6 @@ CONFIGURE_ARGS+=	-no-phonon
 CONFIGURE_ARGS+=	-no-phonon-backend
 CONFIGURE_ARGS+=	-optimized-qmake
 CONFIGURE_ARGS+=	-prefix "${QTPREFIX}"
-CONFIGURE_ARGS+=	-qt-gif	# qt4 does not write compressed GIFs
 CONFIGURE_ARGS.SunOS+=	-no-xrender
 CONFIGURE_ARGS+=	${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
 CONFIGURE_ARGS+=	-opensource -confirm-license

diff --git a/x11/qt4-libs/PLIST b/x11/qt4-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2011/01/12 14:40:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2012/01/12 22:59:58 adam Exp $
 lib/pkgconfig/Qt3Support.pc
 lib/pkgconfig/QtCore.pc
 lib/pkgconfig/QtDeclarative.pc
@@ -15,6 +15,7 @@ lib/pkgconfig/QtWebKit.pc
 lib/pkgconfig/QtXml.pc
 lib/pkgconfig/QtXmlPatterns.pc
 lib/pkgconfig/jscore.pc
+lib/pkgconfig/webcore.pc
 qt4/bin/moc
 qt4/bin/rcc
 qt4/bin/uic
@@ -39,6 +40,7 @@ qt4/lib/libQtWebKit.la
 qt4/lib/libQtXml.la
 qt4/lib/libQtXmlPatterns.la
 qt4/lib/libjscore.la
+qt4/lib/libwebcore.la
 qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
 qt4/plugins/accessible/libqtaccessiblewidgets.la
 qt4/plugins/bearer/libqgenericbearer.la
@@ -53,6 +55,7 @@ qt4/plugins/imageformats/libqgif.la
 qt4/plugins/imageformats/libqico.la
 qt4/plugins/imageformats/libqjpeg.la
 qt4/plugins/imageformats/libqsvg.la
+qt4/plugins/imageformats/libqtga.la
 ${PLIST.unix}qt4/plugins/inputmethods/libqimsw-multi.la
 ${PLIST.mac}qt4/qt_menu.nib/classes.nib
 ${PLIST.mac}qt4/qt_menu.nib/info.nib

diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.27 2011/11/01 06:03:07 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2012/01/12 23:02:26 adam Exp $
 
 BUILDLINK_TREE+=	qt4-libs
 
 .if !defined(QT4_LIBS_BUILDLINK3_MK)
 QT4_LIBS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.6.1nb2
-BUILDLINK_ABI_DEPENDS.qt4-libs+=	qt4-libs>=4.7.4nb2
+BUILDLINK_ABI_DEPENDS.qt4-libs+=	qt4-libs>=4.8.0
 BUILDLINK_PKGSRCDIR.qt4-libs?=	../../x11/qt4-libs
 
 BUILDLINK_INCDIRS.qt4-libs+=	qt4/include

diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
@@ -1,52 +1,46 @@
-$NetBSD: distinfo,v 1.65 2011/11/01 15:52:23 hans Exp $
+$NetBSD: distinfo,v 1.66 2012/01/12 22:59:58 adam Exp $
 
-SHA1 (qt4/qt-everywhere-opensource-src-4.7.4.tar.gz) = af9016aa924a577f7b06ffd28c9773b56d74c939
+SHA1 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 2ba35adca8fb9c66a58eca61a15b21df6213f22e
-RMD160 (qt4/qt-everywhere-opensource-src-4.7.4.tar.gz) = 3e47b09663a89973b1c8628506c995dfc2a5387c
+RMD160 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 7506dce7743215481fd9fe56920b8a47f07a112e
-Size (qt4/qt-everywhere-opensource-src-4.7.4.tar.gz) = 220388303 bytes
+Size (qt-everywhere-opensource-src-4.8.0.tar.gz) = 238580694 bytes
-SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1
+SHA1 (patch-aa) = 4b15483ad6bf94e2b97aa1515fe60e3179446ee5
 SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
 SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
-SHA1 (patch-ad) = 42ab1fa5f0dd54c3cdc898c1a95c399414ca33ea
+SHA1 (patch-ad) = ca1dfb801ea16ba4b10797e4121fa05f585fd87b
-SHA1 (patch-ae) = 249bae0d7befeb74b2e855f2b9d3e6e8dd101540
+SHA1 (patch-ae) = d2dfd606ff82fa6db285d62a77e476f68ac93af7
-SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3
+SHA1 (patch-af) = 86bab4c9090a346d44f378a00f4f434da9ded714
-SHA1 (patch-ag) = 61f992a4f8e36cd2bbdf56849f3c39c86f0b1033
+SHA1 (patch-ag) = 8ba8839a110375c7343c42225945138c5a378e8b
 SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
 SHA1 (patch-ai) = 5ae8d5516b577e017ea61bce8faa774da8c96f47
 SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525
-SHA1 (patch-ak) = 6ee5822d81723cddb44226b34d891fd93c4779b9
+SHA1 (patch-ak) = a16e2ae20e0568f2a50eb390c4fbd480c0223ad4
-SHA1 (patch-al) = 4a2a30551a4970bf3b2f5347b9067a7d490d01fb
+SHA1 (patch-al) = a215436a2df433e050fa48a7cc8238b5ef13b64d
-SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
+SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54
 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
-SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4
+SHA1 (patch-ao) = 2bb9563994ab6e2912f45d19cd4a69f774eaaaef
 SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
-SHA1 (patch-aq) = 0650bcff29fddc65d093c0630cdb7ffafb0451cf
+SHA1 (patch-aq) = 5fd4806a42950af928a76259e26615902de23d78
 SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
 SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
-SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
 SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
 SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
 SHA1 (patch-aw) = df067e2530a825734ffc0afe2607e43c45c07f9b
-SHA1 (patch-ax) = 10f35c99b8cfebeb35f09a97188ae5c8b47a6635
 SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94
-SHA1 (patch-az) = c54b9c594de3e4fd3312e6689d2b8d3bfb84202d
 SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9
 SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5
-SHA1 (patch-bc) = 25e41d689335387c10d26a31291f34f55df4903f
+SHA1 (patch-bc) = 5df34d2d6bb2f93e511cdfb2d9371e1646f5a773
-SHA1 (patch-bd) = 6bb0a67cb087d75761338a5abe567b9fa2b5471d
+SHA1 (patch-bd) = 013dd17149e4ed60072adfd226f7e6b3ea8eb5cd
-SHA1 (patch-be) = e5555a6c08bfb98dd69543cec75771999ee37b13
+SHA1 (patch-be) = dd47e1fbf46ca01901e664f544ea1942f61c2557
-SHA1 (patch-bf) = 7c5810021580a5c4faf8c890b2c02a373b167b04
+SHA1 (patch-bf) = fba76801814a69d22ce5cc58ac2a8c2bfe3bd019
-SHA1 (patch-bg) = 85cec3da9219d5e9a9994ed52074c6ff8ce93dce
+SHA1 (patch-bg) = 76175e659be041ba02c1c07fe8e8fceb029e6759
 SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430
-SHA1 (patch-cb) = 4817f5b266f75e93918517c219a1f4bf74b989b3
+SHA1 (patch-cb) = 13e1b0ffb171637e1ff84a548ef83cf4e006c207
-SHA1 (patch-cc) = 71a7a97a89f6b87a6b4ad4201a4f47f6b5575362
+SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31
-SHA1 (patch-cd) = eb70970354765bbaf6c261f4a44db6ca61c42ae5
+SHA1 (patch-ci) = bc85adf9ea17be24f92897b960517941f5b28ab7
-SHA1 (patch-ce) = 91b8f49008783e25e9e2252f92d9481bba2d318d
+SHA1 (patch-cj) = 4f6d3546e3bc04ca2034af21645fc6f27bc82eef
-SHA1 (patch-cf) = 8b18fce7f564e8cd688f09fd5de6340771f428e8
+SHA1 (patch-qmake_generators_makefile.cpp) = 54184d85fd06c86a62640add6c8334ca323ea863
-SHA1 (patch-cg) = c5948cea47fb4134c626415b0b2c36660beea64a
+SHA1 (patch-src_3rdparty_webkit_Source_WebCore_features.pri) = d0053dd2732604908fcec294b2a833aeb6d93f40
-SHA1 (patch-ch) = 8efaa05e564022710ff978b59581c017bbece979
+SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 9e4a68fe02204e5fda7272f988d991992dfd281e
-SHA1 (patch-ci) = a2ac5703503afcdb2a87f80a8ba373c8ff7a2697
+SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1
-SHA1 (patch-cj) = 49fd8ae10c5fc026101355596b91fcf3e1701b9d
+SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = d24cc8fca0f4cf7579641da8447163d351f876c5
-SHA1 (patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h) = 6485889496bd6e23466a4ae3c938a9e1592e1989
+SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = c2fbda4e7d00ae0e586f7408b798cc05824b4cc0
-SHA1 (patch-src_3rdparty_webkit_WebCore_WebCore.pro) = 41fbce9872c2d6b4977772d88391b1194ec37b2e
-SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 87c48f97ba2026f4bb553aa0b855bc1b1f653abf
-SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = e05f420bd532a8964d293e4bad848636dc716d0f
diff --git a/x11/qt4-libs/files/qmake.conf.mac b/x11/qt4-libs/files/qmake.conf.mac
@@ -1,4 +1,4 @@
-# $NetBSD: qmake.conf.mac,v 1.1 2011/01/12 07:07:07 adam Exp $
+# $NetBSD: qmake.conf.mac,v 1.2 2012/01/12 22:59:58 adam Exp $
 #
 # qmake configuration for PkgSrc on Mac OS X
 
@@ -38,6 +38,8 @@ QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
+QMAKE_OBJECTIVE_CFLAGS	= @CFLAGS@
+
 QMAKE_INCDIR		= @LOCALBASE@/include
 QMAKE_LIBDIR		= @LOCALBASE@/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include

diff --git a/x11/qt4-libs/patches/patch-aa b/x11/qt4-libs/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.12 2010/11/15 13:05:45 adam Exp $
+$NetBSD: patch-aa,v 1.13 2012/01/12 22:59:58 adam Exp $
 
 --- qmake/generators/unix/unixmake2.cpp.orig	2010-09-10 09:04:41.000000000 +0000
 +++ qmake/generators/unix/unixmake2.cpp
@@ -25,12 +25,3 @@ $NetBSD: patch-aa,v 1.12 2010/11/15 13:05:45 adam Exp $
      } else {
          project->values("TARGETA").append(project->first("DESTDIR") + project->first("QMAKE_PREFIX_STATICLIB")
                  + project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_STATICLIB"));
-@@ -1467,7 +1473,7 @@ UnixMakefileGenerator::writePkgConfigFil
-             bundle = bundle.left(suffix);
-         pkgConfiglibName = "-framework " + bundle + " ";
-     } else {
--        pkgConfiglibDir = "-L${libdir}";
-+        pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}";
-         pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
-     }
-     t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;
diff --git a/x11/qt4-libs/patches/patch-ad b/x11/qt4-libs/patches/patch-ad
@@ -1,16 +1,16 @@
-$NetBSD: patch-ad,v 1.12 2011/01/12 07:07:07 adam Exp $
+$NetBSD: patch-ad,v 1.13 2012/01/12 22:59:58 adam Exp $
 
 --- src/corelib/global/qglobal.h.orig	2010-09-10 09:05:25.000000000 +0000
 +++ src/corelib/global/qglobal.h
-@@ -159,6 +159,7 @@ namespace QT_NAMESPACE {}
+@@ -163,6 +163,7 @@ namespace QT_NAMESPACE {}
       NETBSD   - NetBSD
       OPENBSD  - OpenBSD
       BSDI     - BSD/OS
 +     INTERIX  - Interix
       IRIX     - SGI Irix
       OSF      - HP Tru64 UNIX
       SCO      - SCO OpenServer 5
-@@ -224,6 +225,9 @@ namespace QT_NAMESPACE {}
+@@ -229,6 +230,9 @@ namespace QT_NAMESPACE {}
  #elif defined(__NetBSD__)
  #  define Q_OS_NETBSD
  #  define Q_OS_BSD4

diff --git a/x11/qt4-libs/patches/patch-ae b/x11/qt4-libs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.10 2011/03/03 05:50:04 adam Exp $
+$NetBSD: patch-ae,v 1.11 2012/01/12 22:59:58 adam Exp $
 
 --- qmake/generators/unix/unixmake.cpp.orig	2011-02-22 12:02:48.000000000 +0000
 +++ qmake/generators/unix/unixmake.cpp
-@@ -327,27 +327,29 @@ UnixMakefileGenerator::init()
+@@ -356,27 +356,29 @@ UnixMakefileGenerator::init()
                  if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
                      libtool_flags += " --mode=link";
                      if(project->isActiveConfig("staticlib")) {
@@ -42,15 +42,15 @@ $NetBSD: patch-ae,v 1.10 2011/03/03 05:50:04 adam Exp $
                  } else {
                      libtool_flags += " --mode=compile";
                  }
-@@ -708,7 +710,6 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -741,7 +743,6 @@ UnixMakefileGenerator::defaultInstall(co
      QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), false);
      if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
          destdir += Option::dir_sep;
 -    targetdir = fileFixify(targetdir, FileFixifyAbsolute);
      if(targetdir.right(1) != Option::dir_sep)
          targetdir += Option::dir_sep;
 
-@@ -746,10 +747,14 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -779,10 +780,14 @@ UnixMakefileGenerator::defaultInstall(co
          QString src_targ = target;
          if(src_targ == "$(TARGET)")
              src_targ = "$(TARGETL)";

diff --git a/x11/qt4-libs/patches/patch-af b/x11/qt4-libs/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.8 2010/07/04 06:00:14 adam Exp $
+$NetBSD: patch-af,v 1.9 2012/01/12 22:59:58 adam Exp $
 
---- qmake/Makefile.unix.orig	2010-06-02 02:03:09.000000000 +0000
+--- qmake/Makefile.unix.orig	2011-12-08 05:06:02.000000000 +0000
 +++ qmake/Makefile.unix
 @@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@
  QTOBJS = @QMAKE_QTOBJS@
@@ -11,18 +11,18 @@ $NetBSD: patch-af,v 1.8 2010/07/04 06:00:14 adam Exp $
 
  #qmake code
  OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o  \
-@@ -63,7 +63,7 @@ DEPEND_SRC=project.cpp property.cpp meta
+@@ -73,7 +73,7 @@ DEPEND_SRC=project.cpp property.cpp meta
- 	   $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \
+ 	   $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \
  	   $(QTSRCS)
 
--CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \
+-CPPFLAGS = -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \
-+CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \
++CPPFLAGS += -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \
+            -Igenerators/mac -Igenerators/symbian -Igenerators/integrity \
  	   -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
  	   -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \
- 	   -I$(SOURCE_PATH)/tools/shared \
+@@ -84,7 +84,7 @@ CPPFLAGS = -g -I. -Igenerators -Igenerat
-@@ -73,7 +73,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators
  	   -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
-            -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS)
+            -DQT_NO_GEOM_VARIANT -DQT_NO_DEPRECATED $(OPENSOURCE_CXXFLAGS)
 
 -CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
 +CXXFLAGS += @QMAKE_CXXFLAGS@ $(CPPFLAGS)

diff --git a/x11/qt4-libs/patches/patch-ag b/x11/qt4-libs/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.13 2011/03/03 05:50:04 adam Exp $
+$NetBSD: patch-ag,v 1.14 2012/01/12 22:59:58 adam Exp $
 
 --- qmake/project.cpp.orig	2010-09-10 09:04:41.000000000 +0000
 +++ qmake/project.cpp
-@@ -1550,6 +1550,9 @@ QMakeProject::isActiveConfig(const QStri
+@@ -1555,6 +1555,9 @@ QMakeProject::isActiveConfig(const QStri
          return Option::target_mode == Option::TARG_WIN_MODE;
      }
 

diff --git a/x11/qt4-libs/patches/patch-ak b/x11/qt4-libs/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.7 2010/11/15 13:05:45 adam Exp $
+$NetBSD: patch-ak,v 1.8 2012/01/12 22:59:58 adam Exp $
 
 --- src/gui/kernel/qcursor_x11.cpp.orig	2010-09-10 09:05:24.000000000 +0000
 +++ src/gui/kernel/qcursor_x11.cpp
-@@ -246,7 +246,7 @@ void QCursorData::update()
+@@ -249,7 +249,7 @@ void QCursorData::update()
          return;
      }
 

diff --git a/x11/qt4-libs/patches/patch-al b/x11/qt4-libs/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.8 2011/03/03 05:50:04 adam Exp $
+$NetBSD: patch-al,v 1.9 2012/01/12 22:59:58 adam Exp $
 
 --- src/corelib/io/qsettings.cpp.orig	2011-02-22 12:04:00.000000000 +0000
 +++ src/corelib/io/qsettings.cpp
-@@ -142,9 +142,16 @@ QT_END_INCLUDE_NAMESPACE
+@@ -141,9 +141,16 @@ QT_END_INCLUDE_NAMESPACE
 
  Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle)
  {
@@ -19,7 +19,7 @@ $NetBSD: patch-al,v 1.8 2011/03/03 05:50:04 adam Exp $
      return qt_isEvilFsTypeName(buf.f_fstypename);
  }
 
-@@ -178,7 +185,7 @@ Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyT
+@@ -177,7 +184,7 @@ Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyT
 
  #elif defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_OS_AIX) || defined(Q_OS_HPUX) \
        || defined(Q_OS_OSF) || defined(Q_OS_QNX) || defined(Q_OS_SCO) \

diff --git a/x11/qt4-libs/patches/patch-am b/x11/qt4-libs/patches/patch-am
@@ -1,10 +1,10 @@
-$NetBSD: patch-am,v 1.5 2008/01/05 22:15:24 wiz Exp $
+$NetBSD: patch-am,v 1.6 2012/01/12 22:59:58 adam Exp $
 
---- tools/designer/src/uitools/uitools.pro.orig	2007-12-04 16:43:42.000000000 +0000
+--- tools/designer/src/uitools/uitools.pro.orig	2011-12-08 05:06:02.000000000 +0000
 +++ tools/designer/src/uitools/uitools.pro
 @@ -1,7 +1,7 @@
  TEMPLATE = lib
- TARGET = $$qtLibraryTarget(QtUiTools)
+ TARGET = QtUiTools
  QT += xml
 -CONFIG += qt staticlib
 +CONFIG += qt dll