diff options
Diffstat (limited to 'x11/qt4-libs')
41 files changed, 235 insertions, 365 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 1dece8a3e4a..1107b1e5ecb 100644 --- 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 index aac12602012..e7b8b4c76b8 100644 --- 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 index f7d0dfd3471..96ddc46e4b0 100644 --- 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 index 8efdb6c9eb8..36c7c6b7f52 100644 --- a/x11/qt4-libs/buildlink3.mk +++ b/x11/qt4-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $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 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= qt4-libs 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 index dee1a47837b..dd0b87b145a 100644 --- 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 -RMD160 (qt4/qt-everywhere-opensource-src-4.7.4.tar.gz) = 3e47b09663a89973b1c8628506c995dfc2a5387c -Size (qt4/qt-everywhere-opensource-src-4.7.4.tar.gz) = 220388303 bytes -SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1 +SHA1 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 2ba35adca8fb9c66a58eca61a15b21df6213f22e +RMD160 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 7506dce7743215481fd9fe56920b8a47f07a112e +Size (qt-everywhere-opensource-src-4.8.0.tar.gz) = 238580694 bytes +SHA1 (patch-aa) = 4b15483ad6bf94e2b97aa1515fe60e3179446ee5 SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5 -SHA1 (patch-ad) = 42ab1fa5f0dd54c3cdc898c1a95c399414ca33ea -SHA1 (patch-ae) = 249bae0d7befeb74b2e855f2b9d3e6e8dd101540 -SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3 -SHA1 (patch-ag) = 61f992a4f8e36cd2bbdf56849f3c39c86f0b1033 +SHA1 (patch-ad) = ca1dfb801ea16ba4b10797e4121fa05f585fd87b +SHA1 (patch-ae) = d2dfd606ff82fa6db285d62a77e476f68ac93af7 +SHA1 (patch-af) = 86bab4c9090a346d44f378a00f4f434da9ded714 +SHA1 (patch-ag) = 8ba8839a110375c7343c42225945138c5a378e8b SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 SHA1 (patch-ai) = 5ae8d5516b577e017ea61bce8faa774da8c96f47 SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525 -SHA1 (patch-ak) = 6ee5822d81723cddb44226b34d891fd93c4779b9 -SHA1 (patch-al) = 4a2a30551a4970bf3b2f5347b9067a7d490d01fb -SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 +SHA1 (patch-ak) = a16e2ae20e0568f2a50eb390c4fbd480c0223ad4 +SHA1 (patch-al) = a215436a2df433e050fa48a7cc8238b5ef13b64d +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-bd) = 6bb0a67cb087d75761338a5abe567b9fa2b5471d -SHA1 (patch-be) = e5555a6c08bfb98dd69543cec75771999ee37b13 -SHA1 (patch-bf) = 7c5810021580a5c4faf8c890b2c02a373b167b04 -SHA1 (patch-bg) = 85cec3da9219d5e9a9994ed52074c6ff8ce93dce +SHA1 (patch-bc) = 5df34d2d6bb2f93e511cdfb2d9371e1646f5a773 +SHA1 (patch-bd) = 013dd17149e4ed60072adfd226f7e6b3ea8eb5cd +SHA1 (patch-be) = dd47e1fbf46ca01901e664f544ea1942f61c2557 +SHA1 (patch-bf) = fba76801814a69d22ce5cc58ac2a8c2bfe3bd019 +SHA1 (patch-bg) = 76175e659be041ba02c1c07fe8e8fceb029e6759 SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430 -SHA1 (patch-cb) = 4817f5b266f75e93918517c219a1f4bf74b989b3 -SHA1 (patch-cc) = 71a7a97a89f6b87a6b4ad4201a4f47f6b5575362 -SHA1 (patch-cd) = eb70970354765bbaf6c261f4a44db6ca61c42ae5 -SHA1 (patch-ce) = 91b8f49008783e25e9e2252f92d9481bba2d318d -SHA1 (patch-cf) = 8b18fce7f564e8cd688f09fd5de6340771f428e8 -SHA1 (patch-cg) = c5948cea47fb4134c626415b0b2c36660beea64a -SHA1 (patch-ch) = 8efaa05e564022710ff978b59581c017bbece979 -SHA1 (patch-ci) = a2ac5703503afcdb2a87f80a8ba373c8ff7a2697 -SHA1 (patch-cj) = 49fd8ae10c5fc026101355596b91fcf3e1701b9d -SHA1 (patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h) = 6485889496bd6e23466a4ae3c938a9e1592e1989 -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 +SHA1 (patch-cb) = 13e1b0ffb171637e1ff84a548ef83cf4e006c207 +SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31 +SHA1 (patch-ci) = bc85adf9ea17be24f92897b960517941f5b28ab7 +SHA1 (patch-cj) = 4f6d3546e3bc04ca2034af21645fc6f27bc82eef +SHA1 (patch-qmake_generators_makefile.cpp) = 54184d85fd06c86a62640add6c8334ca323ea863 +SHA1 (patch-src_3rdparty_webkit_Source_WebCore_features.pri) = d0053dd2732604908fcec294b2a833aeb6d93f40 +SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 9e4a68fe02204e5fda7272f988d991992dfd281e +SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1 +SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = d24cc8fca0f4cf7579641da8447163d351f876c5 +SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = c2fbda4e7d00ae0e586f7408b798cc05824b4cc0 diff --git a/x11/qt4-libs/files/qmake.conf.mac b/x11/qt4-libs/files/qmake.conf.mac index 88e2f651de3..693844bbaf3 100644 --- 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 index 2daf99f04f1..984e1814836 100644 --- 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 index c3f468a7863..f58883bb349 100644 --- a/x11/qt4-libs/patches/patch-ad +++ b/x11/qt4-libs/patches/patch-ad @@ -1,8 +1,8 @@ -$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 @@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.12 2011/01/12 07:07:07 adam Exp $ 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 index be01364d3ab..a33e3b5cd29 100644 --- 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,7 +42,7 @@ $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; @@ -50,7 +50,7 @@ $NetBSD: patch-ae,v 1.10 2011/03/03 05:50:04 adam Exp $ 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 index 609fe5a1e60..e943ab14b48 100644 --- 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 - $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \ +@@ -73,7 +73,7 @@ DEPEND_SRC=project.cpp property.cpp meta + $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \ $(QTSRCS) --CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \ -+CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \ +-CPPFLAGS = -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \ ++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 \ -@@ -73,7 +73,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators +@@ -84,7 +84,7 @@ CPPFLAGS = -g -I. -Igenerators -Igenerat -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 index c1e0b314e3d..7c611d93712 100644 --- 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 index ba94746929f..047fb6a08ac 100644 --- 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 index 61a749fccfe..f58d5d0a5b5 100644 --- 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 index cf2b6581881..db00f304f53 100644 --- 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 diff --git a/x11/qt4-libs/patches/patch-ao b/x11/qt4-libs/patches/patch-ao index a05cffc04d9..58686c05bbe 100644 --- a/x11/qt4-libs/patches/patch-ao +++ b/x11/qt4-libs/patches/patch-ao @@ -1,6 +1,6 @@ -$NetBSD: patch-ao,v 1.8 2010/07/04 06:00:14 adam Exp $ +$NetBSD: patch-ao,v 1.9 2012/01/12 22:59:58 adam Exp $ ---- src/corelib/codecs/qiconvcodec.cpp.orig 2010-06-02 02:03:17.000000000 +0000 +--- src/corelib/codecs/qiconvcodec.cpp.orig 2011-12-08 05:06:03.000000000 +0000 +++ src/corelib/codecs/qiconvcodec.cpp @@ -50,9 +50,14 @@ #include <stdio.h> @@ -28,7 +28,7 @@ $NetBSD: patch-ao,v 1.8 2010/07/04 06:00:14 adam Exp $ #else # define UTF16 "UTF-16" #endif -@@ -218,7 +226,7 @@ QString QIconvCodec::convertToUnicode(co +@@ -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 @@ -37,7 +37,7 @@ $NetBSD: patch-ao,v 1.8 2010/07/04 06:00:14 adam Exp $ // GNU doesn't disagree with POSIX :/ const char *inBytes = chars; #else -@@ -311,7 +319,7 @@ static bool setByteOrder(iconv_t cd) +@@ -314,7 +322,7 @@ static bool setByteOrder(iconv_t cd) size_t outBytesLeft = sizeof buf; size_t inBytesLeft = sizeof bom; @@ -46,7 +46,7 @@ $NetBSD: patch-ao,v 1.8 2010/07/04 06:00:14 adam Exp $ const char **inBytesPtr = const_cast<const char **>(&inBytes); #else char **inBytesPtr = &inBytes; -@@ -331,7 +339,7 @@ QByteArray QIconvCodec::convertFromUnico +@@ -334,7 +342,7 @@ QByteArray QIconvCodec::convertFromUnico char *outBytes; size_t inBytesLeft; @@ -55,7 +55,7 @@ $NetBSD: patch-ao,v 1.8 2010/07/04 06:00:14 adam Exp $ const char **inBytesPtr = const_cast<const char **>(&inBytes); #else char **inBytesPtr = &inBytes; -@@ -468,11 +476,13 @@ iconv_t QIconvCodec::createIconv_t(const +@@ -466,11 +474,13 @@ iconv_t QIconvCodec::createIconv_t(const static const char empty_codeset[] = ""; const char *codeset = empty_codeset; cd = iconv_open(to ? to : codeset, from ? from : codeset); diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq index 0dbbd8b1197..074d1cb012e 100644 --- a/x11/qt4-libs/patches/patch-aq +++ b/x11/qt4-libs/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.10 2011/08/14 08:56:21 mrg Exp $ +$NetBSD: patch-aq,v 1.11 2012/01/12 22:59:58 adam Exp $ ---- configure.orig 2011-03-29 22:16:21.000000000 -0700 -+++ configure 2011-08-07 21:32:05.000000000 -0700 -@@ -2965,13 +2965,13 @@ +--- configure.orig 2011-12-08 05:06:02.000000000 +0000 ++++ configure +@@ -3100,13 +3100,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then CFG_HOST_ARCH=x86_64 fi ;; @@ -18,7 +18,7 @@ $NetBSD: patch-aq,v 1.10 2011/08/14 08:56:21 mrg Exp $ if [ "$OPT_VERBOSE" = "yes" ]; then echo " 64-bit PowerPC (powerpc)" fi -@@ -2995,6 +2995,19 @@ +@@ -3130,6 +3130,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then fi CFG_HOST_ARCH=sparc ;; @@ -38,7 +38,7 @@ $NetBSD: patch-aq,v 1.10 2011/08/14 08:56:21 mrg Exp $ QNX:*:*) case "$UNAME_MACHINE" in x86pc) -@@ -3297,7 +3310,7 @@ +@@ -3466,7 +3479,7 @@ fi if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then # get the darwin version. 10.0.0 and up means snow leopard. VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` @@ -47,7 +47,7 @@ $NetBSD: patch-aq,v 1.10 2011/08/14 08:56:21 mrg Exp $ echo echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " echo -@@ -4755,7 +4768,7 @@ +@@ -4970,7 +4983,7 @@ if true; then ###[ '!' -f "$outpath/bin/ done QMAKE_BUILD_ERROR=no @@ -56,7 +56,7 @@ $NetBSD: patch-aq,v 1.10 2011/08/14 08:56:21 mrg Exp $ [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 -@@ -6580,7 +6593,7 @@ +@@ -6994,7 +7007,7 @@ fi # select Carbon on 10.4 Tiger. if [ "$PLATFORM_MAC" = "yes" ]; then VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` @@ -65,16 +65,16 @@ $NetBSD: patch-aq,v 1.10 2011/08/14 08:56:21 mrg Exp $ CFG_MAC_COCOA="no"; CFG_MAC_CARBON="yes"; fi -@@ -7788,7 +7801,7 @@ +@@ -8245,7 +8258,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$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" +#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" - if [ "$PLATFORM_QWS" != "yes" ]; then + if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" -@@ -7983,6 +7996,7 @@ +@@ -8450,6 +8463,7 @@ cat >>"$QTCONFIG.tmp" <<EOF #configuration CONFIG += $QTCONFIG_CONFIG QT_ARCH = $CFG_ARCH diff --git a/x11/qt4-libs/patches/patch-at b/x11/qt4-libs/patches/patch-at deleted file mode 100644 index 815583c4b6d..00000000000 --- a/x11/qt4-libs/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.4 2009/09/29 06:39:30 wiz Exp $ - ---- src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp.orig 2009-06-20 04:57:56.000000000 +0000 -+++ src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp -@@ -134,7 +134,7 @@ static String keyIdentifierForQtKeyCode( - case Qt::Key_Backtab: - return "U+0009"; - default: -- return String::format("U+%04X", toupper(keyCode)); -+ return String::format("U+%04X", toupper((unsigned char)keyCode)); - } - } - diff --git a/x11/qt4-libs/patches/patch-ax b/x11/qt4-libs/patches/patch-ax deleted file mode 100644 index 27e2827903d..00000000000 --- a/x11/qt4-libs/patches/patch-ax +++ /dev/null @@ -1,16 +0,0 @@ -$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; diff --git a/x11/qt4-libs/patches/patch-az b/x11/qt4-libs/patches/patch-az deleted file mode 100644 index fdac1b42e57..00000000000 --- a/x11/qt4-libs/patches/patch-az +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-az,v 1.4 2010/11/15 13:05:45 adam Exp $ - ---- src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h.orig 2010-09-10 09:05:24.000000000 +0000 -+++ src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h -@@ -491,7 +491,7 @@ namespace JSC { - u.asBits.tag = CellTag; - else - u.asBits.tag = EmptyValueTag; -- u.asBits.payload = reinterpret_cast<int32_t>(ptr); -+ u.asBits.payload = reinterpret_cast<intptr_t>(ptr); - #if ENABLE(JSC_ZOMBIES) - ASSERT(!isZombie()); - #endif -@@ -503,7 +503,7 @@ namespace JSC { - u.asBits.tag = CellTag; - else - u.asBits.tag = EmptyValueTag; -- u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr)); -+ u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr)); - #if ENABLE(JSC_ZOMBIES) - ASSERT(!isZombie()); - #endif diff --git a/x11/qt4-libs/patches/patch-bc b/x11/qt4-libs/patches/patch-bc index d1869c97866..bdfef5c9907 100644 --- a/x11/qt4-libs/patches/patch-bc +++ b/x11/qt4-libs/patches/patch-bc @@ -1,33 +1,24 @@ -$NetBSD: patch-bc,v 1.3 2010/11/15 13:05:45 adam Exp $ +$NetBSD: patch-bc,v 1.4 2012/01/12 22:59:58 adam Exp $ ---- src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h.orig 2010-11-06 01:55:19.000000000 +0000 -+++ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h -@@ -376,7 +376,7 @@ - - /* OS(NETBSD) - NetBSD */ - #if defined(__NetBSD__) --#define WTF_PLATFORM_NETBSD 1 -+#define WTF_OS_NETBSD 1 - #endif - - /* OS(OPENBSD) - OpenBSD */ -@@ -384,6 +384,11 @@ - #define WTF_OS_OPENBSD 1 - #endif +Build shared libwebcore. + +--- src/3rdparty/webkit/Source/WebCore/WebCore.pri.orig 2012-01-09 07:28:46.000000000 +0000 ++++ src/3rdparty/webkit/Source/WebCore/WebCore.pri +@@ -272,6 +272,7 @@ contains(DEFINES, ENABLE_WEBGL=1)|contai + } -+/* OS(DRAGONFLY) - DragonFly */ -+#ifdef __DragonFly__ -+#define WTF_OS_DRAGONFLY 1 -+#endif -+ - /* OS(QNX) - QNX */ - #if defined(__QNXNTO__) - #define WTF_OS_QNX 1 -@@ -414,6 +419,7 @@ - || OS(ANDROID) \ - || OS(DARWIN) \ - || OS(FREEBSD) \ -+ || OS(DRAGONFLY) \ - || OS(HAIKU) \ - || OS(LINUX) \ - || OS(NETBSD) \ + !CONFIG(webkit-debug):CONFIG(QTDIR_build) { ++ include($$QT_SOURCE_TREE/src/qbase.pri) + # Remove the following 2 lines if you want debug information in WebCore + CONFIG -= separate_debug_info + CONFIG += no_debug_info +@@ -351,9 +351,7 @@ defineTest(prependWebCoreLib) { + QMAKE_LIBDIR += $$pathToWebCoreOutput + POST_TARGETDEPS += $${pathToWebCoreOutput}$${QMAKE_DIR_SEP}$${WEBCORE_TARGET}.lib + } else { +- QMAKE_LIBDIR = $$pathToWebCoreOutput $$QMAKE_LIBDIR + LIBS = -l$$WEBCORE_TARGET $$LIBS +- POST_TARGETDEPS += $${pathToWebCoreOutput}$${QMAKE_DIR_SEP}lib$${WEBCORE_TARGET}.a + } + + CONFIG -= explicitlib diff --git a/x11/qt4-libs/patches/patch-bd b/x11/qt4-libs/patches/patch-bd index 373b282ef14..5b007feff79 100644 --- a/x11/qt4-libs/patches/patch-bd +++ b/x11/qt4-libs/patches/patch-bd @@ -1,13 +1,20 @@ -$NetBSD: patch-bd,v 1.1 2010/11/15 13:05:45 adam Exp $ +$NetBSD: patch-bd,v 1.2 2012/01/12 22:59:58 adam Exp $ ---- src/3rdparty/webkit/JavaScriptCore/config.h.orig 2010-10-26 09:26:05.000000000 +0000 -+++ src/3rdparty/webkit/JavaScriptCore/config.h -@@ -53,7 +53,7 @@ +Build shared libwebcore. + +--- src/3rdparty/webkit/Source/WebCore/WebCore.pro.orig 2012-01-09 07:30:08.000000000 +0000 ++++ src/3rdparty/webkit/Source/WebCore/WebCore.pro +@@ -7,13 +7,10 @@ + include($$PWD/WebCore.pri) + include($$PWD/../JavaScriptCore/JavaScriptCore.pri) + +-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols - #endif + TEMPLATE = lib + TARGET = $$WEBCORE_TARGET +-CONFIG += staticlib --#if OS(FREEBSD) || OS(OPENBSD) -+#if OS(FREEBSD) || OS(OPENBSD) || OS(DRAGONFLY) - #define HAVE_PTHREAD_NP_H 1 - #endif +-DESTDIR = $$WEBCORE_DESTDIR + DEFINES += BUILDING_WEBKIT + DEFINES += QT_MAKEDLL diff --git a/x11/qt4-libs/patches/patch-be b/x11/qt4-libs/patches/patch-be index ac9601499de..bf60963b2cb 100644 --- a/x11/qt4-libs/patches/patch-be +++ b/x11/qt4-libs/patches/patch-be @@ -1,13 +1,15 @@ -$NetBSD: patch-be,v 1.2 2010/11/15 18:32:26 adam Exp $ +$NetBSD: patch-be,v 1.3 2012/01/12 22:59:58 adam Exp $ ---- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.orig 2010-11-06 01:55:19.000000000 +0000 -+++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri -@@ -88,9 +88,7 @@ defineTest(addJavaScriptCoreLib) { +Build shared libjscore. + +--- src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri.orig 2011-12-08 05:06:02.000000000 +0000 ++++ src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri +@@ -86,9 +86,7 @@ defineTest(prependJavaScriptCoreLib) { } else { # Make sure jscore will be early in the list of libraries to workaround a bug in MinGW # that can't resolve symbols from QtCore if libjscore comes after. - QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR - LIBS += -l$$JAVASCRIPTCORE_TARGET + LIBS = -l$$JAVASCRIPTCORE_TARGET $$LIBS - POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a } diff --git a/x11/qt4-libs/patches/patch-bf b/x11/qt4-libs/patches/patch-bf index 91c2fd3e4f7..407ed8c98e2 100644 --- a/x11/qt4-libs/patches/patch-bf +++ b/x11/qt4-libs/patches/patch-bf @@ -1,27 +1,33 @@ -$NetBSD: patch-bf,v 1.1 2010/11/15 13:05:45 adam Exp $ +$NetBSD: patch-bf,v 1.2 2012/01/12 22:59:58 adam Exp $ ---- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro.orig 2010-11-06 01:55:20.000000000 +0000 -+++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro -@@ -4,7 +4,7 @@ include($$PWD/../WebKit.pri) +Build shared libjscore. + +--- src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro.orig 2011-12-08 05:06:02.000000000 +0000 ++++ src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro +@@ -4,7 +4,6 @@ include($$PWD/../WebKit.pri) include(JavaScriptCore.pri) TEMPLATE = lib -CONFIG += staticlib -+CONFIG += buildling-libs # Don't use JavaScriptCore as the target name. qmake would create a JavaScriptCore.vcproj for msvc # which already exists as a directory TARGET = $$JAVASCRIPTCORE_TARGET -@@ -33,10 +33,11 @@ CONFIG(QTDIR_build) { +@@ -19,17 +19,14 @@ contains(QT_CONFIG, embedded):CONFIG += # WebCore adds these config only when in a standalone build. # qbase.pri takes care of that when in a QTDIR_build # Here we add the config for both cases since we don't include qbase.pri -contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions -+#contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -+#unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions CONFIG(QTDIR_build) { + include($$QT_SOURCE_TREE/src/qbase.pri) # Remove the following 2 lines if you want debug information in JavaScriptCore CONFIG -= separate_debug_info CONFIG += no_debug_info + } + +-*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2 +-*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3 + + # Rules when JIT enabled (not disabled) + !contains(DEFINES, ENABLE_JIT=0) { diff --git a/x11/qt4-libs/patches/patch-bg b/x11/qt4-libs/patches/patch-bg index 5e7328e2d52..108040ad3eb 100644 --- a/x11/qt4-libs/patches/patch-bg +++ b/x11/qt4-libs/patches/patch-bg @@ -1,11 +1,10 @@ -$NetBSD: patch-bg,v 1.1 2011/08/14 08:56:21 mrg Exp $ +$NetBSD: patch-bg,v 1.2 2012/01/12 22:59:58 adam Exp $ this ends up going into non-const-able interfaces inside qt4 - --- src/dbus/qdbusintegrator.cpp.orig 2011-03-30 05:19:07.000000000 +0000 +++ src/dbus/qdbusintegrator.cpp 2011-08-08 21:44:34.000000000 +0000 -@@ -71,7 +71,7 @@ +@@ -72,7 +72,7 @@ static bool isDebugging; #define qDBusDebug if (!::isDebugging); else qDebug diff --git a/x11/qt4-libs/patches/patch-cb b/x11/qt4-libs/patches/patch-cb index 66240795029..c846be65bc7 100644 --- a/x11/qt4-libs/patches/patch-cb +++ b/x11/qt4-libs/patches/patch-cb @@ -1,21 +1,13 @@ -$NetBSD: patch-cb,v 1.3 2011/01/12 07:07:07 adam Exp $ +$NetBSD: patch-cb,v 1.4 2012/01/12 22:59:58 adam Exp $ ---- src/gui/kernel/qapplication_mac.mm.orig 2010-12-30 14:07:53.000000000 +0000 +--- src/gui/kernel/qapplication_mac.mm.orig 2011-12-08 05:06:02.000000000 +0000 +++ src/gui/kernel/qapplication_mac.mm -@@ -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, +@@ -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) { -+ qtNib = [[NSNib alloc] initWithContentsOfURL:[NSURL fileURLWithPath:@"@QTPREFIX@/qt_menu.nib"]]; ++ 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/ " diff --git a/x11/qt4-libs/patches/patch-cc b/x11/qt4-libs/patches/patch-cc deleted file mode 100644 index 09a21e09b20..00000000000 --- a/x11/qt4-libs/patches/patch-cc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-cc,v 1.1 2011/03/03 05:50:04 adam Exp $ - -Avoid error when compiling with Clang. - ---- src/gui/kernel/qwidget_mac.mm.orig 2011-01-12 10:01:28.000000000 +0000 -+++ src/gui/kernel/qwidget_mac.mm -@@ -3206,7 +3206,7 @@ void QWidgetPrivate::setWindowIcon_sys(b - if (iconButton == nil) { - QCFString string(q->windowTitle()); - const NSString *tmpString = reinterpret_cast<const NSString *>((CFStringRef)string); -- [qt_mac_window_for(q) setRepresentedURL:[NSURL fileURLWithPath:tmpString]]; -+ [qt_mac_window_for(q) setRepresentedURL:[NSURL fileURLWithPath:(NSString *)tmpString]]; - iconButton = [qt_mac_window_for(q) standardWindowButton:NSWindowDocumentIconButton]; - } - if (icon.isNull()) { diff --git a/x11/qt4-libs/patches/patch-cd b/x11/qt4-libs/patches/patch-cd deleted file mode 100644 index d358dde0326..00000000000 --- a/x11/qt4-libs/patches/patch-cd +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-cd,v 1.1 2011/03/03 05:50:04 adam Exp $ - -Avoid error when compiling with Clang. - ---- src/gui/kernel/qcocoaview_mac.mm.orig 2011-01-12 10:05:05.000000000 +0000 -+++ src/gui/kernel/qcocoaview_mac.mm -@@ -1383,7 +1383,7 @@ static int qCocoaViewCount = 0; - if (!selectedText.isEmpty()) { - QCFString string(selectedText.mid(theRange.location, theRange.length)); - const NSString *tmpString = reinterpret_cast<const NSString *>((CFStringRef)string); -- return [[[NSAttributedString alloc] initWithString:tmpString] autorelease]; -+ return [[[NSAttributedString alloc] initWithString:(NSString *)tmpString] autorelease]; - } else { - return nil; - } diff --git a/x11/qt4-libs/patches/patch-ce b/x11/qt4-libs/patches/patch-ce deleted file mode 100644 index d5547a1a4f5..00000000000 --- a/x11/qt4-libs/patches/patch-ce +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ce,v 1.1 2011/03/03 05:50:04 adam Exp $ - -Avoid error when compiling with Clang. - ---- src/gui/kernel/qcocoamenuloader_mac.mm.orig 2011-01-12 10:11:02.000000000 +0000 -+++ src/gui/kernel/qcocoamenuloader_mac.mm -@@ -70,13 +70,13 @@ QT_USE_NAMESPACE - showAllItem = [[appMenu itemWithTitle:@"Show All"] retain]; - - // Get the names in the nib to match the app name set by Qt. -- NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName())); -+ const NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName())); - [quitItem setTitle:[[quitItem title] stringByReplacingOccurrencesOfString:@"NewApplication" -- withString:appName]]; -+ withString:(NSString *)appName]]; - [hideItem setTitle:[[hideItem title] stringByReplacingOccurrencesOfString:@"NewApplication" -- withString:appName]]; -+ withString:(NSString *)appName]]; - [aboutItem setTitle:[[aboutItem title] stringByReplacingOccurrencesOfString:@"NewApplication" -- withString:appName]]; -+ withString:(NSString *)appName]]; - [appName release]; - // Disable the items that don't do anything. If someone associates a QAction with them - // They should get synced back in. diff --git a/x11/qt4-libs/patches/patch-cf b/x11/qt4-libs/patches/patch-cf deleted file mode 100644 index b2d943987d9..00000000000 --- a/x11/qt4-libs/patches/patch-cf +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-cf,v 1.1 2011/03/03 05:50:04 adam Exp $ - -Avoid error when compiling with Clang. - ---- src/gui/kernel/qt_cocoa_helpers_mac.mm.orig 2011-01-12 10:13:43.000000000 +0000 -+++ src/gui/kernel/qt_cocoa_helpers_mac.mm -@@ -1333,7 +1333,7 @@ QString qt_mac_get_pasteboardString(OSPa - if (PasteboardCopyName (paste, &pbname)) { - pb = [NSPasteboard generalPasteboard]; - } else { -- pb = [NSPasteboard pasteboardWithName:reinterpret_cast<const NSString *>(pbname)]; -+ pb = [NSPasteboard pasteboardWithName:(NSString *)reinterpret_cast<const NSString *>(pbname)]; - CFRelease (pbname); - } - if (pb) { diff --git a/x11/qt4-libs/patches/patch-cg b/x11/qt4-libs/patches/patch-cg index a9868928676..1086436c00b 100644 --- a/x11/qt4-libs/patches/patch-cg +++ b/x11/qt4-libs/patches/patch-cg @@ -1,10 +1,10 @@ -$NetBSD: patch-cg,v 1.1 2011/03/03 05:50:04 adam Exp $ +$NetBSD: patch-cg,v 1.2 2012/01/12 22:59:58 adam Exp $ Avoid error when compiling with Clang. --- src/gui/dialogs/qfontdialog_mac.mm.orig 2011-01-12 10:16:56.000000000 +0000 +++ src/gui/dialogs/qfontdialog_mac.mm -@@ -509,7 +509,7 @@ void QFontDialogPrivate::setFont(void *d +@@ -510,7 +510,7 @@ void QFontDialogPrivate::setFont(void *d #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 if (qstrcmp(fe->name(), "CoreText") == 0) { diff --git a/x11/qt4-libs/patches/patch-ch b/x11/qt4-libs/patches/patch-ch deleted file mode 100644 index ef5b99b291a..00000000000 --- a/x11/qt4-libs/patches/patch-ch +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ch,v 1.1 2011/03/03 05:50:04 adam Exp $ - -Avoid error when compiling with Clang. - ---- src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h.orig 2011-03-02 12:21:02.000000000 +0000 -+++ src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h -@@ -225,7 +225,7 @@ namespace WebCore { - { - if (!node) - return JSC::jsNull(); -- if (JSNode* wrapper = getCachedDOMNodeWrapper(exec, node->document(), node)) -+ if (JSC::JSValue wrapper = getCachedDOMNodeWrapper(exec, node->document(), node)) - return wrapper; - return createDOMNodeWrapper<WrapperClass>(exec, globalObject, node); - } diff --git a/x11/qt4-libs/patches/patch-ci b/x11/qt4-libs/patches/patch-ci index 41c0a9439ee..1fb88b640d3 100644 --- a/x11/qt4-libs/patches/patch-ci +++ b/x11/qt4-libs/patches/patch-ci @@ -1,6 +1,6 @@ -$NetBSD: patch-ci,v 1.2 2011/08/12 13:24:07 adam Exp $ +$NetBSD: patch-ci,v 1.3 2012/01/12 22:59:58 adam Exp $ -Rename argument 'id'; 'id' is a key-word in Objective-C. +Avoid error when compiling with Clang. --- src/plugins/bearer/corewlan/qcorewlanengine.mm.orig 2011-03-02 13:32:05.000000000 +0000 +++ src/plugins/bearer/corewlan/qcorewlanengine.mm @@ -13,21 +13,3 @@ Rename argument 'id'; 'id' is a key-word in Objective-C. @interface QT_MANGLE_NAMESPACE(QNSListener) : NSObject -@@ -864,7 +864,7 @@ quint64 QCoreWlanEngine::bytesReceived(c - return getBytes(interfaceStr,true); - } - --quint64 QCoreWlanEngine::startTime(const QString &id) -+quint64 QCoreWlanEngine::startTime(const QString &qid) - { - QMutexLocker locker(&mutex); - NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init]; -@@ -899,7 +899,7 @@ quint64 QCoreWlanEngine::startTime(const - for(int i = 0; i < dictSize; i++) { - if([ssidStr isEqualToString:keys[i]]) { - const QString ident = QString::number(qHash(QLatin1String("corewlan:") + qt_NSStringToQString(objects[i]))); -- if(ident == id) { -+ if(ident == qid) { - ok = true; - } - } diff --git a/x11/qt4-libs/patches/patch-cj b/x11/qt4-libs/patches/patch-cj index 982e48e286e..8fe74fa7560 100644 --- a/x11/qt4-libs/patches/patch-cj +++ b/x11/qt4-libs/patches/patch-cj @@ -1,10 +1,10 @@ -$NetBSD: patch-cj,v 1.1 2011/08/12 13:24:07 adam Exp $ +$NetBSD: patch-cj,v 1.2 2012/01/12 22:59:58 adam Exp $ Avoid error when compiling with Clang. --- src/gui/kernel/qt_cocoa_helpers_mac_p.h.orig 2011-08-11 11:42:47.000000000 +0000 +++ src/gui/kernel/qt_cocoa_helpers_mac_p.h -@@ -195,7 +195,7 @@ inline QString qt_mac_NSStringToQString( +@@ -215,7 +215,7 @@ inline QString qt_mac_NSStringToQString( { return QCFString::toQString(reinterpret_cast<const CFStringRef>(nsstr)); } inline NSString *qt_mac_QStringToNSString(const QString &qstr) diff --git a/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp b/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp new file mode 100644 index 00000000000..3dc1ea05627 --- /dev/null +++ b/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-qmake_generators_makefile.cpp,v 1.1 2012/01/12 22:59:58 adam Exp $ + +--- qmake/generators/makefile.cpp.orig 2012-01-06 20:25:45.000000000 +0000 ++++ qmake/generators/makefile.cpp +@@ -3256,7 +3256,7 @@ MakefileGenerator::writePkgConfigFile() + 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-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h deleted file mode 100644 index 19255c645a8..00000000000 --- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h,v 1.3 2011/11/01 15:52:23 hans Exp $ - ---- src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h.orig 2011-08-23 12:02:27.000000000 +0000 -+++ src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h -@@ -190,7 +190,7 @@ inline float deg2turn(float d) { return - inline float rad2grad(float r) { return r * 200.0f / piFloat; } - inline float grad2rad(float g) { return g * piFloat / 200.0f; } - --#if !COMPILER(MSVC) && !OS(ANDROID) && !OS(SYMBIAN) -+#if !COMPILER(MSVC) && !OS(ANDROID) && !OS(SYMBIAN) && !(OS(SOLARIS) && COMPILER(GCC) && (GCC_VERSION < 40600)) - using std::isfinite; - using std::isinf; - using std::isnan; diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_features.pri b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_features.pri new file mode 100644 index 00000000000..776f4a08f97 --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_features.pri @@ -0,0 +1,17 @@ +$NetBSD: patch-src_3rdparty_webkit_Source_WebCore_features.pri,v 1.1 2012/01/12 22:59:58 adam Exp $ + +Mac OS X: Problem linking with QTKit enabled. + +--- src/3rdparty/webkit/Source/WebCore/features.pri.orig 2012-01-08 11:13:53.000000000 +0000 ++++ src/3rdparty/webkit/Source/WebCore/features.pri +@@ -165,8 +165,8 @@ symbian|maemo5|maemo6 { + mac:!contains(DEFINES, USE_QTMULTIMEDIA=1) { + DEFINES -= ENABLE_VIDEO=0 + DEFINES += ENABLE_VIDEO=1 +- DEFINES += WTF_USE_QTKIT=1 +- DEFINES -= WTF_USE_QTKIT=0 ++ DEFINES -= WTF_USE_QTKIT=1 ++ DEFINES += WTF_USE_QTKIT=0 + } else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) { + !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): { + DEFINES -= ENABLE_VIDEO=0 diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp new file mode 100644 index 00000000000..930f9412a2c --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp,v 1.1 2012/01/12 22:59:58 adam Exp $ + +Fix C++ error. + +--- src/3rdparty/webkit/Source/WebCore/platform/DefaultLocalizationStrategy.cpp.orig 2012-01-12 19:51:48.000000000 +0100 ++++ src/3rdparty/webkit/Source/WebCore/platform/DefaultLocalizationStrategy.cpp 2012-01-12 20:07:06.000000000 +0100 +@@ -59,7 +59,7 @@ + return result.get(); + #elif PLATFORM(QT) + va_list arguments; +- va_start(arguments, format); ++ va_start(arguments, format.charactersWithNullTermination()); + QString result; + result.vsprintf(format.latin1().data(), arguments); + va_end(arguments); diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp new file mode 100644 index 00000000000..f862f2be185 --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp @@ -0,0 +1,14 @@ +$NetBSD: patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp,v 1.1 2012/01/12 22:59:58 adam Exp $ + +--- src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.cpp.orig 2012-01-08 12:03:43.000000000 +0000 ++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.cpp +@@ -192,9 +192,6 @@ static Vector<MediaPlayerFactory*>& inst + MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(addMediaEngine); + #endif + +-#if !PLATFORM(GTK) && !PLATFORM(EFL) && !(PLATFORM(QT) && USE(GSTREAMER)) +- PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine); +-#endif + } + + return installedEngines; diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_WebCore_WebCore.pro b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_WebCore_WebCore.pro deleted file mode 100644 index 77c219609ec..00000000000 --- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_WebCore_WebCore.pro +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_3rdparty_webkit_WebCore_WebCore.pro,v 1.1 2011/09/14 17:58:32 hans Exp $ - ---- src/3rdparty/webkit/WebCore/WebCore.pro.orig 2010-11-06 02:55:21.000000000 +0100 -+++ src/3rdparty/webkit/WebCore/WebCore.pro 2011-01-15 17:31:40.334667952 +0100 -@@ -90,7 +90,7 @@ unix { - } - - unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections --unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections -+unix:!mac:!solaris-*:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections - linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF - - CONFIG(release):!CONFIG(standalone_package) { diff --git a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp index 149c1cb47e9..e800e78fe7b 100644 --- a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp +++ b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp @@ -1,10 +1,8 @@ -$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.1 2011/08/19 14:55:15 obache Exp $ +$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.2 2012/01/12 22:59:58 adam Exp $ -* fixes build with OpenSSL 0.9.9-dev - ---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2011-03-30 05:19:09.000000000 +0000 +--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2011-12-08 05:06:02.000000000 +0000 +++ src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -170,7 +170,7 @@ DEFINEFUNC(int, SSL_CTX_check_private_ke +@@ -171,7 +171,7 @@ DEFINEFUNC(int, SSL_CTX_check_private_ke #endif DEFINEFUNC4(long, SSL_CTX_ctrl, SSL_CTX *a, a, int b, b, long c, c, void *d, d, return -1, return) DEFINEFUNC(void, SSL_CTX_free, SSL_CTX *a, a, return, DUMMYARG) @@ -13,12 +11,21 @@ $NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.1 2011/08/19 DEFINEFUNC(SSL_CTX *, SSL_CTX_new, const SSL_METHOD *a, a, return 0, return) #else DEFINEFUNC(SSL_CTX *, SSL_CTX_new, SSL_METHOD *a, a, return 0, return) -@@ -213,7 +213,7 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a +@@ -213,7 +213,7 @@ DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a + #if OPENSSL_VERSION_NUMBER >= 0x10000000L + DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return) + #else +-DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, const void *parg, parg, return -1, return) ++DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return) + #endif + #endif + DEFINEFUNC3(int, SSL_read, SSL *a, a, void *b, b, int c, c, return -1, return) +@@ -221,7 +221,7 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG) DEFINEFUNC(void, SSL_set_connect_state, SSL *a, a, return, DUMMYARG) DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, return) -#if OPENSSL_VERSION_NUMBER >= 0x10000000L +#if OPENSSL_VERSION_NUMBER >= 0x00909000L + #ifndef OPENSSL_NO_SSL2 DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) + #endif diff --git a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h index daf6346f12f..5de4e830597 100644 --- a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h +++ b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h @@ -1,10 +1,10 @@ -$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols__p.h,v 1.1 2011/08/19 14:55:15 obache Exp $ +$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols__p.h,v 1.2 2012/01/12 22:59:58 adam Exp $ * fixes build with OpenSSL 0.9.9-dev --- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2011-03-30 05:19:09.000000000 +0000 +++ src/network/ssl/qsslsocket_openssl_symbols_p.h -@@ -278,7 +278,7 @@ int q_SSL_CTX_check_private_key(SSL_CTX +@@ -279,7 +279,7 @@ int q_SSL_CTX_check_private_key(SSL_CTX #endif long q_SSL_CTX_ctrl(SSL_CTX *a, int b, long c, void *d); void q_SSL_CTX_free(SSL_CTX *a); @@ -13,7 +13,7 @@ $NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols__p.h,v 1.1 2011/08/1 SSL_CTX *q_SSL_CTX_new(const SSL_METHOD *a); #else SSL_CTX *q_SSL_CTX_new(SSL_METHOD *a); -@@ -321,7 +321,7 @@ void q_SSL_set_bio(SSL *a, BIO *b, BIO * +@@ -329,7 +329,7 @@ void q_SSL_set_bio(SSL *a, BIO *b, BIO * void q_SSL_set_accept_state(SSL *a); void q_SSL_set_connect_state(SSL *a); int q_SSL_shutdown(SSL *a); |