diff options
212 files changed, 1899 insertions, 1780 deletions
diff --git a/x11/qt5-dbus/Makefile b/x11/qt5-dbus/Makefile index 6800b782d65..7b9b4dd69f8 100644 --- a/x11/qt5-dbus/Makefile +++ b/x11/qt5-dbus/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.10 2014/12/25 13:51:13 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2014/12/30 17:23:45 adam Exp $ +DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-dbus-${QTVERSION} -PKGREVISION= 2 COMMENT= Qt5 DBus support plugin -BUILD_DIRS= qtbase/src/dbus -BUILD_DIRS+= qtbase/src/tools/qdbuscpp2xml -BUILD_DIRS+= qtbase/src/tools/qdbusxml2cpp +BUILD_DIRS= src/dbus +BUILD_DIRS+= src/tools/qdbuscpp2xml +BUILD_DIRS+= src/tools/qdbusxml2cpp .include "../../x11/qt5-qtbase/Makefile.common" @@ -15,19 +15,20 @@ CFLAGS+= -I${BUILDLINK_PREFIX.dbus}/lib/dbus-1.0/include/dbus CFLAGS+= -I${BUILDLINK_PREFIX.qt5-qtbase}/qt5/include INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} - INSTALLATION_DIRS= lib/pkgconfig -PC_FILES= Qt5DBus.pc +do-configure: + ${RM} -f -r ${WRKSRC}/mkspecs +.for d in ${BUILD_DIRS} + cd ${WRKSRC}/${d} && ${QTPREFIX}/bin/qmake -o Makefile +.endfor post-install: -.for i in ${PC_FILES} - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ${LN} -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} +.for i in Qt5DBus.pc + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor - .include "../../devel/gettext-lib/buildlink3.mk" # Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus USE_DBUS-ARCH-DEPS_H= yes diff --git a/x11/qt5-dbus/PLIST b/x11/qt5-dbus/PLIST index a1e2f93c692..3a6c6405e46 100644 --- a/x11/qt5-dbus/PLIST +++ b/x11/qt5-dbus/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 2014/05/01 12:50:39 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2014/12/30 17:23:45 adam Exp $ +lib/pkgconfig/Qt5DBus.pc qt5/bin/qdbuscpp2xml qt5/bin/qdbusxml2cpp -lib/pkgconfig/Qt5DBus.pc +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/dbus_minimal_p.h qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbus_symbols_p.h qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusabstractadaptor_p.h qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusabstractinterface_p.h diff --git a/x11/qt5-dbus/buildlink3.mk b/x11/qt5-dbus/buildlink3.mk index bb062427a0a..e80b966c61d 100644 --- a/x11/qt5-dbus/buildlink3.mk +++ b/x11/qt5-dbus/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2014/12/30 17:23:45 adam Exp $ BUILDLINK_TREE+= qt5-dbus .if !defined(QT5_DBUS_BUILDLINK3_MK) QT5_DBUS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-dbus+= qt5-dbus>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-dbus?= qt5-dbus>=5.2.1nb2 +BUILDLINK_API_DEPENDS.qt5-dbus+= qt5-dbus>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-dbus+= qt5-dbus>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-dbus?= ../../x11/qt5-dbus .include "../../sysutils/dbus/buildlink3.mk" diff --git a/x11/qt5-mysql/Makefile b/x11/qt5-mysql/Makefile index ed66cac9318..c6fb3864b52 100644 --- a/x11/qt5-mysql/Makefile +++ b/x11/qt5-mysql/Makefile @@ -1,26 +1,22 @@ -# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:13 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/12/30 17:23:45 adam Exp $ +DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-mysql-${QTVERSION} -PKGREVISION= 1 COMMENT= Qt5 MySQL plugin -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - CFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql -BUILD_DIRS= qtbase/src/plugins/sqldrivers +BUILD_DIRS= src/plugins/sqldrivers MAKE_ENV+= QTDIR=${QTDIR} - INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} .include "../../x11/qt5-qtbase/Makefile.common" -post-configure: +do-configure: + ${RM} -f -r ${WRKSRC}/mkspecs cd ${WRKSRC}/${BUILD_DIRS} && \ - ${QTDIR}/bin/qmake "sql-plugins=mysql" -o Makefile + ${QTDIR}/bin/qmake "sql-plugins=mysql" -o Makefile -.include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/mysql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-mysql/buildlink3.mk b/x11/qt5-mysql/buildlink3.mk index d42a0bbb27d..1418a1c3c45 100644 --- a/x11/qt5-mysql/buildlink3.mk +++ b/x11/qt5-mysql/buildlink3.mk @@ -1,17 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2014/12/30 17:23:45 adam Exp $ -BUILDLINK_TREE+= qt5-sqlite3 +BUILDLINK_TREE+= qt5-mysql -.if !defined(QT5_SQLITE3_BUILDLINK3_MK) -QT5_SQLITE3_BUILDLINK3_MK:= +.if !defined(QT5_MYSQL_BUILDLINK3_MK) +QT5_MYSQL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-sqlite3?= qt5-mysql>=5.2.1 -BUILDLINK_PKGSRCDIR.qt5-sqlite3?= ../../x11/qt5-sqlite3 +BUILDLINK_API_DEPENDS.qt5-mysql+= qt5-mysql>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-mysql+= qt5-mysql>=5.4.0 +BUILDLINK_PKGSRCDIR.qt5-mysql?= ../../x11/qt5-mysql -BUILDLINK_LIBDIRS.qt5-sqlite3+= qt5/plugins +BUILDLINK_LIBDIRS.qt5-mysql+= qt5/plugins .include "../../x11/qt5-qtbase/buildlink3.mk" -.endif # QT5_SQLITE3_BUILDLINK3_MK +.endif # QT5_MYSQL_BUILDLINK3_MK -BUILDLINK_TREE+= -qt5-sqlite3 +BUILDLINK_TREE+= -qt5-mysql diff --git a/x11/qt5-odbc/Makefile b/x11/qt5-odbc/Makefile index cd20fd19048..95b73921410 100644 --- a/x11/qt5-odbc/Makefile +++ b/x11/qt5-odbc/Makefile @@ -1,33 +1,22 @@ -# $NetBSD: Makefile,v 1.8 2014/12/25 13:51:13 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/12/30 17:23:45 adam Exp $ +DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-odbc-${QTVERSION} -PKGREVISION= 1 COMMENT= Qt5 odbc plugin -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -CONFIGURE_ARGS+= -no-dbus -CONFIGURE_ARGS+= -no-sql-mysql -CONFIGURE_ARGS+= -no-sql-psql -CONFIGURE_ARGS+= -no-sql-sqlite - -BUILD_DIRS= qtbase/src/plugins/sqldrivers +BUILD_DIRS= src/plugins/sqldrivers MAKE_ENV+= QTDIR=${QTDIR} - INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} LIBS+= -lltdl .include "../../x11/qt5-qtbase/Makefile.common" -qmake-odbc-configure: +do-configure: + ${RM} -f -r ${WRKSRC}/mkspecs cd ${WRKSRC}/${BUILD_DIRS} && \ - ${QTDIR}/bin/qmake "sql-plugins=odbc" -o Makefile - -post-configure: qmake-odbc-configure - + ${QTDIR}/bin/qmake "sql-plugins=odbc" -o Makefile -.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../databases/unixodbc/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" diff --git a/x11/qt5-odbc/buildlink3.mk b/x11/qt5-odbc/buildlink3.mk index b9866a44c1e..2c85ec9da18 100644 --- a/x11/qt5-odbc/buildlink3.mk +++ b/x11/qt5-odbc/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2014/12/30 17:23:45 adam Exp $ BUILDLINK_TREE+= qt5-sqlite3 .if !defined(QT5_SQLITE3_BUILDLINK3_MK) QT5_SQLITE3_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-sqlite3?= qt5-odbc>=5.2.1 +BUILDLINK_API_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-sqlite3?= ../../x11/qt5-sqlite3 BUILDLINK_LIBDIRS.qt5-sqlite3+= qt5/plugins diff --git a/x11/qt5-psql/Makefile b/x11/qt5-psql/Makefile index 7664184c7b5..f015c46f7c6 100644 --- a/x11/qt5-psql/Makefile +++ b/x11/qt5-psql/Makefile @@ -1,31 +1,22 @@ -# $NetBSD: Makefile,v 1.9 2014/12/25 13:51:13 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2014/12/30 17:23:45 adam Exp $ +DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-psql-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 PostgreSQL plugin -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -CONFIGURE_ARGS+= -no-dbus -CONFIGURE_ARGS+= -no-sql-mysql -CONFIGURE_ARGS+= -no-sql-psql -CONFIGURE_ARGS+= -no-sql-sqlite - BUILD_QT5= yes -BUILD_DIRS= qtbase/src/plugins/sqldrivers +BUILD_DIRS= src/plugins/sqldrivers MAKE_ENV+= QTDIR=${QTDIR} - INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} .include "../../x11/qt5-qtbase/Makefile.common" -post-configure: +do-configure: + ${RM} -f -r ${WRKSRC}/mkspecs cd ${WRKSRC}/${BUILD_DIRS} && \ - ${QTDIR}/bin/qmake "sql-plugins=psql" -o Makefile - + ${QTDIR}/bin/qmake "sql-plugins=psql" -o Makefile -.include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-psql/buildlink3.mk b/x11/qt5-psql/buildlink3.mk index 30af746e62f..db912cb2696 100644 --- a/x11/qt5-psql/buildlink3.mk +++ b/x11/qt5-psql/buildlink3.mk @@ -1,17 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2014/12/30 17:23:45 adam Exp $ -BUILDLINK_TREE+= qt5-sqlite3 +BUILDLINK_TREE+= qt5-psql -.if !defined(QT5_SQLITE3_BUILDLINK3_MK) -QT5_SQLITE3_BUILDLINK3_MK:= +.if !defined(QT5_PSQL_BUILDLINK3_MK) +QT5_PSQL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-sqlite3?= qt5-psql>=5.2.1nb2 -BUILDLINK_PKGSRCDIR.qt5-sqlite3?= ../../x11/qt5-sqlite3 +BUILDLINK_API_DEPENDS.qt5-psql+= qt5-psql>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-psql+= qt5-psql>=5.4.0 +BUILDLINK_PKGSRCDIR.qt5-psql?= ../../x11/qt5-psql -BUILDLINK_LIBDIRS.qt5-sqlite3+= qt5/plugins +BUILDLINK_LIBDIRS.qt5-psql+= qt5/plugins .include "../../x11/qt5-qtbase/buildlink3.mk" -.endif # QT5_SQLITE3_BUILDLINK3_MK +.endif # QT5_PSQL_BUILDLINK3_MK -BUILDLINK_TREE+= -qt5-sqlite3 +BUILDLINK_TREE+= -qt5-psql diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index 24c2b5222e3..4443bc40b4d 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -1,33 +1,117 @@ -# $NetBSD: Makefile,v 1.14 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: Makefile,v 1.15 2014/12/30 17:23:45 adam Exp $ +DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-qtbase-${QTVERSION} -PKGREVISION= 6 COMMENT= C++ X GUI toolkit .include "../../x11/qt5-qtbase/Makefile.common" -BUILD_DIRS= qtbase -BUILD_TARGET= sub-src +.if defined(MAKE_JOBS) +. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO]) +CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q} +. endif +.endif +HAS_CONFIGURE= yes +CONFIGURE_ARGS+= -optimized-qmake +CONFIGURE_ARGS+= -prefix "${QTPREFIX}" +CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*} +CONFIGURE_ARGS+= -opensource -confirm-license +CONFIGURE_ARGS+= -accessibility +CONFIGURE_ARGS+= -fontconfig +CONFIGURE_ARGS+= -icu +CONFIGURE_ARGS+= -openssl-linked +CONFIGURE_ARGS+= -nomake examples +CONFIGURE_ARGS+= -nomake tests +CONFIGURE_ARGS+= -no-dbus +CONFIGURE_ARGS+= -no-pch +CONFIGURE_ARGS+= -no-sql-mysql +CONFIGURE_ARGS+= -no-sql-psql +CONFIGURE_ARGS+= -no-sql-sqlite +CONFIGURE_ARGS+= -no-strip +CONFIGURE_ARGS+= -system-harfbuzz +CONFIGURE_ARGS+= -system-libjpeg +CONFIGURE_ARGS+= -system-libpng +CONFIGURE_ARGS+= -system-pcre +CONFIGURE_ARGS+= -system-sqlite +CONFIGURE_ARGS+= -system-zlib +OPSYSVARS+= CONFIGURE_ARGS + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} != "Darwin" +CONFIGURE_ARGS+= -iconv +QMAKE_CONF= qmake.conf +. if ${OPSYS} != "SunOS" +CONFIGURE_ARGS+= -reduce-relocations +. endif +.else +QMAKE_CONF= qmake.conf.mac +.endif + +.include "../../mk/compiler.mk" + +.if ${OPSYS} == "SunOS" +. if !empty(CC_VERSION:Mgcc*) +. if ${ABI:U} == "64" +CONFIGURE_ARGS+= -platform solaris-g++-64 +. else +CONFIGURE_ARGS+= -platform solaris-g++ +. endif +. else +. if ${ABI:U} == "64" +CONFIGURE_ARGS+= -platform solaris-cc-64 +. else +CONFIGURE_ARGS+= -platform solaris-cc +. endif +. endif +SYS_LIBS= -lresolv -lsocket -lnsl -lrt +.elif ${OPSYS} == "Interix" +CONFIGURE_ARGS+= -platform interix-g++ +CFLAGS+= -I/usr/local/include/bind +LDFLAGS+= -L/usr/local/lib/bind -lbind +BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind +SYS_LIBS= -lbind -ldb -ldl +.elif ${OPSYS} == "DragonFly" +CONFIGURE_ARGS+= -platform freebsd-g++ +.elif ${OPSYS} == "Darwin" +CONFIGURE_ARGS+= -platform macx-clang +CONFIGURE_ARGS+= -no-framework +. if exists(/usr/lib/libresolv.dylib) +LDFLAGS+= -lresolv +. endif +.elif ${OPSYS} == "Linux" +LDFLAGS+= -ldl +.elif ${OPSYS} == "NetBSD" +. if exists(/usr/lib/libexecinfo.so) +LDFLAGS+= -lexecinfo +. endif +.endif + +REPLACE_PERL+= bin/syncqt.pl PTHREAD_OPTS+= require UNLIMIT_RESOURCES= datasize BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX} -# kdelibs4 requires openssl support! -CONFIGURE_ARGS+= -openssl-linked - +BUILD_TARGET= sub-src INSTALLATION_DIRS= ${QTPREFIX}/bin lib/pkgconfig - INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} -CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/echoplugin/echoplugin.pro -CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/echoplugin/plugin/plugin.pro -CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro -CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro -CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro -CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro -CHECK_INTERPRETER_SKIP+= qt5/mkspecs/macx-ios-clang/rename_main.sh +CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/echoplugin.pro +CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/plugin/plugin.pro +CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro +CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro +CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro +CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro +CHECK_INTERPRETER_SKIP+=qt5/mkspecs/macx-ios-clang/rename_main.sh + +SUBST_CLASSES+= opt +SUBST_STAGE.opt= pre-configure +SUBST_MESSAGE.opt= Removing some Qt5 default compiler flags. +SUBST_FILES.opt= mkspecs/common/gcc-base.conf +SUBST_SED.opt= -e 's,-O[23],,' +SUBST_SED.opt+= -e 's,-fvisibility=hidden,,' BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri @@ -37,31 +121,66 @@ PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \ Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \ Qt5Widgets.pc Qt5Xml.pc +pre-configure: + ${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \ + -e 's:@X11BASE@:${X11BASE}:g' \ + -e 's:@X11PREFIX@:${X11PREFIX}:g' \ + -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ + -e 's:@CC@:${CC:Q}:g' \ + -e 's:@CXX@:${CXX:Q}:g' \ + -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \ + -e 's:@CFLAGS@:${CFLAGS:Q}:g' \ + -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \ + -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \ + -e 's:@LEX@:${LEX}:g' \ + -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \ + -e 's:@AR@:${AR:Q}:g' \ + -e 's:@MKDIR@:${MKDIR}:g' \ + -e 's:@LIBQT@:${LIBQT:Q}:g' \ + -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \ + -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \ + -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ + -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \ + ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf + for dir in ${WRKSRC}/mkspecs/*; do \ + cp ${WRKSRC}/qmake.conf $${dir}; \ + rm -f $${dir}/*.orig; \ + done + ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf + ${RM} -f ${WRKSRC}/mkspecs/features/mac/objective_c.prf.orig + post-configure: - cd ${WRKSRC}/${BUILD_DIRS} && ./bin/qmake -o Makefile + cd ${WRKSRC} && ./bin/qmake -o Makefile post-install: .for prog in moc qdoc rcc uic - ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/qtbase/bin/${prog} \ - ${DESTDIR}${QTPREFIX}/bin/ + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ + ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/ .endfor .for i in ${PC_FILES} - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor - cd ${WRKSRC}/qtbase && env ${MAKE_ENV} ${INSTALL_ENV} \ + cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} \ ${MAKE_PROGRAM} install_mkspecs - ${CP} ${DESTDIR}${PREFIX}/${BROKEN_FILES} \ - ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 # The pri file has WRKSRC in it. - ${SED} -e 's,${WRKSRC}/qtbase/bin/qmake,${QTDIR}/bin/qmake,g' \ - < ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 \ - > ${DESTDIR}${PREFIX}/${BROKEN_FILES} - ${RM} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 + ${SED} -e 's,${WRKSRC}/bin/qmake,${QTDIR}/bin/qmake,g' \ + ${DESTDIR}${PREFIX}/${BROKEN_FILES} \ + > ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 + ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 \ + ${DESTDIR}${PREFIX}/${BROKEN_FILES} +.include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" +.include "../../fonts/harfbuzz/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../textproc/icu/buildlink3.mk" .if ${OPSYS} != "Darwin" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" @@ -79,5 +198,6 @@ post-install: .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libxkbcommon/buildlink3.mk" .endif +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtbase/Makefile.common b/x11/qt5-qtbase/Makefile.common index c110703847d..39fcee3eadc 100644 --- a/x11/qt5-qtbase/Makefile.common +++ b/x11/qt5-qtbase/Makefile.common @@ -1,6 +1,4 @@ - - -# $NetBSD: Makefile.common,v 1.12 2014/12/25 13:51:13 wiz Exp $ +# $NetBSD: Makefile.common,v 1.13 2014/12/30 17:23:45 adam Exp $ # used by x11/qt5-dbus/Makefile # used by x11/qt5-mysql/Makefile # used by x11/qt5-odbc/Makefile @@ -11,6 +9,7 @@ # used by x11/qt5-qtgraphicaleffects/Makefile # used by x11/qt5-qtimageformats/Makefile # used by x11/qt5-qtlocation/Makefile +# used by x11/qt5-qtmacextras/Makefile # used by x11/qt5-qtmultimedia/Makefile # used by x11/qt5-qtquick1/Makefile # used by x11/qt5-qtquickcontrols/Makefile @@ -25,187 +24,38 @@ # used by x11/qt5-qtxmlpatterns/Makefile # used by x11/qt5-sqlite3/Makefile -DISTNAME= qt-everywhere-opensource-src-${QTDISTVER} -CATEGORIES= x11 -MASTER_SITES= http://download.qt-project.org/official_releases/qt/${QTDISTVER:R}/${QTDISTVER}/single/ -EXTRACT_SUFX= .tar.xz -EXTRACT_USING= bsdtar - .include "../../x11/qt5/Makefile.common" .include "options.mk" -DISTINFO_FILE= ${.CURDIR}/../../x11/qt5-qtbase/distinfo -FILESDIR= ${.CURDIR}/../../x11/qt5-qtbase/files -PATCHDIR= ${.CURDIR}/../../x11/qt5-qtbase/patches - -.if defined(MAKE_JOBS) -. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO]) -CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q} -. endif -.endif - .include "../../mk/dlopen.buildlink3.mk" BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} -HAS_CONFIGURE= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= gmake perl:build pkg-config CONFIG_SHELL= ${PERL5} -REPLACE_PERL+= qtbase/bin/syncqt.pl -REPLACE_PERL+= qtwebkit/Source/WebKit2/Scripts/generate-forwarding-headers.pl - # wcstof(3) etc. is used in C++ code. CFLAGS.NetBSD+= -D_NETBSD_SOURCE # for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined. BUILDLINK_TRANSFORM+= rm:-Wundef -CONFIGURE_ARGS+= -optimized-qmake -CONFIGURE_ARGS+= -prefix "${QTPREFIX}" -CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*} -CONFIGURE_ARGS+= -opensource -confirm-license -CONFIGURE_ARGS+= -accessibility -CONFIGURE_ARGS+= -fontconfig -CONFIGURE_ARGS+= -icu -CONFIGURE_ARGS+= -openssl-linked -CONFIGURE_ARGS+= -nomake examples -CONFIGURE_ARGS+= -nomake tests -CONFIGURE_ARGS+= -no-pch -CONFIGURE_ARGS+= -no-strip -CONFIGURE_ARGS+= -system-libjpeg -CONFIGURE_ARGS+= -system-libpng -CONFIGURE_ARGS+= -system-sqlite -CONFIGURE_ARGS+= -system-pcre -CONFIGURE_ARGS+= -system-zlib -CONFIGURE_ARGS+= -no-dbus -CONFIGURE_ARGS+= -no-sql-mysql -CONFIGURE_ARGS+= -no-sql-psql -CONFIGURE_ARGS+= -no-sql-sqlite -OPSYSVARS+= CONFIGURE_ARGS - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} != "Darwin" -CONFIGURE_ARGS+= -iconv -. if ${OPSYS} != "SunOS" -CONFIGURE_ARGS+= -reduce-relocations -. endif -.endif - MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} PLIST_VARS+= mac unix .if ${OPSYS} == "Darwin" PLIST.mac= yes -QMAKE_CONF= qmake.conf.mac .else PLIST.unix= yes -QMAKE_CONF= qmake.conf .endif # avoid creating a .qt directory in the users home directory SCRIPTS_ENV+= HOME=${WRKDIR} -.include "../../mk/compiler.mk" - -.if ${OPSYS} == "SunOS" -. if !empty(CC_VERSION:Mgcc*) -. if ${ABI:U} == "64" -CONFIGURE_ARGS+= -platform solaris-g++-64 -. else -CONFIGURE_ARGS+= -platform solaris-g++ -. endif -. else -. if ${ABI:U} == "64" -CONFIGURE_ARGS+= -platform solaris-cc-64 -. else -CONFIGURE_ARGS+= -platform solaris-cc -. endif -. endif -SYS_LIBS= -lresolv -lsocket -lnsl -lrt -.elif ${OPSYS} == "Interix" -CONFIGURE_ARGS+= -platform interix-g++ -CFLAGS+= -I/usr/local/include/bind -LDFLAGS+= -L/usr/local/lib/bind -lbind -BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind -SYS_LIBS= -lbind -ldb -ldl -.elif ${OPSYS} == "DragonFly" -CONFIGURE_ARGS+= -platform freebsd-g++ -.elif ${OPSYS} == "Darwin" -CONFIGURE_ARGS+= -platform macx-clang -CONFIGURE_ARGS+= -no-framework -. if exists(/usr/lib/libresolv.dylib) -LDFLAGS+= -lresolv -. endif -.elif ${OPSYS} == "Linux" -LDFLAGS+= -ldl -.endif - -remove-3rdparty-libs: -.for i in freetype libjpeg libpng xcb zlib - ${RM} -f -r ${WRKSRC}/qtbase/src/3rdparty/${i} -.endfor - -set-qmake-conf: - ${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \ - -e 's:@X11BASE@:${X11BASE}:g' \ - -e 's:@X11PREFIX@:${X11PREFIX}:g' \ - -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ - -e 's:@CC@:${CC:Q}:g' \ - -e 's:@CXX@:${CXX:Q}:g' \ - -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \ - -e 's:@CFLAGS@:${CFLAGS:Q}:g' \ - -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \ - -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \ - -e 's:@LEX@:${LEX}:g' \ - -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \ - -e 's:@AR@:${AR:Q}:g' \ - -e 's:@MKDIR@:${MKDIR}:g' \ - -e 's:@LIBQT@:${LIBQT:Q}:g' \ - -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \ - -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \ - -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ - -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \ - ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf - for dir in ${WRKSRC}/qtbase/mkspecs/*; do \ - cp ${WRKSRC}/qmake.conf $${dir}; \ - rm -f $${dir}/*.orig; \ - done - ${RM} -f ${WRKSRC}/qtbase/mkspecs/features/mac/default_pre.prf - ${RM} -f ${WRKSRC}/qtbase/mkspecs/features/mac/objective_c.prf.orig - -no-qmake-build: - cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/patch-qtbase_configure.no-qmake - ${LN} -sf ${QTPREFIX}/bin/moc ${WRKSRC}/qtbase/bin/moc - ${LN} -sf ${QTPREFIX}/bin/qmake ${WRKSRC}/qtbase/bin/qmake - ${LN} -sf ${QTPREFIX}/bin/rcc ${WRKSRC}/qtbase/bin/rcc - ${LN} -sf ${QTPREFIX}/bin/uic ${WRKSRC}/qtbase/bin/uic - -.if empty(PKGPATH:Mx11/qt5-qtbase) -pre-configure: remove-3rdparty-libs set-qmake-conf no-qmake-build -.else -pre-configure: remove-3rdparty-libs set-qmake-conf +.if empty(PKGPATH:Mx11/qt5-qtbase) && empty(PKGPATH:Mx11/qt5-dbus) \ + && empty(PKGPATH:Mx11/qt5-odbc) && empty(PKGPATH:Mx11/qt5-mysql) \ + && empty(PKGPATH:Mx11/qt5-psql) && empty(PKGPATH:Mx11/qt5-sqlite3) +do-configure: + cd ${WRKSRC} && ${QTPREFIX}/bin/qmake -o Makefile .endif - -.if empty(PKGPATH:Mx11/qt5-qtbase) && empty(PKGPATH:Mx11/qt5-sqlite3) \ - && empty(PKGPATH:Mx11/qt5-mysql) && empty(PKGPATH:Mx11/qt5-psql) \ - && empty(PKGPATH:Mx11/qt5-odbc) -post-configure: -.for d in ${BUILD_DIRS} - cd ${WRKSRC}/${d} && \ - ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} ${QTPREFIX}/bin/qmake -o Makefile -.endfor -.endif - -.include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pcre/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../textproc/icu/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" diff --git a/x11/qt5-qtbase/PLIST b/x11/qt5-qtbase/PLIST index 3ab111c2666..a9d5f623f8e 100644 --- a/x11/qt5-qtbase/PLIST +++ b/x11/qt5-qtbase/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2014/04/23 07:05:31 adam Exp $ +@comment $NetBSD: PLIST,v 1.4 2014/12/30 17:23:45 adam Exp $ lib/pkgconfig/Qt5Bootstrap.pc lib/pkgconfig/Qt5Concurrent.pc lib/pkgconfig/Qt5Core.pc @@ -14,12 +14,14 @@ lib/pkgconfig/Qt5Widgets.pc lib/pkgconfig/Qt5Xml.pc qt5/bin/moc qt5/bin/qdoc +qt5/bin/qlalr qt5/bin/qmake qt5/bin/rcc qt5/bin/syncqt.pl qt5/bin/uic qt5/doc/global/compat.qdocconf qt5/doc/global/config.qdocconf +qt5/doc/global/externalsites.qdocconf qt5/doc/global/externalsites/external-resources.qdoc qt5/doc/global/externalsites/qch-urls.qdoc qt5/doc/global/externalsites/qt-webpages.qdoc @@ -27,15 +29,19 @@ qt5/doc/global/externalsites/qtcreator.qdoc qt5/doc/global/externalsites/rfc.qdoc qt5/doc/global/fileextensions.qdocconf qt5/doc/global/html-config.qdocconf +qt5/doc/global/html-footer-online.qdocconf qt5/doc/global/html-footer.qdocconf qt5/doc/global/html-header-offline.qdocconf qt5/doc/global/html-header-online.qdocconf +qt5/doc/global/includes-online/search.qdoc +qt5/doc/global/includes/examples-run.qdocinc qt5/doc/global/macros.qdocconf qt5/doc/global/manifest-meta.qdocconf qt5/doc/global/qt-cpp-defines.qdocconf qt5/doc/global/qt-html-templates-offline.qdocconf qt5/doc/global/qt-html-templates-online.qdocconf qt5/doc/global/qt-module-defaults-offline.qdocconf +qt5/doc/global/qt-module-defaults-online-commercial.qdocconf qt5/doc/global/qt-module-defaults-online.qdocconf qt5/doc/global/qt-module-defaults.qdocconf qt5/doc/global/template/images/Qt-dark_gradient.png @@ -74,6 +80,15 @@ qt5/doc/global/template/images/page.png qt5/doc/global/template/images/page_bg.png qt5/doc/global/template/images/spinner.gif qt5/doc/global/template/images/sprites-combined.png +qt5/doc/global/template/scripts/extras.js +qt5/doc/global/template/scripts/main.js +qt5/doc/global/template/style/doc_search.png +qt5/doc/global/template/style/gsc.css +qt5/doc/global/template/style/icomoon.eot +qt5/doc/global/template/style/icomoon.svg +qt5/doc/global/template/style/icomoon.ttf +qt5/doc/global/template/style/icomoon.woff +qt5/doc/global/template/style/list_arrow.png qt5/doc/global/template/style/offline.css qt5/doc/global/template/style/online.css qt5/include/QtConcurrent/QtConcurrent @@ -128,6 +143,7 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeventdispatcher_blackberry_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeventdispatcher_glib_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeventdispatcher_unix_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeventdispatcher_win_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeventdispatcher_winrt_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeventloop_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeventtransition_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfactoryloader_p.h @@ -139,6 +155,7 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemengine_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystementry_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemiterator_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemmetadata_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemwatcher_fsevents_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemwatcher_inotify_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemwatcher_kqueue_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemwatcher_p.h @@ -153,6 +170,7 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfuturewatcher_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qgb18030codec_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qharfbuzz_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qhistorystate_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qhooks_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qiconvcodec_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qicucodec_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qiodevice_p.h @@ -172,7 +190,6 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qlocale_data_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qlocale_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qlocale_tools_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qlockfile_p.h -qt5/include/QtCore/${PKGVERSION}/QtCore/private/qloggingcategory_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qloggingregistry_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qmachparser_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qmetaobject_moc_p.h @@ -195,6 +212,10 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qobject_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qorderedmutexlocker_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qparallelanimationgroup_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qpodlist_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qppsattribute_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qppsattributeprivate_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qppsobject_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qppsobjectprivate_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qprocess_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qpropertyanimation_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qreadwritelock_p.h @@ -213,6 +234,8 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qsimplecodec_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qsjiscodec_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qstate_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qstatemachine_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qstorageinfo_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qstringiterator_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qsystemerror_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qsystemlibrary_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qsystemsemaphore_p.h @@ -236,6 +259,7 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qurltlds_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qutfcodec_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qvariant_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qvariantanimation_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qversionnumber_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qwindowscodec_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qwindowspipereader_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qwindowspipewriter_p.h @@ -259,6 +283,7 @@ qt5/include/QtCore/QArrayDataPointer qt5/include/QtCore/QArrayDataPointerRef qt5/include/QtCore/QAssociativeIterable qt5/include/QtCore/QAtomicInt +qt5/include/QtCore/QAtomicInteger qt5/include/QtCore/QAtomicPointer qt5/include/QtCore/QBBSystemLocaleData qt5/include/QtCore/QBasicMutex @@ -269,6 +294,8 @@ qt5/include/QtCore/QBuffer qt5/include/QtCore/QByteArray qt5/include/QtCore/QByteArrayData qt5/include/QtCore/QByteArrayDataPtr +qt5/include/QtCore/QByteArrayList +qt5/include/QtCore/QByteArrayListIterator qt5/include/QtCore/QByteArrayMatcher qt5/include/QtCore/QByteRef qt5/include/QtCore/QCache @@ -295,6 +322,7 @@ qt5/include/QtCore/QDirIterator qt5/include/QtCore/QDynamicPropertyChangeEvent qt5/include/QtCore/QEasingCurve qt5/include/QtCore/QElapsedTimer +qt5/include/QtCore/QEnableSharedFromThis qt5/include/QtCore/QEvent qt5/include/QtCore/QEventLoop qt5/include/QtCore/QEventLoopLocker @@ -325,7 +353,6 @@ qt5/include/QtCore/QGenericReturnArgument qt5/include/QtCore/QGlobalStatic qt5/include/QtCore/QHash qt5/include/QtCore/QHashData -qt5/include/QtCore/QHashDummyNode qt5/include/QtCore/QHashDummyValue qt5/include/QtCore/QHashIterator qt5/include/QtCore/QHashNode @@ -343,7 +370,9 @@ qt5/include/QtCore/QJsonDocument qt5/include/QtCore/QJsonObject qt5/include/QtCore/QJsonParseError qt5/include/QtCore/QJsonValue +qt5/include/QtCore/QJsonValuePtr qt5/include/QtCore/QJsonValueRef +qt5/include/QtCore/QJsonValueRefPtr qt5/include/QtCore/QLatin1Char qt5/include/QtCore/QLatin1Literal qt5/include/QtCore/QLatin1String @@ -358,6 +387,7 @@ qt5/include/QtCore/QLinkedListNode qt5/include/QtCore/QList qt5/include/QtCore/QListData qt5/include/QtCore/QListIterator +qt5/include/QtCore/QListSpecialMethods qt5/include/QtCore/QLocale qt5/include/QtCore/QLockFile qt5/include/QtCore/QLoggingCategory @@ -368,6 +398,7 @@ qt5/include/QtCore/QMapIterator qt5/include/QtCore/QMapNode qt5/include/QtCore/QMapNodeBase qt5/include/QtCore/QMargins +qt5/include/QtCore/QMarginsF qt5/include/QtCore/QMessageAuthenticationCode qt5/include/QtCore/QMessageLogContext qt5/include/QtCore/QMessageLogger @@ -387,6 +418,7 @@ qt5/include/QtCore/QModelIndex qt5/include/QtCore/QModelIndexList qt5/include/QtCore/QMultiHash qt5/include/QtCore/QMultiMap +qt5/include/QtCore/QMutableByteArrayListIterator qt5/include/QtCore/QMutableFutureIterator qt5/include/QtCore/QMutableHashIterator qt5/include/QtCore/QMutableLinkedListIterator @@ -445,6 +477,7 @@ qt5/include/QtCore/QSharedData qt5/include/QtCore/QSharedDataPointer qt5/include/QtCore/QSharedMemory qt5/include/QtCore/QSharedPointer +qt5/include/QtCore/QSignalBlocker qt5/include/QtCore/QSignalMapper qt5/include/QtCore/QSignalTransition qt5/include/QtCore/QSize @@ -460,6 +493,7 @@ qt5/include/QtCore/QStaticAssertFailure qt5/include/QtCore/QStaticByteArrayData qt5/include/QtCore/QStaticPlugin qt5/include/QtCore/QStaticStringData +qt5/include/QtCore/QStorageInfo qt5/include/QtCore/QString qt5/include/QtCore/QStringBuilder qt5/include/QtCore/QStringData @@ -554,30 +588,23 @@ qt5/include/QtCore/qarraydata.h qt5/include/QtCore/qarraydataops.h qt5/include/QtCore/qarraydatapointer.h qt5/include/QtCore/qatomic.h -qt5/include/QtCore/qatomic_alpha.h qt5/include/QtCore/qatomic_armv5.h qt5/include/QtCore/qatomic_armv6.h qt5/include/QtCore/qatomic_armv7.h -qt5/include/QtCore/qatomic_bfin.h qt5/include/QtCore/qatomic_bootstrap.h qt5/include/QtCore/qatomic_cxx11.h qt5/include/QtCore/qatomic_gcc.h qt5/include/QtCore/qatomic_ia64.h -qt5/include/QtCore/qatomic_integrity.h qt5/include/QtCore/qatomic_mips.h qt5/include/QtCore/qatomic_msvc.h -qt5/include/QtCore/qatomic_power.h -qt5/include/QtCore/qatomic_s390.h -qt5/include/QtCore/qatomic_sh4a.h -qt5/include/QtCore/qatomic_sparc.h qt5/include/QtCore/qatomic_unix.h -qt5/include/QtCore/qatomic_vxworks.h qt5/include/QtCore/qatomic_x86.h qt5/include/QtCore/qbasicatomic.h qt5/include/QtCore/qbasictimer.h qt5/include/QtCore/qbitarray.h qt5/include/QtCore/qbuffer.h qt5/include/QtCore/qbytearray.h +qt5/include/QtCore/qbytearraylist.h qt5/include/QtCore/qbytearraymatcher.h qt5/include/QtCore/qcache.h qt5/include/QtCore/qchar.h @@ -620,6 +647,7 @@ qt5/include/QtCore/qflags.h qt5/include/QtCore/qfunctions_nacl.h qt5/include/QtCore/qfunctions_vxworks.h qt5/include/QtCore/qfunctions_wince.h +qt5/include/QtCore/qfunctions_winrt.h qt5/include/QtCore/qfuture.h qt5/include/QtCore/qfutureinterface.h qt5/include/QtCore/qfuturesynchronizer.h @@ -665,7 +693,6 @@ qt5/include/QtCore/qobject_impl.h qt5/include/QtCore/qobjectcleanuphandler.h qt5/include/QtCore/qobjectdefs.h qt5/include/QtCore/qobjectdefs_impl.h -qt5/include/QtCore/qoldbasicatomic.h qt5/include/QtCore/qpair.h qt5/include/QtCore/qparallelanimationgroup.h qt5/include/QtCore/qpauseanimation.h @@ -705,6 +732,7 @@ qt5/include/QtCore/qstack.h qt5/include/QtCore/qstandardpaths.h qt5/include/QtCore/qstate.h qt5/include/QtCore/qstatemachine.h +qt5/include/QtCore/qstorageinfo.h qt5/include/QtCore/qstring.h qt5/include/QtCore/qstringbuilder.h qt5/include/QtCore/qstringlist.h @@ -739,6 +767,7 @@ qt5/include/QtCore/qvector.h qt5/include/QtCore/qwaitcondition.h qt5/include/QtCore/qwineventnotifier.h qt5/include/QtCore/qxmlstream.h +qt5/include/QtGui/${PKGVERSION}/QtGui/private/qabstractlayoutstyleinfo_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qabstracttextdocumentlayout_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qaccessiblecache_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qbezier_p.h @@ -765,13 +794,14 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfixed_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfont_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfontengine_ft_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfontengine_p.h -qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfontengine_qpa_p.h +qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfontengine_qpf2_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfontengineglyphcache_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfontsubset_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfragmentmap_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qgifhandler_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qglyphrun_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qgrayraster_p.h +qt5/include/QtGui/${PKGVERSION}/QtGui/private/qgridlayoutengine_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qguiapplication_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qharfbuzzng_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qhexstring_p.h @@ -784,6 +814,7 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/private/qinputmethod_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qjpeghandler_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qkeymapper_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qkeysequence_p.h +qt5/include/QtGui/${PKGVERSION}/QtGui/private/qlayoutpolicy_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qmath_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qmemrotate_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qnativeimage_p.h @@ -796,18 +827,22 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglengineshadersource_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglextensions_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglframebufferobject_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglgradientcache_p.h +qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglpaintdevice_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglpaintengine_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglqueryhelper_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglshadercache_meego_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglshadercache_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopengltexture_p.h +qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopengltextureblitter_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopengltexturecache_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopengltextureglyphcache_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopengltexturehelper_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglversionfunctionsfactory_p.h +qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglvertexarrayobject_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qoutlinemapper_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qpagedpaintdevice_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qpaintbuffer_p.h +qt5/include/QtGui/${PKGVERSION}/QtGui/private/qpaintdevicewindow_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qpaintengine_blitter_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qpaintengine_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qpaintengine_pic_p.h @@ -882,7 +917,6 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformopenglcontext.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformpixmap.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformscreen.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformscreen_p.h -qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformscreenpageflipper.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformservices.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformsessionmanager.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformsharedgraphicscache.h @@ -1037,8 +1071,12 @@ qt5/include/QtGui/QOpenGLTimerQuery qt5/include/QtGui/QOpenGLVersionFunctions qt5/include/QtGui/QOpenGLVersionProfile qt5/include/QtGui/QOpenGLVertexArrayObject +qt5/include/QtGui/QOpenGLWindow +qt5/include/QtGui/QPageLayout +qt5/include/QtGui/QPageSize qt5/include/QtGui/QPagedPaintDevice qt5/include/QtGui/QPaintDevice +qt5/include/QtGui/QPaintDeviceWindow qt5/include/QtGui/QPaintEngine qt5/include/QtGui/QPaintEngineState qt5/include/QtGui/QPaintEvent @@ -1051,12 +1089,14 @@ qt5/include/QtGui/QPen qt5/include/QtGui/QPicture qt5/include/QtGui/QPictureFormatPlugin qt5/include/QtGui/QPictureIO +qt5/include/QtGui/QPixelFormat qt5/include/QtGui/QPixmap qt5/include/QtGui/QPixmapCache qt5/include/QtGui/QPolygon qt5/include/QtGui/QPolygonF qt5/include/QtGui/QQuaternion qt5/include/QtGui/QRadialGradient +qt5/include/QtGui/QRasterWindow qt5/include/QtGui/QRawFont qt5/include/QtGui/QRegExpValidator qt5/include/QtGui/QRegion @@ -1202,8 +1242,12 @@ qt5/include/QtGui/qopengltexture.h qt5/include/QtGui/qopengltimerquery.h qt5/include/QtGui/qopenglversionfunctions.h qt5/include/QtGui/qopenglvertexarrayobject.h +qt5/include/QtGui/qopenglwindow.h qt5/include/QtGui/qpagedpaintdevice.h +qt5/include/QtGui/qpagelayout.h +qt5/include/QtGui/qpagesize.h qt5/include/QtGui/qpaintdevice.h +qt5/include/QtGui/qpaintdevicewindow.h qt5/include/QtGui/qpaintengine.h qt5/include/QtGui/qpainter.h qt5/include/QtGui/qpainterpath.h @@ -1212,10 +1256,12 @@ qt5/include/QtGui/qpdfwriter.h qt5/include/QtGui/qpen.h qt5/include/QtGui/qpicture.h qt5/include/QtGui/qpictureformatplugin.h +qt5/include/QtGui/qpixelformat.h qt5/include/QtGui/qpixmap.h qt5/include/QtGui/qpixmapcache.h qt5/include/QtGui/qpolygon.h qt5/include/QtGui/qquaternion.h +qt5/include/QtGui/qrasterwindow.h qt5/include/QtGui/qrawfont.h qt5/include/QtGui/qregion.h qt5/include/QtGui/qrgb.h @@ -1248,8 +1294,10 @@ qt5/include/QtGui/qwindow.h qt5/include/QtGui/qwindowdefs.h qt5/include/QtGui/qwindowdefs_win.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qabstractnetworkcache_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qabstractprotocolhandler_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qabstractsocket_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qabstractsocketengine_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qasn1element_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qauthenticator_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qbearerengine_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qbearerplugin_p.h @@ -1263,11 +1311,13 @@ qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhttpnetworkconnectionchan qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhttpnetworkheader_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhttpnetworkreply_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhttpnetworkrequest_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhttpprotocolhandler_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhttpsocketengine_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhttpthreaddelegate_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qlocalserver_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qlocalsocket_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnativesocketengine_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnativesocketengine_winrt_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnet_unix_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkaccessauthenticationmanager_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkaccessbackend_p.h @@ -1295,15 +1345,17 @@ qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkrequest_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworksession_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsharednetworksession_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsocks5socketengine_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qspdyprotocolhandler_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslcertificate_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslcertificateextension_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslcipher_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslconfiguration_p.h -qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslcontext_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslcontext_openssl_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslkey_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_openssl_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_openssl_symbols_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_winrt_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtcpsocket_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qurlinfo_p.h qt5/include/QtNetwork/QAbstractNetworkCache @@ -1399,6 +1451,7 @@ qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qglshadercache_p.h qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qgraphicsshadereffect_p.h qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qpaintengineex_opengl2_p.h qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qtextureglyphcache_gl_p.h +qt5/include/QtOpenGL/QGL qt5/include/QtOpenGL/QGLBuffer qt5/include/QtOpenGL/QGLColormap qt5/include/QtOpenGL/QGLContext @@ -1429,6 +1482,22 @@ qt5/include/QtOpenGLExtensions/QtOpenGLExtensionsDepends qt5/include/QtOpenGLExtensions/QtOpenGLExtensionsVersion qt5/include/QtOpenGLExtensions/qopenglextensions.h qt5/include/QtOpenGLExtensions/qtopenglextensionsversion.h +qt5/include/QtPlatformHeaders/QCocoaNativeContext +qt5/include/QtPlatformHeaders/QEGLNativeContext +qt5/include/QtPlatformHeaders/QEglFSFunctions +qt5/include/QtPlatformHeaders/QGLXNativeContext +qt5/include/QtPlatformHeaders/QWGLNativeContext +qt5/include/QtPlatformHeaders/QXcbWindowFunctions +qt5/include/QtPlatformHeaders/QtPlatformHeaders +qt5/include/QtPlatformHeaders/QtPlatformHeadersDepends +qt5/include/QtPlatformHeaders/QtPlatformHeadersVersion +qt5/include/QtPlatformHeaders/qcocoanativecontext.h +qt5/include/QtPlatformHeaders/qeglfsfunctions.h +qt5/include/QtPlatformHeaders/qeglnativecontext.h +qt5/include/QtPlatformHeaders/qglxnativecontext.h +qt5/include/QtPlatformHeaders/qtplatformheadersversion.h +qt5/include/QtPlatformHeaders/qwglnativecontext.h +qt5/include/QtPlatformHeaders/qxcbwindowfunctions.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/application_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/atspiadaptor_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/bridge_p.h @@ -1436,13 +1505,20 @@ qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/cache_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/cglconvenience_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/constant_mappings_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/dbusconnection_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qaccessiblebridgeutils_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qbasicfontdatabase_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qcfsocketnotifier_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qcoretextfontdatabase_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdevicediscovery_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglcompositor_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglconvenience_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglpbuffer_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformbackingstore_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformcontext_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformcursor_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformintegration_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformscreen_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformwindow_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevkeyboard_defaultmap_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevkeyboardhandler_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevkeyboardmanager_p.h @@ -1455,6 +1531,7 @@ qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeventdisp qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfbbackingstore_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfbcursor_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfbscreen_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfbvthandler_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfbwindow_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfontconfigdatabase_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfontengine_coretext_p.h @@ -1464,6 +1541,7 @@ qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qgenericun qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qgenericunixservices_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qgenericunixthemes_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qglxconvenience_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qmacmime_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qxlibeglintegration_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/struct_marshallers_p.h @@ -1478,10 +1556,13 @@ qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qpagesetupdialog qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qpagesetupdialog_unix_p.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qpaintengine_alpha_p.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qpaintengine_preview_p.h +qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprint_p.h +qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprintdevice_p.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprintengine_pdf_p.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprintengine_win_p.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprinter_p.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprinterinfo_p.h +qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintdevice.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintersupport.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintplugin.h qt5/include/QtPrintSupport/QAbstractPrintDialog @@ -1565,8 +1646,10 @@ qt5/include/QtTest/${PKGVERSION}/QtTest/private/qbenchmarkmeasurement_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qbenchmarkmetric_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qbenchmarkperfevents_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qbenchmarkvalgrind_p.h +qt5/include/QtTest/${PKGVERSION}/QtTest/private/qcsvbenchmarklogger_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qplaintestlogger_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qsignaldumper_p.h +qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestblacklist_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestcoreelement_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestcorelist_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestelement_p.h @@ -1620,13 +1703,13 @@ qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractitemview_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractscrollarea_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractslider_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractspinbox_p.h +qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qaccessiblewidgetfactory_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qaction_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qandroidstyle_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qapplication_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qbasickeyeventtransition_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qbasicmouseeventtransition_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qbsptree_p.h -qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcalendartextnavigator_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcolordialog_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcolumnview_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcolumnviewgrip_p.h @@ -1635,7 +1718,7 @@ qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcommonstyle_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcommonstylepixmaps_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcompleter_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qdatetimeedit_p.h -qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qdesktopwidget_qpa_p.h +qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qdesktopwidget_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qdialog_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qdockarealayout_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qdockwidget_p.h @@ -1655,9 +1738,11 @@ qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgesturemanager_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraph_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicsanchorlayout_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicseffect_p.h +qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicsgridlayoutengine_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicsitem_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicslayout_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicslayoutitem_p.h +qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicslayoutstyleinfo_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicsproxywidget_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicsscene_bsp_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicsscene_p.h @@ -1667,7 +1752,6 @@ qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicsscenelinearindex_ qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicstransform_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicsview_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicswidget_p.h -qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgridlayoutengine_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgtk2painter_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgtkglobal_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgtkpainter_p.h @@ -1731,7 +1815,7 @@ qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwidgetlinecontrol_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwidgetresizehandler_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwidgettextcontrol_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwidgettextcontrol_p_p.h -qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwidgetwindow_qpa_p.h +qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwidgetwindow_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowcontainer_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowscestyle_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowscestyle_p_p.h @@ -1751,7 +1835,45 @@ qt5/include/QtWidgets/QAbstractItemView qt5/include/QtWidgets/QAbstractScrollArea qt5/include/QtWidgets/QAbstractSlider qt5/include/QtWidgets/QAbstractSpinBox +qt5/include/QtWidgets/QAccessibleAbstractScrollArea +qt5/include/QtWidgets/QAccessibleAbstractSlider +qt5/include/QtWidgets/QAccessibleAbstractSpinBox +qt5/include/QtWidgets/QAccessibleButton +qt5/include/QtWidgets/QAccessibleCalendarWidget +qt5/include/QtWidgets/QAccessibleComboBox +qt5/include/QtWidgets/QAccessibleDial +qt5/include/QtWidgets/QAccessibleDialogButtonBox +qt5/include/QtWidgets/QAccessibleDisplay +qt5/include/QtWidgets/QAccessibleDockWidget +qt5/include/QtWidgets/QAccessibleDoubleSpinBox +qt5/include/QtWidgets/QAccessibleGroupBox +qt5/include/QtWidgets/QAccessibleLineEdit +qt5/include/QtWidgets/QAccessibleMainWindow +qt5/include/QtWidgets/QAccessibleMdiArea +qt5/include/QtWidgets/QAccessibleMdiSubWindow +qt5/include/QtWidgets/QAccessibleMenu +qt5/include/QtWidgets/QAccessibleMenuBar +qt5/include/QtWidgets/QAccessibleMenuItem +qt5/include/QtWidgets/QAccessiblePlainTextEdit +qt5/include/QtWidgets/QAccessibleProgressBar +qt5/include/QtWidgets/QAccessibleScrollArea +qt5/include/QtWidgets/QAccessibleScrollBar +qt5/include/QtWidgets/QAccessibleSlider +qt5/include/QtWidgets/QAccessibleSpinBox +qt5/include/QtWidgets/QAccessibleStackedWidget +qt5/include/QtWidgets/QAccessibleTabBar +qt5/include/QtWidgets/QAccessibleTable +qt5/include/QtWidgets/QAccessibleTableCell +qt5/include/QtWidgets/QAccessibleTableCornerButton +qt5/include/QtWidgets/QAccessibleTableHeaderCell +qt5/include/QtWidgets/QAccessibleTextBrowser +qt5/include/QtWidgets/QAccessibleTextEdit +qt5/include/QtWidgets/QAccessibleTextWidget +qt5/include/QtWidgets/QAccessibleToolBox +qt5/include/QtWidgets/QAccessibleToolButton +qt5/include/QtWidgets/QAccessibleTree qt5/include/QtWidgets/QAccessibleWidget +qt5/include/QtWidgets/QAccessibleWindowContainer qt5/include/QtWidgets/QAction qt5/include/QtWidgets/QActionGroup qt5/include/QtWidgets/QApplication @@ -1855,6 +1977,7 @@ qt5/include/QtWidgets/QMenu qt5/include/QtWidgets/QMenuBar qt5/include/QtWidgets/QMessageBox qt5/include/QtWidgets/QMouseEventTransition +qt5/include/QtWidgets/QOpenGLWidget qt5/include/QtWidgets/QPanGesture qt5/include/QtWidgets/QPinchGesture qt5/include/QtWidgets/QPlainTextDocumentLayout @@ -1964,13 +2087,17 @@ qt5/include/QtWidgets/QWizardPage qt5/include/QtWidgets/QtWidgets qt5/include/QtWidgets/QtWidgetsDepends qt5/include/QtWidgets/QtWidgetsVersion +qt5/include/QtWidgets/complexwidgets.h +qt5/include/QtWidgets/itemviews.h qt5/include/QtWidgets/qabstractbutton.h qt5/include/QtWidgets/qabstractitemdelegate.h qt5/include/QtWidgets/qabstractitemview.h qt5/include/QtWidgets/qabstractscrollarea.h qt5/include/QtWidgets/qabstractslider.h qt5/include/QtWidgets/qabstractspinbox.h +qt5/include/QtWidgets/qaccessiblemenu.h qt5/include/QtWidgets/qaccessiblewidget.h +qt5/include/QtWidgets/qaccessiblewidgets.h qt5/include/QtWidgets/qaction.h qt5/include/QtWidgets/qactiongroup.h qt5/include/QtWidgets/qapplication.h @@ -2043,6 +2170,7 @@ qt5/include/QtWidgets/qmenu.h qt5/include/QtWidgets/qmenubar.h qt5/include/QtWidgets/qmessagebox.h qt5/include/QtWidgets/qmouseeventtransition.h +qt5/include/QtWidgets/qopenglwidget.h qt5/include/QtWidgets/qplaintextedit.h qt5/include/QtWidgets/qprogressbar.h qt5/include/QtWidgets/qprogressdialog.h @@ -2093,6 +2221,9 @@ qt5/include/QtWidgets/qwidget.h qt5/include/QtWidgets/qwidgetaction.h qt5/include/QtWidgets/qwidgetsfunctions_wince.h qt5/include/QtWidgets/qwizard.h +qt5/include/QtWidgets/rangecontrols.h +qt5/include/QtWidgets/simplewidgets.h +qt5/include/QtXml/${PKGVERSION}/QtXml/private/qxml_p.h qt5/include/QtXml/QDomAttr qt5/include/QtXml/QDomCDATASection qt5/include/QtXml/QDomCharacterData @@ -2145,12 +2276,13 @@ qt5/lib/cmake/Qt5Gui/Qt5GuiConfig.cmake qt5/lib/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake qt5/lib/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake ${PLIST.mac}qt5/lib/cmake/Qt5Gui/Qt5Gui_QCocoaIntegrationPlugin.cmake +${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake -qt5/lib/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake +qt5/lib/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake qt5/lib/cmake/Qt5Network/Qt5NetworkConfig.cmake qt5/lib/cmake/Qt5Network/Qt5NetworkConfigVersion.cmake ${PLIST.mac}qt5/lib/cmake/Qt5Network/Qt5Network_QCoreWlanEnginePlugin.cmake @@ -2161,6 +2293,7 @@ qt5/lib/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake qt5/lib/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfigVersion.cmake qt5/lib/cmake/Qt5PrintSupport/Qt5PrintSupportConfig.cmake qt5/lib/cmake/Qt5PrintSupport/Qt5PrintSupportConfigVersion.cmake +${PLIST.mac}qt5/lib/cmake/Qt5PrintSupport/Qt5PrintSupport_QCocoaPrinterSupportPlugin.cmake qt5/lib/cmake/Qt5Sql/Qt5SqlConfig.cmake qt5/lib/cmake/Qt5Sql/Qt5SqlConfigVersion.cmake qt5/lib/cmake/Qt5Test/Qt5TestConfig.cmake @@ -2169,7 +2302,6 @@ qt5/lib/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake qt5/lib/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake qt5/lib/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake qt5/lib/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake -qt5/lib/cmake/Qt5Widgets/Qt5Widgets_AccessibleFactory.cmake qt5/lib/cmake/Qt5Xml/Qt5XmlConfig.cmake qt5/lib/cmake/Qt5Xml/Qt5XmlConfigVersion.cmake qt5/lib/libQt5Bootstrap.la @@ -2259,12 +2391,28 @@ qt5/mkspecs/common/qcc-base-qnx-x86.conf qt5/mkspecs/common/qcc-base-qnx.conf qt5/mkspecs/common/qcc-base.conf qt5/mkspecs/common/qmake.conf +qt5/mkspecs/common/qnx/qplatformdefs.h qt5/mkspecs/common/shell-unix.conf qt5/mkspecs/common/shell-win32.conf qt5/mkspecs/common/unix.conf qt5/mkspecs/common/wince/qmake.conf qt5/mkspecs/common/wince/qplatformdefs.h +qt5/mkspecs/common/winrt_winphone/assets/logo_44x44.png +qt5/mkspecs/common/winrt_winphone/assets/logo_480x800.png +qt5/mkspecs/common/winrt_winphone/assets/logo_71x71.png +qt5/mkspecs/common/winrt_winphone/assets/logo_large.png +qt5/mkspecs/common/winrt_winphone/assets/logo_medium.png +qt5/mkspecs/common/winrt_winphone/assets/logo_small.png +qt5/mkspecs/common/winrt_winphone/assets/logo_splash.png +qt5/mkspecs/common/winrt_winphone/assets/logo_store.png +qt5/mkspecs/common/winrt_winphone/assets/tile_iconic_medium.png +qt5/mkspecs/common/winrt_winphone/assets/tile_iconic_small.png +qt5/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in +qt5/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in +qt5/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in +qt5/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in qt5/mkspecs/common/winrt_winphone/qmake.conf +qt5/mkspecs/common/winrt_winphone/qplatformdefs.h qt5/mkspecs/cygwin-g++/qmake.conf qt5/mkspecs/cygwin-g++/qplatformdefs.h qt5/mkspecs/darwin-g++/qmake.conf @@ -2283,6 +2431,9 @@ qt5/mkspecs/devices/linux-archos-gen8-g++/qplatformdefs.h qt5/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp qt5/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf qt5/mkspecs/devices/linux-arm-amlogic-8726M-g++/qplatformdefs.h +qt5/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qeglfshooks_hix5hd2.cpp +qt5/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf +qt5/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qplatformdefs.h qt5/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf qt5/mkspecs/devices/linux-arm-trident-pnx8473-g++/qplatformdefs.h qt5/mkspecs/devices/linux-beagleboard-g++/qmake.conf @@ -2292,8 +2443,6 @@ qt5/mkspecs/devices/linux-imx53qsb-g++/qplatformdefs.h qt5/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp qt5/mkspecs/devices/linux-imx6-g++/qmake.conf qt5/mkspecs/devices/linux-imx6-g++/qplatformdefs.h -qt5/mkspecs/devices/linux-maemo-n9-g++/qmake.conf -qt5/mkspecs/devices/linux-maemo-n9-g++/qplatformdefs.h qt5/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp qt5/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf qt5/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qplatformdefs.h @@ -2313,6 +2462,7 @@ qt5/mkspecs/features/android/android.prf qt5/mkspecs/features/android/android_deployment_settings.prf qt5/mkspecs/features/build_pass.prf qt5/mkspecs/features/c++11.prf +qt5/mkspecs/features/c++14.prf qt5/mkspecs/features/cmake_functions.prf qt5/mkspecs/features/configure.prf qt5/mkspecs/features/create_cmake.prf @@ -2344,14 +2494,16 @@ qt5/mkspecs/features/incredibuild_xge.prf qt5/mkspecs/features/java.prf qt5/mkspecs/features/lex.prf qt5/mkspecs/features/link_pkgconfig.prf +qt5/mkspecs/features/ltcg.prf qt5/mkspecs/features/mac/default_post.prf qt5/mkspecs/features/mac/objective_c.prf qt5/mkspecs/features/mac/rez.prf qt5/mkspecs/features/mac/sdk.prf qt5/mkspecs/features/moc.prf qt5/mkspecs/features/no_debug_info.prf -qt5/mkspecs/features/opengles1.prf +qt5/mkspecs/features/precompile_header.prf qt5/mkspecs/features/qfeatures.prf +qt5/mkspecs/features/qlalr.prf qt5/mkspecs/features/qmake.conf qt5/mkspecs/features/qml1_module.prf qt5/mkspecs/features/qml1_plugin.prf @@ -2373,6 +2525,7 @@ qt5/mkspecs/features/qt_docs_targets.prf qt5/mkspecs/features/qt_example_installs.prf qt5/mkspecs/features/qt_functions.prf qt5/mkspecs/features/qt_headersclean.prf +qt5/mkspecs/features/qt_helper_lib.prf qt5/mkspecs/features/qt_installs.prf qt5/mkspecs/features/qt_module.prf qt5/mkspecs/features/qt_module_headers.prf @@ -2395,7 +2548,6 @@ qt5/mkspecs/features/testlib_defines.prf qt5/mkspecs/features/uic.prf qt5/mkspecs/features/unix/bsymbolic_functions.prf qt5/mkspecs/features/unix/dylib.prf -qt5/mkspecs/features/unix/gdb_dwarf_index.prf qt5/mkspecs/features/unix/hide_symbols.prf qt5/mkspecs/features/unix/largefile.prf qt5/mkspecs/features/unix/opengl.prf @@ -2415,16 +2567,20 @@ qt5/mkspecs/features/win32/console.prf qt5/mkspecs/features/win32/default_pre.prf qt5/mkspecs/features/win32/dumpcpp.prf qt5/mkspecs/features/win32/idcidl.prf -qt5/mkspecs/features/win32/ltcg.prf qt5/mkspecs/features/win32/msvc_mp.prf qt5/mkspecs/features/win32/opengl.prf qt5/mkspecs/features/win32/openvg.prf +qt5/mkspecs/features/win32/qt_config.prf qt5/mkspecs/features/win32/qt_dll.prf qt5/mkspecs/features/win32/rtti.prf qt5/mkspecs/features/win32/rtti_off.prf qt5/mkspecs/features/win32/stl.prf qt5/mkspecs/features/win32/stl_off.prf +qt5/mkspecs/features/win32/windeployqt.prf qt5/mkspecs/features/win32/windows.prf +qt5/mkspecs/features/winrt/console.prf +qt5/mkspecs/features/winrt/font_deployment.prf +qt5/mkspecs/features/winrt/package_manifest.prf qt5/mkspecs/features/yacc.prf qt5/mkspecs/freebsd-g++/qmake.conf qt5/mkspecs/freebsd-g++/qplatformdefs.h @@ -2470,8 +2626,6 @@ qt5/mkspecs/linux-g++-32/qmake.conf qt5/mkspecs/linux-g++-32/qplatformdefs.h qt5/mkspecs/linux-g++-64/qmake.conf qt5/mkspecs/linux-g++-64/qplatformdefs.h -qt5/mkspecs/linux-g++-maemo/qmake.conf -qt5/mkspecs/linux-g++-maemo/qplatformdefs.h qt5/mkspecs/linux-g++/qmake.conf qt5/mkspecs/linux-g++/qplatformdefs.h qt5/mkspecs/linux-icc-32/qmake.conf @@ -2521,10 +2675,12 @@ qt5/mkspecs/macx-icc/qplatformdefs.h qt5/mkspecs/macx-ios-clang/Default-568h@2x.png qt5/mkspecs/macx-ios-clang/Info.plist.app qt5/mkspecs/macx-ios-clang/Info.plist.lib +qt5/mkspecs/macx-ios-clang/LaunchScreen.xib qt5/mkspecs/macx-ios-clang/features/default_post.prf qt5/mkspecs/macx-ios-clang/features/default_pre.prf qt5/mkspecs/macx-ios-clang/features/qt.prf qt5/mkspecs/macx-ios-clang/features/qt_config.prf +qt5/mkspecs/macx-ios-clang/features/qt_parts.prf qt5/mkspecs/macx-ios-clang/qmake.conf qt5/mkspecs/macx-ios-clang/qplatformdefs.h qt5/mkspecs/macx-ios-clang/rename_main.sh @@ -2566,6 +2722,8 @@ qt5/mkspecs/qconfig.pri qt5/mkspecs/qdevice.pri qt5/mkspecs/qfeatures.pri qt5/mkspecs/qmodule.pri +qt5/mkspecs/qnx-armle-v7-qcc/qmake.conf +qt5/mkspecs/qnx-armle-v7-qcc/qplatformdefs.h qt5/mkspecs/qnx-armv7le-qcc/qmake.conf qt5/mkspecs/qnx-armv7le-qcc/qplatformdefs.h qt5/mkspecs/qnx-x86-qcc/qmake.conf @@ -2597,6 +2755,8 @@ qt5/mkspecs/unixware-g++/qplatformdefs.h qt5/mkspecs/unsupported/android-g++/qeglfshooks_surfaceflinger.cpp qt5/mkspecs/unsupported/android-g++/qmake.conf qt5/mkspecs/unsupported/android-g++/qplatformdefs.h +qt5/mkspecs/unsupported/freebsd-clang/qmake.conf +qt5/mkspecs/unsupported/freebsd-clang/qplatformdefs.h qt5/mkspecs/unsupported/integrity-ghs/qmake.conf qt5/mkspecs/unsupported/integrity-ghs/qplatformdefs.h qt5/mkspecs/unsupported/linux-armcc/qmake.conf @@ -2646,15 +2806,24 @@ qt5/mkspecs/wince70embedded-x86-msvc2008/qmake.conf qt5/mkspecs/wince70embedded-x86-msvc2008/qplatformdefs.h qt5/mkspecs/winphone-arm-msvc2012/qmake.conf qt5/mkspecs/winphone-arm-msvc2012/qplatformdefs.h +qt5/mkspecs/winphone-arm-msvc2013/qmake.conf +qt5/mkspecs/winphone-arm-msvc2013/qplatformdefs.h qt5/mkspecs/winphone-x86-msvc2012/qmake.conf qt5/mkspecs/winphone-x86-msvc2012/qplatformdefs.h +qt5/mkspecs/winphone-x86-msvc2013/qmake.conf +qt5/mkspecs/winphone-x86-msvc2013/qplatformdefs.h qt5/mkspecs/winrt-arm-msvc2012/qmake.conf qt5/mkspecs/winrt-arm-msvc2012/qplatformdefs.h +qt5/mkspecs/winrt-arm-msvc2013/qmake.conf +qt5/mkspecs/winrt-arm-msvc2013/qplatformdefs.h qt5/mkspecs/winrt-x64-msvc2012/qmake.conf qt5/mkspecs/winrt-x64-msvc2012/qplatformdefs.h +qt5/mkspecs/winrt-x64-msvc2013/qmake.conf +qt5/mkspecs/winrt-x64-msvc2013/qplatformdefs.h qt5/mkspecs/winrt-x86-msvc2012/qmake.conf qt5/mkspecs/winrt-x86-msvc2012/qplatformdefs.h -qt5/plugins/accessible/libqtaccessiblewidgets.la +qt5/mkspecs/winrt-x86-msvc2013/qmake.conf +qt5/mkspecs/winrt-x86-msvc2013/qplatformdefs.h ${PLIST.mac}qt5/plugins/bearer/libqcorewlanbearer.la qt5/plugins/bearer/libqgenericbearer.la qt5/plugins/imageformats/libqgif.la diff --git a/x11/qt5-qtbase/buildlink3.mk b/x11/qt5-qtbase/buildlink3.mk index 4f6b007ff94..372c9721b5b 100644 --- a/x11/qt5-qtbase/buildlink3.mk +++ b/x11/qt5-qtbase/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.7 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2014/12/30 17:23:45 adam Exp $ BUILDLINK_TREE+= qt5-qtbase .if !defined(QT5_QTBASE_BUILDLINK3_MK) QT5_QTBASE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtbase?= qt5-qtbase>=5.2.1nb6 +BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtbase?= ../../x11/qt5-qtbase BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include @@ -18,14 +18,19 @@ CMAKE_PREFIX_PATH+= ${QTDIR} PTHREAD_OPTS+= require +.include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" +.include "../../fonts/harfbuzz/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .if ${OPSYS} != "Darwin" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index b861455e892..5acef8ac0bb 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,100 +1,29 @@ -$NetBSD: distinfo,v 1.12 2014/08/23 20:25:11 wiz Exp $ +$NetBSD: distinfo,v 1.13 2014/12/30 17:23:45 adam Exp $ -SHA1 (qt-everywhere-opensource-src-5.2.1.tar.xz) = cc68265c62321670bd40e29bdd484ea881bd6af3 -RMD160 (qt-everywhere-opensource-src-5.2.1.tar.xz) = 9b716c5875a6186968392896ac8bd3261fae9b24 -Size (qt-everywhere-opensource-src-5.2.1.tar.xz) = 174004404 bytes -SHA1 (patch-qtbase_config.tests_unix_iconv_iconv.cpp) = bd7d0440b9c7022a71ccc6fe71415e1846c50e57 -SHA1 (patch-qtbase_configure) = bc00f5f7ea40c7304b9cf836748e1bad6f98526a -SHA1 (patch-qtbase_mkspecs_features_mac_objective__c.prf) = 40d56c675deabea27cdb9eae91d1e90b0f8348ad -SHA1 (patch-qtbase_mkspecs_features_qt__module__pris.prf) = b58b4a9e1a0a76cfa99c8b2c540514159707043b -SHA1 (patch-qtbase_qmake_Makefile.unix) = cdde195c16f55bc5f22ff095c20a59b7c2cdc883 -SHA1 (patch-qtbase_qmake_generators_makefile.cpp) = 18831f38df9d4abf61dbd0a1f780bffc0b1cabf4 -SHA1 (patch-qtbase_qmake_generators_unix_unixmake.cpp) = 9bf95f4edb70d4c53cbd5fffcf051988a0958f4e -SHA1 (patch-qtbase_qmake_generators_unix_unixmake2.cpp) = 77f9e4114c48398676dbda1a564ba004a33c2a0b -SHA1 (patch-qtbase_src_concurrent_qtconcurrentiteratekernel.cpp) = 9a00bc1538136c29992e15b60bc23f9b40db900a -SHA1 (patch-qtbase_src_corelib_arch_sparc_arch.pri) = 0af37348671d681cbfc5033dfe5347df33d59f27 -SHA1 (patch-qtbase_src_corelib_codecs_qiconvcodec.cpp) = ba42bd582adb9ffca218152f4201120801cb1c98 -SHA1 (patch-qtbase_src_corelib_global_qsystemdetection.h) = 9b4a18f59bd4ce2401ccbffe9db597674feb0686 -SHA1 (patch-qtbase_src_corelib_io_io.pri) = 3cdaa27a60710a56739781dc996a5325007e32f9 -SHA1 (patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp) = 28af6bc44dbb02d5773e44e37e5a1c58bdf6fffc -SHA1 (patch-qtbase_src_corelib_io_qsettings.cpp) = c52e8c457431dc7c37ee8b9225591cd05e91f639 -SHA1 (patch-qtbase_src_dbus_qdbusintegrator.cpp) = 6d178269350dab993383dfa2490119115e489e15 -SHA1 (patch-qtbase_src_network_kernel_qhostinfo__unix.cpp) = 01ceb308e8d595e26b988ff335187452025e0648 -SHA1 (patch-qtbase_src_platformsupport_platformsupport.pro) = 386f440483d25eb67aa3d58be5a2927ad424c1bc -SHA1 (patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro) = 873adfe8ce8604147dfd3d562d21888289a5ccc2 -SHA1 (patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 36e5ef3cb35d9fef04ae594be9e5ef990ba14f72 -SHA1 (patch-qtbase_src_tools_bootstrap_bootstrap.pro) = 24f47fcf6bab2ddca855a77113a0681dec063ca8 -SHA1 (patch-qtbase_src_tools_moc_main.cpp) = 31f42b1625ec7a978e21ad3fdde67ce3328df425 -SHA1 (patch-qtbase_src_widgets_graphicsview_qgraphicsitem__p.h) = a30402585f0b7efd9fc0dcd256e410a92dffff2c -SHA1 (patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro) = 729e57819a0477c2bb06015b3bd106e1f972eb51 -SHA1 (patch-qtbase_tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = ec68f41ccdc622eb5457ea7a3c37c1f54058b595 -SHA1 (patch-qtdeclarative_examples_quick_customitems_painteditem_painteditem.pro) = 4eb38df598145da3bb8272dfc4c34649d54cf9fe -SHA1 (patch-qtdeclarative_src_3rdparty_masm_wtf_MathExtras.h) = 5cef3ed89e333f3386bd61cbf5af6632ad400499 -SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4alloca__p.h) = 5eb9eba79d6564b9375910dd7ed6ad406c8b0c8e -SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4engine.cpp) = 1447ade56250f2645d13669c5cab85cd299dfdf5 -SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4globalobject.cpp) = d0c1b5b190d350a30dee609c37be9ec467fce02f -SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4mm.cpp) = f37900af31ed15040499d9a28125ad32909a393c -SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4stringobject.cpp) = a51bbafc307663e150da89efc29175424d733f1a -SHA1 (patch-qtdeclarative_src_qmldevtools_qmldevtools.pro) = 6f0e65eb6c4a5bfd05a603d9cbfc6fdc22e46d3b -SHA1 (patch-qtdeclarative_tests_auto_qml_qjsengine_tst__qjsengine.cpp) = b1cc5a386dd0f1b3651adb9babee87be84221998 -SHA1 (patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp) = 235140fa9d5e4ffbb954621e50b83a719c5ef636 -SHA1 (patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp) = ac97ed7ec63e3cfc060ce7e90dfe7f053f9dd851 -SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp) = e2b0022da1f523324159efdcd29237f82380aed8 -SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp) = 5f79e39dba119b9c0c757268a0a13332040e36a5 -SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp) = 224a3097498d12284f10a9adb5a774356092f374 -SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp) = 16efe4a42cf7cb2718cb03062d2d132edfc2fedc -SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp) = 729d69245a1ab6fe9b01a63673102685b39d7add -SHA1 (patch-qtquick1_tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp) = b1efdea5596a76eeae37a70bd49bb7741a8b7c5f -SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_config.h) = 66dc22ee78727c84f1e82dc10bb342d514f8f9a0 -SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h) = ee35790f58ec9cf4d1a370f5549d92b5a680f557 -SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h) = ea5d9249aaa6e00b2111e0ba5bd8337f2e0f345a -SHA1 (patch-qtserialport_src_serialport_qserialport__unix.cpp) = 27ff0bdedda6099f11ebb3eb4c377052bb605ddd -SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 67c3422f65338ea29d03e45f51bb0f40274760d1 -SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = 5dc1139b4dbfd464bfecd9eac86090064e5ae816 -SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h) = 30562da15ccfd3034b6db5430e7abdab2fd5cb94 -SHA1 (patch-qttools_src_assistant_clucene_qclucene-config__p.h) = 000e1c5e6bba4e59738ec539d4f22530dc84cd98 -SHA1 (patch-qttools_src_designer_src_uitools_uitools.pro) = 61e72ba527d1209daa3672c749e25413d0ac595e -SHA1 (patch-qtwebkit_Source_JavaScriptCore_API_ObjCCallbackFunction.h) = 80862b28ebbb2182be96da16853903a48c0bc610 -SHA1 (patch-qtwebkit_Source_JavaScriptCore_DerivedSources.pri) = 196feeeaf0ce0e3a4f8c9541bb3ea67b0892f79c -SHA1 (patch-qtwebkit_Source_JavaScriptCore_JavaScriptCore.pri) = 0ce44b200616417357efc6495274c3a682bcd44b -SHA1 (patch-qtwebkit_Source_JavaScriptCore_Target.pri) = 5c86d2733e8288e6ec9bea61907f917953adfc5c -SHA1 (patch-qtwebkit_Source_JavaScriptCore_assembler_ARMAssembler.h) = e1d300fa9e307dc2e905d7a81ba755cd13e5de7e -SHA1 (patch-qtwebkit_Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 5c0b8cdba7590a4dc79715b874868c0d334b5f35 -SHA1 (patch-qtwebkit_Source_JavaScriptCore_bytecode_CodeBlock.cpp) = c720b46af1f38c8feac7c0ec478e54c68c817a82 -SHA1 (patch-qtwebkit_Source_JavaScriptCore_dfg_DFGNode.h) = f52396dd1202bb0716e13cbeff173c5cc3ca8ae1 -SHA1 (patch-qtwebkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 2cbc9cdf08dfbb2d1814fd7a9fe18195700be15f -SHA1 (patch-qtwebkit_Source_JavaScriptCore_offlineasm_cloop.rb) = dc92c4e128df078a2c4d86f08d7fa9dc37ea4845 -SHA1 (patch-qtwebkit_Source_JavaScriptCore_tools_CodeProfiling.cpp) = 77788d99f912fd848006ed371c789cd13ae545a5 -SHA1 (patch-qtwebkit_Source_QtWebKit.pro) = bfa825f3214d5f256143a141fe6bdd16487edeff -SHA1 (patch-qtwebkit_Source_ThirdParty_ANGLE_Target.pri) = 738dae54ba16d7646048a3346ba33f237ff43991 -SHA1 (patch-qtwebkit_Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 9d7d5415a550242d05d11362cdbe090801990247 -SHA1 (patch-qtwebkit_Source_ThirdParty_ANGLE_src_compiler_osinclude.h) = d8a10a6838bdc8c432d1bc89253c25dc50c3f876 -SHA1 (patch-qtwebkit_Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = 119bbdba462346768f3d8c7ff8ff036f6fd5a486 -SHA1 (patch-qtwebkit_Source_WTF_WTF.pro) = 1273b662feaa30ba42cefc1f11fb8854e11405a9 -SHA1 (patch-qtwebkit_Source_WTF_wtf_Assertions.cpp) = b56a5cf3a7f03976f78b7eeac801571aa4fa9142 -SHA1 (patch-qtwebkit_Source_WTF_wtf_InlineASM.h) = f66cfe90357638d868f4c55bd3628305774bdc99 -SHA1 (patch-qtwebkit_Source_WTF_wtf_NumberOfCores.cpp) = b17efd2ba90f28f0184ab5f3f9ef69a72be3ac0f -SHA1 (patch-qtwebkit_Source_WTF_wtf_Platform.h) = a999f608962affebc99f55d93cede5a180b542a9 -SHA1 (patch-qtwebkit_Source_WTF_wtf_RAMSize.cpp) = 4e7412a8eba669bdec436458229a998e782bedd3 -SHA1 (patch-qtwebkit_Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = 5d5a21dd636f0667219af916990740883478b651 -SHA1 (patch-qtwebkit_Source_WTF_wtf_Threading.h) = af279f7004c0f3c446aa3be901e973bf503d3dec -SHA1 (patch-qtwebkit_Source_WTF_wtf_text_StringImpl.h) = fcaf98f905999ab579990ac14d3e3227f5f9f124 -SHA1 (patch-qtwebkit_Source_WebCore_Target.pri) = 8647fb922702e09c78285e217ff999f1ef3e6fe8 -SHA1 (patch-qtwebkit_Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 644d0e005c0d367ae4875998461d2a57ad4e362e -SHA1 (patch-qtwebkit_Source_WebCore_editing_Editor.h) = ac37cddf5a34233ac12c41d3896ba523d66a61d0 -SHA1 (patch-qtwebkit_Source_WebCore_page_NavigatorBase.cpp) = 29c3821bc93967eadb808177f3c3deddb5065eb3 -SHA1 (patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h) = 30cc1874c67834ee31109c7de838ae91bc2cbe61 -SHA1 (patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h) = 08e5ac6d67fb66f80072877cd4eaa1ade94067cc -SHA1 (patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp) = be8e1ab3ed5af934a3f38cd2fabe73249813422f -SHA1 (patch-qtwebkit_Source_WebCore_platform_sql_SQLiteDatabase.cpp) = 6432882b26fb2a1a2e855286905e5d54db82b74f -SHA1 (patch-qtwebkit_Source_WebKit2_DerivedSources.pri) = eb3306cb14e53b6e1712cf95fbc8dadaaee31745 -SHA1 (patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp) = 4e0589307055cb2cb35465c92f596c5a5d0ace06 -SHA1 (patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.h) = 3690a35eb8defb1a746bcde790c8cca050b4faea -SHA1 (patch-qtwebkit_Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = fb5b89c138c061ea9caf05b6d7060db87b713db5 -SHA1 (patch-qtwebkit_Source_WebKit2_Target.pri) = 80bcb27c5f3f168227741fd68b9e67fc0b613eb4 -SHA1 (patch-qtwebkit_Source_WebKit_WebKit1.pro) = 70282ebe8ff4524389fe523063d4d00eef21158e -SHA1 (patch-qtwebkit_Source_WebKit_qt_examples_platformplugin_platformplugin.pro) = 0941eec0ea8e5597d409ee19b5cdf4cd5e6fc42b -SHA1 (patch-qtwebkit_Tools_Scripts_webkitdirs.pm) = 9eca383e4163c15bfbf35dadcd8a8ac06a5beaac -SHA1 (patch-qtwebkit_Tools_WebKitTestRunner_InjectedBundle_Target.pri) = 7e9b37382f7fe7b8e35e7f1e24f7476206a0ca23 -SHA1 (patch-qtwebkit_Tools_qmake_mkspecs_features_functions.prf) = 3a4cc9692de91dd40b80e288679dea7ee3154652 -SHA1 (patch-qtwebkit_Tools_qmake_mkspecs_features_production__build.prf) = 1c2228acb6b638153842d9f865d077596751cd2b +SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd +RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909 +Size (qtbase-opensource-src-5.4.0.tar.xz) = 46109688 bytes +SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764 +SHA1 (patch-configure) = f8b7c04737473af372165d1b8b48891b8e2b446c +SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177 +SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39 +SHA1 (patch-qmake_Makefile.unix) = d07bfa160af94d06546865662bc2049a789fffec +SHA1 (patch-qmake_generators_makefile.cpp) = 9db55a0a64183b9bff830af185ea1eb7c59d296a +SHA1 (patch-qmake_generators_unix_unixmake.cpp) = 8b8f1b6b34c06f50fb1c20c8c13220a7b4b46989 +SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 7c2966006f20390c5b40698f1a110debd0b88c3a +SHA1 (patch-src_concurrent_qtconcurrentiteratekernel.cpp) = abdb069ef9b77ced3c18a9cc9c18bcdfeda02ce8 +SHA1 (patch-src_corelib_arch_sparc_arch.pri) = cb95ec1bb7aa6084f14dff5828854deed54b8ca1 +SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66fd1b85d101 +SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a749109ad5fbcb2180 +SHA1 (patch-src_corelib_io_io.pri) = c4bb37370849bfbc994809825ff94090d71a7116 +SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = 7732cae95975af17e0618667b979c3b84d51adae +SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 6d7f9dc13dabfbdac0d71662794d7fad8b0cf215 +SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d +SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081 +SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 86f828bd545fe53c626fde0a645213077b88ef64 +SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 98a715ce225fcf698cc8389adef82bb67be8310d +SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = 46c40c3d205fc5bffd26dac1b231d7c5a33c2dba +SHA1 (patch-src_tools_moc_main.cpp) = d5888014ad648cb06fa8c348e52102133e6a5f4b +SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1 +SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 7d5ccb008a30238fcf35e763832a494af51ed0ac +SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1 diff --git a/x11/qt5-qtbase/files/patch-qtbase_configure.no-qmake b/x11/qt5-qtbase/files/patch-qtbase_configure.no-qmake deleted file mode 100644 index fec3f1efef8..00000000000 --- a/x11/qt5-qtbase/files/patch-qtbase_configure.no-qmake +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtbase_configure.no-qmake,v 1.2 2014/04/23 07:05:31 adam Exp $ - ---- qtbase/configure.orig 2013-11-29 09:43:56.000000000 +0000 -+++ qtbase/configure -@@ -3889,8 +3889,8 @@ setBootstrapVariable() - getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" - } - --# build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+# does not build qmake -+if false; then - echo "Creating qmake..." - - mkdir -p "$outpath/qmake" || exit diff --git a/x11/qt5-qtbase/files/qmake.conf b/x11/qt5-qtbase/files/qmake.conf index 2633201dd4c..aa2dae361ef 100644 --- a/x11/qt5-qtbase/files/qmake.conf +++ b/x11/qt5-qtbase/files/qmake.conf @@ -16,29 +16,10 @@ QMAKE_LEXFLAGS = QMAKE_YACC = @YACC@ QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = @CFLAGS@ -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -Wall -W -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -fPIC -QMAKE_CFLAGS_APP = -fPIE -QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -QMAKE_CFLAGS_THREAD = -D_REENTRANT +#QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = @CXX@ QMAKE_CXXFLAGS = @CXXFLAGS@ -DQ_TRAILING_DIR_SEP -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_APP = $$QMAKE_CFLAGS_APP -QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD QMAKE_CXXFLAGS_CXX11 = -std=c++0x QMAKE_INCDIR = @LOCALBASE@/include @@ -53,18 +34,17 @@ QMAKE_LINK_SHLIB = @CXX@ QMAKE_LINK_C = @CC@ QMAKE_LINK_C_SHLIB = @CC@ QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) -QMAKE_LFLAGS = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -Wl,-Bdynamic -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -Wl,-soname, -QMAKE_LFLAGS_THREAD = @PTHREAD_LDFLAGS@ -QMAKE_LFLAGS_RPATH = -rpath +# --- from gcc-base-unix.conf +#QMAKE_LFLAGS_SHLIB = -Wl,-Bdynamic +#QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB +#QMAKE_LFLAGS_SONAME = -Wl,-soname, +QMAKE_LFLAGS_THREAD = @PTHREAD_LDFLAGS@ +#QMAKE_LFLAGS_RPATH = -rpath # -Bsymbolic-functions (ld) support #QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions -QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, +#QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, +# --- QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = @@ -82,8 +62,8 @@ QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_UIC3 = $(QTDIR)/bin/uic3 QMAKE_RCC = $(QTDIR)/bin/rcc -QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = @MKDIR@ +include(../common/gcc-base-unix.conf) include(../common/unix.conf) load(qt_config) diff --git a/x11/qt5-qtbase/files/qmake.conf.mac b/x11/qt5-qtbase/files/qmake.conf.mac index f0d8d82279e..b2344287111 100644 --- a/x11/qt5-qtbase/files/qmake.conf.mac +++ b/x11/qt5-qtbase/files/qmake.conf.mac @@ -9,49 +9,21 @@ CONFIG += compile_libtool QMAKE_INCREMENTAL_STYLE = sublib QMAKE_COMPILER = @CC@ -QMAKE_COMPILER_DEFINES = __APPLE__ __GNUC__ QMAKE_CC = @CC@ QMAKE_LEX = @LEX@ QMAKE_LEXFLAGS = QMAKE_YACC = @YACC@ -QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = @CFLAGS@ -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -Wall -W -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -fPIC -QMAKE_CFLAGS_APP = -fPIE -QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -QMAKE_CFLAGS_THREAD = -D_REENTRANT +#QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = @CXX@ QMAKE_CXXFLAGS = @CXXFLAGS@ -DQ_TRAILING_DIR_SEP -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_APP = $$QMAKE_CFLAGS_APP -QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD QMAKE_CXXFLAGS_CXX11 = -std=c++0x -QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS -QMAKE_OBJECTIVE_CFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_OBJECTIVE_CFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_OBJECTIVE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS - QMAKE_INCDIR = @LOCALBASE@/include QMAKE_LIBDIR = @LOCALBASE@/lib -#QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ +#QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ # /System/Library/Frameworks/AGL.framework/Headers/ QMAKE_LINK = @CXX@ @@ -60,16 +32,8 @@ QMAKE_LINK_C = @CC@ QMAKE_LINK_C_SHLIB = @CC@ QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) QMAKE_LFLAGS = @LDFLAGS@ -QMAKE_LFLAGS_RELEASE = -framework Foundation -eMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -single_module -dynamiclib -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE} -QMAKE_LFLAGS_THREAD = @PTHREAD_LDFLAGS@ QMAKE_LFLAGS_RPATH = -QMAKE_LFLAGS_INCREMENTAL= -undefined suppress -flat_namespace -QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE} -QMAKE_LFLAGS_COMPAT_VERSION=-compatibility_version$${LITERAL_WHITESPACE} +QMAKE_LFLAGS_THREAD = @PTHREAD_LDFLAGS@ # -all_load required to make Objective-C categories work in static builds. QMAKE_LFLAGS_STATIC_LIB = -all_load @@ -77,7 +41,6 @@ QMAKE_FIX_RPATH = install_name_tool -id QMAKE_EXTENSION_SHLIB = dylib QMAKE_LIBS = -QMAKE_LFLAGS_RPATH = QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_THREAD = QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL @@ -91,8 +54,8 @@ QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_UIC3 = $(QTDIR)/bin/uic3 QMAKE_RCC = $(QTDIR)/bin/rcc -QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = @MKDIR@ +include(../common/gcc-base-mac.conf) include(../common/unix.conf) load(qt_config) diff --git a/x11/qt5-qtbase/options.mk b/x11/qt5-qtbase/options.mk index 2b1852589d1..7a38f493d6a 100644 --- a/x11/qt5-qtbase/options.mk +++ b/x11/qt5-qtbase/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2014/06/18 09:26:12 wiz Exp $ +# $NetBSD: options.mk,v 1.4 2014/12/30 17:23:45 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qt5 PKG_SUPPORTED_OPTIONS= cups debug gtk2 @@ -13,7 +13,6 @@ CONFIGURE_ARGS+= -no-cups .endif .if !empty(PKG_OPTIONS:Mgtk2) -. include "../../devel/glib2/buildlink3.mk" . include "../../x11/gtk2/buildlink3.mk" CONFIGURE_ARGS+= -gtkstyle .else diff --git a/x11/qt5-qtbase/patches/patch-qtbase_config.tests_unix_iconv_iconv.cpp b/x11/qt5-qtbase/patches/patch-config.tests_unix_iconv_iconv.cpp index ce85444e526..5c3cda5b9ca 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_config.tests_unix_iconv_iconv.cpp +++ b/x11/qt5-qtbase/patches/patch-config.tests_unix_iconv_iconv.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtbase_config.tests_unix_iconv_iconv.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-config.tests_unix_iconv_iconv.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ * Fix for NetBSD iconv(3) ---- qtbase/config.tests/unix/iconv/iconv.cpp.orig 2013-11-27 01:01:17.000000000 +0000 -+++ qtbase/config.tests/unix/iconv/iconv.cpp +--- config.tests/unix/iconv/iconv.cpp.orig 2013-11-27 01:01:17.000000000 +0000 ++++ config.tests/unix/iconv/iconv.cpp @@ -48,7 +48,11 @@ int main(int, char **) { iconv_t x = iconv_open("", ""); diff --git a/x11/qt5-qtbase/patches/patch-qtbase_configure b/x11/qt5-qtbase/patches/patch-configure index fc38d28b0b4..ad5ca165682 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_configure +++ b/x11/qt5-qtbase/patches/patch-configure @@ -1,10 +1,10 @@ -$NetBSD: patch-qtbase_configure,v 1.2 2014/04/23 07:05:31 adam Exp $ +$NetBSD: patch-configure,v 1.1 2014/12/30 17:23:46 adam Exp $ * Don't use SDKs on OS X * Add NetBSD/sparc{,64} support ---- qtbase/configure.orig 2014-02-01 20:37:23.000000000 +0000 -+++ qtbase/configure +--- configure.orig 2014-02-01 20:37:23.000000000 +0000 ++++ configure @@ -319,7 +319,6 @@ getQMakeConf() { if [ -z "$specvals" ]; then diff --git a/x11/qt5-qtbase/patches/patch-qtbase_mkspecs_features_mac_objective__c.prf b/x11/qt5-qtbase/patches/patch-mkspecs_features_mac_objective__c.prf index 73e2a3de03c..4eaff31f3c1 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_mkspecs_features_mac_objective__c.prf +++ b/x11/qt5-qtbase/patches/patch-mkspecs_features_mac_objective__c.prf @@ -1,9 +1,9 @@ -$NetBSD: patch-qtbase_mkspecs_features_mac_objective__c.prf,v 1.1 2014/04/23 07:05:31 adam Exp $ +$NetBSD: patch-mkspecs_features_mac_objective__c.prf,v 1.1 2014/12/30 17:23:46 adam Exp $ Use LIBTOOL for objective-c sources. ---- qtbase/mkspecs/features/mac/objective_c.prf.orig 2014-02-01 20:37:37.000000000 +0000 -+++ qtbase/mkspecs/features/mac/objective_c.prf +--- mkspecs/features/mac/objective_c.prf.orig 2014-02-01 20:37:37.000000000 +0000 ++++ mkspecs/features/mac/objective_c.prf @@ -15,8 +15,8 @@ isEmpty(QMAKE_EXT_OBJECTIVE_C):QMAKE_EXT objective_c.dependency_type = TYPE_C diff --git a/x11/qt5-qtbase/patches/patch-qtbase_mkspecs_features_qt__module__pris.prf b/x11/qt5-qtbase/patches/patch-mkspecs_features_qt__module__pris.prf index 2afa77e55d8..f47a6b42873 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_mkspecs_features_qt__module__pris.prf +++ b/x11/qt5-qtbase/patches/patch-mkspecs_features_qt__module__pris.prf @@ -1,9 +1,9 @@ -$NetBSD: patch-qtbase_mkspecs_features_qt__module__pris.prf,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-mkspecs_features_qt__module__pris.prf,v 1.1 2014/12/30 17:23:46 adam Exp $ * Build libtoolized shared libraries ---- qtbase/mkspecs/features/qt_module_pris.prf.orig 2013-11-27 01:01:16.000000000 +0000 -+++ qtbase/mkspecs/features/qt_module_pris.prf +--- mkspecs/features/qt_module_pris.prf.orig 2013-11-27 01:01:16.000000000 +0000 ++++ mkspecs/features/qt_module_pris.prf @@ -59,7 +59,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$ else: \ module_rundep = diff --git a/x11/qt5-qtbase/patches/patch-qtbase_qmake_Makefile.unix b/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix index 102f45ac569..ddc66c7dfd1 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_qmake_Makefile.unix +++ b/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix @@ -1,10 +1,10 @@ -$NetBSD: patch-qtbase_qmake_Makefile.unix,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-qmake_Makefile.unix,v 1.1 2014/12/30 17:23:46 adam Exp $ * Pass environmental variables from pkgsrc ---- qtbase/qmake/Makefile.unix.orig 2013-11-27 01:01:10.000000000 +0000 -+++ qtbase/qmake/Makefile.unix -@@ -89,7 +89,7 @@ DEPEND_SRC = \ +--- qmake/Makefile.unix.orig 2014-12-05 16:24:30.000000000 +0000 ++++ qmake/Makefile.unix +@@ -92,7 +92,7 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/json/qjsonvalue.cpp \ $(QTSRCS) @@ -13,9 +13,9 @@ $NetBSD: patch-qtbase_qmake_Makefile.unix,v 1.1 2013/12/13 14:38:35 ryoon Exp $ -I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKSRC)/generators -I$(QMKSRC)/generators/unix -I$(QMKSRC)/generators/win32 \ -I$(QMKSRC)/generators/mac -I$(QMKSRC)/generators/integrity \ -I$(INC_PATH) -I$(INC_PATH)/QtCore \ -@@ -102,7 +102,7 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ +@@ -105,7 +105,7 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ - -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_JSON_READONLY + -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_JSON_READONLY -DQT_NO_STANDARDPATHS -CXXFLAGS = $(EXTRA_CXXFLAGS) $(CPPFLAGS) +CXXFLAGS += $(EXTRA_CXXFLAGS) $(CPPFLAGS) diff --git a/x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp b/x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp new file mode 100644 index 00000000000..2c34faa3964 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-qmake_generators_makefile.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ + +* Libtoolized + +--- qmake/generators/makefile.cpp.orig 2014-09-11 10:48:00.000000000 +0000 ++++ qmake/generators/makefile.cpp +@@ -3299,7 +3299,7 @@ MakefileGenerator::writePkgConfigFile() + pkgConfiglibName = "-framework " + bundle + " "; + } else { + if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir)) +- t << "-L${libdir} "; ++ t << "-Wl,-R${libdir} -L${libdir} "; + pkgConfiglibName = "-l" + unescapeFilePath(project->first("QMAKE_ORIG_TARGET")); + if (project->isActiveConfig("shared")) + pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString(); diff --git a/x11/qt5-qtbase/patches/patch-qtbase_qmake_generators_unix_unixmake.cpp b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp index 6c0b336dd5c..94908d4b204 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_qmake_generators_unix_unixmake.cpp +++ b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp @@ -1,20 +1,20 @@ -$NetBSD: patch-qtbase_qmake_generators_unix_unixmake.cpp,v 1.2 2014/08/23 20:25:11 wiz Exp $ +$NetBSD: patch-qmake_generators_unix_unixmake.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ * First chunk, add a whitespace after -rpath. * fix install target so that destdir is added when installing QMAKE_TARGET ---- qtbase/qmake/generators/unix/unixmake.cpp.orig 2014-02-01 20:37:29.000000000 +0000 -+++ qtbase/qmake/generators/unix/unixmake.cpp -@@ -156,7 +156,7 @@ UnixMakefileGenerator::init() - const ProStringList &rpathdirs = project->values("QMAKE_RPATHDIR"); - for(int i = 0; i < rpathdirs.size(); ++i) { - if(!project->isEmpty("QMAKE_LFLAGS_RPATH")) -- project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + escapeFilePath(QFileInfo(rpathdirs[i].toQString()).absoluteFilePath()); -+ project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + " " + escapeFilePath(QFileInfo(rpathdirs[i].toQString()).absoluteFilePath()); +--- qmake/generators/unix/unixmake.cpp.orig 2014-12-05 16:24:30.000000000 +0000 ++++ qmake/generators/unix/unixmake.cpp +@@ -169,7 +169,7 @@ UnixMakefileGenerator::init() + QString rpathdir = rpathdirs[i].toQString(); + if (!rpathdir.startsWith('@') && !rpathdir.startsWith('$')) + rpathdir = QFileInfo(rpathdir).absoluteFilePath(); +- project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + escapeFilePath(rpathdir); ++ project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + " " + escapeFilePath(rpathdir); } } if (!project->isEmpty("QMAKE_RPATHLINKDIR")) { -@@ -346,27 +346,29 @@ UnixMakefileGenerator::init() +@@ -353,27 +353,29 @@ UnixMakefileGenerator::init() if (!strncmp(libtoolify[i], "QMAKE_LINK", 10) || !strcmp(libtoolify[i], "QMAKE_AR_CMD")) { libtool_flags += " --mode=link"; if(project->isActiveConfig("staticlib")) { @@ -54,7 +54,7 @@ $NetBSD: patch-qtbase_qmake_generators_unix_unixmake.cpp,v 1.2 2014/08/23 20:25: } else { libtool_flags += " --mode=compile"; } -@@ -722,7 +724,6 @@ UnixMakefileGenerator::defaultInstall(co +@@ -729,7 +731,6 @@ UnixMakefileGenerator::defaultInstall(co QString targetdir = Option::fixPathToTargetOS(project->first("target.path").toQString(), false); if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep) destdir += Option::dir_sep; @@ -62,7 +62,7 @@ $NetBSD: patch-qtbase_qmake_generators_unix_unixmake.cpp,v 1.2 2014/08/23 20:25: if(targetdir.right(1) != Option::dir_sep) targetdir += Option::dir_sep; -@@ -760,10 +761,18 @@ UnixMakefileGenerator::defaultInstall(co +@@ -769,10 +770,18 @@ UnixMakefileGenerator::defaultInstall(co QString src_targ = target; if(src_targ == "$(TARGET)") src_targ = "$(TARGETL)"; diff --git a/x11/qt5-qtbase/patches/patch-qtbase_qmake_generators_unix_unixmake2.cpp b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp index 89eb62a8ac4..3d81370013d 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_qmake_generators_unix_unixmake2.cpp +++ b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtbase_qmake_generators_unix_unixmake2.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ * Libtoolized ---- qtbase/qmake/generators/unix/unixmake2.cpp.orig 2013-11-27 01:01:10.000000000 +0000 -+++ qtbase/qmake/generators/unix/unixmake2.cpp +--- qmake/generators/unix/unixmake2.cpp.orig 2014-09-11 10:48:00.000000000 +0000 ++++ qmake/generators/unix/unixmake2.cpp @@ -112,12 +112,12 @@ UnixMakefileGenerator::writeMakeParts(QT t << "####### Compiler, tools and options\n\n"; t << "CC = " << var("QMAKE_CC") << endl; @@ -21,7 +21,7 @@ $NetBSD: patch-qtbase_qmake_generators_unix_unixmake2.cpp,v 1.1 2013/12/13 14:38 if(!project->isActiveConfig("no_include_pwd")) { QString pwd = escapeFilePath(fileFixify(qmake_getpwd())); if(pwd.isEmpty()) -@@ -138,8 +138,8 @@ UnixMakefileGenerator::writeMakeParts(QT +@@ -144,8 +144,8 @@ UnixMakefileGenerator::writeMakeParts(QT if(!project->isActiveConfig("staticlib")) { t << "LINK = " << var("QMAKE_LINK") << endl; @@ -32,16 +32,16 @@ $NetBSD: patch-qtbase_qmake_generators_unix_unixmake2.cpp,v 1.1 2013/12/13 14:38 } t << "AR = " << var("QMAKE_AR") << endl; -@@ -227,6 +227,8 @@ UnixMakefileGenerator::writeMakeParts(QT +@@ -234,6 +234,8 @@ UnixMakefileGenerator::writeMakeParts(QT if(!project->isEmpty("QMAKE_BUNDLE")) { t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl; t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; -+ } else if(project->isActiveConfig("compile_libtool")) { -+ t << "TARGETD = " << var("TARGET_la") << endl; - } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) { - t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl; ++ } else if(project->isActiveConfig("compile_libtool")) { ++ t << "TARGETD = " << var("TARGET_la") << endl; + } else if (!project->isActiveConfig("unversioned_libname")) { t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; -@@ -1041,8 +1043,12 @@ void UnixMakefileGenerator::init2() + if (project->isEmpty("QMAKE_HPUX_SHLIB")) { +@@ -1073,8 +1075,12 @@ void UnixMakefileGenerator::init2() } else if (project->isActiveConfig("staticlib")) { project->values("TARGET").first().prepend(project->first("QMAKE_PREFIX_STATICLIB")); project->values("TARGET").first() += "." + project->first("QMAKE_EXTENSION_STATICLIB"); diff --git a/x11/qt5-qtbase/patches/patch-qtbase_qmake_generators_makefile.cpp b/x11/qt5-qtbase/patches/patch-qtbase_qmake_generators_makefile.cpp deleted file mode 100644 index e2ca27a0bdd..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtbase_qmake_generators_makefile.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtbase_qmake_generators_makefile.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Libtoolized - ---- qtbase/qmake/generators/makefile.cpp.orig 2013-11-27 01:01:10.000000000 +0000 -+++ qtbase/qmake/generators/makefile.cpp -@@ -3296,7 +3296,7 @@ MakefileGenerator::writePkgConfigFile() - bundle = bundle.left(suffix); - pkgConfiglibName = "-framework " + bundle + " "; - } else { -- pkgConfiglibDir = "-L${libdir}"; -+ pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}"; - pkgConfiglibName = "-l" + fileInfo(fname).completeBaseName(); - if (project->isActiveConfig("shared")) - pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString(); diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_arch_sparc_arch.pri b/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_arch_sparc_arch.pri deleted file mode 100644 index 1c3682a1664..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_arch_sparc_arch.pri +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtbase_src_corelib_arch_sparc_arch.pri,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Fix for SPARC64 - ---- qtbase/src/corelib/arch/sparc/arch.pri.orig 2013-11-27 01:01:15.000000000 +0000 -+++ qtbase/src/corelib/arch/sparc/arch.pri -@@ -1,7 +1,7 @@ - # - # SPARC architecture - # --*-64* { -+sEqual(QT_HOST_BITSIZE, 64) | *-64* { - SOURCES += $$PWD/qatomic64.s - } - else { diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp b/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp deleted file mode 100644 index e152afaeb38..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp,v 1.2 2014/04/23 07:05:31 adam Exp $ - -* Add NetBSD support - ---- qtbase/src/corelib/io/qfilesystemwatcher.cpp.orig 2014-02-01 20:37:36.000000000 +0000 -+++ qtbase/src/corelib/io/qfilesystemwatcher.cpp -@@ -60,7 +60,7 @@ - # include "qfilesystemwatcher_win_p.h" - #elif defined(USE_INOTIFY) - # include "qfilesystemwatcher_inotify_p.h" --#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) -+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || defined(Q_OS_NETBSD) - # include "qfilesystemwatcher_kqueue_p.h" - #endif - -@@ -74,7 +74,7 @@ QFileSystemWatcherEngine *QFileSystemWat - // there is a chance that inotify may fail on Linux pre-2.6.13 (August - // 2005), so we can't just new inotify directly. - return QInotifyFileSystemWatcherEngine::create(parent); --#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) -+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || defined(Q_OS_NETBSD) - return QKqueueFileSystemWatcherEngine::create(parent); - #else - Q_UNUSED(parent); diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qsettings.cpp b/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qsettings.cpp deleted file mode 100644 index 1a1d2d11464..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qsettings.cpp +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-qtbase_src_corelib_io_qsettings.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Add statvfs(2) support mainly for NetBSD - ---- qtbase/src/corelib/io/qsettings.cpp.orig 2013-11-27 01:01:16.000000000 +0000 -+++ qtbase/src/corelib/io/qsettings.cpp -@@ -144,9 +144,16 @@ QT_END_INCLUDE_NAMESPACE - - Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle) - { -+#ifdef QT_STATVFS -+ struct statvfs buf; -+ if (fstatvfs(handle, &buf) != 0) -+ return false; -+#else - struct statfs buf; - if (fstatfs(handle, &buf) != 0) - return false; -+#endif -+ - return qt_isEvilFsTypeName(buf.f_fstypename); - } - diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_dbus_qdbusintegrator.cpp b/x11/qt5-qtbase/patches/patch-qtbase_src_dbus_qdbusintegrator.cpp deleted file mode 100644 index 07ae2e7b612..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_dbus_qdbusintegrator.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-qtbase_src_dbus_qdbusintegrator.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - ---- qtbase/src/dbus/qdbusintegrator.cpp.orig 2013-11-27 01:01:11.000000000 +0000 -+++ qtbase/src/dbus/qdbusintegrator.cpp -@@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE - static bool isDebugging; - #define qDBusDebug if (!::isDebugging); else qDebug - --Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) -+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) - - static inline QString dbusServiceString() - { return *orgFreedesktopDBusString(); } diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_network_kernel_qhostinfo__unix.cpp b/x11/qt5-qtbase/patches/patch-qtbase_src_network_kernel_qhostinfo__unix.cpp deleted file mode 100644 index 7b5f9304c57..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_network_kernel_qhostinfo__unix.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-qtbase_src_network_kernel_qhostinfo__unix.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - ---- qtbase/src/network/kernel/qhostinfo_unix.cpp.orig 2013-11-27 01:01:10.000000000 +0000 -+++ qtbase/src/network/kernel/qhostinfo_unix.cpp -@@ -126,6 +126,8 @@ static void resolveLibrary() - if (!local_res_nclose) - local_res_ninit = 0; - } -+ if (local_res_ninit) -+ local_res_init = 0; - #endif - } - diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro b/x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro deleted file mode 100644 index e56c20faea2..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro,v 1.1 2014/01/28 08:46:14 ryoon Exp $ - -PR pkg/48553 - ---- qtbase/src/plugins/platforminputcontexts/compose/compose.pro.orig 2013-12-08 17:09:53.000000000 +0000 -+++ qtbase/src/plugins/platforminputcontexts/compose/compose.pro -@@ -16,6 +16,8 @@ SOURCES += $$PWD/main.cpp \ - HEADERS += $$PWD/qcomposeplatforminputcontext.h \ - $$PWD/generator/qtablegenerator.h \ - -+DEFINES += X11BASE=\\\"$$(X11BASE)\\\" -+ - # libxkbcommon - contains(QT_CONFIG, xkbcommon-qt): { - include(../../../3rdparty/xkbcommon.pri) diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp b/x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp deleted file mode 100644 index 1cd4622f1e8..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp,v 1.1 2014/01/28 08:46:14 ryoon Exp $ - -PR pkg/48553 - ---- qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp.orig 2013-12-08 17:09:53.000000000 +0000 -+++ qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -81,6 +81,10 @@ void TableGenerator::initPossibleLocatio - if (qEnvironmentVariableIsSet("QTCOMPOSE")) { - m_possibleLocations.append(QString(qgetenv("QTCOMPOSE"))); - } -+#ifdef X11BASE -+m_possibleLocations.append(QStringLiteral(X11BASE) + QStringLiteral("/share/X11/locale")); -+m_possibleLocations.append(QStringLiteral(X11BASE) + QStringLiteral("/lib/X11/locale")); -+#endif - m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); - m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); - } diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_tools_bootstrap_bootstrap.pro b/x11/qt5-qtbase/patches/patch-qtbase_src_tools_bootstrap_bootstrap.pro deleted file mode 100644 index e72807518e0..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_tools_bootstrap_bootstrap.pro +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-qtbase_src_tools_bootstrap_bootstrap.pro,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Create shared library .so file fo libQt5Bootstrap.la. - ---- qtbase/src/tools/bootstrap/bootstrap.pro.orig 2013-11-27 01:01:11.000000000 +0000 -+++ qtbase/src/tools/bootstrap/bootstrap.pro -@@ -1,4 +1,4 @@ --option(host_build) -+#option(host_build) - - TARGET = QtBootstrap - QT = diff --git a/x11/qt5-qtbase/patches/patch-qtbase_tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro b/x11/qt5-qtbase/patches/patch-qtbase_tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro deleted file mode 100644 index db54be24df9..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtbase_tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-qtbase_tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro,v 1.1 2013/12/15 19:51:19 joerg Exp $ - -Consumes too much memory with Clang. As it is just a test case, -disable optimisation for all compiler. - ---- qtbase/tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro.orig 2013-12-15 15:52:18.000000000 +0000 -+++ qtbase/tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro -@@ -4,4 +4,6 @@ TARGET = tst_qtreewidgetitemiterator - QT += widgets testlib - SOURCES += tst_qtreewidgetitemiterator.cpp - -+QMAKE_CXXFLAGS_WARN_ON= -O0 -+QMAKE_CXXFLAGS_WARN_OFF= -O0 - diff --git a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_3rdparty_masm_wtf_MathExtras.h b/x11/qt5-qtbase/patches/patch-qtdeclarative_src_3rdparty_masm_wtf_MathExtras.h deleted file mode 100644 index 28c41ec0995..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_3rdparty_masm_wtf_MathExtras.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtdeclarative_src_3rdparty_masm_wtf_MathExtras.h,v 1.1 2014/07/14 16:32:14 jperkin Exp $ - -Skip bad section for SunOS, at least newer releases. - ---- qtdeclarative/src/3rdparty/masm/wtf/MathExtras.h.orig 2014-02-01 20:38:03.000000000 +0000 -+++ qtdeclarative/src/3rdparty/masm/wtf/MathExtras.h -@@ -88,7 +88,7 @@ inline double wtf_ceil(double x) { retur - - #endif - --#if OS(SOLARIS) -+#if OS(notSOLARIS) - - namespace std { - diff --git a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4alloca__p.h b/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4alloca__p.h deleted file mode 100644 index 2c6098d8119..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4alloca__p.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtdeclarative_src_qml_jsruntime_qv4alloca__p.h,v 1.2 2014/07/14 16:32:14 jperkin Exp $ - -* NetBSD has no alloca.h - ---- qtdeclarative/src/qml/jsruntime/qv4alloca_p.h.orig 2014-02-01 20:38:02.000000000 +0000 -+++ qtdeclarative/src/qml/jsruntime/qv4alloca_p.h -@@ -49,7 +49,7 @@ - # ifndef __GNUC__ - # define alloca _alloca - # endif --#else -+#elif defined(Q_OS_LINUX) || defined(Q_OS_SOLARIS) - # include <alloca.h> - #endif - diff --git a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4engine.cpp b/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4engine.cpp deleted file mode 100644 index d5ffef9ae1c..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4engine.cpp +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-qtdeclarative_src_qml_jsruntime_qv4engine.cpp,v 1.1 2014/07/14 16:32:14 jperkin Exp $ - -Get stack address/size on SunOS. - ---- qtdeclarative/src/qml/jsruntime/qv4engine.cpp.orig 2014-02-01 20:38:02.000000000 +0000 -+++ qtdeclarative/src/qml/jsruntime/qv4engine.cpp -@@ -109,9 +109,15 @@ quintptr getStackLimit() - # else - void* stackBottom = 0; - pthread_attr_t attr; -- pthread_getattr_np(pthread_self(), &attr); - size_t stackSize = 0; -+# if OS(SOLARIS) -+ pthread_attr_init(&attr); -+ pthread_attr_getstackaddr(&attr, &stackBottom); -+ pthread_attr_getstacksize(&attr, &stackSize); -+# else -+ pthread_getattr_np(pthread_self(), &attr); - pthread_attr_getstack(&attr, &stackBottom, &stackSize); -+# endif - pthread_attr_destroy(&attr); - - # if defined(Q_OS_ANDROID) diff --git a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4mm.cpp b/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4mm.cpp deleted file mode 100644 index b694b37696b..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4mm.cpp +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-qtdeclarative_src_qml_jsruntime_qv4mm.cpp,v 1.1 2014/07/14 16:32:14 jperkin Exp $ - -SunOS needs alloca.h for alloca() -Get stack address/size on SunOS - ---- qtdeclarative/src/qml/jsruntime/qv4mm.cpp.orig 2014-02-01 20:38:02.000000000 +0000 -+++ qtdeclarative/src/qml/jsruntime/qv4mm.cpp -@@ -67,6 +67,10 @@ - #include <sys/storage.h> // __tls() - #endif - -+#if OS(SOLARIS) -+#include <alloca.h> -+#endif -+ - QT_BEGIN_NAMESPACE - - using namespace QV4; -@@ -234,9 +238,15 @@ MemoryManager::MemoryManager() - # else - void* stackBottom = 0; - pthread_attr_t attr; -- pthread_getattr_np(pthread_self(), &attr); - size_t stackSize = 0; -+# if OS(SOLARIS) -+ pthread_attr_init(&attr); -+ pthread_attr_getstackaddr(&attr, &stackBottom); -+ pthread_attr_getstacksize(&attr, &stackSize); -+# else -+ pthread_getattr_np(pthread_self(), &attr); - pthread_attr_getstack(&attr, &stackBottom, &stackSize); -+# endif - pthread_attr_destroy(&attr); - - m_d->stackTop = static_cast<quintptr *>(stackBottom) + stackSize/sizeof(quintptr); diff --git a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4stringobject.cpp b/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4stringobject.cpp deleted file mode 100644 index b0a147a616b..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4stringobject.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-qtdeclarative_src_qml_jsruntime_qv4stringobject.cpp,v 1.1 2014/07/14 16:32:14 jperkin Exp $ - -SunOS needs alloca.h for alloca() - ---- qtdeclarative/src/qml/jsruntime/qv4stringobject.cpp.orig 2014-02-01 20:38:02.000000000 +0000 -+++ qtdeclarative/src/qml/jsruntime/qv4stringobject.cpp -@@ -73,6 +73,10 @@ - # include <windows.h> - #endif - -+#ifdef Q_OS_SOLARIS -+#include <alloca.h> -+#endif -+ - using namespace QV4; - - DEFINE_MANAGED_VTABLE(StringObject); diff --git a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qmldevtools_qmldevtools.pro b/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qmldevtools_qmldevtools.pro deleted file mode 100644 index 9f16c87f800..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qmldevtools_qmldevtools.pro +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-qtdeclarative_src_qmldevtools_qmldevtools.pro,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Create libQtQmlDevTools.so for qttools. - ---- qtdeclarative/src/qmldevtools/qmldevtools.pro.orig 2013-11-27 01:02:16.000000000 +0000 -+++ qtdeclarative/src/qmldevtools/qmldevtools.pro -@@ -1,7 +1,9 @@ --option(host_build) - TARGET = QtQmlDevTools - QT = core --CONFIG += static no_module_headers internal_module -+CONFIG += no_module_headers -+ -+target.path = $$[QT_INSTALL_LIBS] -+INSTALLS += target - - MODULE_INCLUDES = \ - \$\$QT_MODULE_INCLUDE_BASE \ diff --git a/x11/qt5-qtbase/patches/patch-qtdeclarative_tests_auto_qml_qjsengine_tst__qjsengine.cpp b/x11/qt5-qtbase/patches/patch-qtdeclarative_tests_auto_qml_qjsengine_tst__qjsengine.cpp deleted file mode 100644 index fec40711345..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtdeclarative_tests_auto_qml_qjsengine_tst__qjsengine.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtdeclarative_tests_auto_qml_qjsengine_tst__qjsengine.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* NetBSD has no alloca.h - ---- qtdeclarative/tests/auto/qml/qjsengine/tst_qjsengine.cpp.orig 2013-11-27 01:01:54.000000000 +0000 -+++ qtdeclarative/tests/auto/qml/qjsengine/tst_qjsengine.cpp -@@ -57,7 +57,7 @@ - - #if defined(Q_OS_WIN) - #include <malloc.h> --#else -+#elif defined(Q_OS_LINUX) - #include <alloca.h> - #endif - diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp deleted file mode 100644 index f6508377da9..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp,v 1.3 2014/07/24 15:51:56 jperkin Exp $ - -Pull in correct includes on NetBSD and SunOS. - ---- qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp.orig 2014-02-01 20:37:58.000000000 +0000 -+++ qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp -@@ -44,7 +44,14 @@ - #include <QtCore/QDir> - #include <QtCore/QDebug> - -+#ifdef __linux__ - #include <linux/types.h> -+#include <linux/videodev2.h> -+#elif defined(__NetBSD__) -+#include <sys/videoio.h> -+#elif defined(__sun) -+#include <sys/videodev2.h> -+#endif - #include <sys/time.h> - #include <sys/ioctl.h> - #include <sys/poll.h> -@@ -54,7 +61,6 @@ - #include <string.h> - #include <stdlib.h> - #include <sys/mman.h> --#include <linux/videodev2.h> - - QGstreamerVideoInputDeviceControl::QGstreamerVideoInputDeviceControl(QObject *parent) - :QVideoDeviceSelectorControl(parent), m_source(0), m_selectedDevice(0) diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp deleted file mode 100644 index fdadafab893..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ - ---- qtmultimedia/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp.orig 2013-12-20 09:09:03.000000000 +0000 -+++ qtmultimedia/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp -@@ -49,7 +49,12 @@ - #include <QtCore/QDir> - #include <QtCore/QDebug> - -+#if defined(__linux__) - #include <linux/types.h> -+#include <linux/videodev2.h> -+#elif defined(__NetBSD__) -+#include <sys/videoio.h> -+#endif - #include <sys/time.h> - #include <sys/ioctl.h> - #include <sys/poll.h> -@@ -59,7 +64,6 @@ - #include <string.h> - #include <stdlib.h> - #include <sys/mman.h> --#include <linux/videodev2.h> - #include <gst/gst.h> - - // #define QT_SUPPORTEDMIMETYPES_DEBUG diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp deleted file mode 100644 index 20b6615f1be..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ - ---- qtmultimedia/src/plugins/gstreamer/camerabin/camerabincontrol.cpp.orig 2013-12-20 09:31:52.000000000 +0000 -+++ qtmultimedia/src/plugins/gstreamer/camerabin/camerabincontrol.cpp -@@ -50,7 +50,12 @@ - #include <QtCore/qfile.h> - #include <QtCore/qmetaobject.h> - -+#ifdef __linux__ - #include <linux/types.h> -+#include <linux/videodev2.h> -+#elif defined(__NetBSD__) -+#include <sys/videoio.h> -+#endif - #include <sys/time.h> - #include <sys/ioctl.h> - #include <sys/poll.h> -@@ -60,7 +65,6 @@ - #include <string.h> - #include <stdlib.h> - #include <sys/mman.h> --#include <linux/videodev2.h> - - QT_BEGIN_NAMESPACE - diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp deleted file mode 100644 index 233a2dac95e..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp,v 1.2 2014/07/24 15:51:56 jperkin Exp $ - -Pull in correct includes on NetBSD and SunOS. - ---- qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp.orig 2014-02-01 20:37:59.000000000 +0000 -+++ qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp -@@ -50,7 +50,14 @@ - #include "camerabinservice.h" - #include <private/qgstutils_p.h> - -+#ifdef __linux__ - #include <linux/types.h> -+#include <linux/videodev2.h> -+#elif defined(__NetBSD__) -+#include <sys/videoio.h> -+#elif defined(__sun) -+#include <sys/videodev2.h> -+#endif - #include <sys/time.h> - #include <sys/ioctl.h> - #include <sys/poll.h> -@@ -60,7 +67,6 @@ - #include <string.h> - #include <stdlib.h> - #include <sys/mman.h> --#include <linux/videodev2.h> - #include <gst/gst.h> - - QT_BEGIN_NAMESPACE diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp deleted file mode 100644 index c9c73f5fd34..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ - ---- qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp.orig 2013-12-20 09:17:00.000000000 +0000 -+++ qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp -@@ -51,7 +51,12 @@ - #include "qgstreamercaptureservice.h" - #include <private/qgstutils_p.h> - -+#ifdef __linux__ - #include <linux/types.h> -+#include <linux/videodev2.h> -+#elif defined(__NetBSD__) -+#include <sys/videoio.h> -+#endif - #include <sys/time.h> - #include <sys/ioctl.h> - #include <sys/poll.h> -@@ -61,7 +66,6 @@ - #include <string.h> - #include <stdlib.h> - #include <sys/mman.h> --#include <linux/videodev2.h> - #include <gst/gst.h> - - QMediaService* QGstreamerCaptureServicePlugin::create(const QString &key) diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp deleted file mode 100644 index 06bc3cab22d..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp,v 1.2 2014/07/24 15:51:56 jperkin Exp $ - -NetBSD and SunOS don't have support for v4l2_frmsizeenum and related logic. -Should be fixed properly. - -Pull in correct includes on NetBSD and SunOS. - ---- qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp.orig 2014-02-01 20:37:59.000000000 +0000 -+++ qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp -@@ -44,7 +44,14 @@ - #include <QtCore/qdebug.h> - #include <QtCore/qfile.h> - -+#if defined(__linux__) -+#include <linux/videodev2.h> - #include <linux/types.h> -+#elif defined(__NetBSD__) -+#include <sys/videoio.h> -+#elif defined(__sun) -+#include <sys/videodev2.h> -+#endif - #include <sys/time.h> - #include <sys/ioctl.h> - #include <sys/poll.h> -@@ -54,7 +61,6 @@ - #include <string.h> - #include <stdlib.h> - #include <sys/mman.h> --#include <linux/videodev2.h> - - QT_BEGIN_NAMESPACE - static inline uint qHash(const QSize& key) { return uint(key.width()*256+key.height()); } -@@ -154,7 +160,7 @@ void QGstreamerV4L2Input::updateSupporte - - - //get the list of resolutions: -- -+#if !defined(__NetBSD__) && !defined(__sun) - foreach (quint32 format, supportedFormats) { - struct v4l2_frmsizeenum formatSize; - memset(&formatSize, 0, sizeof(formatSize)); -@@ -256,6 +262,7 @@ void QGstreamerV4L2Input::updateSupporte - m_ratesByResolution[s].unite(frameRates.toSet()); - } - } -+#endif - - f.close(); - diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp deleted file mode 100644 index 879c704df15..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ - ---- qtmultimedia/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp.orig 2013-12-20 09:21:00.000000000 +0000 -+++ qtmultimedia/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp -@@ -51,7 +51,12 @@ - #include "qgstreamerplayerservice.h" - #include <private/qgstutils_p.h> - -+#ifdef __linux__ - #include <linux/types.h> -+#include <linux/videodev2.h> -+#elif defined(__NetBSD__) -+#include <sys/videoio.h> -+#endif - #include <sys/time.h> - #include <sys/ioctl.h> - #include <sys/poll.h> -@@ -61,7 +66,6 @@ - #include <string.h> - #include <stdlib.h> - #include <sys/mman.h> --#include <linux/videodev2.h> - #include <gst/gst.h> - - diff --git a/x11/qt5-qtbase/patches/patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_config.h b/x11/qt5-qtbase/patches/patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_config.h deleted file mode 100644 index fac29ef6ffd..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_config.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_config.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Add DragonFly support - ---- qtscript/src/3rdparty/javascriptcore/JavaScriptCore/config.h.orig 2013-11-27 01:00:27.000000000 +0000 -+++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/config.h -@@ -53,7 +53,7 @@ - - #endif - --#if OS(FREEBSD) || OS(OPENBSD) -+#if OS(FREEBSD) || OS(OPENBSD) || OS(DRAGONFLY) - #define HAVE_PTHREAD_NP_H 1 - #endif - diff --git a/x11/qt5-qtbase/patches/patch-qtserialport_src_serialport_qserialport__unix.cpp b/x11/qt5-qtbase/patches/patch-qtserialport_src_serialport_qserialport__unix.cpp deleted file mode 100644 index c56788442c4..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtserialport_src_serialport_qserialport__unix.cpp +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-qtserialport_src_serialport_qserialport__unix.cpp,v 1.1 2014/02/09 17:19:14 wiedi Exp $ - -SunOS doesn't have cfmakeraw ---- qtserialport/src/serialport/qserialport_unix.cpp.orig 2013-12-08 17:09:55.000000000 +0000 -+++ qtserialport/src/serialport/qserialport_unix.cpp -@@ -236,7 +236,15 @@ bool QSerialPortPrivate::open(QIODevice: - } - - currentTermios = restoredTermios; -+#if defined(__sun) -+ currentTermios.c_iflag &= ~(IMAXBEL|IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON); -+ currentTermios.c_oflag &= ~OPOST; -+ currentTermios.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN); -+ currentTermios.c_cflag &= ~(CSIZE|PARENB); -+ currentTermios.c_cflag |= CS8; -+#else - ::cfmakeraw(¤tTermios); -+#endif - currentTermios.c_cflag |= CLOCAL; - currentTermios.c_cc[VTIME] = 0; - currentTermios.c_cc[VMIN] = 0; diff --git a/x11/qt5-qtbase/patches/patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h b/x11/qt5-qtbase/patches/patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h deleted file mode 100644 index 3cdf0781fca..00000000000 --- a/x11/qt5-qtbase/patches/patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - ---- qttools/src/assistant/3rdparty/clucene/src/CLucene/util/Arrays.h.orig 2013-11-27 01:01:52.000000000 +0000 -+++ qttools/src/assistant/3rdparty/clucene/src/CLucene/util/Arrays.h -@@ -151,7 +151,7 @@ CL_NS_DEF(util) - - _itr1 itr1 = val1->begin(); - _itr2 itr2 = val2->begin(); -- while ( --size >= 0 ){ -+ while ( size-- >= 0 ){ - if ( !comp(*itr1,*itr2) ) - return false; - itr1++; diff --git a/x11/qt5-qtbase/patches/patch-qttools_src_designer_src_uitools_uitools.pro b/x11/qt5-qtbase/patches/patch-qttools_src_designer_src_uitools_uitools.pro deleted file mode 100644 index e0404fb49db..00000000000 --- a/x11/qt5-qtbase/patches/patch-qttools_src_designer_src_uitools_uitools.pro +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-qttools_src_designer_src_uitools_uitools.pro,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Libtoolized and build as shared library - ---- qttools/src/designer/src/uitools/uitools.pro.orig 2013-11-27 01:01:52.000000000 +0000 -+++ qttools/src/designer/src/uitools/uitools.pro -@@ -1,5 +1,5 @@ - TARGET = QtUiTools --CONFIG += static -+CONFIG += - QT = core - - QMAKE_DOCS = $$PWD/doc/qtuitools.qdocconf diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_Target.pri b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_Target.pri deleted file mode 100644 index 6bfe11c71ab..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_Target.pri +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-qtwebkit_Source_JavaScriptCore_Target.pri,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Libtoolized -* Build as shared library -* Install libJavaScriptCore library -* Make conditionals for Unix - ---- qtwebkit/Source/JavaScriptCore/Target.pri.orig 2013-11-27 01:01:49.000000000 +0000 -+++ qtwebkit/Source/JavaScriptCore/Target.pri -@@ -13,14 +13,17 @@ WEBKIT += wtf - QT += core - QT -= gui - --CONFIG += staticlib -+#CONFIG += staticlib -+ -+target.path = $$[QT_INSTALL_LIBS] -+INSTALLS += target - - *-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2 - *-g++*:QMAKE_CXXFLAGS_RELEASE += -O3 - - # Rules when JIT enabled (not disabled) - !contains(DEFINES, ENABLE_JIT=0) { -- linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) { -+ unix*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) { - QMAKE_CXXFLAGS += -fno-stack-protector - QMAKE_CFLAGS += -fno-stack-protector - } -@@ -329,7 +332,7 @@ SOURCES += \ - tools/CodeProfiling.cpp \ - yarr/YarrJIT.cpp \ - --linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) { -+unix-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) { - SOURCES += \ - disassembler/UDis86Disassembler.cpp \ - disassembler/udis86/udis86.c \ diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp deleted file mode 100644 index 6dd399e273a..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-qtwebkit_Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Add NetBSD support - ---- qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2013-11-27 01:01:49.000000000 +0000 -+++ qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp -@@ -46,6 +46,8 @@ typedef struct - uint32_t a_val; - } a_un; - } Elf32_auxv_t; -+#elif OS(NETBSD) -+#include <sys/sysctl.h> - # else - # include <asm/hwcap.h> - # endif -@@ -69,6 +71,16 @@ static bool isVFPPresent() - } - #endif - -+#if OS(NETBSD) -+ size_t len; -+ int flag; -+ -+ len = sizeof(flag); -+ if (sysctlbyname("machdep.fpu_present", &flag, &len, NULL, 0) == 0) { -+ return flag == 1; -+ } -+#endif -+ - #if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || (COMPILER(GCC) && defined(__VFP_FP__)) - return true; - #else diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_bytecode_CodeBlock.cpp b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_bytecode_CodeBlock.cpp deleted file mode 100644 index 89cd0bad0a0..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_bytecode_CodeBlock.cpp +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-qtwebkit_Source_JavaScriptCore_bytecode_CodeBlock.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* From http://pkgs.fedoraproject.org/cgit/qt5-qtwebkit.git/tree/qtwebkit-opensource-src-5.2.0-beta1-nojit.patch - Disable JIT support conditionally - ---- qtwebkit/Source/JavaScriptCore/bytecode/CodeBlock.cpp.orig 2013-11-27 01:01:49.000000000 +0000 -+++ qtwebkit/Source/JavaScriptCore/bytecode/CodeBlock.cpp -@@ -2947,8 +2947,12 @@ void CodeBlock::countReoptimization() - - unsigned CodeBlock::numberOfDFGCompiles() - { -+#if ENABLE(JIT) - ASSERT(JITCode::isBaselineCode(getJITType())); - return (JITCode::isOptimizingJIT(replacement()->getJITType()) ? 1 : 0) + m_reoptimizationRetryCounter; -+#else -+ return 0; -+#endif - } - - int32_t CodeBlock::codeTypeThresholdMultiplier() const diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_offlineasm_cloop.rb b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_offlineasm_cloop.rb deleted file mode 100644 index 5a03f07a860..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_offlineasm_cloop.rb +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtwebkit_Source_JavaScriptCore_offlineasm_cloop.rb,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* When JIT is disabled, fix build - ---- qtwebkit/Source/JavaScriptCore/offlineasm/cloop.rb.orig 2013-11-27 01:01:49.000000000 +0000 -+++ qtwebkit/Source/JavaScriptCore/offlineasm/cloop.rb -@@ -398,7 +398,7 @@ def cloopEmitUnaryOperation(operands, ty - end - - def cloopEmitCompareDoubleWithNaNCheckAndBranch(operands, condition) -- $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) || isnan(#{operands[1].clValue(:double)})" -+ $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) || std::isnan(#{operands[1].clValue(:double)})" - $asm.putc " || (#{operands[0].clValue(:double)} #{condition} #{operands[1].clValue(:double)}))" - $asm.putc " goto #{operands[2].cLabel};" - end diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_QtWebKit.pro b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_QtWebKit.pro deleted file mode 100644 index fcaa67fc1a0..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_QtWebKit.pro +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtwebkit_Source_QtWebKit.pro,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Make all libraries as shared, I am not sure... - ---- qtwebkit/Source/QtWebKit.pro.orig 2013-11-27 01:01:51.000000000 +0000 -+++ qtwebkit/Source/QtWebKit.pro -@@ -5,7 +5,7 @@ - # ------------------------------------------------------------------- - - TEMPLATE = subdirs --CONFIG += ordered -+CONFIG += ordered force_static_libs_as_shared - - api.file = api.pri - SUBDIRS += api diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_ThirdParty_ANGLE_src_compiler_glslang.y b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_ThirdParty_ANGLE_src_compiler_glslang.y deleted file mode 100644 index 1ced1890c5d..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_ThirdParty_ANGLE_src_compiler_glslang.y +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtwebkit_Source_ThirdParty_ANGLE_src_compiler_glslang.y,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Fix build with bison 3 - ---- qtwebkit/Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig 2013-11-27 01:01:50.000000000 +0000 -+++ qtwebkit/Source/ThirdParty/ANGLE/src/compiler/glslang.y -@@ -47,7 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glsl - %pure-parser - %parse-param {TParseContext* context} - %locations --%lex-param {YYLEX_PARAM} -+%lex-param {TParseContext* context} - - %union { - #define YYLTYPE TSourceLoc diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_WTF.pro b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_WTF.pro deleted file mode 100644 index c529eeae927..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_WTF.pro +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-qtwebkit_Source_WTF_WTF.pro,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Libtoolized -* Install libWTF shared library - ---- qtwebkit/Source/WTF/WTF.pro.orig 2013-11-27 01:01:20.000000000 +0000 -+++ qtwebkit/Source/WTF/WTF.pro -@@ -8,7 +8,10 @@ TARGET = WTF - - include(WTF.pri) - --CONFIG += staticlib -+#CONFIG += staticlib -+ -+target.path = $$[QT_INSTALL_LIBS] -+INSTALLS += target - - VPATH += $$PWD/wtf - diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_text_StringImpl.h b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_text_StringImpl.h deleted file mode 100644 index 007149d9f38..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_text_StringImpl.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-qtwebkit_Source_WTF_wtf_text_StringImpl.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - ---- qtwebkit/Source/WTF/wtf/text/StringImpl.h.orig 2013-11-27 01:01:21.000000000 +0000 -+++ qtwebkit/Source/WTF/wtf/text/StringImpl.h -@@ -24,6 +24,7 @@ - #define StringImpl_h - - #include <limits.h> -+#include <unistd.h> - #include <wtf/ASCIICType.h> - #include <wtf/Forward.h> - #include <wtf/StdLibExtras.h> diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h deleted file mode 100644 index e1c4efe40d5..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Treat *BSD like Linux - ---- qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h.orig 2013-11-27 01:01:44.000000000 +0000 -+++ qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h -@@ -36,7 +36,7 @@ typedef struct __IOSurface* IOSurfaceRef - typedef IOSurfaceRef PlatformGraphicsSurface; - #endif - --#if OS(LINUX) -+#if OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) - typedef uint32_t PlatformGraphicsSurface; - #endif - diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h deleted file mode 100644 index c6d258b5f36..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Treat *BSD like Linux - ---- qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h.orig 2013-11-27 01:01:44.000000000 +0000 -+++ qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h -@@ -35,7 +35,7 @@ struct GraphicsSurfaceToken { - - #if OS(DARWIN) - typedef mach_port_t BufferHandle; --#elif OS(LINUX) -+#elif OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) - typedef uint32_t BufferHandle; - #elif OS(WINDOWS) - typedef HANDLE BufferHandle; diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_sql_SQLiteDatabase.cpp b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_sql_SQLiteDatabase.cpp deleted file mode 100644 index 39dc6691cae..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_sql_SQLiteDatabase.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-qtwebkit_Source_WebCore_platform_sql_SQLiteDatabase.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - ---- qtwebkit/Source/WebCore/platform/sql/SQLiteDatabase.cpp.orig 2013-11-27 01:01:43.000000000 +0000 -+++ qtwebkit/Source/WebCore/platform/sql/SQLiteDatabase.cpp -@@ -127,7 +127,7 @@ void SQLiteDatabase::interrupt() - if (!m_db) - return; - sqlite3_interrupt(m_db); -- yield(); -+ WTF::yield(); - } - - m_lockingMutex.unlock(); diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit_qt_examples_platformplugin_platformplugin.pro b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit_qt_examples_platformplugin_platformplugin.pro deleted file mode 100644 index 569488c6b79..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit_qt_examples_platformplugin_platformplugin.pro +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-qtwebkit_Source_WebKit_qt_examples_platformplugin_platformplugin.pro,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Fix unprivileged build, - https://bugs.webkit.org/show_bug.cgi?id=117077 - ---- qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro.orig 2013-11-27 01:01:40.000000000 +0000 -+++ qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro -@@ -20,7 +20,8 @@ load(mobilityconfig, true) - } - } - --DESTDIR = $$[QT_INSTALL_PLUGINS]/webkit -+target.path = $$[QT_INSTALL_PLUGINS]/webkit -+INSTALLS += target - - SOURCES += \ - WebPlugin.cpp \ diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Tools_WebKitTestRunner_InjectedBundle_Target.pri b/x11/qt5-qtbase/patches/patch-qtwebkit_Tools_WebKitTestRunner_InjectedBundle_Target.pri deleted file mode 100644 index cfcf8f9c2cf..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Tools_WebKitTestRunner_InjectedBundle_Target.pri +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-qtwebkit_Tools_WebKitTestRunner_InjectedBundle_Target.pri,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Treat NetBSD like Linux - ---- qtwebkit/Tools/WebKitTestRunner/InjectedBundle/Target.pri.orig 2013-11-27 01:01:19.000000000 +0000 -+++ qtwebkit/Tools/WebKitTestRunner/InjectedBundle/Target.pri -@@ -67,6 +67,6 @@ INCLUDEPATH += \ - PREFIX_HEADER = $$PWD/../WebKitTestRunnerPrefix.h - *-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER" - --linux-* { -+linux-*|netbsd-* { - QMAKE_LFLAGS += -Wl,--no-undefined - } diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Tools_qmake_mkspecs_features_production__build.prf b/x11/qt5-qtbase/patches/patch-qtwebkit_Tools_qmake_mkspecs_features_production__build.prf deleted file mode 100644 index 02b21392c2f..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Tools_qmake_mkspecs_features_production__build.prf +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-qtwebkit_Tools_qmake_mkspecs_features_production__build.prf,v 1.1 2013/12/13 14:38:35 ryoon Exp $ - -* Set CONFIGs for non-static (libtoolized) build - ---- qtwebkit/Tools/qmake/mkspecs/features/production_build.prf.orig 2013-11-27 01:01:20.000000000 +0000 -+++ qtwebkit/Tools/qmake/mkspecs/features/production_build.prf -@@ -7,7 +7,7 @@ CONFIG *= use_all_in_one_files - # resulting in the need of several gigabytes of memory at link-time. Reduce the pressure - # by compiling any static library like WTF or JSC with release flags instead and keep debug - # symbols for the static libraries that implement API. --if(linux-*:!contains(QMAKE_HOST.arch, x86_64))|win32-g++*:if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib):staticlib { -+if(linux-*:!contains(QMAKE_HOST.arch, x86_64))|win32-g++*:if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib) { - !equals(TARGET, WebKit2):!equals(TARGET, WebKitWidgets) { - CONFIG += no_debug_info - CONFIG -= separate_debug_info diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_concurrent_qtconcurrentiteratekernel.cpp b/x11/qt5-qtbase/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp index 91ee5f55802..96179d5c078 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_concurrent_qtconcurrentiteratekernel.cpp +++ b/x11/qt5-qtbase/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp @@ -1,7 +1,7 @@ -$NetBSD: patch-qtbase_src_concurrent_qtconcurrentiteratekernel.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-src_concurrent_qtconcurrentiteratekernel.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ ---- qtbase/src/concurrent/qtconcurrentiteratekernel.cpp.orig 2013-11-27 01:01:16.000000000 +0000 -+++ qtbase/src/concurrent/qtconcurrentiteratekernel.cpp +--- src/concurrent/qtconcurrentiteratekernel.cpp.orig 2013-11-27 01:01:16.000000000 +0000 ++++ src/concurrent/qtconcurrentiteratekernel.cpp @@ -41,7 +41,7 @@ #include "qtconcurrentiteratekernel.h" diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_arch_sparc_arch.pri b/x11/qt5-qtbase/patches/patch-src_corelib_arch_sparc_arch.pri new file mode 100644 index 00000000000..bd07d43278b --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_corelib_arch_sparc_arch.pri @@ -0,0 +1,15 @@ +$NetBSD: patch-src_corelib_arch_sparc_arch.pri,v 1.1 2014/12/30 17:23:46 adam Exp $ + +* Fix for SPARC64 + +--- src/corelib/arch/sparc/arch.pri.orig 2013-11-27 01:01:15.000000000 +0000 ++++ src/corelib/arch/sparc/arch.pri +@@ -1,7 +1,7 @@ + # + # SPARC architecture + # +-*-64* { ++sEqual(QT_HOST_BITSIZE, 64) | *-64* { + SOURCES += $$PWD/qatomic64.s + } + else { diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_codecs_qiconvcodec.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp index e75230df6ed..d0277e18e52 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_codecs_qiconvcodec.cpp +++ b/x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-qtbase_src_corelib_codecs_qiconvcodec.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ * Add DragonFly support * Add NetBSD support ---- qtbase/src/corelib/codecs/qiconvcodec.cpp.orig 2013-11-27 01:01:15.000000000 +0000 -+++ qtbase/src/corelib/codecs/qiconvcodec.cpp +--- src/corelib/codecs/qiconvcodec.cpp.orig 2013-11-27 01:01:15.000000000 +0000 ++++ src/corelib/codecs/qiconvcodec.cpp @@ -52,9 +52,14 @@ #include <stdio.h> #include <dlfcn.h> diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_global_qsystemdetection.h b/x11/qt5-qtbase/patches/patch-src_corelib_global_qsystemdetection.h index a001bd69805..36d2bbf4fde 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_global_qsystemdetection.h +++ b/x11/qt5-qtbase/patches/patch-src_corelib_global_qsystemdetection.h @@ -1,9 +1,9 @@ -$NetBSD: patch-qtbase_src_corelib_global_qsystemdetection.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-src_corelib_global_qsystemdetection.h,v 1.1 2014/12/30 17:23:46 adam Exp $ * Add Interix support ---- qtbase/src/corelib/global/qsystemdetection.h.orig 2013-11-27 01:01:15.000000000 +0000 -+++ qtbase/src/corelib/global/qsystemdetection.h +--- src/corelib/global/qsystemdetection.h.orig 2013-11-27 01:01:15.000000000 +0000 ++++ src/corelib/global/qsystemdetection.h @@ -68,6 +68,7 @@ NETBSD - NetBSD OPENBSD - OpenBSD diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_io.pri b/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri index ddebbcb1364..2277629d414 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_io.pri +++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri @@ -1,10 +1,10 @@ -$NetBSD: patch-qtbase_src_corelib_io_io.pri,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-src_corelib_io_io.pri,v 1.1 2014/12/30 17:23:46 adam Exp $ * Add NetBSD support * Add DragonFly support ---- qtbase/src/corelib/io/io.pri.orig 2013-11-27 01:01:16.000000000 +0000 -+++ qtbase/src/corelib/io/io.pri +--- src/corelib/io/io.pri.orig 2013-11-27 01:01:16.000000000 +0000 ++++ src/corelib/io/io.pri @@ -152,7 +152,7 @@ win32 { } diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_io_qfilesystemwatcher.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_io_qfilesystemwatcher.cpp new file mode 100644 index 00000000000..60a4a897a7e --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_qfilesystemwatcher.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-src_corelib_io_qfilesystemwatcher.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ + +* Add NetBSD support + +--- src/corelib/io/qfilesystemwatcher.cpp.orig 2014-09-11 10:48:06.000000000 +0000 ++++ src/corelib/io/qfilesystemwatcher.cpp +@@ -60,7 +60,7 @@ + # include "qfilesystemwatcher_win_p.h" + #elif defined(USE_INOTIFY) + # include "qfilesystemwatcher_inotify_p.h" +-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_IOS) || (defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7) ++#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_IOS) || (defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7) + # include "qfilesystemwatcher_kqueue_p.h" + #elif defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_6 + # include "qfilesystemwatcher_fsevents_p.h" +@@ -76,7 +76,7 @@ QFileSystemWatcherEngine *QFileSystemWat + // there is a chance that inotify may fail on Linux pre-2.6.13 (August + // 2005), so we can't just new inotify directly. + return QInotifyFileSystemWatcherEngine::create(parent); +-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_IOS) || (defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7) ++#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_IOS) || (defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7) + return QKqueueFileSystemWatcherEngine::create(parent); + #elif defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_6 + return QFseventsFileSystemWatcherEngine::create(parent); diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp new file mode 100644 index 00000000000..ed4cffc5d95 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ + +--- src/corelib/io/qstorageinfo_unix.cpp.orig 2014-12-17 11:12:56.000000000 +0000 ++++ src/corelib/io/qstorageinfo_unix.cpp +@@ -118,7 +118,7 @@ public: + inline QByteArray device() const; + private: + #if defined(Q_OS_BSD4) +- statfs *stat_buf; ++ QT_STATFSBUF *stat_buf; + int entryCount; + int currentIndex; + #elif defined(Q_OS_SOLARIS) diff --git a/x11/qt5-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.cpp b/x11/qt5-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.cpp new file mode 100644 index 00000000000..890ce83cdd9 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_network_kernel_qhostinfo__unix.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ + +--- src/network/kernel/qhostinfo_unix.cpp.orig 2013-11-27 01:01:10.000000000 +0000 ++++ src/network/kernel/qhostinfo_unix.cpp +@@ -126,6 +126,8 @@ static void resolveLibrary() + if (!local_res_nclose) + local_res_ninit = 0; + } ++ if (local_res_ninit) ++ local_res_init = 0; + #endif + } + diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_platformsupport_platformsupport.pro b/x11/qt5-qtbase/patches/patch-src_platformsupport_platformsupport.pro index c5dca788d55..a1d97e93d17 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_platformsupport_platformsupport.pro +++ b/x11/qt5-qtbase/patches/patch-src_platformsupport_platformsupport.pro @@ -1,9 +1,9 @@ -$NetBSD: patch-qtbase_src_platformsupport_platformsupport.pro,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-src_platformsupport_platformsupport.pro,v 1.1 2014/12/30 17:23:46 adam Exp $ * Libtoolized and make it shared library ---- qtbase/src/platformsupport/platformsupport.pro.orig 2013-11-27 01:01:11.000000000 +0000 -+++ qtbase/src/platformsupport/platformsupport.pro +--- src/platformsupport/platformsupport.pro.orig 2013-11-27 01:01:11.000000000 +0000 ++++ src/platformsupport/platformsupport.pro @@ -1,7 +1,7 @@ TARGET = QtPlatformSupport QT = core-private gui-private diff --git a/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro b/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro new file mode 100644 index 00000000000..5578fe1c8c8 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro @@ -0,0 +1,15 @@ +$NetBSD: patch-src_plugins_platforminputcontexts_compose_compose.pro,v 1.1 2014/12/30 17:23:46 adam Exp $ + +PR pkg/48553 + +--- src/plugins/platforminputcontexts/compose/compose.pro.orig 2014-09-11 10:48:06.000000000 +0000 ++++ src/plugins/platforminputcontexts/compose/compose.pro +@@ -16,6 +16,8 @@ SOURCES += $$PWD/main.cpp \ + HEADERS += $$PWD/qcomposeplatforminputcontext.h \ + $$PWD/generator/qtablegenerator.h \ + ++DEFINES += X11BASE=\\\"$$(X11BASE)\\\" ++ + # libxkbcommon + contains(QT_CONFIG, xkbcommon-qt): { + # dont't need x11 dependency for compose key plugin diff --git a/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp b/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp new file mode 100644 index 00000000000..3030a4ec883 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ + +PR pkg/48553 + +--- src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp.orig 2014-09-11 10:48:06.000000000 +0000 ++++ src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +@@ -76,6 +76,10 @@ void TableGenerator::initPossibleLocatio + // the QTCOMPOSE environment variable + if (qEnvironmentVariableIsSet("QTCOMPOSE")) + m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); ++#ifdef X11BASE ++ m_possibleLocations.append(QStringLiteral(X11BASE) + QStringLiteral("/share/X11/locale")); ++ m_possibleLocations.append(QStringLiteral(X11BASE) + QStringLiteral("/lib/X11/locale")); ++#endif + m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); + m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); + m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); diff --git a/x11/qt5-qtbase/patches/patch-src_tools_bootstrap_bootstrap.pro b/x11/qt5-qtbase/patches/patch-src_tools_bootstrap_bootstrap.pro new file mode 100644 index 00000000000..f8cc0093b50 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_tools_bootstrap_bootstrap.pro @@ -0,0 +1,12 @@ +$NetBSD: patch-src_tools_bootstrap_bootstrap.pro,v 1.1 2014/12/30 17:23:46 adam Exp $ + +* Create shared library .so file fo libQt5Bootstrap.la. + +--- src/tools/bootstrap/bootstrap.pro.orig 2013-11-27 01:01:11.000000000 +0000 ++++ src/tools/bootstrap/bootstrap.pro +@@ -1,4 +1,4 @@ +-option(host_build) ++#option(host_build) + + TARGET = QtBootstrap + QT = diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_tools_moc_main.cpp b/x11/qt5-qtbase/patches/patch-src_tools_moc_main.cpp index 197feba8041..0a2ccf19e8b 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_tools_moc_main.cpp +++ b/x11/qt5-qtbase/patches/patch-src_tools_moc_main.cpp @@ -1,7 +1,7 @@ -$NetBSD: patch-qtbase_src_tools_moc_main.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-src_tools_moc_main.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ ---- qtbase/src/tools/moc/main.cpp.orig 2013-11-27 01:01:11.000000000 +0000 -+++ qtbase/src/tools/moc/main.cpp +--- src/tools/moc/main.cpp.orig 2013-11-27 01:01:11.000000000 +0000 ++++ src/tools/moc/main.cpp @@ -192,6 +192,8 @@ int runMoc(int argc, char **argv) Moc moc; pp.macros["Q_MOC_RUN"]; diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_widgets_graphicsview_qgraphicsitem__p.h b/x11/qt5-qtbase/patches/patch-src_widgets_graphicsview_qgraphicsitem__p.h index 07d762e656c..658e20ea54a 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_widgets_graphicsview_qgraphicsitem__p.h +++ b/x11/qt5-qtbase/patches/patch-src_widgets_graphicsview_qgraphicsitem__p.h @@ -1,7 +1,7 @@ -$NetBSD: patch-qtbase_src_widgets_graphicsview_qgraphicsitem__p.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-src_widgets_graphicsview_qgraphicsitem__p.h,v 1.1 2014/12/30 17:23:46 adam Exp $ ---- qtbase/src/widgets/graphicsview/qgraphicsitem_p.h.orig 2013-11-27 01:01:12.000000000 +0000 -+++ qtbase/src/widgets/graphicsview/qgraphicsitem_p.h +--- src/widgets/graphicsview/qgraphicsitem_p.h.orig 2013-11-27 01:01:12.000000000 +0000 ++++ src/widgets/graphicsview/qgraphicsitem_p.h @@ -761,7 +761,7 @@ inline bool qt_closestItemFirst(const QG // item1Ancestor is now at the same level as item2Ancestor, but not the same. const QGraphicsItem *p1 = t1; diff --git a/x11/qt5-qtbase/patches/patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro b/x11/qt5-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro index 59499f50c8e..a961adb5c24 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro +++ b/x11/qt5-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro @@ -1,9 +1,9 @@ -$NetBSD: patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro,v 1.2 2014/04/23 07:05:31 adam Exp $ +$NetBSD: patch-tests_auto_corelib_io_qprocess_qprocess.pro,v 1.1 2014/12/30 17:23:46 adam Exp $ * Pass whitespace(s) in filename test cases. ---- qtbase/tests/auto/corelib/io/qprocess/qprocess.pro.orig 2014-02-01 20:37:28.000000000 +0000 -+++ qtbase/tests/auto/corelib/io/qprocess/qprocess.pro +--- tests/auto/corelib/io/qprocess/qprocess.pro.orig 2014-02-01 20:37:28.000000000 +0000 ++++ tests/auto/corelib/io/qprocess/qprocess.pro @@ -3,10 +3,7 @@ TEMPLATE = subdirs include(qprocess.pri) SUBDIRS = $$SUBPROGRAMS diff --git a/x11/qt5-qtbase/patches/patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro b/x11/qt5-qtbase/patches/patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro new file mode 100644 index 00000000000..9667c6da277 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro @@ -0,0 +1,14 @@ +$NetBSD: patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro,v 1.1 2014/12/30 17:23:46 adam Exp $ + +Consumes too much memory with Clang. As it is just a test case, +disable optimisation for all compiler. + +--- tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro.orig 2013-12-15 15:52:18.000000000 +0000 ++++ tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro +@@ -4,4 +4,6 @@ TARGET = tst_qtreewidgetitemiterator + QT += widgets testlib + SOURCES += tst_qtreewidgetitemiterator.cpp + ++QMAKE_CXXFLAGS_WARN_ON= -O0 ++QMAKE_CXXFLAGS_WARN_OFF= -O0 + diff --git a/x11/qt5-qtdeclarative/Makefile b/x11/qt5-qtdeclarative/Makefile index 921f884b116..2eb679bbcd9 100644 --- a/x11/qt5-qtdeclarative/Makefile +++ b/x11/qt5-qtdeclarative/Makefile @@ -1,13 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2014/12/25 13:51:13 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2014/12/30 17:23:46 adam Exp $ +DISTNAME= qtdeclarative-opensource-src-${QTVERSION} PKGNAME= qt5-qtdeclarative-${QTVERSION} -PKGREVISION= 2 COMMENT= Qt5 module for declarative framework -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtdeclarative BUILD_TARGET= sub-tools INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} INSTALLATION_DIRS+= lib/pkgconfig @@ -17,9 +13,8 @@ INSTALLATION_DIRS+= lib/pkgconfig post-install: .for i in Qt5Qml.pc Qt5QmlDevTools.pc Qt5Quick.pc Qt5QuickParticles.pc \ Qt5QuickTest.pc - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" diff --git a/x11/qt5-qtdeclarative/PLIST b/x11/qt5-qtdeclarative/PLIST index bb408b4ade4..31dcfd38b48 100644 --- a/x11/qt5-qtdeclarative/PLIST +++ b/x11/qt5-qtdeclarative/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2014/08/24 07:30:50 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2014/12/30 17:23:46 adam Exp $ lib/pkgconfig/Qt5Qml.pc lib/pkgconfig/Qt5QmlDevTools.pc lib/pkgconfig/Qt5Quick.pc @@ -6,7 +6,9 @@ lib/pkgconfig/Qt5QuickParticles.pc lib/pkgconfig/Qt5QuickTest.pc qt5/bin/qml qt5/bin/qmlbundle +qt5/bin/qmleasing qt5/bin/qmlimportscanner +qt5/bin/qmllint qt5/bin/qmlmin qt5/bin/qmlplugindump qt5/bin/qmlprofiler @@ -16,6 +18,7 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qabstractanimationjob_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qanimationgroupjob_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qanimationjobutil_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qbitfield_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qcontinuinganimationgroupjob_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qdebugmessageservice_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qdeletewatcher_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qfieldlist_p.h @@ -34,6 +37,7 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qpodvector_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qpointervaluepair_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlabstractbinding_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlabstractexpression_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlabstractprofileradapter_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlaccessors_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmladaptormodel_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlapplicationengine_p.h @@ -45,15 +49,15 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlbuiltinfunctions_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlbundle_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlchangeset_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcleanup_p.h -qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcodegenerator_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcompiler_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcomponent_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcomponentattached_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlconfigurabledebugservice_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlconfigurabledebugservice_p_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlconnections_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcontext_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcontextwrapper_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcustomparser_p.h -qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcustomparser_p_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldata_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugserver_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugserverconnection_p.h @@ -64,6 +68,7 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldelegatemodel_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldelegatemodel_p_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldirparser_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlengine_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlenginecontrolservice_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlenginedebugservice_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlexpression_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlextensionplugin_p.h @@ -76,7 +81,7 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinspectorinterface_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinspectorservice_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinstantiator_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinstantiator_p_p.h -qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinstruction_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlirbuilder_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmljavascriptexpression_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmljsast_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmljsastfwd_p.h @@ -106,18 +111,20 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlobjectmodel_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlopenmetaobject_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlplatform_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpool_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlprofiler_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlprofilerdefinitions_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlprofilerservice_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlproperty_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertycache_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertyvalueinterceptor_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlproxymetaobject_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlrefcount_p.h -qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlscript_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlscriptstring_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlstringconverters_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlthread_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltimer_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltrace_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltypecompiler_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltypeloader_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltypenamecache_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltypenotavailable_p.h @@ -137,7 +144,10 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qsequentialanimationgroupjob_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qtqmlglobal_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4alloca_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4argumentsobject_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4arraydata_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4arrayobject_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4assembler_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4binop_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4booleanobject_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4codegen_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4compileddata_p.h @@ -169,17 +179,22 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4lookup_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4managed_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4math_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4mathobject_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4memberdata_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4mm_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4numberobject_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4object_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4objectiterator_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4objectproto_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4persistent_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4profileradapter_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4profiling_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4property_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4qmlextensions_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4qobjectwrapper_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4regalloc_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4regexp_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4regexpobject_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4registerinfo_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4runtime_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4scopedvalue_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4script_p.h @@ -190,15 +205,15 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4sqlerrors_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4ssa_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4string_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4stringobject_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4targetplatform_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4unop_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4util_p.h -qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4value_def_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4value_inl_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4value_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4variantobject_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4vme_moth_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv8debug_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv8engine_p.h -qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv8profiler_p.h -qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv8profilerservice_p.h qt5/include/QtQml/QJSEngine qt5/include/QtQml/QJSValue qt5/include/QtQml/QJSValueIterator @@ -263,7 +278,11 @@ qt5/include/QtQml/qqmlscriptstring.h qt5/include/QtQml/qtqmlglobal.h qt5/include/QtQml/qtqmlversion.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/designerwindowmanager_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qaccessiblequickitem_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qaccessiblequickview_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qqmlaccessible_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickaccessibleattached_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickaccessiblefactory_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanchors_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanchors_p_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanimatedimage_p.h @@ -296,6 +315,7 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickflickablebehavior_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickflipable_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfocusscope_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfontloader_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfontmetrics_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickgridview_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickimage_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickimage_p_p.h @@ -317,6 +337,7 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickloader_p_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickmousearea_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickmousearea_p_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickmultipointtoucharea_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickopenglinfo_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpainteditem_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpath_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpath_p_p.h @@ -328,9 +349,11 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpincharea_p_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpixmapcache_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpositioners_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpositioners_p_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickprofiler_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpropertychanges_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickrectangle_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickrectangle_p_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickrendercontrol_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickrepeater_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickrepeater_p_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickscalegrid_p_p.h @@ -361,6 +384,7 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextedit_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextedit_p_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextinput_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextinput_p_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextmetrics_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextnode_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextnodeengine_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextutil_p.h @@ -372,7 +396,9 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickutilmodule_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickvaluetypes_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickview_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickwindow_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickwindowattached_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickwindowmodule_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgabstractrenderer_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgadaptationlayer_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgareaallocator_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgatlastexture_p.h @@ -383,16 +409,18 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultdistancefieldglyphca qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultglyphnode_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultglyphnode_p_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultimagenode_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultlayer_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultpainternode_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultrectanglenode_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdepthstencilbuffer_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdistancefieldglyphnode_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdistancefieldglyphnode_p_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdistancefieldutil_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgengine_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsggeometry_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgmaterialshader_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgnode_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgnodeupdater_p.h -qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgpainternode_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgrenderer_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgrenderloop_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgrendernode_p.h @@ -407,15 +435,19 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qtquickglobal_p.h qt5/include/QtQuick/QQuickFramebufferObject qt5/include/QtQuick/QQuickImageProvider qt5/include/QtQuick/QQuickItem +qt5/include/QtQuick/QQuickItemGrabResult qt5/include/QtQuick/QQuickPaintedItem +qt5/include/QtQuick/QQuickRenderControl qt5/include/QtQuick/QQuickTextDocument qt5/include/QtQuick/QQuickTextureFactory qt5/include/QtQuick/QQuickTransform qt5/include/QtQuick/QQuickView qt5/include/QtQuick/QQuickWindow +qt5/include/QtQuick/QSGAbstractRenderer qt5/include/QtQuick/QSGBasicGeometryNode qt5/include/QtQuick/QSGClipNode qt5/include/QtQuick/QSGDynamicTexture +qt5/include/QtQuick/QSGEngine qt5/include/QtQuick/QSGFlatColorMaterial qt5/include/QtQuick/QSGGeometry qt5/include/QtQuick/QSGGeometryNode @@ -444,10 +476,14 @@ qt5/include/QtQuick/designersupport.h qt5/include/QtQuick/qquickframebufferobject.h qt5/include/QtQuick/qquickimageprovider.h qt5/include/QtQuick/qquickitem.h +qt5/include/QtQuick/qquickitemgrabresult.h qt5/include/QtQuick/qquickpainteditem.h +qt5/include/QtQuick/qquickrendercontrol.h qt5/include/QtQuick/qquicktextdocument.h qt5/include/QtQuick/qquickview.h qt5/include/QtQuick/qquickwindow.h +qt5/include/QtQuick/qsgabstractrenderer.h +qt5/include/QtQuick/qsgengine.h qt5/include/QtQuick/qsgflatcolormaterial.h qt5/include/QtQuick/qsggeometry.h qt5/include/QtQuick/qsgmaterial.h @@ -505,6 +541,14 @@ qt5/include/QtQuickTest/QtQuickTestVersion qt5/include/QtQuickTest/qtquicktestversion.h qt5/include/QtQuickTest/quicktest.h qt5/include/QtQuickTest/quicktestglobal.h +qt5/include/QtQuickWidgets/${PKGVERSION}/QtQuickWidgets/private/qquickwidget_p.h +qt5/include/QtQuickWidgets/QQuickWidget +qt5/include/QtQuickWidgets/QtQuickWidgets +qt5/include/QtQuickWidgets/QtQuickWidgetsDepends +qt5/include/QtQuickWidgets/QtQuickWidgetsVersion +qt5/include/QtQuickWidgets/qquickwidget.h +qt5/include/QtQuickWidgets/qtquickwidgetsglobal.h +qt5/include/QtQuickWidgets/qtquickwidgetsversion.h qt5/lib/cmake/Qt5Qml/Qt5QmlConfig.cmake qt5/lib/cmake/Qt5Qml/Qt5QmlConfigVersion.cmake qt5/lib/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake @@ -515,7 +559,8 @@ qt5/lib/cmake/Qt5Quick/Qt5QuickConfig.cmake qt5/lib/cmake/Qt5Quick/Qt5QuickConfigVersion.cmake qt5/lib/cmake/Qt5QuickTest/Qt5QuickTestConfig.cmake qt5/lib/cmake/Qt5QuickTest/Qt5QuickTestConfigVersion.cmake -qt5/lib/cmake/Qt5Widgets/Qt5Widgets_AccessibleQuickFactory.cmake +qt5/lib/cmake/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake +qt5/lib/cmake/Qt5QuickWidgets/Qt5QuickWidgetsConfigVersion.cmake qt5/lib/libQt5Qml.la qt5/lib/libQt5Qml.prl qt5/lib/libQt5QmlDevTools.la @@ -526,11 +571,14 @@ qt5/lib/libQt5QuickParticles.la qt5/lib/libQt5QuickParticles.prl qt5/lib/libQt5QuickTest.la qt5/lib/libQt5QuickTest.prl +qt5/lib/libQt5QuickWidgets.la +qt5/lib/libQt5QuickWidgets.prl qt5/lib/pkgconfig/Qt5Qml.pc qt5/lib/pkgconfig/Qt5QmlDevTools.pc qt5/lib/pkgconfig/Qt5Quick.pc qt5/lib/pkgconfig/Qt5QuickParticles.pc qt5/lib/pkgconfig/Qt5QuickTest.pc +qt5/lib/pkgconfig/Qt5QuickWidgets.pc qt5/mkspecs/modules/qt_lib_qml.pri qt5/mkspecs/modules/qt_lib_qml_private.pri qt5/mkspecs/modules/qt_lib_qmldevtools.pri @@ -540,7 +588,8 @@ qt5/mkspecs/modules/qt_lib_qmltest_private.pri qt5/mkspecs/modules/qt_lib_quick.pri qt5/mkspecs/modules/qt_lib_quick_private.pri qt5/mkspecs/modules/qt_lib_quickparticles_private.pri -qt5/plugins/accessible/libqtaccessiblequick.la +qt5/mkspecs/modules/qt_lib_quickwidgets.pri +qt5/mkspecs/modules/qt_lib_quickwidgets_private.pri qt5/plugins/qmltooling/libqmldbg_qtquick2.la qt5/plugins/qmltooling/libqmldbg_tcp.la qt5/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la @@ -551,23 +600,18 @@ qt5/qml/Qt/labs/settings/plugins.qmltypes qt5/qml/Qt/labs/settings/qmldir qt5/qml/QtQml/Models.2/libmodelsplugin.la qt5/qml/QtQml/Models.2/qmldir +qt5/qml/QtQml/StateMachine/libqtqmlstatemachine.la +qt5/qml/QtQml/StateMachine/plugins.qmltypes +qt5/qml/QtQml/StateMachine/qmldir qt5/qml/QtQuick.2/libqtquick2plugin.la qt5/qml/QtQuick.2/plugins.qmltypes qt5/qml/QtQuick.2/qmldir -qt5/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.la -qt5/qml/QtQuick/Dialogs/Private/qmldir -qt5/qml/QtQuick/Dialogs/libdialogplugin.la -qt5/qml/QtQuick/Dialogs/plugins.qmltypes -qt5/qml/QtQuick/Dialogs/qmldir qt5/qml/QtQuick/LocalStorage/libqmllocalstorageplugin.la qt5/qml/QtQuick/LocalStorage/plugins.qmltypes qt5/qml/QtQuick/LocalStorage/qmldir qt5/qml/QtQuick/Particles.2/libparticlesplugin.la qt5/qml/QtQuick/Particles.2/plugins.qmltypes qt5/qml/QtQuick/Particles.2/qmldir -qt5/qml/QtQuick/PrivateWidgets/libwidgetsplugin.la -qt5/qml/QtQuick/PrivateWidgets/plugins.qmltypes -qt5/qml/QtQuick/PrivateWidgets/qmldir qt5/qml/QtQuick/Window.2/libwindowplugin.la qt5/qml/QtQuick/Window.2/plugins.qmltypes qt5/qml/QtQuick/Window.2/qmldir diff --git a/x11/qt5-qtdeclarative/buildlink3.mk b/x11/qt5-qtdeclarative/buildlink3.mk index e9806be6636..e5fd90cbe3c 100644 --- a/x11/qt5-qtdeclarative/buildlink3.mk +++ b/x11/qt5-qtdeclarative/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2014/12/30 17:23:46 adam Exp $ BUILDLINK_TREE+= qt5-qtdeclarative .if !defined(QT5_QTDECLARATIVE_BUILDLINK3_MK) QT5_QTDECLARATIVE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative?= qt5-qtdeclarative>=5.2.1nb2 +BUILDLINK_API_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtdeclarative?= ../../x11/qt5-qtdeclarative BUILDLINK_INCDIRS.qt5-qtdeclarative+= qt5/include diff --git a/x11/qt5-qtdeclarative/distinfo b/x11/qt5-qtdeclarative/distinfo new file mode 100644 index 00000000000..725e78f2404 --- /dev/null +++ b/x11/qt5-qtdeclarative/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $ + +SHA1 (qtdeclarative-opensource-src-5.4.0.tar.xz) = 12c12d50c71cfb1f18c7fabfabe4ad4b364b09fe +RMD160 (qtdeclarative-opensource-src-5.4.0.tar.xz) = b2c19c9bf472f375d78358b11042823964b42774 +Size (qtdeclarative-opensource-src-5.4.0.tar.xz) = 18401844 bytes +SHA1 (patch-examples_quick_customitems_painteditem_painteditem.pro) = a3881ee92daae30130fa665c8686f2e1572ecc1a +SHA1 (patch-src_3rdparty_masm_wtf_MathExtras.h) = 4b86cfe54867a376ea6267e53566e457b577de7b +SHA1 (patch-src_qml_jsruntime_qv4engine.cpp) = 05c365003ae8e83a34b3a51ecb3164f55b8e8809 +SHA1 (patch-src_qml_jsruntime_qv4globalobject.cpp) = 814b0caf6356d687e96e7e4f1ffcc85e64c86348 +SHA1 (patch-src_qmldevtools_qmldevtools.pro) = 647ee5cabb5e63a89c5c49db8d19be05556cf3cf diff --git a/x11/qt5-qtbase/patches/patch-qtdeclarative_examples_quick_customitems_painteditem_painteditem.pro b/x11/qt5-qtdeclarative/patches/patch-examples_quick_customitems_painteditem_painteditem.pro index 6d646587074..39f751bfec4 100644 --- a/x11/qt5-qtbase/patches/patch-qtdeclarative_examples_quick_customitems_painteditem_painteditem.pro +++ b/x11/qt5-qtdeclarative/patches/patch-examples_quick_customitems_painteditem_painteditem.pro @@ -1,9 +1,9 @@ -$NetBSD: patch-qtdeclarative_examples_quick_customitems_painteditem_painteditem.pro,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-examples_quick_customitems_painteditem_painteditem.pro,v 1.1 2014/12/30 17:23:46 adam Exp $ * Avoid conflict between "cp -R" and "libtool --mode=install" ---- qtdeclarative/examples/quick/customitems/painteditem/painteditem.pro.orig 2013-11-27 01:01:54.000000000 +0000 -+++ qtdeclarative/examples/quick/customitems/painteditem/painteditem.pro +--- examples/quick/customitems/painteditem/painteditem.pro.orig 2013-11-27 01:01:54.000000000 +0000 ++++ examples/quick/customitems/painteditem/painteditem.pro @@ -11,7 +11,7 @@ SOURCES += textballoon.cpp RESOURCES += painteditem.qrc diff --git a/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_MathExtras.h b/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_MathExtras.h new file mode 100644 index 00000000000..dd39e9f71b4 --- /dev/null +++ b/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_MathExtras.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_3rdparty_masm_wtf_MathExtras.h,v 1.1 2014/12/30 17:23:46 adam Exp $ + +Skip bad section for SunOS, at least newer releases. + +--- src/3rdparty/masm/wtf/MathExtras.h.orig 2014-02-01 20:38:03.000000000 +0000 ++++ src/3rdparty/masm/wtf/MathExtras.h +@@ -88,7 +88,7 @@ inline double wtf_ceil(double x) { retur + + #endif + +-#if OS(SOLARIS) ++#if OS(notSOLARIS) + + namespace std { + diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp new file mode 100644 index 00000000000..3974825c7c0 --- /dev/null +++ b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp @@ -0,0 +1,25 @@ +$NetBSD: patch-src_qml_jsruntime_qv4engine.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ + +Get stack address/size on SunOS. + +--- src/qml/jsruntime/qv4engine.cpp.orig 2014-09-11 10:48:29.000000000 +0000 ++++ src/qml/jsruntime/qv4engine.cpp +@@ -118,11 +118,17 @@ quintptr getStackLimit() + pthread_attr_t attr; + #if HAVE(PTHREAD_NP_H) && OS(FREEBSD) + if (pthread_attr_get_np(pthread_self(), &attr) == 0) { +-#else ++#elif !OS(SOLARIS) + if (pthread_getattr_np(pthread_self(), &attr) == 0) { + #endif + size_t stackSize = 0; ++#if OS(SOLARIS) ++ pthread_attr_init(&attr); ++ pthread_attr_getstackaddr(&attr, &stackBottom); ++ pthread_attr_getstacksize(&attr, &stackSize); ++#else + pthread_attr_getstack(&attr, &stackBottom, &stackSize); ++#endif + pthread_attr_destroy(&attr); + + # if defined(Q_OS_ANDROID) diff --git a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4globalobject.cpp b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4globalobject.cpp index f38972f5391..a3c70a6b06a 100644 --- a/x11/qt5-qtbase/patches/patch-qtdeclarative_src_qml_jsruntime_qv4globalobject.cpp +++ b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4globalobject.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtdeclarative_src_qml_jsruntime_qv4globalobject.cpp,v 1.1 2014/07/14 16:32:14 jperkin Exp $ +$NetBSD: patch-src_qml_jsruntime_qv4globalobject.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ Avoid "error: call of overloaded <func> is ambiguous" ---- qtdeclarative/src/qml/jsruntime/qv4globalobject.cpp.orig 2014-02-01 20:38:02.000000000 +0000 -+++ qtdeclarative/src/qml/jsruntime/qv4globalobject.cpp +--- src/qml/jsruntime/qv4globalobject.cpp.orig 2014-02-01 20:38:02.000000000 +0000 ++++ src/qml/jsruntime/qv4globalobject.cpp @@ -534,7 +534,7 @@ ReturnedValue GlobalFunctions::method_pa } diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro b/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro new file mode 100644 index 00000000000..4d1f1a26d5f --- /dev/null +++ b/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro @@ -0,0 +1,17 @@ +$NetBSD: patch-src_qmldevtools_qmldevtools.pro,v 1.1 2014/12/30 17:23:46 adam Exp $ + +* Create libQtQmlDevTools.so for qttools. + +--- src/qmldevtools/qmldevtools.pro.orig 2014-09-11 10:48:29.000000000 +0000 ++++ src/qmldevtools/qmldevtools.pro +@@ -1,7 +1,8 @@ +-option(host_build) + TARGET = QtQmlDevTools + QT = core +-CONFIG += static no_module_headers internal_module qmldevtools_build ++CONFIG += no_module_headers qmldevtools_build ++target.path = $$[QT_INSTALL_LIBS] ++INSTALLS += target + + MODULE_INCLUDES = \ + \$\$QT_MODULE_INCLUDE_BASE \ diff --git a/x11/qt5-qtdoc/Makefile b/x11/qt5-qtdoc/Makefile index b3e9baeafcc..95da0257b16 100644 --- a/x11/qt5-qtdoc/Makefile +++ b/x11/qt5-qtdoc/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.10 2014/12/25 13:51:13 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2014/12/30 17:23:46 adam Exp $ +DISTNAME= qtdoc-opensource-src-${QTVERSION} PKGNAME= qt5-qtdoc-${QTVERSION} COMMENT= Qt5 documentations -USE_LIBTOOL= yes - MAKE_ENV+= QTDIR=${QTDIR} -BUILD_DIRS= qtdoc BUILD_TARGET= docs INSTALL_TARGET= install_docs diff --git a/x11/qt5-qtdoc/PLIST b/x11/qt5-qtdoc/PLIST index de97a2c09b0..83fdc360c54 100644 --- a/x11/qt5-qtdoc/PLIST +++ b/x11/qt5-qtdoc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/12/30 17:23:46 adam Exp $ qt5/doc/qtdoc.qch qt5/doc/qtdoc/3rdparty.html qt5/doc/qtdoc/accelerators.html @@ -8,17 +8,23 @@ qt5/doc/qtdoc/accessible-qwidget.html qt5/doc/qtdoc/accessible.html qt5/doc/qtdoc/activeqt-idc.html qt5/doc/qtdoc/activeqt-testcon.html -qt5/doc/qtdoc/addons.html qt5/doc/qtdoc/all-examples.html qt5/doc/qtdoc/android-runtime-licensing-notes.html qt5/doc/qtdoc/android-support.html +qt5/doc/qtdoc/android3rdpartylibs.html qt5/doc/qtdoc/androidgs.html qt5/doc/qtdoc/annotated.html qt5/doc/qtdoc/appicon.html qt5/doc/qtdoc/atomic-operations.html qt5/doc/qtdoc/best-practices.html +qt5/doc/qtdoc/blackberry-support.html +qt5/doc/qtdoc/blackberryappdeploy.html +qt5/doc/qtdoc/blackberrybuild.html +qt5/doc/qtdoc/blackberrygs.html +qt5/doc/qtdoc/blackberryqt5.html qt5/doc/qtdoc/bughowto.html qt5/doc/qtdoc/build-sources.html +qt5/doc/qtdoc/building-from-source-ios.html qt5/doc/qtdoc/classes.html qt5/doc/qtdoc/classesandfunctions.html qt5/doc/qtdoc/cmake-manual.html @@ -29,11 +35,14 @@ qt5/doc/qtdoc/deployment-android.html qt5/doc/qtdoc/deployment-plugins.html qt5/doc/qtdoc/deployment.html qt5/doc/qtdoc/desktop-integration.html +qt5/doc/qtdoc/embedded-linux.html qt5/doc/qtdoc/examples-activeqt.html +qt5/doc/qtdoc/examples-android.html qt5/doc/qtdoc/examples-animation.html -qt5/doc/qtdoc/examples-dbus.html qt5/doc/qtdoc/examples-draganddrop.html qt5/doc/qtdoc/examples-gestures.html +qt5/doc/qtdoc/examples-ios.html +qt5/doc/qtdoc/examples-ipc.html qt5/doc/qtdoc/examples-layouts.html qt5/doc/qtdoc/examples-sql.html qt5/doc/qtdoc/examples-statemachine.html @@ -47,9 +56,9 @@ qt5/doc/qtdoc/functions.html qt5/doc/qtdoc/gettingstarted.html qt5/doc/qtdoc/gettingstartedqml.html qt5/doc/qtdoc/gettingstartedqt.html -qt5/doc/qtdoc/gpl.html qt5/doc/qtdoc/groups.html qt5/doc/qtdoc/hierarchy.html +qt5/doc/qtdoc/highdpi.html qt5/doc/qtdoc/i18n-plural-rules.html qt5/doc/qtdoc/i18n-source-translation.html qt5/doc/qtdoc/i18n.html @@ -57,6 +66,7 @@ qt5/doc/qtdoc/images/accessibleobjecttree.png qt5/doc/qtdoc/images/activeqt-examples.png qt5/doc/qtdoc/images/animatedtiles_snapshot.png qt5/doc/qtdoc/images/animation-examples.png +qt5/doc/qtdoc/images/applicationwindow.png qt5/doc/qtdoc/images/arrow_bc.png qt5/doc/qtdoc/images/bgrContent.png qt5/doc/qtdoc/images/btn_next.png @@ -79,6 +89,9 @@ qt5/doc/qtdoc/images/home.png qt5/doc/qtdoc/images/ico_note.png qt5/doc/qtdoc/images/ico_note_attention.png qt5/doc/qtdoc/images/ico_out.png +qt5/doc/qtdoc/images/icon_QtCreator_78x78px.png +qt5/doc/qtdoc/images/icon_Qt_78x78px.png +qt5/doc/qtdoc/images/icon_Tools.png qt5/doc/qtdoc/images/layout-examples.png qt5/doc/qtdoc/images/logo.png qt5/doc/qtdoc/images/qml-extending-types.png @@ -97,8 +110,6 @@ qt5/doc/qtdoc/images/qml-uses-integratingjs.png qt5/doc/qtdoc/images/qml-uses-layouts-anchors.png qt5/doc/qtdoc/images/qml-uses-layouts-direct.png qt5/doc/qtdoc/images/qml-uses-layouts-positioners.png -qt5/doc/qtdoc/images/qml-uses-styling-text.png -qt5/doc/qtdoc/images/qml-uses-styling.png qt5/doc/qtdoc/images/qml-uses-text.png qt5/doc/qtdoc/images/qml-uses-visual-opacity.png qt5/doc/qtdoc/images/qml-uses-visual-rectangles.png @@ -112,11 +123,12 @@ qt5/doc/qtdoc/images/qt5_particles.jpg qt5/doc/qtdoc/images/qt5_shadereffect.jpg qt5/doc/qtdoc/images/qt5_video.jpg qt5/doc/qtdoc/images/qt5_widgets.jpg -qt5/doc/qtdoc/images/qtdemo.png qt5/doc/qtdoc/images/qtpositioning_weatherinfo_ex.jpg -qt5/doc/qtdoc/images/qtquickcontrols-example-gallery.jpg +qt5/doc/qtdoc/images/qtquickcontrols-example-gallery-android.png +qt5/doc/qtdoc/images/qtquickcontrols-example-gallery-osx.png qt5/doc/qtdoc/images/qtsensors_accelbubble_ex.jpg -qt5/doc/qtdoc/images/quick_controls_touch_ex.jpg +qt5/doc/qtdoc/images/qtwebengine_quicknanobrowser.jpg +qt5/doc/qtdoc/images/scalability-gridlayout.png qt5/doc/qtdoc/images/session.png qt5/doc/qtdoc/images/sql-examples.png qt5/doc/qtdoc/images/thread-examples.png @@ -140,11 +152,6 @@ qt5/doc/qtdoc/linux-issues.html qt5/doc/qtdoc/linux-requirements.html qt5/doc/qtdoc/linux.html qt5/doc/qtdoc/mac-licensing.html -qt5/doc/qtdoc/macosx-building.html -qt5/doc/qtdoc/macosx-deployment.html -qt5/doc/qtdoc/macosx-issues.html -qt5/doc/qtdoc/macosx-requirements.html -qt5/doc/qtdoc/macosx.html qt5/doc/qtdoc/mobiledevelopment.html qt5/doc/qtdoc/moc.html qt5/doc/qtdoc/modules-cpp.html @@ -153,17 +160,28 @@ qt5/doc/qtdoc/modules.html qt5/doc/qtdoc/namespaces.html qt5/doc/qtdoc/newclasses51.html qt5/doc/qtdoc/newclasses52.html +qt5/doc/qtdoc/newclasses53.html +qt5/doc/qtdoc/newclasses54.html qt5/doc/qtdoc/obsoleteclasses.html qt5/doc/qtdoc/obsoleteqmltypes.html qt5/doc/qtdoc/opensourcelicense.html qt5/doc/qtdoc/opensslsupport.html +qt5/doc/qtdoc/osx-building.html +qt5/doc/qtdoc/osx-deployment.html +qt5/doc/qtdoc/osx-issues.html +qt5/doc/qtdoc/osx-requirements.html +qt5/doc/qtdoc/osx.html qt5/doc/qtdoc/overviews-main.html qt5/doc/qtdoc/overviews.html qt5/doc/qtdoc/platform-notes-android.html +qt5/doc/qtdoc/platform-notes-blackberry.html qt5/doc/qtdoc/platform-notes-integrity.html +qt5/doc/qtdoc/platform-notes-ios.html qt5/doc/qtdoc/platform-notes-qnx.html qt5/doc/qtdoc/platform-notes-qtee.html qt5/doc/qtdoc/platform-notes-vxworks.html +qt5/doc/qtdoc/plugins-howto.html +qt5/doc/qtdoc/porting-to-ios.html qt5/doc/qtdoc/portingcppapp.html qt5/doc/qtdoc/portingguide.html qt5/doc/qtdoc/portingqmlapp.html @@ -172,7 +190,9 @@ qt5/doc/qtdoc/publishtogoogleplay.html qt5/doc/qtdoc/qml-codingconventions.html qt5/doc/qtdoc/qml-glossary.html qt5/doc/qtdoc/qmlapplications.html +qt5/doc/qtdoc/qmlbasictypes.html qt5/doc/qtdoc/qmlfirststeps.html +qt5/doc/qtdoc/qmlmodules.html qt5/doc/qtdoc/qmltypes.html qt5/doc/qtdoc/qpa.html qt5/doc/qtdoc/qt-activex.html @@ -185,12 +205,10 @@ qt5/doc/qtdoc/qt5-intro.html qt5/doc/qtdoc/qtce.html qt5/doc/qtdoc/qtconcurrent-mtexamples.html qt5/doc/qtdoc/qtconcurrentexamples.html -qt5/doc/qtdoc/qtdemo.html qt5/doc/qtdoc/qtdoc.index qt5/doc/qtdoc/qtdoc.qhp qt5/doc/qtdoc/qtdoc.qhp.sha1 qt5/doc/qtdoc/qtexamplesandtutorials.html -qt5/doc/qtdoc/qtinstaller.html qt5/doc/qtdoc/qtmain.html qt5/doc/qtdoc/qtmodules.html qt5/doc/qtdoc/qtquick-debugging.html @@ -216,10 +234,12 @@ qt5/doc/qtdoc/scalability.html qt5/doc/qtdoc/session.html qt5/doc/qtdoc/shadow.html qt5/doc/qtdoc/sharedlibrary.html +qt5/doc/qtdoc/signalsandslots-syntaxes.html qt5/doc/qtdoc/sourcebreaks.html qt5/doc/qtdoc/sql-examples.html qt5/doc/qtdoc/string-processing.html qt5/doc/qtdoc/style/offline.css +qt5/doc/qtdoc/style/qt5-sidebar.html qt5/doc/qtdoc/supported-platforms.html qt5/doc/qtdoc/testing-and-debugging.html qt5/doc/qtdoc/third-party-libraries.html @@ -244,10 +264,11 @@ qt5/doc/qtdoc/trademarks.html qt5/doc/qtdoc/uic.html qt5/doc/qtdoc/unicode.html qt5/doc/qtdoc/unix-signals.html -qt5/doc/qtdoc/wayland-introduction.html qt5/doc/qtdoc/whatsnew50.html qt5/doc/qtdoc/whatsnew51.html qt5/doc/qtdoc/whatsnew52.html +qt5/doc/qtdoc/whatsnew53.html +qt5/doc/qtdoc/whatsnew54.html qt5/doc/qtdoc/why-moc.html qt5/doc/qtdoc/wince-with-qt-introduction.html qt5/doc/qtdoc/windows-building.html @@ -258,6 +279,7 @@ qt5/doc/qtdoc/windows-support.html qt5/doc/qtdoc/windowsce-customization.html qt5/doc/qtdoc/windowsce-opengl.html qt5/doc/qtdoc/windowsce-signing.html +qt5/doc/qtdoc/winrt-support.html qt5/doc/qtdoc/xml-examples.html @pkgdir qt5/doc/qtdoc/scripts @pkgdir qt5/doc/qtdoc/images/used-in-examples diff --git a/x11/qt5-qtdoc/distinfo b/x11/qt5-qtdoc/distinfo new file mode 100644 index 00000000000..2d0548b841a --- /dev/null +++ b/x11/qt5-qtdoc/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $ + +SHA1 (qtdoc-opensource-src-5.4.0.tar.xz) = 38dccc28e50525301634eaeaa2c20d71c3938f7a +RMD160 (qtdoc-opensource-src-5.4.0.tar.xz) = e10c7bb33fa44453560eed00feedb025a1132c75 +Size (qtdoc-opensource-src-5.4.0.tar.xz) = 16049796 bytes diff --git a/x11/qt5-qtgraphicaleffects/Makefile b/x11/qt5-qtgraphicaleffects/Makefile index 1fa83def36a..17f460532cf 100644 --- a/x11/qt5-qtgraphicaleffects/Makefile +++ b/x11/qt5-qtgraphicaleffects/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/12/30 17:23:46 adam Exp $ +DISTNAME= qtgraphicaleffects-opensource-src-${QTVERSION} PKGNAME= qt5-qtgraphicaleffects-${QTVERSION} COMMENT= Qt5 module for Graphics effects -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtgraphicaleffects +BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} diff --git a/x11/qt5-qtimageformats/Makefile b/x11/qt5-qtimageformats/Makefile index b3143a21c79..a676f2d634e 100644 --- a/x11/qt5-qtimageformats/Makefile +++ b/x11/qt5-qtimageformats/Makefile @@ -1,12 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/12/30 17:23:46 adam Exp $ +DISTNAME= qtimageformats-opensource-src-${QTVERSION} PKGNAME= qt5-qtimageformats-${QTVERSION} COMMENT= Qt5 module for Image formats -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtimageformats BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} @@ -16,6 +13,9 @@ INSTALLATION_DIRS+= lib/pkgconfig .include "../../x11/qt5-qtbase/Makefile.common" .include "../../archivers/xz/buildlink3.mk" +.include "../../graphics/jasper/buildlink3.mk" +.include "../../graphics/libwebp/buildlink3.mk" +.include "../../graphics/mng/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtimageformats/PLIST b/x11/qt5-qtimageformats/PLIST index d0cc65ba0a0..b85023b9053 100644 --- a/x11/qt5-qtimageformats/PLIST +++ b/x11/qt5-qtimageformats/PLIST @@ -1,9 +1,17 @@ -@comment $NetBSD: PLIST,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/12/30 17:23:46 adam Exp $ +qt5/lib/cmake/Qt5Gui/Qt5Gui_QDDSPlugin.cmake +qt5/lib/cmake/Qt5Gui/Qt5Gui_QICNSPlugin.cmake +qt5/lib/cmake/Qt5Gui/Qt5Gui_QJp2Plugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QMngPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QTgaPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QTiffPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QWbmpPlugin.cmake +qt5/lib/cmake/Qt5Gui/Qt5Gui_QWebpPlugin.cmake +qt5/plugins/imageformats/libqdds.la +qt5/plugins/imageformats/libqicns.la +qt5/plugins/imageformats/libqjp2.la qt5/plugins/imageformats/libqmng.la qt5/plugins/imageformats/libqtga.la qt5/plugins/imageformats/libqtiff.la qt5/plugins/imageformats/libqwbmp.la +qt5/plugins/imageformats/libqwebp.la diff --git a/x11/qt5-qtimageformats/buildlink3.mk b/x11/qt5-qtimageformats/buildlink3.mk index c111eb48f63..ab0df707f0d 100644 --- a/x11/qt5-qtimageformats/buildlink3.mk +++ b/x11/qt5-qtimageformats/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2014/12/30 17:23:46 adam Exp $ BUILDLINK_TREE+= qt5-qtimageformats .if !defined(QT5_QTIMAGEFORMATS_BUILDLINK3_MK) QT5_QTIMAGEFORMATS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtimageformats+= qt5-qtimageformats>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtimageformats?= qt5-qtimageformats>=5.2.1 +BUILDLINK_API_DEPENDS.qt5-qtimageformats+= qt5-qtimageformats>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtimageformats+= qt5-qtimageformats>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtimageformats?= ../../x11/qt5-qtimageformats BUILDLINK_INCDIRS.qt5-qtimageformats+= qt5/include @@ -14,6 +14,9 @@ BUILDLINK_LIBDIRS.qt5-qtimageformats+= qt5/lib BUILDLINK_LIBDIRS.qt5-qtimageformats+= qt5/plugins .include "../../archivers/xz/buildlink3.mk" +.include "../../graphics/jasper/buildlink3.mk" +.include "../../graphics/libwebp/buildlink3.mk" +.include "../../graphics/mng/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .endif # QT5_QTIMAGEFORMATS_BUILDLINK3_MK diff --git a/x11/qt5-qtimageformats/distinfo b/x11/qt5-qtimageformats/distinfo new file mode 100644 index 00000000000..ba20154cfa9 --- /dev/null +++ b/x11/qt5-qtimageformats/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $ + +SHA1 (qtimageformats-opensource-src-5.4.0.tar.xz) = 6590b61c51a186837c3d2058d8192886d970f92a +RMD160 (qtimageformats-opensource-src-5.4.0.tar.xz) = b907cf6bcfec01bf99c5c98f00ee6c14f17b27a1 +Size (qtimageformats-opensource-src-5.4.0.tar.xz) = 2104452 bytes diff --git a/x11/qt5-qtlocation/Makefile b/x11/qt5-qtlocation/Makefile index eb55174c768..a16d499a815 100644 --- a/x11/qt5-qtlocation/Makefile +++ b/x11/qt5-qtlocation/Makefile @@ -1,27 +1,20 @@ -# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/12/30 17:23:46 adam Exp $ +DISTNAME= qtlocation-opensource-src-${QTVERSION} PKGNAME= qt5-qtlocation-${QTVERSION} COMMENT= Qt5 module for qtlocation -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS+= qtlocation BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} - INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} INSTALLATION_DIRS+= lib/pkgconfig -PC_FILES= Qt5Positioning.pc - .include "../../x11/qt5-qtbase/Makefile.common" post-install: -.for i in ${PC_FILES} - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ${LN} -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} +.for i in Qt5Positioning.pc + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor .include "../../x11/qt5-qtdeclarative/buildlink3.mk" diff --git a/x11/qt5-qtlocation/PLIST b/x11/qt5-qtlocation/PLIST index 3ce1249bcd1..f34eb03711d 100644 --- a/x11/qt5-qtlocation/PLIST +++ b/x11/qt5-qtlocation/PLIST @@ -1,12 +1,158 @@ -@comment $NetBSD: PLIST,v 1.2 2013/12/15 09:42:44 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/12/30 17:23:46 adam Exp $ lib/pkgconfig/Qt5Positioning.pc +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qcache3q_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocameracapabilities_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocameradata_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocameratiles_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocodereply_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocodingmanager_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocodingmanagerengine_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomaneuver_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomap_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapcontroller_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapdata_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapdata_p_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanager_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanager_p_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanagerengine_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanagerengine_p_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapscene_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomaptype_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomaptype_p_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroute_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutereply_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeorouterequest_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutesegment_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutingmanager_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutingmanagerengine_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoserviceprovider_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilecache_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapdata_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapdata_p_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmappingmanagerengine_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapreply_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapreply_p_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilefetcher_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilefetcher_p_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilerequestmanager_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilespec_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilespec_p_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplace_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceattribute_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacecategory_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacecontactdetail_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacecontent_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacecontentrequest_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceeditorial_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceicon_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceimage_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacemanagerengine_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceproposedsearchresult_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceratings_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacereply_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceresult_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacereview_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacesearchresult_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacesupplier_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceuser_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/unsupportedreplies_p.h +qt5/include/QtLocation/QGeoCodeReply +qt5/include/QtLocation/QGeoCodingManager +qt5/include/QtLocation/QGeoCodingManagerEngine +qt5/include/QtLocation/QGeoManeuver +qt5/include/QtLocation/QGeoRoute +qt5/include/QtLocation/QGeoRouteReply +qt5/include/QtLocation/QGeoRouteRequest +qt5/include/QtLocation/QGeoRouteSegment +qt5/include/QtLocation/QGeoRoutingManager +qt5/include/QtLocation/QGeoRoutingManagerEngine +qt5/include/QtLocation/QGeoServiceProvider +qt5/include/QtLocation/QGeoServiceProviderFactory +qt5/include/QtLocation/QLocation +qt5/include/QtLocation/QPlace +qt5/include/QtLocation/QPlaceAttribute +qt5/include/QtLocation/QPlaceCategory +qt5/include/QtLocation/QPlaceContactDetail +qt5/include/QtLocation/QPlaceContent +qt5/include/QtLocation/QPlaceContentReply +qt5/include/QtLocation/QPlaceContentRequest +qt5/include/QtLocation/QPlaceDetailsReply +qt5/include/QtLocation/QPlaceEditorial +qt5/include/QtLocation/QPlaceIcon +qt5/include/QtLocation/QPlaceIdReply +qt5/include/QtLocation/QPlaceImage +qt5/include/QtLocation/QPlaceManager +qt5/include/QtLocation/QPlaceManagerEngine +qt5/include/QtLocation/QPlaceMatchReply +qt5/include/QtLocation/QPlaceMatchRequest +qt5/include/QtLocation/QPlaceProposedSearchResult +qt5/include/QtLocation/QPlaceRatings +qt5/include/QtLocation/QPlaceReply +qt5/include/QtLocation/QPlaceResult +qt5/include/QtLocation/QPlaceReview +qt5/include/QtLocation/QPlaceSearchReply +qt5/include/QtLocation/QPlaceSearchRequest +qt5/include/QtLocation/QPlaceSearchResult +qt5/include/QtLocation/QPlaceSearchSuggestionReply +qt5/include/QtLocation/QPlaceSupplier +qt5/include/QtLocation/QPlaceUser +qt5/include/QtLocation/QtLocation +qt5/include/QtLocation/QtLocationDepends +qt5/include/QtLocation/QtLocationVersion +qt5/include/QtLocation/placemacro.h +qt5/include/QtLocation/qgeocodereply.h +qt5/include/QtLocation/qgeocodingmanager.h +qt5/include/QtLocation/qgeocodingmanagerengine.h +qt5/include/QtLocation/qgeomaneuver.h +qt5/include/QtLocation/qgeoroute.h +qt5/include/QtLocation/qgeoroutereply.h +qt5/include/QtLocation/qgeorouterequest.h +qt5/include/QtLocation/qgeoroutesegment.h +qt5/include/QtLocation/qgeoroutingmanager.h +qt5/include/QtLocation/qgeoroutingmanagerengine.h +qt5/include/QtLocation/qgeoserviceprovider.h +qt5/include/QtLocation/qgeoserviceproviderfactory.h +qt5/include/QtLocation/qlocation.h +qt5/include/QtLocation/qlocationglobal.h +qt5/include/QtLocation/qplace.h +qt5/include/QtLocation/qplaceattribute.h +qt5/include/QtLocation/qplacecategory.h +qt5/include/QtLocation/qplacecontactdetail.h +qt5/include/QtLocation/qplacecontent.h +qt5/include/QtLocation/qplacecontentreply.h +qt5/include/QtLocation/qplacecontentrequest.h +qt5/include/QtLocation/qplacedetailsreply.h +qt5/include/QtLocation/qplaceeditorial.h +qt5/include/QtLocation/qplaceicon.h +qt5/include/QtLocation/qplaceidreply.h +qt5/include/QtLocation/qplaceimage.h +qt5/include/QtLocation/qplacemanager.h +qt5/include/QtLocation/qplacemanagerengine.h +qt5/include/QtLocation/qplacematchreply.h +qt5/include/QtLocation/qplacematchrequest.h +qt5/include/QtLocation/qplaceproposedsearchresult.h +qt5/include/QtLocation/qplaceratings.h +qt5/include/QtLocation/qplacereply.h +qt5/include/QtLocation/qplaceresult.h +qt5/include/QtLocation/qplacereview.h +qt5/include/QtLocation/qplacesearchreply.h +qt5/include/QtLocation/qplacesearchrequest.h +qt5/include/QtLocation/qplacesearchresult.h +qt5/include/QtLocation/qplacesearchsuggestionreply.h +qt5/include/QtLocation/qplacesupplier.h +qt5/include/QtLocation/qplaceuser.h +qt5/include/QtLocation/qtlocationversion.h qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdeclarativegeoaddress_p.h qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdeclarativegeolocation_p.h +qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdoublevector2d_p.h +qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdoublevector3d_p.h qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeoaddress_p.h qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeocircle_p.h qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeocoordinate_p.h qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeolocation_p.h qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeopositioninfosource_p.h +qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeoprojection_p.h qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeorectangle_p.h qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeoshape_p.h qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qlocationutils_p.h @@ -44,14 +190,29 @@ qt5/include/QtPositioning/qgeoshape.h qt5/include/QtPositioning/qnmeapositioninfosource.h qt5/include/QtPositioning/qpositioningglobal.h qt5/include/QtPositioning/qtpositioningversion.h +qt5/lib/cmake/Qt5Location/Qt5LocationConfig.cmake +qt5/lib/cmake/Qt5Location/Qt5LocationConfigVersion.cmake +qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryNokia.cmake +qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake qt5/lib/cmake/Qt5Positioning/Qt5PositioningConfig.cmake qt5/lib/cmake/Qt5Positioning/Qt5PositioningConfigVersion.cmake +qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryPoll.cmake +qt5/lib/libQt5Location.la +qt5/lib/libQt5Location.prl qt5/lib/libQt5Positioning.la qt5/lib/libQt5Positioning.prl +qt5/lib/pkgconfig/Qt5Location.pc qt5/lib/pkgconfig/Qt5Positioning.pc +qt5/mkspecs/modules/qt_lib_location.pri +qt5/mkspecs/modules/qt_lib_location_private.pri qt5/mkspecs/modules/qt_lib_positioning.pri qt5/mkspecs/modules/qt_lib_positioning_private.pri +qt5/plugins/geoservices/libqtgeoservices_nokia.la +qt5/plugins/geoservices/libqtgeoservices_osm.la qt5/plugins/position/libqtposition_positionpoll.la +qt5/qml/QtLocation/libdeclarative_location.la +qt5/qml/QtLocation/plugins.qmltypes +qt5/qml/QtLocation/qmldir qt5/qml/QtPositioning/libdeclarative_positioning.la qt5/qml/QtPositioning/plugins.qmltypes qt5/qml/QtPositioning/qmldir diff --git a/x11/qt5-qtlocation/buildlink3.mk b/x11/qt5-qtlocation/buildlink3.mk index cef2a7ccc76..d7c224fb4c5 100644 --- a/x11/qt5-qtlocation/buildlink3.mk +++ b/x11/qt5-qtlocation/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2014/12/30 17:23:46 adam Exp $ BUILDLINK_TREE+= qt5-qtlocation .if !defined(QT5_QTLOCATION_BUILDLINK3_MK) QT5_QTLOCATION_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtlocation+= qt5-qtlocation>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtlocation?= qt5-qtlocation>=5.2.1 +BUILDLINK_API_DEPENDS.qt5-qtlocation+= qt5-qtlocation>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtlocation+= qt5-qtlocation>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtlocation?= ../../x11/qt5-qtlocation BUILDLINK_INCDIRS.qt5-qtlocation+= qt5/include diff --git a/x11/qt5-qtlocation/distinfo b/x11/qt5-qtlocation/distinfo new file mode 100644 index 00000000000..301dbd6f8ee --- /dev/null +++ b/x11/qt5-qtlocation/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $ + +SHA1 (qtlocation-opensource-src-5.4.0.tar.xz) = c47e80c4282f96de843d90341f93cd0f48333284 +RMD160 (qtlocation-opensource-src-5.4.0.tar.xz) = 575c3660a81fc285b331a23d49df43dd5d070006 +Size (qtlocation-opensource-src-5.4.0.tar.xz) = 3297720 bytes diff --git a/x11/qt5-qtmacextras/DESCR b/x11/qt5-qtmacextras/DESCR new file mode 100644 index 00000000000..b85eba05d75 --- /dev/null +++ b/x11/qt5-qtmacextras/DESCR @@ -0,0 +1 @@ +Qt5 module for X11 extras diff --git a/x11/qt5-qtmacextras/Makefile b/x11/qt5-qtmacextras/Makefile new file mode 100644 index 00000000000..e09369c16b2 --- /dev/null +++ b/x11/qt5-qtmacextras/Makefile @@ -0,0 +1,20 @@ +# $NetBSD: Makefile,v 1.1 2014/12/30 17:23:46 adam Exp $ + +DISTNAME= qtmacextras-opensource-src-${QTVERSION} +PKGNAME= qt5-qtmacextras-${QTVERSION} +COMMENT= Qt5 module for Mac extras + +BUILD_TARGET= sub-src +INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} +INSTALLATION_DIRS+= lib/pkgconfig + +.include "../../x11/qt5-qtbase/Makefile.common" + +post-install: +.for i in Qt5MacExtras.pc + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} +.endfor + +.include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtmacextras/PLIST b/x11/qt5-qtmacextras/PLIST new file mode 100644 index 00000000000..dbf6e9c4d67 --- /dev/null +++ b/x11/qt5-qtmacextras/PLIST @@ -0,0 +1,27 @@ +@comment $NetBSD: PLIST,v 1.1 2014/12/30 17:23:46 adam Exp $ +lib/pkgconfig/Qt5MacExtras.pc +qt5/include/QtMacExtras/${PKGVERSION}/QtMacExtras/private/qmacfunctions_p.h +qt5/include/QtMacExtras/${PKGVERSION}/QtMacExtras/private/qmactoolbar_p.h +qt5/include/QtMacExtras/${PKGVERSION}/QtMacExtras/private/qmactoolbardelegate_p.h +qt5/include/QtMacExtras/${PKGVERSION}/QtMacExtras/private/qmactoolbaritem_p.h +qt5/include/QtMacExtras/${PKGVERSION}/QtMacExtras/private/qnstoolbar_p.h +qt5/include/QtMacExtras/QMacPasteboardMime +qt5/include/QtMacExtras/QMacToolBar +qt5/include/QtMacExtras/QMacToolBarItem +qt5/include/QtMacExtras/QtMac +qt5/include/QtMacExtras/QtMacExtras +qt5/include/QtMacExtras/QtMacExtrasDepends +qt5/include/QtMacExtras/QtMacExtrasVersion +qt5/include/QtMacExtras/qmacextrasglobal.h +qt5/include/QtMacExtras/qmacfunctions.h +qt5/include/QtMacExtras/qmacpasteboardmime.h +qt5/include/QtMacExtras/qmactoolbar.h +qt5/include/QtMacExtras/qmactoolbaritem.h +qt5/include/QtMacExtras/qtmacextrasversion.h +qt5/lib/cmake/Qt5MacExtras/Qt5MacExtrasConfig.cmake +qt5/lib/cmake/Qt5MacExtras/Qt5MacExtrasConfigVersion.cmake +qt5/lib/libQt5MacExtras.la +qt5/lib/libQt5MacExtras.prl +qt5/lib/pkgconfig/Qt5MacExtras.pc +qt5/mkspecs/modules/qt_lib_macextras.pri +qt5/mkspecs/modules/qt_lib_macextras_private.pri diff --git a/x11/qt5-qtmacextras/buildlink3.mk b/x11/qt5-qtmacextras/buildlink3.mk new file mode 100644 index 00000000000..0a95e4e5fd9 --- /dev/null +++ b/x11/qt5-qtmacextras/buildlink3.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink3.mk,v 1.1 2014/12/30 17:23:46 adam Exp $ + +BUILDLINK_TREE+= qt5-qtmacextras + +.if !defined(QT5_QTMACEXTRAS_BUILDLINK3_MK) +QT5_QTMACEXTRAS_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.qt5-qtmacextras+= qt5-qtmacextras>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtmacextras+= qt5-qtmacextras>=5.4.0 +BUILDLINK_PKGSRCDIR.qt5-qtmacextras?= ../../x11/qt5-qtmacextras + +BUILDLINK_INCDIRS.qt5-qtmacextras+= qt5/include +BUILDLINK_LIBDIRS.qt5-qtmacextras+= qt5/lib +BUILDLINK_LIBDIRS.qt5-qtmacextras+= qt5/plugins + +.include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" +.endif # QT5_QTMACEXTRAS_BUILDLINK3_MK + +BUILDLINK_TREE+= -qt5-qtmacextras diff --git a/x11/qt5-qtmacextras/distinfo b/x11/qt5-qtmacextras/distinfo new file mode 100644 index 00000000000..336a62aedb7 --- /dev/null +++ b/x11/qt5-qtmacextras/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $ + +SHA1 (qtmacextras-opensource-src-5.4.0.tar.xz) = 0502d71f1f2fef71f428bdde0aff734c2fc4b382 +RMD160 (qtmacextras-opensource-src-5.4.0.tar.xz) = 726b7f8f3172d511955259eb6b63d6fa6eff27a3 +Size (qtmacextras-opensource-src-5.4.0.tar.xz) = 38424 bytes diff --git a/x11/qt5-qtmultimedia/Makefile b/x11/qt5-qtmultimedia/Makefile index c5dde9989df..9821a4a865d 100644 --- a/x11/qt5-qtmultimedia/Makefile +++ b/x11/qt5-qtmultimedia/Makefile @@ -1,15 +1,11 @@ -# $NetBSD: Makefile,v 1.10 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2014/12/30 17:23:46 adam Exp $ +DISTNAME= qtmultimedia-opensource-src-${QTVERSION} PKGNAME= qt5-qtmultimedia-${QTVERSION} COMMENT= Qt5 module for multimedia -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtmultimedia BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} - INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} INSTALLATION_DIRS+= lib/pkgconfig @@ -17,9 +13,8 @@ INSTALLATION_DIRS+= lib/pkgconfig post-install: .for i in Qt5Multimedia.pc Qt5MultimediaQuick_p.pc Qt5MultimediaWidgets.pc - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor .if ${OPSYS} != "Darwin" diff --git a/x11/qt5-qtmultimedia/PLIST b/x11/qt5-qtmultimedia/PLIST index 6b4fa9cf281..c72a4d6c30d 100644 --- a/x11/qt5-qtmultimedia/PLIST +++ b/x11/qt5-qtmultimedia/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2014/04/23 07:05:32 adam Exp $ +@comment $NetBSD: PLIST,v 1.5 2014/12/30 17:23:46 adam Exp $ lib/pkgconfig/Qt5Multimedia.pc lib/pkgconfig/Qt5MultimediaQuick_p.pc lib/pkgconfig/Qt5MultimediaWidgets.pc @@ -7,13 +7,10 @@ qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/playlistfileparser_p qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qabstractvideobuffer_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiobuffer_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiodevicefactory_p.h -qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiodeviceinfo_alsa_p.h -qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiodeviceinfo_win32_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiohelpers_p.h -qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudioinput_alsa_p.h -qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudioinput_win32_p.h -qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiooutput_alsa_p.h -qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiooutput_win32_p.h +qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qcamera_p.h +qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qdeclarativevideooutput_backend_p.h +qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qdeclarativevideooutput_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstappsrc_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstbufferpoolinterface_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstcodecsinfo_p.h @@ -34,6 +31,7 @@ qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qimagevideobuffer_p. qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediacontrol_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmedianetworkplaylistprovider_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaobject_p.h +qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaopenglhelper_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaplaylist_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaplaylistcontrol_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaplaylistioplugin_p.h @@ -47,6 +45,7 @@ qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaresourcepolicy qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaresourceset_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaservice_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaserviceprovider_p.h +qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediastoragelocation_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmemoryvideobuffer_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qsamplecache_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qsgvideonode_p.h @@ -60,6 +59,7 @@ qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwavedecoder_p.h qt5/include/QtMultimedia/QAbstractAudioDeviceInfo qt5/include/QtMultimedia/QAbstractAudioInput qt5/include/QtMultimedia/QAbstractAudioOutput +qt5/include/QtMultimedia/QAbstractPlanarVideoBuffer qt5/include/QtMultimedia/QAbstractVideoBuffer qt5/include/QtMultimedia/QAbstractVideoSurface qt5/include/QtMultimedia/QAudio @@ -94,6 +94,8 @@ qt5/include/QtMultimedia/QCameraImageCapture qt5/include/QtMultimedia/QCameraImageCaptureControl qt5/include/QtMultimedia/QCameraImageProcessing qt5/include/QtMultimedia/QCameraImageProcessingControl +qt5/include/QtMultimedia/QCameraInfo +qt5/include/QtMultimedia/QCameraInfoControl qt5/include/QtMultimedia/QCameraLocksControl qt5/include/QtMultimedia/QCameraViewfinderSettingsControl qt5/include/QtMultimedia/QCameraZoomControl @@ -117,6 +119,8 @@ qt5/include/QtMultimedia/QMediaRecorderControl qt5/include/QtMultimedia/QMediaResource qt5/include/QtMultimedia/QMediaResourceList qt5/include/QtMultimedia/QMediaService +qt5/include/QtMultimedia/QMediaServiceCameraInfoInterface +qt5/include/QtMultimedia/QMediaServiceDefaultDeviceInterface qt5/include/QtMultimedia/QMediaServiceFeaturesInterface qt5/include/QtMultimedia/QMediaServiceProviderFactoryInterface qt5/include/QtMultimedia/QMediaServiceProviderHint @@ -178,6 +182,8 @@ qt5/include/QtMultimedia/qcameraimagecapture.h qt5/include/QtMultimedia/qcameraimagecapturecontrol.h qt5/include/QtMultimedia/qcameraimageprocessing.h qt5/include/QtMultimedia/qcameraimageprocessingcontrol.h +qt5/include/QtMultimedia/qcamerainfo.h +qt5/include/QtMultimedia/qcamerainfocontrol.h qt5/include/QtMultimedia/qcameralockscontrol.h qt5/include/QtMultimedia/qcameraviewfindersettingscontrol.h qt5/include/QtMultimedia/qcamerazoomcontrol.h @@ -223,9 +229,20 @@ qt5/include/QtMultimedia/qvideoprobe.h qt5/include/QtMultimedia/qvideorenderercontrol.h qt5/include/QtMultimedia/qvideosurfaceformat.h qt5/include/QtMultimedia/qvideowindowcontrol.h +qt5/include/QtMultimediaQuick_p/${PKGVERSION}/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h +qt5/include/QtMultimediaQuick_p/${PKGVERSION}/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h +qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_I420 +qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB +qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture +qt5/include/QtMultimediaQuick_p/QSGVideoNode_I420 +qt5/include/QtMultimediaQuick_p/QSGVideoNode_RGB +qt5/include/QtMultimediaQuick_p/QSGVideoNode_Texture qt5/include/QtMultimediaQuick_p/QtMultimediaQuick_p qt5/include/QtMultimediaQuick_p/QtMultimediaQuick_pDepends qt5/include/QtMultimediaQuick_p/QtMultimediaQuick_pVersion +qt5/include/QtMultimediaQuick_p/qsgvideonode_i420.h +qt5/include/QtMultimediaQuick_p/qsgvideonode_rgb.h +qt5/include/QtMultimediaQuick_p/qsgvideonode_texture.h qt5/include/QtMultimediaQuick_p/qtmultimediaquick_pversion.h qt5/include/QtMultimediaWidgets/${PKGVERSION}/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h qt5/include/QtMultimediaWidgets/${PKGVERSION}/QtMultimediaWidgets/private/qpaintervideosurface_p.h @@ -245,6 +262,15 @@ qt5/include/QtMultimediaWidgets/qvideowidget.h qt5/include/QtMultimediaWidgets/qvideowidgetcontrol.h qt5/lib/cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake qt5/lib/cmake/Qt5Multimedia/Qt5MultimediaConfigVersion.cmake +${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AVFMediaPlayerServicePlugin.cmake +${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AVFServicePlugin.cmake +${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AudioCaptureServicePlugin.cmake +${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CoreAudioPlugin.cmake +${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake +${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerAudioDecoderServicePlugin.cmake +${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerCaptureServicePlugin.cmake +${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerPlayerServicePlugin.cmake +qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QM3uPlaylistPlugin.cmake qt5/lib/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake qt5/lib/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfigVersion.cmake qt5/lib/libQt5Multimedia.la @@ -266,7 +292,6 @@ qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri ${PLIST.mac}qt5/plugins/audio/libqtaudio_coreaudio.la ${PLIST.mac}qt5/plugins/mediaservice/libqavfcamera.la ${PLIST.mac}qt5/plugins/mediaservice/libqavfmediaplayer.la -${PLIST.mac}qt5/plugins/mediaservice/libqqt7engine.la ${PLIST.mac}qt5/plugins/mediaservice/libqtmedia_audioengine.la ${PLIST.unix}qt5/plugins/mediaservice/libgstaudiodecoder.la ${PLIST.unix}qt5/plugins/mediaservice/libgstcamerabin.la diff --git a/x11/qt5-qtmultimedia/buildlink3.mk b/x11/qt5-qtmultimedia/buildlink3.mk index 6544bd54d33..db53207751b 100644 --- a/x11/qt5-qtmultimedia/buildlink3.mk +++ b/x11/qt5-qtmultimedia/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2014/06/09 14:18:04 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2014/12/30 17:23:46 adam Exp $ BUILDLINK_TREE+= qt5-qtmultimedia .if !defined(QT5_QTMULTIMEDIA_BUILDLINK3_MK) QT5_QTMULTIMEDIA_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtmultimedia?= qt5-qtmultimedia>=5.2.1 +BUILDLINK_API_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?= ../../x11/qt5-qtmultimedia BUILDLINK_INCDIRS.qt5-qtmultimedia+= qt5/include diff --git a/x11/qt5-qtmultimedia/distinfo b/x11/qt5-qtmultimedia/distinfo new file mode 100644 index 00000000000..b19b2675737 --- /dev/null +++ b/x11/qt5-qtmultimedia/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $ + +SHA1 (qtmultimedia-opensource-src-5.4.0.tar.xz) = a66fe5538f554957f60fc160121a3b0e7e72753b +RMD160 (qtmultimedia-opensource-src-5.4.0.tar.xz) = b2e0db7dbc711417df91fed21a6b8b12ee948c9c +Size (qtmultimedia-opensource-src-5.4.0.tar.xz) = 3188824 bytes diff --git a/x11/qt5-qtquick1/Makefile b/x11/qt5-qtquick1/Makefile index 63c07d84de7..e301a1ec903 100644 --- a/x11/qt5-qtquick1/Makefile +++ b/x11/qt5-qtquick1/Makefile @@ -1,13 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2014/12/30 17:23:47 adam Exp $ +DISTNAME= qtquick1-opensource-src-${QTVERSION} PKGNAME= qt5-qtquick1-${QTVERSION} -PKGREVISION= 2 COMMENT= Qt5 module for Quick1 -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtquick1 +BUILD_TARGET= sub-tools MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -17,9 +14,8 @@ INSTALLATION_DIRS+= lib/pkgconfig post-install: .for i in Qt5Declarative.pc - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor .include "../../x11/qt5-qtscript/buildlink3.mk" diff --git a/x11/qt5-qtquick1/PLIST b/x11/qt5-qtquick1/PLIST index 1d499599f52..58d522758f2 100644 --- a/x11/qt5-qtquick1/PLIST +++ b/x11/qt5-qtquick1/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.3 2014/09/10 12:24:13 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2014/12/30 17:23:47 adam Exp $ lib/pkgconfig/Qt5Declarative.pc +${PLIST.mac}qt5/bin/QMLViewer qt5/bin/qml1plugindump qt5/bin/qmlviewer qt5/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la @@ -235,6 +236,9 @@ qt5/include/QtDeclarative/qtdeclarativeglobal.h qt5/include/QtDeclarative/qtdeclarativeversion.h qt5/lib/cmake/Qt5Declarative/Qt5DeclarativeConfig.cmake qt5/lib/cmake/Qt5Declarative/Qt5DeclarativeConfigVersion.cmake +qt5/lib/cmake/Qt5Declarative/Qt5Declarative_QTcpServerConnection.cmake +qt5/lib/cmake/Qt5Declarative/Qt5Declarative_QtQuick1Plugin.cmake +qt5/lib/cmake/Qt5Designer/Qt5Designer_QDeclarativeViewPlugin.cmake qt5/lib/libQt5Declarative.la qt5/lib/libQt5Declarative.prl qt5/lib/pkgconfig/Qt5Declarative.pc diff --git a/x11/qt5-qtquick1/buildlink3.mk b/x11/qt5-qtquick1/buildlink3.mk index 5fe4b158dd1..10a9348d26e 100644 --- a/x11/qt5-qtquick1/buildlink3.mk +++ b/x11/qt5-qtquick1/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.10 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2014/12/30 17:23:47 adam Exp $ BUILDLINK_TREE+= qt5-qtquick1 .if !defined(QT5_QTQUICK1_BUILDLINK3_MK) QT5_QTQUICK1_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtquick1+= qt5-qtquick1>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtquick1?= qt5-qtquick1>=5.2.1nb2 +BUILDLINK_API_DEPENDS.qt5-qtquick1+= qt5-qtquick1>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtquick1+= qt5-qtquick1>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtquick1?= ../../x11/qt5-qtquick1 BUILDLINK_INCDIRS.qt5-qtquick1+= qt5/include diff --git a/x11/qt5-qtquick1/distinfo b/x11/qt5-qtquick1/distinfo new file mode 100644 index 00000000000..45cad754005 --- /dev/null +++ b/x11/qt5-qtquick1/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ + +SHA1 (qtquick1-opensource-src-5.4.0.tar.xz) = d4af107f1227f111b7a65924d2ce5e3c08c7ee20 +RMD160 (qtquick1-opensource-src-5.4.0.tar.xz) = b3241866d7a79b22287d29d8002ec8f2c709d01e +Size (qtquick1-opensource-src-5.4.0.tar.xz) = 15982676 bytes +SHA1 (patch-tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp) = a8b96ccfdda1b7cb617c67fad6e8d6c821e7e882 diff --git a/x11/qt5-qtbase/patches/patch-qtquick1_tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp b/x11/qt5-qtquick1/patches/patch-tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp index 709eadbac55..ffc44e0994e 100644 --- a/x11/qt5-qtbase/patches/patch-qtquick1_tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp +++ b/x11/qt5-qtquick1/patches/patch-tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtquick1_tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $ -* Teat NetBSD like Linux +* Treat NetBSD like Linux ---- qtquick1/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp.orig 2013-11-27 01:00:25.000000000 +0000 -+++ qtquick1/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +--- tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp.orig 2013-11-27 01:00:25.000000000 +0000 ++++ tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -384,7 +384,7 @@ void tst_qdeclarativeimage::svg() QCOMPARE(obj->pixmap().height(), 300); QCOMPARE(obj->width(), 300.0); diff --git a/x11/qt5-qtquickcontrols/Makefile b/x11/qt5-qtquickcontrols/Makefile index f9f2c860d2e..c2bef134e2d 100644 --- a/x11/qt5-qtquickcontrols/Makefile +++ b/x11/qt5-qtquickcontrols/Makefile @@ -1,13 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/12/30 17:23:47 adam Exp $ +DISTNAME= qtquickcontrols-opensource-src-${QTVERSION} PKGNAME= qt5-qtquickcontrols-${QTVERSION} COMMENT= Qt5 module for QuickControls -USE_LIBTOOL= yes - -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtquickcontrols +BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} diff --git a/x11/qt5-qtquickcontrols/PLIST b/x11/qt5-qtquickcontrols/PLIST index ceee0979df0..41889c2f7c7 100644 --- a/x11/qt5-qtquickcontrols/PLIST +++ b/x11/qt5-qtquickcontrols/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2013/12/13 14:38:36 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/12/30 17:23:47 adam Exp $ qt5/qml/QtQuick/Controls/ApplicationWindow.qml qt5/qml/QtQuick/Controls/BusyIndicator.qml qt5/qml/QtQuick/Controls/Button.qml +qt5/qml/QtQuick/Controls/Calendar.qml qt5/qml/QtQuick/Controls/CheckBox.qml qt5/qml/QtQuick/Controls/ComboBox.qml qt5/qml/QtQuick/Controls/GroupBox.qml @@ -10,12 +11,20 @@ qt5/qml/QtQuick/Controls/Menu.qml qt5/qml/QtQuick/Controls/MenuBar.qml qt5/qml/QtQuick/Controls/Private/AbstractCheckable.qml qt5/qml/QtQuick/Controls/Private/BasicButton.qml +qt5/qml/QtQuick/Controls/Private/CalendarHeaderModel.qml +qt5/qml/QtQuick/Controls/Private/CalendarUtils.js qt5/qml/QtQuick/Controls/Private/ColumnMenuContent.qml +qt5/qml/QtQuick/Controls/Private/ContentItem.qml qt5/qml/QtQuick/Controls/Private/Control.qml +qt5/qml/QtQuick/Controls/Private/EditMenu.qml +qt5/qml/QtQuick/Controls/Private/EditMenu_base.qml +qt5/qml/QtQuick/Controls/Private/EditMenu_ios.qml qt5/qml/QtQuick/Controls/Private/FastGlow.qml qt5/qml/QtQuick/Controls/Private/FocusFrame.qml +qt5/qml/QtQuick/Controls/Private/HoverButton.qml qt5/qml/QtQuick/Controls/Private/MenuContentItem.qml qt5/qml/QtQuick/Controls/Private/MenuContentScroller.qml +qt5/qml/QtQuick/Controls/Private/MenuItemSubControls.qml qt5/qml/QtQuick/Controls/Private/ModalPopupBehavior.qml qt5/qml/QtQuick/Controls/Private/ScrollBar.qml qt5/qml/QtQuick/Controls/Private/ScrollViewHelper.qml @@ -23,9 +32,13 @@ qt5/qml/QtQuick/Controls/Private/SourceProxy.qml qt5/qml/QtQuick/Controls/Private/StackView.js qt5/qml/QtQuick/Controls/Private/StackViewSlideDelegate.qml qt5/qml/QtQuick/Controls/Private/Style.qml +qt5/qml/QtQuick/Controls/Private/SystemPaletteSingleton.qml qt5/qml/QtQuick/Controls/Private/TabBar.qml qt5/qml/QtQuick/Controls/Private/TableViewSelection.qml +qt5/qml/QtQuick/Controls/Private/TextHandle.qml +qt5/qml/QtQuick/Controls/Private/TextInputWithHandles.qml qt5/qml/QtQuick/Controls/Private/TextSingleton.qml +qt5/qml/QtQuick/Controls/Private/ToolMenuButton.qml qt5/qml/QtQuick/Controls/Private/qmldir qt5/qml/QtQuick/Controls/Private/style.js qt5/qml/QtQuick/Controls/ProgressBar.qml @@ -38,8 +51,10 @@ qt5/qml/QtQuick/Controls/StackView.qml qt5/qml/QtQuick/Controls/StackViewDelegate.qml qt5/qml/QtQuick/Controls/StackViewTransition.qml qt5/qml/QtQuick/Controls/StatusBar.qml +qt5/qml/QtQuick/Controls/Styles/Base/ApplicationWindowStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/BusyIndicatorStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/ButtonStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/CalendarStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/CheckBoxStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/ComboBoxStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/FocusFrameStyle.qml @@ -75,7 +90,9 @@ qt5/qml/QtQuick/Controls/Styles/Base/images/editbox.png qt5/qml/QtQuick/Controls/Styles/Base/images/focusframe.png qt5/qml/QtQuick/Controls/Styles/Base/images/groupbox.png qt5/qml/QtQuick/Controls/Styles/Base/images/header.png +qt5/qml/QtQuick/Controls/Styles/Base/images/leftanglearrow.png qt5/qml/QtQuick/Controls/Styles/Base/images/progress-indeterminate.png +qt5/qml/QtQuick/Controls/Styles/Base/images/rightanglearrow.png qt5/qml/QtQuick/Controls/Styles/Base/images/scrollbar-handle-horizontal.png qt5/qml/QtQuick/Controls/Styles/Base/images/scrollbar-handle-transient.png qt5/qml/QtQuick/Controls/Styles/Base/images/scrollbar-handle-vertical.png @@ -86,8 +103,10 @@ qt5/qml/QtQuick/Controls/Styles/Base/images/spinner_medium.png qt5/qml/QtQuick/Controls/Styles/Base/images/spinner_small.png qt5/qml/QtQuick/Controls/Styles/Base/images/tab.png qt5/qml/QtQuick/Controls/Styles/Base/images/tab_selected.png +qt5/qml/QtQuick/Controls/Styles/Desktop/ApplicationWindowStyle.qml qt5/qml/QtQuick/Controls/Styles/Desktop/BusyIndicatorStyle.qml qt5/qml/QtQuick/Controls/Styles/Desktop/ButtonStyle.qml +qt5/qml/QtQuick/Controls/Styles/Desktop/CalendarStyle.qml qt5/qml/QtQuick/Controls/Styles/Desktop/CheckBoxStyle.qml qt5/qml/QtQuick/Controls/Styles/Desktop/ComboBoxStyle.qml qt5/qml/QtQuick/Controls/Styles/Desktop/FocusFrameStyle.qml @@ -122,6 +141,14 @@ qt5/qml/QtQuick/Controls/ToolButton.qml qt5/qml/QtQuick/Controls/libqtquickcontrolsplugin.la qt5/qml/QtQuick/Controls/plugins.qmltypes qt5/qml/QtQuick/Controls/qmldir +qt5/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.la +qt5/qml/QtQuick/Dialogs/Private/qmldir +qt5/qml/QtQuick/Dialogs/libdialogplugin.la +qt5/qml/QtQuick/Dialogs/plugins.qmltypes +qt5/qml/QtQuick/Dialogs/qmldir qt5/qml/QtQuick/Layouts/libqquicklayoutsplugin.la qt5/qml/QtQuick/Layouts/plugins.qmltypes qt5/qml/QtQuick/Layouts/qmldir +qt5/qml/QtQuick/PrivateWidgets/libwidgetsplugin.la +qt5/qml/QtQuick/PrivateWidgets/plugins.qmltypes +qt5/qml/QtQuick/PrivateWidgets/qmldir diff --git a/x11/qt5-qtquickcontrols/buildlink3.mk b/x11/qt5-qtquickcontrols/buildlink3.mk index 655e0819ade..be90bdbb051 100644 --- a/x11/qt5-qtquickcontrols/buildlink3.mk +++ b/x11/qt5-qtquickcontrols/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2014/12/30 17:23:47 adam Exp $ BUILDLINK_TREE+= qt5-qtquickcontrols .if !defined(QT5_QTQUICKCONTROLS_BUILDLINK3_MK) QT5_QTQUICKCONTROLS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtquickcontrols+= qt5-qtquickcontrols>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtquickcontrols?= qt5-qtquickcontrols>=5.2.1 +BUILDLINK_API_DEPENDS.qt5-qtquickcontrols+= qt5-qtquickcontrols>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtquickcontrols+= qt5-qtquickcontrols>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtquickcontrols?= ../../x11/qt5-qtquickcontrols BUILDLINK_INCDIRS.qt5-qtquickcontrols+= qt5/include diff --git a/x11/qt5-qtquickcontrols/distinfo b/x11/qt5-qtquickcontrols/distinfo new file mode 100644 index 00000000000..8b88a18f4b9 --- /dev/null +++ b/x11/qt5-qtquickcontrols/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ + +SHA1 (qtquickcontrols-opensource-src-5.4.0.tar.xz) = 1d8dd4a0b1c69e14805c59d4676c8406c65a4114 +RMD160 (qtquickcontrols-opensource-src-5.4.0.tar.xz) = 1baba3e53b80770ff979f7206b8456efcd2ddcae +Size (qtquickcontrols-opensource-src-5.4.0.tar.xz) = 919408 bytes diff --git a/x11/qt5-qtscript/Makefile b/x11/qt5-qtscript/Makefile index 845aa71f369..6a893284a54 100644 --- a/x11/qt5-qtscript/Makefile +++ b/x11/qt5-qtscript/Makefile @@ -1,12 +1,9 @@ -# $NetBSD: Makefile,v 1.10 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2014/12/30 17:23:47 adam Exp $ +DISTNAME= qtscript-opensource-src-${QTVERSION} PKGNAME= qt5-qtscript-${QTVERSION} COMMENT= Qt5 module for script -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtscript BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} @@ -17,9 +14,8 @@ INSTALLATION_DIRS+= lib/pkgconfig post-install: .for i in Qt5Script.pc Qt5ScriptTools.pc - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor .include "../../x11/qt5-qttools/buildlink3.mk" diff --git a/x11/qt5-qtscript/buildlink3.mk b/x11/qt5-qtscript/buildlink3.mk index f50a611f24e..9cc05421420 100644 --- a/x11/qt5-qtscript/buildlink3.mk +++ b/x11/qt5-qtscript/buildlink3.mk @@ -1,19 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2014/12/30 17:23:47 adam Exp $ BUILDLINK_TREE+= qt5-qtscript .if !defined(QT5_QTSCRIPT_BUILDLINK3_MK) QT5_QTSCRIPT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtscript+= qt5-qtscript>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtscript?= qt5-qtscript>=5.2.1 +BUILDLINK_API_DEPENDS.qt5-qtscript+= qt5-qtscript>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtscript+= qt5-qtscript>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtscript?= ../../x11/qt5-qtscript BUILDLINK_INCDIRS.qt5-qtscript+= qt5/include BUILDLINK_LIBDIRS.qt5-qtscript+= qt5/lib BUILDLINK_LIBDIRS.qt5-qtscript+= qt5/plugins -.include "../../x11/qt5-qtbase/buildlink3.mk" +.include "../../x11/qt5-qttools/buildlink3.mk" .endif # QT5_QTSCRIPT_BUILDLINK3_MK BUILDLINK_TREE+= -qt5-qtscript diff --git a/x11/qt5-qtscript/distinfo b/x11/qt5-qtscript/distinfo new file mode 100644 index 00000000000..6dd536deb70 --- /dev/null +++ b/x11/qt5-qtscript/distinfo @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ + +SHA1 (qtscript-opensource-src-5.4.0.tar.xz) = 7ca8d6ccbc97fb24a9e76b69eeaa5e7e9c321955 +RMD160 (qtscript-opensource-src-5.4.0.tar.xz) = c51fd51c5f3ada72fdd5397ed5fb71d209ecf3a4 +Size (qtscript-opensource-src-5.4.0.tar.xz) = 2579768 bytes +SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h) = c8044ceaab87091aba1f226e03afa681abad11b0 +SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h) = 6672e941f0ecbba35b5b932ab9f7b49a269fb6e6 +SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h) = 5467afc8dc5e2f93a267a6ab380bb647c501d145 diff --git a/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h new file mode 100644 index 00000000000..402c804f145 --- /dev/null +++ b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h,v 1.1 2014/12/30 17:23:47 adam Exp $ + +* Add DragonFly support + +--- src/3rdparty/javascriptcore/JavaScriptCore/config.h.orig 2013-11-27 01:00:27.000000000 +0000 ++++ src/3rdparty/javascriptcore/JavaScriptCore/config.h +@@ -53,7 +53,7 @@ + + #endif + +-#if OS(FREEBSD) || OS(OPENBSD) ++#if OS(FREEBSD) || OS(OPENBSD) || OS(DRAGONFLY) + #define HAVE_PTHREAD_NP_H 1 + #endif + diff --git a/x11/qt5-qtbase/patches/patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h index aefb8f01c48..bc22d162fbe 100644 --- a/x11/qt5-qtbase/patches/patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h +++ b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h @@ -1,7 +1,7 @@ -$NetBSD: patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h,v 1.1 2014/12/30 17:23:47 adam Exp $ ---- qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig 2013-11-27 01:00:27.000000000 +0000 -+++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h +--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig 2013-11-27 01:00:27.000000000 +0000 ++++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h @@ -491,7 +491,7 @@ namespace JSC { u.asBits.tag = CellTag; else diff --git a/x11/qt5-qtbase/patches/patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h index 9724d0d0f67..79376a65d74 100644 --- a/x11/qt5-qtbase/patches/patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h +++ b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h @@ -1,10 +1,10 @@ -$NetBSD: patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add NetBSD support * Add DragonFly support ---- qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2013-11-27 01:00:28.000000000 +0000 -+++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2013-11-27 01:00:28.000000000 +0000 ++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -419,7 +419,7 @@ /* OS(NETBSD) - NetBSD */ diff --git a/x11/qt5-qtsensors/Makefile b/x11/qt5-qtsensors/Makefile index f44135dd712..c5016bda67b 100644 --- a/x11/qt5-qtsensors/Makefile +++ b/x11/qt5-qtsensors/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/12/30 17:23:47 adam Exp $ +DISTNAME= qtsensors-opensource-src-${QTVERSION} PKGNAME= qt5-qtsensors-${QTVERSION} COMMENT= Qt5 module for Sensors -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtsensors +BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -16,9 +14,8 @@ INSTALLATION_DIRS+= lib/pkgconfig post-install: .for i in Qt5Sensors.pc - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor .include "../../x11/qt5-qtdeclarative/buildlink3.mk" diff --git a/x11/qt5-qtsensors/PLIST b/x11/qt5-qtsensors/PLIST index 7d2f2373c8e..4c3af479aab 100644 --- a/x11/qt5-qtsensors/PLIST +++ b/x11/qt5-qtsensors/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2013/12/15 09:42:44 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/12/30 17:23:47 adam Exp $ lib/pkgconfig/Qt5Sensors.pc qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qaccelerometer_p.h qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qaltimeter_p.h qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qambientlightsensor_p.h qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qambienttemperaturesensor_p.h qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qcompass_p.h +qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qdistancesensor_p.h qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qgyroscope_p.h qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qholstersensor_p.h qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qirproximitysensor_p.h @@ -37,6 +38,9 @@ qt5/include/QtSensors/QAmbientTemperatureSensor qt5/include/QtSensors/QCompass qt5/include/QtSensors/QCompassFilter qt5/include/QtSensors/QCompassReading +qt5/include/QtSensors/QDistanceFilter +qt5/include/QtSensors/QDistanceReading +qt5/include/QtSensors/QDistanceSensor qt5/include/QtSensors/QGyroscope qt5/include/QtSensors/QGyroscopeFilter qt5/include/QtSensors/QGyroscopeReading @@ -90,6 +94,7 @@ qt5/include/QtSensors/qaltimeter.h qt5/include/QtSensors/qambientlightsensor.h qt5/include/QtSensors/qambienttemperaturesensor.h qt5/include/QtSensors/qcompass.h +qt5/include/QtSensors/qdistancesensor.h qt5/include/QtSensors/qgyroscope.h qt5/include/QtSensors/qholstersensor.h qt5/include/QtSensors/qirproximitysensor.h @@ -113,7 +118,9 @@ qt5/include/QtSensors/qtiltsensor.h qt5/include/QtSensors/qtsensorsversion.h qt5/lib/cmake/Qt5Sensors/Qt5SensorsConfig.cmake qt5/lib/cmake/Qt5Sensors/Qt5SensorsConfigVersion.cmake -qt5/lib/cmake/Qt5Sensors/Qt5Sensors_.cmake +qt5/lib/cmake/Qt5Sensors/Qt5Sensors_QShakeSensorGesturePlugin.cmake +qt5/lib/cmake/Qt5Sensors/Qt5Sensors_QtSensorGesturePlugin.cmake +qt5/lib/cmake/Qt5Sensors/Qt5Sensors_dummySensorPlugin.cmake qt5/lib/cmake/Qt5Sensors/Qt5Sensors_genericSensorPlugin.cmake qt5/lib/libQt5Sensors.la qt5/lib/libQt5Sensors.prl diff --git a/x11/qt5-qtsensors/buildlink3.mk b/x11/qt5-qtsensors/buildlink3.mk index 70c80ed79b9..295afde45ee 100644 --- a/x11/qt5-qtsensors/buildlink3.mk +++ b/x11/qt5-qtsensors/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2014/10/07 16:47:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2014/12/30 17:23:47 adam Exp $ BUILDLINK_TREE+= qt5-qtsensors .if !defined(QT5_QTSENSORS_BUILDLINK3_MK) QT5_QTSENSORS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtsensors+= qt5-qtsensors>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtsensors?= qt5-qtsensors>=5.2.1 +BUILDLINK_API_DEPENDS.qt5-qtsensors+= qt5-qtsensors>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtsensors+= qt5-qtsensors>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtsensors?= ../../x11/qt5-qtsensors BUILDLINK_INCDIRS.qt5-qtsensors+= qt5/include diff --git a/x11/qt5-qtsensors/distinfo b/x11/qt5-qtsensors/distinfo new file mode 100644 index 00000000000..e107a25caac --- /dev/null +++ b/x11/qt5-qtsensors/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ + +SHA1 (qtsensors-opensource-src-5.4.0.tar.xz) = 5fe798541707acfe7a4955076a0d27d8d58f4d15 +RMD160 (qtsensors-opensource-src-5.4.0.tar.xz) = a4b560e49f129311487ba41307c3451cb627edf6 +Size (qtsensors-opensource-src-5.4.0.tar.xz) = 2068848 bytes diff --git a/x11/qt5-qtserialport/Makefile b/x11/qt5-qtserialport/Makefile index 751e5ee3f17..85b9192905b 100644 --- a/x11/qt5-qtserialport/Makefile +++ b/x11/qt5-qtserialport/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/12/30 17:23:47 adam Exp $ +DISTNAME= qtserialport-opensource-src-${QTVERSION} PKGNAME= qt5-qtserialport-${QTVERSION} COMMENT= Qt5 module for Serial Port -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtserialport +BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -16,9 +14,8 @@ INSTALLATION_DIRS+= lib/pkgconfig post-install: .for i in Qt5SerialPort.pc - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor .include "../../x11/qt5-qtbase/buildlink3.mk" diff --git a/x11/qt5-qtserialport/PLIST b/x11/qt5-qtserialport/PLIST index 41318dc4aa8..72c3fbf0e7a 100644 --- a/x11/qt5-qtserialport/PLIST +++ b/x11/qt5-qtserialport/PLIST @@ -1,11 +1,14 @@ -@comment $NetBSD: PLIST,v 1.2 2013/12/15 09:42:44 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/12/30 17:23:47 adam Exp $ lib/pkgconfig/Qt5SerialPort.pc +qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qcore_mac_p.h +qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qcore_unix_p.h qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qlockfile_p.h qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qringbuffer_p.h qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialport_p.h qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialport_symbian_p.h qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialport_unix_p.h qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialport_win_p.h +qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialport_wince_p.h qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialportinfo_p.h qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qtudev_p.h qt5/include/QtSerialPort/QLockFile diff --git a/x11/qt5-qtserialport/buildlink3.mk b/x11/qt5-qtserialport/buildlink3.mk index f3cd7da4eb0..beb781a67e2 100644 --- a/x11/qt5-qtserialport/buildlink3.mk +++ b/x11/qt5-qtserialport/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/10/07 16:47:17 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2014/12/30 17:23:47 adam Exp $ BUILDLINK_TREE+= qt5-qtserialport .if !defined(QT5_QTSERIALPORT_BUILDLINK3_MK) QT5_QTSERIALPORT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtserialport?= qt5-qtserialport>=5.2.1 +BUILDLINK_API_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtserialport?= ../../x11/qt5-qtserialport BUILDLINK_INCDIRS.qt5-qtserialport+= qt5/include diff --git a/x11/qt5-qtserialport/distinfo b/x11/qt5-qtserialport/distinfo new file mode 100644 index 00000000000..d751a5e0414 --- /dev/null +++ b/x11/qt5-qtserialport/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ + +SHA1 (qtserialport-opensource-src-5.4.0.tar.xz) = ccfc39045d803405ec36bcfdbf281417dd96663a +RMD160 (qtserialport-opensource-src-5.4.0.tar.xz) = 8a6b3a5f9caf5e2bcc988ccb4e44370d6ae553ec +Size (qtserialport-opensource-src-5.4.0.tar.xz) = 251680 bytes diff --git a/x11/qt5-qtsvg/Makefile b/x11/qt5-qtsvg/Makefile index 13c22550c58..097fb3da6a3 100644 --- a/x11/qt5-qtsvg/Makefile +++ b/x11/qt5-qtsvg/Makefile @@ -1,12 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/12/30 17:23:47 adam Exp $ +DISTNAME= qtsvg-opensource-src-${QTVERSION} PKGNAME= qt5-qtsvg-${QTVERSION} COMMENT= Qt5 module for SVG -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtsvg BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} @@ -17,9 +14,8 @@ INSTALLATION_DIRS+= lib/pkgconfig post-install: .for i in Qt5Svg.pc - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor .include "../../x11/qt5-qtbase/buildlink3.mk" diff --git a/x11/qt5-qtsvg/PLIST b/x11/qt5-qtsvg/PLIST index 6d5169ce90c..5a4dc5a46aa 100644 --- a/x11/qt5-qtsvg/PLIST +++ b/x11/qt5-qtsvg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2013/12/15 09:42:44 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/12/30 17:23:47 adam Exp $ lib/pkgconfig/Qt5Svg.pc qt5/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvgfont_p.h qt5/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvgfunctions_wince_p.h @@ -8,6 +8,7 @@ qt5/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvgnode_p.h qt5/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvgstructure_p.h qt5/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvgstyle_p.h qt5/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvgtinydocument_p.h +qt5/include/QtSvg/${PKGVERSION}/QtSvg/private/qtsvgglobal_p.h qt5/include/QtSvg/QGraphicsSvgItem qt5/include/QtSvg/QSvgGenerator qt5/include/QtSvg/QSvgRenderer @@ -21,9 +22,10 @@ qt5/include/QtSvg/qsvgrenderer.h qt5/include/QtSvg/qsvgwidget.h qt5/include/QtSvg/qtsvgglobal.h qt5/include/QtSvg/qtsvgversion.h -qt5/lib/cmake/Qt5Gui/Qt5Gui_QSvgPlugin.cmake qt5/lib/cmake/Qt5Svg/Qt5SvgConfig.cmake qt5/lib/cmake/Qt5Svg/Qt5SvgConfigVersion.cmake +qt5/lib/cmake/Qt5Svg/Qt5Svg_QSvgIconPlugin.cmake +qt5/lib/cmake/Qt5Svg/Qt5Svg_QSvgPlugin.cmake qt5/lib/libQt5Svg.la qt5/lib/libQt5Svg.prl qt5/lib/pkgconfig/Qt5Svg.pc diff --git a/x11/qt5-qtsvg/buildlink3.mk b/x11/qt5-qtsvg/buildlink3.mk index aa2a06102f9..c920d99db59 100644 --- a/x11/qt5-qtsvg/buildlink3.mk +++ b/x11/qt5-qtsvg/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/10/07 16:47:17 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2014/12/30 17:23:47 adam Exp $ BUILDLINK_TREE+= qt5-qtsvg .if !defined(QT5_QTSVG_BUILDLINK3_MK) QT5_QTSVG_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtsvg?= qt5-qtsvg>=5.2.1 +BUILDLINK_API_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtsvg?= ../../x11/qt5-qtsvg BUILDLINK_INCDIRS.qt5-qtsvg+= qt5/include diff --git a/x11/qt5-qtsvg/distinfo b/x11/qt5-qtsvg/distinfo new file mode 100644 index 00000000000..9ef32424e59 --- /dev/null +++ b/x11/qt5-qtsvg/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ + +SHA1 (qtsvg-opensource-src-5.4.0.tar.xz) = b49d9974dd83c82887a076f9093250cb9fcceea7 +RMD160 (qtsvg-opensource-src-5.4.0.tar.xz) = 876cc98f57301ae7cf54d4f26bb82f8e23398841 +Size (qtsvg-opensource-src-5.4.0.tar.xz) = 1758668 bytes diff --git a/x11/qt5-qttools/Makefile b/x11/qt5-qttools/Makefile index 22ae5cdacfb..8d27f35ff65 100644 --- a/x11/qt5-qttools/Makefile +++ b/x11/qt5-qttools/Makefile @@ -1,15 +1,11 @@ -# $NetBSD: Makefile,v 1.12 2014/12/27 22:57:13 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2014/12/30 17:23:47 adam Exp $ +DISTNAME= qttools-opensource-src-${QTVERSION} PKGNAME= qt5-qttools-${QTVERSION} -PKGREVISION= 2 COMMENT= Qt5 tools DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qttools MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -22,9 +18,8 @@ QTPKGCONFIGPC= Qt5CLucene.pc Qt5DesignerComponents.pc Qt5UiTools.pc \ post-install: .for i in ${QTPKGCONFIGPC} - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor .include "../../x11/qt5-dbus/buildlink3.mk" diff --git a/x11/qt5-qttools/PLIST b/x11/qt5-qttools/PLIST index 8d30aa1b199..99c7eb9a28b 100644 --- a/x11/qt5-qttools/PLIST +++ b/x11/qt5-qttools/PLIST @@ -1,21 +1,27 @@ -@comment $NetBSD: PLIST,v 1.3 2014/08/29 20:33:47 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2014/12/30 17:23:47 adam Exp $ lib/pkgconfig/Qt5CLucene.pc lib/pkgconfig/Qt5Designer.pc lib/pkgconfig/Qt5DesignerComponents.pc lib/pkgconfig/Qt5Help.pc lib/pkgconfig/Qt5UiTools.pc -qt5/bin/assistant -qt5/bin/designer +${PLIST.mac}qt5/bin/Assistant +${PLIST.mac}qt5/bin/Designer +${PLIST.mac}qt5/bin/Linguist +${PLIST.unix}qt5/bin/assistant +${PLIST.unix}qt5/bin/designer qt5/bin/lconvert -qt5/bin/linguist +${PLIST.unix}qt5/bin/linguist qt5/bin/lrelease qt5/bin/lupdate +${PLIST.mac}qt5/bin/macchangeqt +${PLIST.mac}qt5/bin/macdeployqt qt5/bin/pixeltool qt5/bin/qcollectiongenerator qt5/bin/qdbus qt5/bin/qdbusviewer qt5/bin/qhelpconverter qt5/bin/qhelpgenerator +qt5/bin/qtdiag qt5/bin/qtpaths qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qanalyzer_p.h qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qclucene-config_p.h @@ -261,7 +267,10 @@ qt5/include/QtUiTools/qtuitoolsversion.h qt5/include/QtUiTools/quiloader.h qt5/lib/cmake/Qt5Designer/Qt5DesignerConfig.cmake qt5/lib/cmake/Qt5Designer/Qt5DesignerConfigVersion.cmake +qt5/lib/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake +qt5/lib/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake qt5/lib/cmake/Qt5Help/Qt5HelpConfig.cmake +qt5/lib/cmake/Qt5Help/Qt5HelpConfigExtras.cmake qt5/lib/cmake/Qt5Help/Qt5HelpConfigVersion.cmake qt5/lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake qt5/lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake @@ -304,4 +313,5 @@ qt5/phrasebooks/polish.qph qt5/phrasebooks/russian.qph qt5/phrasebooks/spanish.qph qt5/phrasebooks/swedish.qph +qt5/plugins/designer/libqquickwidget.la qt5/plugins/designer/libqwebview.la diff --git a/x11/qt5-qttools/buildlink3.mk b/x11/qt5-qttools/buildlink3.mk index 6bb7349d6d4..73aa58cb27b 100644 --- a/x11/qt5-qttools/buildlink3.mk +++ b/x11/qt5-qttools/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.10 2014/10/07 16:47:17 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2014/12/30 17:23:47 adam Exp $ BUILDLINK_TREE+= qt5-qttools .if !defined(QT5_QTTOOLS_BUILDLINK3_MK) QT5_QTTOOLS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qttools+= qt5-qttools>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qttools?= qt5-qttools>=5.2.1nb2 +BUILDLINK_API_DEPENDS.qt5-qttools+= qt5-qttools>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qttools+= qt5-qttools>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qttools?= ../../x11/qt5-qttools BUILDLINK_INCDIRS.qt5-qttools+= qt5/include diff --git a/x11/qt5-qttools/distinfo b/x11/qt5-qttools/distinfo new file mode 100644 index 00000000000..7c2f12af112 --- /dev/null +++ b/x11/qt5-qttools/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ + +SHA1 (qttools-opensource-src-5.4.0.tar.xz) = e923f9f7b2696bc7f451325599d55739dd5aa88a +RMD160 (qttools-opensource-src-5.4.0.tar.xz) = 8b0e1da7e8f9215c04b68b58fdded0d4553ff11d +Size (qttools-opensource-src-5.4.0.tar.xz) = 9261924 bytes +SHA1 (patch-src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 8161e4a61815b047f9c8b7c7a5578170db3a5eb7 +SHA1 (patch-src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = dc741575811ee3f65d51c971c9907bd5eda3993a +SHA1 (patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h) = b0b5c5c5c8fbd26fbf89899e4b32e35ccf946f83 +SHA1 (patch-src_assistant_clucene_qclucene-config__p.h) = 9c093ca76ae4eef6ba5622d4f2916d42813f4f1a +SHA1 (patch-src_designer_src_uitools_uitools.pro) = 17e6c0f3904ef83d2a46fb03a04556d306268075 diff --git a/x11/qt5-qtbase/patches/patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp b/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp index 564265880ed..712b71c0101 100644 --- a/x11/qt5-qtbase/patches/patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp +++ b/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp @@ -1,7 +1,7 @@ -$NetBSD: patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $ ---- qttools/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp.orig 2013-11-27 01:01:52.000000000 +0000 -+++ qttools/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp +--- src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp.orig 2013-11-27 01:01:52.000000000 +0000 ++++ src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp @@ -264,7 +264,7 @@ int32_t SegmentMerger::mergeFields() CND_CONDITION(fieldsWriter != NULL, "Memory allocation for fieldsWriter failed"); diff --git a/x11/qt5-qtbase/patches/patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp b/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp index adfc93157b5..64e3392447a 100644 --- a/x11/qt5-qtbase/patches/patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp +++ b/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp @@ -1,7 +1,7 @@ -$NetBSD: patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $ ---- qttools/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp.orig 2013-11-27 01:01:52.000000000 +0000 -+++ qttools/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp +--- src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp.orig 2013-11-27 01:01:52.000000000 +0000 ++++ src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp @@ -414,7 +414,7 @@ FieldCacheImpl::FileEntry::FileEntry (co _CLDECDELETE(term); diff --git a/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h b/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h new file mode 100644 index 00000000000..a74de1be0f1 --- /dev/null +++ b/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h,v 1.1 2014/12/30 17:23:47 adam Exp $ + +--- src/assistant/3rdparty/clucene/src/CLucene/util/Arrays.h.orig 2013-11-27 01:01:52.000000000 +0000 ++++ src/assistant/3rdparty/clucene/src/CLucene/util/Arrays.h +@@ -151,7 +151,7 @@ CL_NS_DEF(util) + + _itr1 itr1 = val1->begin(); + _itr2 itr2 = val2->begin(); +- while ( --size >= 0 ){ ++ while ( size-- >= 0 ){ + if ( !comp(*itr1,*itr2) ) + return false; + itr1++; diff --git a/x11/qt5-qtbase/patches/patch-qttools_src_assistant_clucene_qclucene-config__p.h b/x11/qt5-qttools/patches/patch-src_assistant_clucene_qclucene-config__p.h index 96e2380a272..38c6cf6d810 100644 --- a/x11/qt5-qtbase/patches/patch-qttools_src_assistant_clucene_qclucene-config__p.h +++ b/x11/qt5-qttools/patches/patch-src_assistant_clucene_qclucene-config__p.h @@ -1,9 +1,9 @@ -$NetBSD: patch-qttools_src_assistant_clucene_qclucene-config__p.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-src_assistant_clucene_qclucene-config__p.h,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add NetBSD support ---- qttools/src/assistant/clucene/qclucene-config_p.h.orig 2013-11-27 01:01:52.000000000 +0000 -+++ qttools/src/assistant/clucene/qclucene-config_p.h +--- src/assistant/clucene/qclucene-config_p.h.orig 2013-11-27 01:01:52.000000000 +0000 ++++ src/assistant/clucene/qclucene-config_p.h @@ -94,7 +94,7 @@ configure. #define _CL_HAVE_FCNTL_H 1 #endif diff --git a/x11/qt5-qttools/patches/patch-src_designer_src_uitools_uitools.pro b/x11/qt5-qttools/patches/patch-src_designer_src_uitools_uitools.pro new file mode 100644 index 00000000000..fe6f5013af9 --- /dev/null +++ b/x11/qt5-qttools/patches/patch-src_designer_src_uitools_uitools.pro @@ -0,0 +1,13 @@ +$NetBSD: patch-src_designer_src_uitools_uitools.pro,v 1.1 2014/12/30 17:23:47 adam Exp $ + +* Libtoolized and build as shared library + +--- src/designer/src/uitools/uitools.pro.orig 2013-11-27 01:01:52.000000000 +0000 ++++ src/designer/src/uitools/uitools.pro +@@ -1,5 +1,5 @@ + TARGET = QtUiTools +-CONFIG += static ++CONFIG += + QT = core + + QMAKE_DOCS = $$PWD/doc/qtuitools.qdocconf diff --git a/x11/qt5-qttranslations/Makefile b/x11/qt5-qttranslations/Makefile index 0b31b298785..087db966e36 100644 --- a/x11/qt5-qttranslations/Makefile +++ b/x11/qt5-qttranslations/Makefile @@ -1,14 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2014/12/30 17:23:47 adam Exp $ +DISTNAME= qttranslations-opensource-src-${QTVERSION} PKGNAME= qt5-qttranslations-${QTVERSION} COMMENT= Qt5 translations -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qttranslations MAKE_ENV+= QTDIR=${QTDIR} - INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} .include "../../x11/qt5-qtbase/Makefile.common" diff --git a/x11/qt5-qttranslations/PLIST b/x11/qt5-qttranslations/PLIST index 9d4e37c19f0..0c8b7b4f39f 100644 --- a/x11/qt5-qttranslations/PLIST +++ b/x11/qt5-qttranslations/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2013/12/13 14:38:36 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/12/30 17:23:47 adam Exp $ qt5/translations/assistant_cs.qm qt5/translations/assistant_da.qm qt5/translations/assistant_de.qm @@ -40,17 +40,20 @@ qt5/translations/linguist_uk.qm qt5/translations/linguist_zh_CN.qm qt5/translations/linguist_zh_TW.qm qt5/translations/qmlviewer_cs.qm +qt5/translations/qmlviewer_fi.qm qt5/translations/qmlviewer_hu.qm qt5/translations/qmlviewer_ja.qm qt5/translations/qmlviewer_ru.qm qt5/translations/qmlviewer_sk.qm qt5/translations/qmlviewer_uk.qm qt5/translations/qt_ar.qm +qt5/translations/qt_ca.qm qt5/translations/qt_cs.qm qt5/translations/qt_da.qm qt5/translations/qt_de.qm qt5/translations/qt_es.qm qt5/translations/qt_fa.qm +qt5/translations/qt_fi.qm qt5/translations/qt_fr.qm qt5/translations/qt_gl.qm qt5/translations/qt_he.qm @@ -60,6 +63,7 @@ qt5/translations/qt_help_de.qm qt5/translations/qt_help_fr.qm qt5/translations/qt_help_gl.qm qt5/translations/qt_help_hu.qm +qt5/translations/qt_help_it.qm qt5/translations/qt_help_ja.qm qt5/translations/qt_help_ko.qm qt5/translations/qt_help_pl.qm @@ -83,11 +87,14 @@ qt5/translations/qt_sv.qm qt5/translations/qt_uk.qm qt5/translations/qt_zh_CN.qm qt5/translations/qt_zh_TW.qm +qt5/translations/qtbase_ca.qm qt5/translations/qtbase_cs.qm qt5/translations/qtbase_de.qm +qt5/translations/qtbase_fi.qm qt5/translations/qtbase_hu.qm qt5/translations/qtbase_it.qm qt5/translations/qtbase_ja.qm +qt5/translations/qtbase_lv.qm qt5/translations/qtbase_ru.qm qt5/translations/qtbase_sk.qm qt5/translations/qtbase_uk.qm @@ -101,35 +108,53 @@ qt5/translations/qtconfig_sl.qm qt5/translations/qtconfig_uk.qm qt5/translations/qtconfig_zh_CN.qm qt5/translations/qtconfig_zh_TW.qm +qt5/translations/qtconnectivity_de.qm +qt5/translations/qtconnectivity_uk.qm qt5/translations/qtdeclarative_de.qm +qt5/translations/qtdeclarative_fi.qm qt5/translations/qtdeclarative_ja.qm +qt5/translations/qtdeclarative_lv.qm qt5/translations/qtdeclarative_ru.qm qt5/translations/qtdeclarative_sk.qm qt5/translations/qtdeclarative_uk.qm +qt5/translations/qtlocation_de.qm +qt5/translations/qtlocation_uk.qm +qt5/translations/qtmultimedia_ca.qm qt5/translations/qtmultimedia_cs.qm qt5/translations/qtmultimedia_de.qm +qt5/translations/qtmultimedia_fi.qm qt5/translations/qtmultimedia_hu.qm qt5/translations/qtmultimedia_it.qm qt5/translations/qtmultimedia_ja.qm qt5/translations/qtmultimedia_ru.qm qt5/translations/qtmultimedia_sk.qm qt5/translations/qtmultimedia_uk.qm +qt5/translations/qtquick1_ca.qm qt5/translations/qtquick1_cs.qm qt5/translations/qtquick1_de.qm +qt5/translations/qtquick1_fi.qm qt5/translations/qtquick1_hu.qm qt5/translations/qtquick1_it.qm qt5/translations/qtquick1_ja.qm qt5/translations/qtquick1_ru.qm qt5/translations/qtquick1_sk.qm qt5/translations/qtquick1_uk.qm +qt5/translations/qtquickcontrols_de.qm +qt5/translations/qtquickcontrols_ja.qm +qt5/translations/qtquickcontrols_ru.qm +qt5/translations/qtquickcontrols_uk.qm +qt5/translations/qtscript_ca.qm qt5/translations/qtscript_cs.qm qt5/translations/qtscript_de.qm +qt5/translations/qtscript_fi.qm qt5/translations/qtscript_hu.qm qt5/translations/qtscript_it.qm qt5/translations/qtscript_ja.qm +qt5/translations/qtscript_lv.qm qt5/translations/qtscript_ru.qm qt5/translations/qtscript_sk.qm qt5/translations/qtscript_uk.qm +qt5/translations/qtxmlpatterns_ca.qm qt5/translations/qtxmlpatterns_cs.qm qt5/translations/qtxmlpatterns_de.qm qt5/translations/qtxmlpatterns_hu.qm diff --git a/x11/qt5-qttranslations/distinfo b/x11/qt5-qttranslations/distinfo new file mode 100644 index 00000000000..b3ec22cd5be --- /dev/null +++ b/x11/qt5-qttranslations/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ + +SHA1 (qttranslations-opensource-src-5.4.0.tar.xz) = 7649c41015efd4d111b16866aaacb5ee475e0137 +RMD160 (qttranslations-opensource-src-5.4.0.tar.xz) = 2cc838ab70430c81a75802d1dd3953a288327d67 +Size (qttranslations-opensource-src-5.4.0.tar.xz) = 1095484 bytes diff --git a/x11/qt5-qtwebkit/Makefile b/x11/qt5-qtwebkit/Makefile index 4cd7f5303c8..5e7b64fbe4e 100644 --- a/x11/qt5-qtwebkit/Makefile +++ b/x11/qt5-qtwebkit/Makefile @@ -1,68 +1,39 @@ -# $NetBSD: Makefile,v 1.20 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2014/12/30 17:23:47 adam Exp $ +DISTNAME= qtwebkit-opensource-src-${QTVERSION} PKGNAME= qt5-qtwebkit-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 WebView module BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf -USE_LIBTOOL= yes USE_TOOLS+= bison flex pkg-config sed +REPLACE_PERL+= Source/WebKit2/Scripts/generate-forwarding-headers.pl -BUILD_DIRS= qtwebkit MAKE_ENV+= QTDIR=${QTDIR} - INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} INSTALLATION_DIRS+= lib/pkgconfig .if ${USE_CWRAPPERS:Uno} == "yes" -BUILDLINK_TRANSFORM+= R:${WRKSRC}/qtwebkit/lib:${QTDIR}/lib +BUILDLINK_TRANSFORM+= R:${WRKSRC}/lib:${QTDIR}/lib .else -BUILDLINK_TRANSFORM+= rpath:${WRKSRC}/qtwebkit/lib:${QTDIR}/lib +BUILDLINK_TRANSFORM+= rpath:${WRKSRC}/lib:${QTDIR}/lib .endif -QTPKGCONFIGPC= Qt5WebKit.pc Qt5WebKitWidgets.pc - -BROKEN_FILES+= qt5/lib/pkgconfig/Qt5WebKit.pc \ - qt5/lib/libQt5WebKit.la \ - qt5/lib/libQt5WebKitWidgets.la \ - qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.la \ - qt5/qml/QtWebKit/libqmlwebkitplugin.la .include "../../x11/qt5-qtbase/Makefile.common" post-install: -# Fix broken files -.for i in ${BROKEN_FILES} - ${CP} -f ${DESTDIR}${PREFIX}/${i} \ - ${DESTDIR}${PREFIX}/${i}.1 - ${SED} -e 's,${WRKSRC}/[^[:space:]]*,,g' \ - < ${DESTDIR}${PREFIX}/${i}.1 \ - | ${SED} -e 's/-lWebKit1 //' \ - | ${SED} -e 's/-lWebKit2 //' \ - | ${SED} -e 's/-lWebCore //' \ - | ${SED} -e 's/-lANGLE //' \ - | ${SED} -e 's/-lJavaScriptCore //' \ - | ${SED} -e 's/-lWTF //' \ - > ${DESTDIR}${PREFIX}/${i} - ${RM} -f ${DESTDIR}${PREFIX}/${i}.1 -.endfor -.for i in ${QTPKGCONFIGPC} - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} +.for i in Qt5WebKit.pc Qt5WebKitWidgets.pc + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor .include "../../databases/sqlite3/buildlink3.mk" .if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" .include "../../devel/libexecinfo/buildlink3.mk" .endif -.include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .if ${OPSYS} != "Darwin" -.include "../../graphics/MesaLib/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../x11/libXcomposite/buildlink3.mk" .endif diff --git a/x11/qt5-qtwebkit/PLIST b/x11/qt5-qtwebkit/PLIST index b51ed1acb36..553421f8928 100644 --- a/x11/qt5-qtwebkit/PLIST +++ b/x11/qt5-qtwebkit/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2014/08/24 09:38:23 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2014/12/30 17:23:47 adam Exp $ lib/pkgconfig/Qt5WebKit.pc lib/pkgconfig/Qt5WebKitWidgets.pc qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/bytearraytestdata.h @@ -13,6 +13,7 @@ qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qquickwebview_p_p.h qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qrawwebview_p.h qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qrawwebview_p_p.h qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qtwebsecurityorigin_p.h +qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebchannelwebkittransport_p.h qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebdatabase_p.h qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebdownloaditem_p.h qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebdownloaditem_p_p.h @@ -103,16 +104,18 @@ qt5/lib/libWebKit1.la qt5/lib/libWebKit1.prl qt5/lib/libWebKit2.la qt5/lib/libWebKit2.prl +qt5/lib/libleveldb.la +qt5/lib/libleveldb.prl qt5/lib/pkgconfig/Qt5WebKit.pc qt5/lib/pkgconfig/Qt5WebKitWidgets.pc -qt5/libexec/QtWebPluginProcess qt5/libexec/QtWebProcess +${PLIST.unix}qt5/libexec/QtWebPluginProcess qt5/mkspecs/modules/qt_lib_webkit.pri qt5/mkspecs/modules/qt_lib_webkit_private.pri qt5/mkspecs/modules/qt_lib_webkitwidgets.pri qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri -qt5/plugins/webkit/libplatformplugin.la qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.la qt5/qml/QtWebKit/experimental/qmldir qt5/qml/QtWebKit/libqmlwebkitplugin.la +qt5/qml/QtWebKit/plugins.qmltypes qt5/qml/QtWebKit/qmldir diff --git a/x11/qt5-qtwebkit/buildlink3.mk b/x11/qt5-qtwebkit/buildlink3.mk index 34f1e4c96ac..9021de4dd96 100644 --- a/x11/qt5-qtwebkit/buildlink3.mk +++ b/x11/qt5-qtwebkit/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.12 2014/10/07 16:47:17 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2014/12/30 17:23:47 adam Exp $ BUILDLINK_TREE+= qt5-qtwebkit .if !defined(QT5_QTWEBKIT_BUILDLINK3_MK) QT5_QTWEBKIT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtwebkit?= qt5-qtwebkit>=5.2.1nb4 +BUILDLINK_API_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtwebkit?= ../../x11/qt5-qtwebkit BUILDLINK_INCDIRS.qt5-qtwebkit+= qt5/include @@ -14,14 +14,10 @@ BUILDLINK_LIBDIRS.qt5-qtwebkit+= qt5/lib BUILDLINK_LIBDIRS.qt5-qtwebkit+= qt5/plugins .include "../../databases/sqlite3/buildlink3.mk" -.include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" -.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .if ${OPSYS} != "Darwin" +.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../x11/libXcomposite/buildlink3.mk" .endif .include "../../x11/qt5-qtdeclarative/buildlink3.mk" diff --git a/x11/qt5-qtwebkit/distinfo b/x11/qt5-qtwebkit/distinfo new file mode 100644 index 00000000000..8a73354c2d4 --- /dev/null +++ b/x11/qt5-qtwebkit/distinfo @@ -0,0 +1,49 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ + +SHA1 (qtwebkit-opensource-src-5.4.0.tar.xz) = e5e92e126bb673dadc329bc726c21bf4f994d829 +RMD160 (qtwebkit-opensource-src-5.4.0.tar.xz) = 7310e566174839214a962f1d2ff07cbb7decb7a2 +Size (qtwebkit-opensource-src-5.4.0.tar.xz) = 33456404 bytes +SHA1 (patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h) = be77c4b19f5f97c12180c1b7d3b72968364f3229 +SHA1 (patch-Source_JavaScriptCore_DerivedSources.pri) = b7a81c85257ddebd7bdff546a6d6720c9a2c5b56 +SHA1 (patch-Source_JavaScriptCore_JavaScriptCore.pri) = ccf64d0df1c61ff5c31c000636f3b64460562314 +SHA1 (patch-Source_JavaScriptCore_Target.pri) = 2635cb0b9193fcf2ad55f01099341f4e140ab19b +SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = a6cfdbced0bb528f47e4c0279ca03898780578cb +SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 2ed23192d9a4ec2c0f7b7b9a48bed664adbc7fb3 +SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = cf39645a9b61299bb7b5b700a4cf2af68aa2f9f6 +SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 09bfdb6e63b835fb50611289d4a1c50cd18c9e37 +SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 3b73e876e89e920267a6bd19dba696298f00c704 +SHA1 (patch-Source_QtWebKit.pro) = cfa9b6a36ce63f7655a164bbc696db2c0a44d288 +SHA1 (patch-Source_ThirdParty_ANGLE_Target.pri) = 33473cbae5e2f835b0cea6cfd5fe50f031bea60c +SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 875cfb3a98b943a78bf87e91d724d067b5bd2523 +SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h) = a09b19f661c17a65f733a08822199b28eb51aed9 +SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = 1e4b8cffbd7ec0a6130a0ec2112023bed5c0b78e +SHA1 (patch-Source_ThirdParty_leveldb_Target.pri) = c202d901a2af5e9efdf2357c1e062f58c8db321d +SHA1 (patch-Source_WTF_WTF.pro) = 06883057a69fb95142cf33615a800cd532528e3e +SHA1 (patch-Source_WTF_wtf_Assertions.cpp) = 9146f5c8a44563328194470e3f1f4ec5150fbe93 +SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 64ea54605fbe787be57f7423e33802def66d6432 +SHA1 (patch-Source_WTF_wtf_NumberOfCores.cpp) = 5f80234f0bc8a66b2f1b4824a8b79b402e707491 +SHA1 (patch-Source_WTF_wtf_Platform.h) = 1d43e161c9836949970eca4545fd995b85a4f4d6 +SHA1 (patch-Source_WTF_wtf_RAMSize.cpp) = 1c5a9c0aaffdec25cea74b010b9bc8922593b1af +SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = 249308d00b18a8b89e9787f440341e77a1927531 +SHA1 (patch-Source_WTF_wtf_Threading.h) = 92f303cb972335fc9aaf4054cf66d9b6e99c94a5 +SHA1 (patch-Source_WTF_wtf_text_StringImpl.h) = ab4fc5bef1c01bf21e4a80da8709985dd16d8da0 +SHA1 (patch-Source_WebCore_Target.pri) = 6399c94c0b4f30fc0ce1d25c5056d7381ecb9020 +SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 011224d015cc46571646ee148bf67758ba4a56b3 +SHA1 (patch-Source_WebCore_editing_Editor.h) = 8b566568d843c9699789e9d45a019e7f4192699a +SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = f596432d46cb67b5b233bf7fdf0286d94c554e5e +SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h) = d1d986afd5525143fc786a959240a72167f03352 +SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h) = 838acb2d7ecf41e5f6989d98459d103f4268cdcf +SHA1 (patch-Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp) = a42d4604c92ec43d11966f2a599125d6a1e9febc +SHA1 (patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp) = 97dd7fd94afcb967bc1c65287d4ded5b34840857 +SHA1 (patch-Source_WebKit2_DerivedSources.pri) = 4147fd02d353f90a859e15d8dae70efd4dc1eeb4 +SHA1 (patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp) = b83d80adef042141a9047b64f635577151c4e819 +SHA1 (patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.h) = 8270ff1cc34e738e45d730c56a463e96c0a9ea11 +SHA1 (patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = 17a7e91683f7e336d8ec3d4b26a91d4b0a1c4e31 +SHA1 (patch-Source_WebKit2_Target.pri) = ed1b26769f666c1aeb45480666af1f5a0c83e489 +SHA1 (patch-Source_WebKit_WebKit1.pro) = 421885279866c19172eb93597e60c9940128f8de +SHA1 (patch-Source_WebKit_qt_examples_platformplugin_platformplugin.pro) = 40b2669f06d3fe964f86252e3e16eabe6d8ed508 +SHA1 (patch-Source_api.pri) = 116d15c6d2554c5bd0865de972fb3f9101cb4b3c +SHA1 (patch-Tools_Scripts_webkitdirs.pm) = 60b3be277872ac7e96a16649598ac0b937d7b91f +SHA1 (patch-Tools_WebKitTestRunner_InjectedBundle_Target.pri) = 336191aa4014005f13698ccdd459ae8e935e0588 +SHA1 (patch-Tools_qmake_mkspecs_features_functions.prf) = 87053c94e52d172f7b1b81cedb5de57ca7ddfb87 +SHA1 (patch-Tools_qmake_mkspecs_features_production__build.prf) = 4c20517f1d3266c5169e822526374c429ba430d4 diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_API_ObjCCallbackFunction.h b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h index 7f57d5681f0..1d2873951c6 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_API_ObjCCallbackFunction.h +++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h @@ -1,7 +1,7 @@ -$NetBSD: patch-qtwebkit_Source_JavaScriptCore_API_ObjCCallbackFunction.h,v 1.1 2014/04/23 07:05:31 adam Exp $ +$NetBSD: patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h,v 1.1 2014/12/30 17:23:47 adam Exp $ ---- qtwebkit/Source/JavaScriptCore/API/ObjCCallbackFunction.h.orig 2014-04-21 21:08:37.000000000 +0000 -+++ qtwebkit/Source/JavaScriptCore/API/ObjCCallbackFunction.h +--- Source/JavaScriptCore/API/ObjCCallbackFunction.h.orig 2014-04-21 21:08:37.000000000 +0000 ++++ Source/JavaScriptCore/API/ObjCCallbackFunction.h @@ -29,7 +29,7 @@ #if JSC_OBJC_API_ENABLED diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_DerivedSources.pri b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_DerivedSources.pri index 5e6984d964e..ccff7bb4e57 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_DerivedSources.pri +++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_DerivedSources.pri @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_JavaScriptCore_DerivedSources.pri,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_JavaScriptCore_DerivedSources.pri,v 1.1 2014/12/30 17:23:47 adam Exp $ * Make conditional for Unix ---- qtwebkit/Source/JavaScriptCore/DerivedSources.pri.orig 2013-11-27 01:01:48.000000000 +0000 -+++ qtwebkit/Source/JavaScriptCore/DerivedSources.pri +--- Source/JavaScriptCore/DerivedSources.pri.orig 2013-11-27 01:01:48.000000000 +0000 ++++ Source/JavaScriptCore/DerivedSources.pri @@ -108,7 +108,7 @@ llint.depends = $$LLINT_DEPENDENCY llint.commands = ruby $$llint.script $$LLINT_ASSEMBLER ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} GENERATORS += llint diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_JavaScriptCore.pri b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_JavaScriptCore.pri index 7bb0de17057..a1a2929e2f1 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_JavaScriptCore.pri +++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_JavaScriptCore.pri @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_JavaScriptCore_JavaScriptCore.pri,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_JavaScriptCore_JavaScriptCore.pri,v 1.1 2014/12/30 17:23:47 adam Exp $ * Make conditional for Unix ---- qtwebkit/Source/JavaScriptCore/JavaScriptCore.pri.orig 2013-11-27 01:01:48.000000000 +0000 -+++ qtwebkit/Source/JavaScriptCore/JavaScriptCore.pri +--- Source/JavaScriptCore/JavaScriptCore.pri.orig 2013-11-27 01:01:48.000000000 +0000 ++++ Source/JavaScriptCore/JavaScriptCore.pri @@ -41,6 +41,6 @@ wince* { INCLUDEPATH += $$SOURCE_DIR/os-win32 } diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_Target.pri b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_Target.pri new file mode 100644 index 00000000000..3b9cfb4c439 --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_Target.pri @@ -0,0 +1,29 @@ +$NetBSD: patch-Source_JavaScriptCore_Target.pri,v 1.1 2014/12/30 17:23:47 adam Exp $ + +* Libtoolized +* Build as shared library +* Install libJavaScriptCore library +* Make conditionals for Unix + +--- Source/JavaScriptCore/Target.pri.orig 2014-09-11 10:48:22.000000000 +0000 ++++ Source/JavaScriptCore/Target.pri +@@ -13,7 +13,9 @@ WEBKIT += wtf + QT += core + QT -= gui + +-CONFIG += staticlib optimize_full ++CONFIG += optimize_full ++target.path = $$[QT_INSTALL_LIBS] ++INSTALLS += target + + # Rules when JIT enabled (not disabled) + !contains(DEFINES, ENABLE_JIT=0) { +@@ -326,7 +328,7 @@ SOURCES += \ + tools/CodeProfiling.cpp \ + yarr/YarrJIT.cpp \ + +-linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) { ++unix-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) { + SOURCES += \ + disassembler/UDis86Disassembler.cpp \ + disassembler/udis86/udis86.c \ diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_assembler_ARMAssembler.h b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h index 5ebddae9a53..af18a166a85 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_assembler_ARMAssembler.h +++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add NetBSD support ---- qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h.orig 2013-11-27 01:01:49.000000000 +0000 -+++ qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h +--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig 2013-11-27 01:01:49.000000000 +0000 ++++ Source/JavaScriptCore/assembler/ARMAssembler.h @@ -27,6 +27,10 @@ #ifndef ARMAssembler_h #define ARMAssembler_h diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp new file mode 100644 index 00000000000..c7ddeda15fc --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp @@ -0,0 +1,39 @@ +$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $ + +* Add NetBSD support + +--- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2014-09-11 10:48:22.000000000 +0000 ++++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp +@@ -43,6 +43,15 @@ + # endif + #endif + ++#if OS(NETBSD) ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <sys/sysctl.h> ++#include <fcntl.h> ++#include <unistd.h> ++#include <asm/hwcap.h> ++#endif ++ + namespace JSC { + + static bool isVFPPresent() +@@ -61,6 +70,16 @@ static bool isVFPPresent() + } + #endif + ++#if OS(NETBSD) ++ size_t len; ++ int flag; ++ ++ len = sizeof(flag); ++ if (sysctlbyname("machdep.fpu_present", &flag, &len, NULL, 0) == 0) { ++ return flag == 1; ++ } ++#endif ++ + #if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || (COMPILER(GCC) && defined(__VFP_FP__)) + return true; + #else diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_dfg_DFGNode.h b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h index d047a2ce38e..994e65bf3c9 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_dfg_DFGNode.h +++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_JavaScriptCore_dfg_DFGNode.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add NetBSD support ---- qtwebkit/Source/JavaScriptCore/dfg/DFGNode.h.orig 2013-11-27 01:01:48.000000000 +0000 -+++ qtwebkit/Source/JavaScriptCore/dfg/DFGNode.h +--- Source/JavaScriptCore/dfg/DFGNode.h.orig 2013-11-27 01:01:48.000000000 +0000 ++++ Source/JavaScriptCore/dfg/DFGNode.h @@ -73,7 +73,7 @@ struct NewArrayBufferData { struct OpInfo { explicit OpInfo(int32_t value) : m_value(static_cast<uintptr_t>(value)) { } diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp index eb368936227..13b0dbb459b 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add Solaris/SunOS support ---- qtwebkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig 2013-11-27 01:01:49.000000000 +0000 -+++ qtwebkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp +--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig 2013-11-27 01:01:49.000000000 +0000 ++++ Source/JavaScriptCore/heap/MachineStackMarker.cpp @@ -20,6 +20,9 @@ */ diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_tools_CodeProfiling.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp index 0b5fa2c3c3e..8fd162037a3 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_tools_CodeProfiling.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add NetBSD support ---- qtwebkit/Source/JavaScriptCore/tools/CodeProfiling.cpp.orig 2013-11-27 01:01:49.000000000 +0000 -+++ qtwebkit/Source/JavaScriptCore/tools/CodeProfiling.cpp +--- Source/JavaScriptCore/tools/CodeProfiling.cpp.orig 2013-11-27 01:01:49.000000000 +0000 ++++ Source/JavaScriptCore/tools/CodeProfiling.cpp @@ -33,7 +33,7 @@ #include <signal.h> #endif diff --git a/x11/qt5-qtwebkit/patches/patch-Source_QtWebKit.pro b/x11/qt5-qtwebkit/patches/patch-Source_QtWebKit.pro new file mode 100644 index 00000000000..462d383500d --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Source_QtWebKit.pro @@ -0,0 +1,25 @@ +$NetBSD: patch-Source_QtWebKit.pro,v 1.1 2014/12/30 17:23:47 adam Exp $ + +* Make all libraries as shared +* Do not build examples + +--- Source/QtWebKit.pro.orig 2014-09-11 10:48:24.000000000 +0000 ++++ Source/QtWebKit.pro +@@ -5,7 +5,7 @@ + # ------------------------------------------------------------------- + + TEMPLATE = subdirs +-CONFIG += ordered ++CONFIG += ordered force_static_libs_as_shared + + api.file = api.pri + SUBDIRS += api +@@ -39,8 +39,4 @@ build?(webkit1) { + SUBDIRS += tests + } + +- examples.file = WebKit/qt/examples/examples.pro +- examples.CONFIG += no_default_target +- examples.makefile = Makefile +- SUBDIRS += examples + } diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_ThirdParty_ANGLE_Target.pri b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_Target.pri index d9c649e3185..1387ceddcf7 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_ThirdParty_ANGLE_Target.pri +++ b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_Target.pri @@ -1,10 +1,10 @@ -$NetBSD: patch-qtwebkit_Source_ThirdParty_ANGLE_Target.pri,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_ThirdParty_ANGLE_Target.pri,v 1.1 2014/12/30 17:23:47 adam Exp $ * Libtoolized * Install libANGLE library ---- qtwebkit/Source/ThirdParty/ANGLE/Target.pri.orig 2013-11-27 01:01:50.000000000 +0000 -+++ qtwebkit/Source/ThirdParty/ANGLE/Target.pri +--- Source/ThirdParty/ANGLE/Target.pri.orig 2013-11-27 01:01:50.000000000 +0000 ++++ Source/ThirdParty/ANGLE/Target.pri @@ -9,7 +9,10 @@ TARGET = ANGLE include(ANGLE.pri) diff --git a/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y new file mode 100644 index 00000000000..3f6c5826708 --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y @@ -0,0 +1,15 @@ +$NetBSD: patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y,v 1.1 2014/12/30 17:23:47 adam Exp $ + +* Fix build with bison 3 + +--- Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig 2013-11-27 01:01:50.000000000 +0000 ++++ Source/ThirdParty/ANGLE/src/compiler/glslang.y +@@ -47,7 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glsl + %pure-parser + %parse-param {TParseContext* context} + %locations +-%lex-param {YYLEX_PARAM} ++%lex-param {TParseContext* context} + + %union { + #define YYLTYPE TSourceLoc diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_ThirdParty_ANGLE_src_compiler_osinclude.h b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h index b04df088e9a..1154268e8c5 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_ThirdParty_ANGLE_src_compiler_osinclude.h +++ b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h @@ -1,10 +1,10 @@ -$NetBSD: patch-qtwebkit_Source_ThirdParty_ANGLE_src_compiler_osinclude.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add NetBSD support * Add DragonFly support ---- qtwebkit/Source/ThirdParty/ANGLE/src/compiler/osinclude.h.orig 2013-11-27 01:01:50.000000000 +0000 -+++ qtwebkit/Source/ThirdParty/ANGLE/src/compiler/osinclude.h +--- Source/ThirdParty/ANGLE/src/compiler/osinclude.h.orig 2013-11-27 01:01:50.000000000 +0000 ++++ Source/ThirdParty/ANGLE/src/compiler/osinclude.h @@ -18,7 +18,7 @@ defined(__FreeBSD__) || defined(__OpenBSD__) || \ defined(__sun) || defined(ANDROID) || \ diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h index 7aa1bd44936..953f7f6bf56 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h +++ b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h @@ -1,7 +1,7 @@ -$NetBSD: patch-qtwebkit_Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.1 2014/12/30 17:23:47 adam Exp $ ---- qtwebkit/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig 2013-11-27 01:01:50.000000000 +0000 -+++ qtwebkit/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h +--- Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig 2013-11-27 01:01:50.000000000 +0000 ++++ Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h @@ -173,6 +173,7 @@ #include <stdlib.h> #include <stdio.h> diff --git a/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_leveldb_Target.pri b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_leveldb_Target.pri new file mode 100644 index 00000000000..ece23e10f08 --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_leveldb_Target.pri @@ -0,0 +1,17 @@ +$NetBSD: patch-Source_ThirdParty_leveldb_Target.pri,v 1.1 2014/12/30 17:23:47 adam Exp $ + +Build as shared library. + +--- Source/ThirdParty/leveldb/Target.pri.orig 2014-11-14 11:29:30.000000000 +0000 ++++ Source/ThirdParty/leveldb/Target.pri +@@ -9,7 +9,9 @@ TARGET = leveldb + + include(leveldb.pri) + +-CONFIG += staticlib ++#CONFIG += staticlib ++target.path = $$[QT_INSTALL_LIBS] ++INSTALLS += target + + HEADERS += \ + db/builder.h \ diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_WTF.pro b/x11/qt5-qtwebkit/patches/patch-Source_WTF_WTF.pro new file mode 100644 index 00000000000..7276c5175d1 --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_WTF.pro @@ -0,0 +1,17 @@ +$NetBSD: patch-Source_WTF_WTF.pro,v 1.1 2014/12/30 17:23:47 adam Exp $ + +* Install libWTF shared library + +--- Source/WTF/WTF.pro.orig 2014-09-11 10:48:11.000000000 +0000 ++++ Source/WTF/WTF.pro +@@ -8,7 +8,9 @@ TARGET = WTF + + include(WTF.pri) + +-CONFIG += staticlib optimize_full ++CONFIG += optimize_full ++target.path = $$[QT_INSTALL_LIBS] ++INSTALLS += target + + VPATH += $$PWD/wtf + diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_Assertions.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Assertions.cpp index 5bfbd7a5b19..38cf640cb4e 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_Assertions.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Assertions.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_WTF_wtf_Assertions.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WTF_wtf_Assertions.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add NetBSD support ---- qtwebkit/Source/WTF/wtf/Assertions.cpp.orig 2013-11-27 01:01:21.000000000 +0000 -+++ qtwebkit/Source/WTF/wtf/Assertions.cpp +--- Source/WTF/wtf/Assertions.cpp.orig 2013-11-27 01:01:21.000000000 +0000 ++++ Source/WTF/wtf/Assertions.cpp @@ -61,7 +61,7 @@ #include <windows.h> #endif diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_InlineASM.h b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_InlineASM.h index 7ec17e68a19..ac204156a4e 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_InlineASM.h +++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_InlineASM.h @@ -1,10 +1,10 @@ -$NetBSD: patch-qtwebkit_Source_WTF_wtf_InlineASM.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WTF_wtf_InlineASM.h,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add NetBSD support * Add Solaris/SunOS support ---- qtwebkit/Source/WTF/wtf/InlineASM.h.orig 2013-11-27 01:01:21.000000000 +0000 -+++ qtwebkit/Source/WTF/wtf/InlineASM.h +--- Source/WTF/wtf/InlineASM.h.orig 2013-11-27 01:01:21.000000000 +0000 ++++ Source/WTF/wtf/InlineASM.h @@ -42,7 +42,7 @@ #define THUMB_FUNC_PARAM(name) #endif diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_NumberOfCores.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_NumberOfCores.cpp index b9eb15db920..980eb4149d9 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_NumberOfCores.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_NumberOfCores.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_WTF_wtf_NumberOfCores.cpp,v 1.2 2013/12/17 23:22:35 joerg Exp $ +$NetBSD: patch-Source_WTF_wtf_NumberOfCores.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add NetBSD support ---- qtwebkit/Source/WTF/wtf/NumberOfCores.cpp.orig 2013-12-08 17:09:59.000000000 +0000 -+++ qtwebkit/Source/WTF/wtf/NumberOfCores.cpp +--- Source/WTF/wtf/NumberOfCores.cpp.orig 2013-12-08 17:09:59.000000000 +0000 ++++ Source/WTF/wtf/NumberOfCores.cpp @@ -32,6 +32,7 @@ // data types defined in the former. See sysctl(3) and style(9). #include <sys/types.h> diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_Platform.h b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h index e4e0158426d..10e35a8c12f 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_Platform.h +++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h @@ -1,11 +1,11 @@ -$NetBSD: patch-qtwebkit_Source_WTF_wtf_Platform.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.1 2014/12/30 17:23:47 adam Exp $ * Disable JIT support for NetBSD, fix segfault of qtwebkit consumers * Use system's malloc for NetBSD, do not use fastmalloc from qt5, fix segfault of qtwebkit consumers ---- qtwebkit/Source/WTF/wtf/Platform.h.orig 2013-11-27 01:01:21.000000000 +0000 -+++ qtwebkit/Source/WTF/wtf/Platform.h +--- Source/WTF/wtf/Platform.h.orig 2013-11-27 01:01:21.000000000 +0000 ++++ Source/WTF/wtf/Platform.h @@ -36,6 +36,9 @@ macros, policy decision macros, and top-level port definitions. ==== */ #define PLATFORM(WTF_FEATURE) (defined WTF_PLATFORM_##WTF_FEATURE && WTF_PLATFORM_##WTF_FEATURE) diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_RAMSize.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_RAMSize.cpp index 35a502c015a..7a4209bb140 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_RAMSize.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_RAMSize.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_WTF_wtf_RAMSize.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WTF_wtf_RAMSize.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add NetBSD support ---- qtwebkit/Source/WTF/wtf/RAMSize.cpp.orig 2013-11-27 01:01:20.000000000 +0000 -+++ qtwebkit/Source/WTF/wtf/RAMSize.cpp +--- Source/WTF/wtf/RAMSize.cpp.orig 2013-11-27 01:01:20.000000000 +0000 ++++ Source/WTF/wtf/RAMSize.cpp @@ -27,7 +27,7 @@ #include "RAMSize.h" diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp index 1620f15ed1a..42fa68f575a 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add NetBSD support ---- qtwebkit/Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig 2013-11-27 01:01:20.000000000 +0000 -+++ qtwebkit/Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp +--- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig 2013-11-27 01:01:20.000000000 +0000 ++++ Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp @@ -39,6 +39,12 @@ #if OS(ANDROID) || OS(HURD) // PTHREAD_KEYS_MAX is not defined in bionic nor in Hurd, so explicitly define it here. diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_Threading.h b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Threading.h index dd8ba2d4b9e..5d0314445c1 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_Threading.h +++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Threading.h @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_WTF_wtf_Threading.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WTF_wtf_Threading.h,v 1.1 2014/12/30 17:23:47 adam Exp $ * Add Solaris/SunOS support ---- qtwebkit/Source/WTF/wtf/Threading.h.orig 2013-11-27 01:01:21.000000000 +0000 -+++ qtwebkit/Source/WTF/wtf/Threading.h +--- Source/WTF/wtf/Threading.h.orig 2013-11-27 01:01:21.000000000 +0000 ++++ Source/WTF/wtf/Threading.h @@ -112,6 +112,8 @@ using WTF::createThread; using WTF::currentThread; using WTF::detachThread; diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_text_StringImpl.h b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_text_StringImpl.h new file mode 100644 index 00000000000..2db83b157fe --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_text_StringImpl.h @@ -0,0 +1,12 @@ +$NetBSD: patch-Source_WTF_wtf_text_StringImpl.h,v 1.1 2014/12/30 17:23:47 adam Exp $ + +--- Source/WTF/wtf/text/StringImpl.h.orig 2013-11-27 01:01:21.000000000 +0000 ++++ Source/WTF/wtf/text/StringImpl.h +@@ -24,6 +24,7 @@ + #define StringImpl_h + + #include <limits.h> ++#include <unistd.h> + #include <wtf/ASCIICType.h> + #include <wtf/Forward.h> + #include <wtf/StdLibExtras.h> diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_Target.pri b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_Target.pri index c7e1bb44670..5ae1886ba7f 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_Target.pri +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_Target.pri @@ -1,17 +1,15 @@ -$NetBSD: patch-qtwebkit_Source_WebCore_Target.pri,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WebCore_Target.pri,v 1.1 2014/12/30 17:23:47 adam Exp $ * Build libWebCore with libtool * Install libWebCore libraries ---- qtwebkit/Source/WebCore/Target.pri.orig 2013-11-27 01:01:46.000000000 +0000 -+++ qtwebkit/Source/WebCore/Target.pri -@@ -12,7 +12,10 @@ include(WebCore.pri) +--- Source/WebCore/Target.pri.orig 2013-11-27 01:01:46.000000000 +0000 ++++ Source/WebCore/Target.pri +@@ -12,7 +12,8 @@ include(WebCore.pri) WEBKIT += wtf WEBKIT += javascriptcore -CONFIG += staticlib -+#CONFIG += staticlib -+ +target.path = $$[QT_INSTALL_LIBS] +INSTALLS += target diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp index f459589caa0..be5b38c2dd7 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.1 2014/12/30 17:23:48 adam Exp $ * Add NetBSD support ---- qtwebkit/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig 2013-11-27 01:01:47.000000000 +0000 -+++ qtwebkit/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp +--- Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig 2013-11-27 01:01:47.000000000 +0000 ++++ Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp @@ -63,6 +63,8 @@ JSValue JSInspectorFrontendHost::platfor DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("freebsd"))); #elif OS(OPENBSD) diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_editing_Editor.h b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_editing_Editor.h index 62a00657825..2d94a144855 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_editing_Editor.h +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_editing_Editor.h @@ -1,7 +1,7 @@ -$NetBSD: patch-qtwebkit_Source_WebCore_editing_Editor.h,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WebCore_editing_Editor.h,v 1.1 2014/12/30 17:23:48 adam Exp $ ---- qtwebkit/Source/WebCore/editing/Editor.h.orig 2013-11-27 01:01:43.000000000 +0000 -+++ qtwebkit/Source/WebCore/editing/Editor.h +--- Source/WebCore/editing/Editor.h.orig 2013-11-27 01:01:43.000000000 +0000 ++++ Source/WebCore/editing/Editor.h @@ -416,7 +416,7 @@ public: Vector<String> dictationAlternativesForMarker(const DocumentMarker*); void applyDictationAlternativelternative(const String& alternativeString); diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_page_NavigatorBase.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_NavigatorBase.cpp index 8a3ce53a8de..bb6a6fcddef 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_page_NavigatorBase.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_NavigatorBase.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_WebCore_page_NavigatorBase.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WebCore_page_NavigatorBase.cpp,v 1.1 2014/12/30 17:23:48 adam Exp $ * Treat *BSD like Linux ---- qtwebkit/Source/WebCore/page/NavigatorBase.cpp.orig 2013-11-27 01:01:47.000000000 +0000 -+++ qtwebkit/Source/WebCore/page/NavigatorBase.cpp +--- Source/WebCore/page/NavigatorBase.cpp.orig 2013-11-27 01:01:47.000000000 +0000 ++++ Source/WebCore/page/NavigatorBase.cpp @@ -30,7 +30,7 @@ #include "NetworkStateNotifier.h" #include <wtf/text/WTFString.h> diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h new file mode 100644 index 00000000000..7dfd02a8343 --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h @@ -0,0 +1,15 @@ +$NetBSD: patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h,v 1.1 2014/12/30 17:23:48 adam Exp $ + +* Treat *BSD like Linux + +--- Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h.orig 2013-11-27 01:01:44.000000000 +0000 ++++ Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h +@@ -36,7 +36,7 @@ typedef struct __IOSurface* IOSurfaceRef + typedef IOSurfaceRef PlatformGraphicsSurface; + #endif + +-#if OS(LINUX) ++#if OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) + typedef uint32_t PlatformGraphicsSurface; + #endif + diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h new file mode 100644 index 00000000000..ec00f11b089 --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h @@ -0,0 +1,15 @@ +$NetBSD: patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h,v 1.1 2014/12/30 17:23:48 adam Exp $ + +* Treat *BSD like Linux + +--- Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h.orig 2013-11-27 01:01:44.000000000 +0000 ++++ Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h +@@ -35,7 +35,7 @@ struct GraphicsSurfaceToken { + + #if OS(DARWIN) + typedef mach_port_t BufferHandle; +-#elif OS(LINUX) ++#elif OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) + typedef uint32_t BufferHandle; + #elif OS(WINDOWS) + typedef HANDLE BufferHandle; diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp index a19a4313fcd..1a3fd00d6a6 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp,v 1.1 2014/04/23 07:05:31 adam Exp $ +$NetBSD: patch-Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp,v 1.1 2014/12/30 17:23:48 adam Exp $ Correct includes. ---- qtwebkit/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp.orig 2014-04-22 06:24:40.000000000 +0000 -+++ qtwebkit/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp +--- Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp.orig 2014-04-22 06:24:40.000000000 +0000 ++++ Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp @@ -23,9 +23,9 @@ #if USE(GRAPHICS_SURFACE) && OS(DARWIN) #include "TextureMapperGL.h" diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp new file mode 100644 index 00000000000..247f4cc54d9 --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp,v 1.1 2014/12/30 17:23:48 adam Exp $ + +--- Source/WebCore/platform/sql/SQLiteDatabase.cpp.orig 2013-11-27 01:01:43.000000000 +0000 ++++ Source/WebCore/platform/sql/SQLiteDatabase.cpp +@@ -127,7 +127,7 @@ void SQLiteDatabase::interrupt() + if (!m_db) + return; + sqlite3_interrupt(m_db); +- yield(); ++ WTF::yield(); + } + + m_lockingMutex.unlock(); diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_DerivedSources.pri b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_DerivedSources.pri index d184fb27c99..cf5ebf7b7d7 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_DerivedSources.pri +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_DerivedSources.pri @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_WebKit2_DerivedSources.pri,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WebKit2_DerivedSources.pri,v 1.1 2014/12/30 17:23:48 adam Exp $ * Fix build from the lack of many headers, this is ugly hack ---- qtwebkit/Source/WebKit2/DerivedSources.pri.orig 2013-11-27 01:01:50.000000000 +0000 -+++ qtwebkit/Source/WebKit2/DerivedSources.pri +--- Source/WebKit2/DerivedSources.pri.orig 2013-11-27 01:01:50.000000000 +0000 ++++ Source/WebKit2/DerivedSources.pri @@ -4,6 +4,9 @@ # See 'Tools/qmake/README' for an overview of the build system # ------------------------------------------------------------------- diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp index 3196a0a9845..1268cee0412 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp @@ -1,7 +1,7 @@ -$NetBSD: patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp,v 1.1 2014/04/23 07:05:31 adam Exp $ +$NetBSD: patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp,v 1.1 2014/12/30 17:23:48 adam Exp $ ---- qtwebkit/Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp.orig 2014-04-22 06:58:04.000000000 +0000 -+++ qtwebkit/Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp +--- Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp.orig 2014-04-22 06:58:04.000000000 +0000 ++++ Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp @@ -31,7 +31,7 @@ #include "MessageFlags.h" #include "StringReference.h" diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.h b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.h index ca6ad691f10..2ab4226229c 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.h +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.h @@ -1,7 +1,7 @@ -$NetBSD: patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.h,v 1.1 2014/04/23 07:05:31 adam Exp $ +$NetBSD: patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.h,v 1.1 2014/12/30 17:23:48 adam Exp $ ---- qtwebkit/Source/WebKit2/Platform/CoreIPC/MessageDecoder.h.orig 2014-04-22 06:56:09.000000000 +0000 -+++ qtwebkit/Source/WebKit2/Platform/CoreIPC/MessageDecoder.h +--- Source/WebKit2/Platform/CoreIPC/MessageDecoder.h.orig 2014-04-22 06:56:09.000000000 +0000 ++++ Source/WebKit2/Platform/CoreIPC/MessageDecoder.h @@ -46,7 +46,7 @@ public: bool isSyncMessage() const; bool shouldDispatchMessageWhenWaitingForSyncReply() const; diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp index 575ad6acd6b..580505373cb 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp,v 1.1 2014/12/30 17:23:48 adam Exp $ * Try to use /tmp/* file like shared memory, I am not sure. ---- qtwebkit/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp.orig 2013-11-27 01:01:51.000000000 +0000 -+++ qtwebkit/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp +--- Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp.orig 2013-11-27 01:01:51.000000000 +0000 ++++ Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp @@ -139,14 +139,25 @@ PassRefPtr<SharedMemory> SharedMemory::c PassRefPtr<SharedMemory> SharedMemory::create(size_t size) { diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Target.pri b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Target.pri index 23e666e3040..d4f25853a2c 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Target.pri +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Target.pri @@ -1,11 +1,11 @@ -$NetBSD: patch-qtwebkit_Source_WebKit2_Target.pri,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WebKit2_Target.pri,v 1.1 2014/12/30 17:23:48 adam Exp $ * Fix build from the lack of many headers, this is ugly hack * Build libWebKit2 with libtool * Install libWebKit2 libraries ---- qtwebkit/Source/WebKit2/Target.pri.orig 2013-11-27 01:01:51.000000000 +0000 -+++ qtwebkit/Source/WebKit2/Target.pri +--- Source/WebKit2/Target.pri.orig 2013-11-27 01:01:51.000000000 +0000 ++++ Source/WebKit2/Target.pri @@ -7,11 +7,16 @@ TEMPLATE = lib TARGET = WebKit2 diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit_WebKit1.pro b/x11/qt5-qtwebkit/patches/patch-Source_WebKit_WebKit1.pro index d1c7ccef893..648a9adc763 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit_WebKit1.pro +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebKit_WebKit1.pro @@ -1,10 +1,10 @@ -$NetBSD: patch-qtwebkit_Source_WebKit_WebKit1.pro,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Source_WebKit_WebKit1.pro,v 1.1 2014/12/30 17:23:48 adam Exp $ * Build libWebKit libraries with libtool * Install libWebKit libraries ---- qtwebkit/Source/WebKit/WebKit1.pro.orig 2013-11-27 01:01:39.000000000 +0000 -+++ qtwebkit/Source/WebKit/WebKit1.pro +--- Source/WebKit/WebKit1.pro.orig 2013-11-27 01:01:39.000000000 +0000 ++++ Source/WebKit/WebKit1.pro @@ -16,7 +16,10 @@ QT += gui # defined by the logic in qt_module.prf as it should DEFINES += QT_BUILD_WEBKIT_LIB diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_examples_platformplugin_platformplugin.pro b/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_examples_platformplugin_platformplugin.pro new file mode 100644 index 00000000000..fb6c1be2d56 --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_examples_platformplugin_platformplugin.pro @@ -0,0 +1,17 @@ +$NetBSD: patch-Source_WebKit_qt_examples_platformplugin_platformplugin.pro,v 1.1 2014/12/30 17:23:48 adam Exp $ + +* Fix unprivileged build, + https://bugs.webkit.org/show_bug.cgi?id=117077 + +--- Source/WebKit/qt/examples/platformplugin/platformplugin.pro.orig 2013-11-27 01:01:40.000000000 +0000 ++++ Source/WebKit/qt/examples/platformplugin/platformplugin.pro +@@ -20,7 +20,8 @@ load(mobilityconfig, true) + } + } + +-DESTDIR = $$[QT_INSTALL_PLUGINS]/webkit ++target.path = $$[QT_INSTALL_PLUGINS]/webkit ++INSTALLS += target + + SOURCES += \ + WebPlugin.cpp \ diff --git a/x11/qt5-qtwebkit/patches/patch-Source_api.pri b/x11/qt5-qtwebkit/patches/patch-Source_api.pri new file mode 100644 index 00000000000..1d81abfb55e --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Source_api.pri @@ -0,0 +1,15 @@ +$NetBSD: patch-Source_api.pri,v 1.1 2014/12/30 17:23:48 adam Exp $ + +OS X also requires dummy object file, otherwise 'ar' would fail. + +--- Source/api.pri.orig 2014-11-17 12:03:52.000000000 +0000 ++++ Source/api.pri +@@ -102,7 +102,7 @@ load(qt_module) + } + } + +-qnx { ++macx|qnx { + # see: https://bugs.webkit.org/show_bug.cgi?id=93460 + # the gcc 4.4.2 used in the qnx bbndk cannot cope with + # the linkage step of libQtWebKit, adding a dummy .cpp diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Tools_Scripts_webkitdirs.pm b/x11/qt5-qtwebkit/patches/patch-Tools_Scripts_webkitdirs.pm index ec14808ee6e..4bf720e36ab 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Tools_Scripts_webkitdirs.pm +++ b/x11/qt5-qtwebkit/patches/patch-Tools_Scripts_webkitdirs.pm @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Tools_Scripts_webkitdirs.pm,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Tools_Scripts_webkitdirs.pm,v 1.1 2014/12/30 17:23:48 adam Exp $ * Add NetBSD support ---- qtwebkit/Tools/Scripts/webkitdirs.pm.orig 2013-11-27 01:01:20.000000000 +0000 -+++ qtwebkit/Tools/Scripts/webkitdirs.pm +--- Tools/Scripts/webkitdirs.pm.orig 2013-11-27 01:01:20.000000000 +0000 ++++ Tools/Scripts/webkitdirs.pm @@ -355,7 +355,7 @@ sub determineNumberOfCPUs } elsif (isWindows() || isCygwin()) { # Assumes cygwin diff --git a/x11/qt5-qtwebkit/patches/patch-Tools_WebKitTestRunner_InjectedBundle_Target.pri b/x11/qt5-qtwebkit/patches/patch-Tools_WebKitTestRunner_InjectedBundle_Target.pri new file mode 100644 index 00000000000..a2e7e22c84a --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Tools_WebKitTestRunner_InjectedBundle_Target.pri @@ -0,0 +1,14 @@ +$NetBSD: patch-Tools_WebKitTestRunner_InjectedBundle_Target.pri,v 1.1 2014/12/30 17:23:48 adam Exp $ + +* Treat NetBSD like Linux + +--- Tools/WebKitTestRunner/InjectedBundle/Target.pri.orig 2013-11-27 01:01:19.000000000 +0000 ++++ Tools/WebKitTestRunner/InjectedBundle/Target.pri +@@ -67,6 +67,6 @@ INCLUDEPATH += \ + PREFIX_HEADER = $$PWD/../WebKitTestRunnerPrefix.h + *-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER" + +-linux-* { ++linux-*|netbsd-* { + QMAKE_LFLAGS += -Wl,--no-undefined + } diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Tools_qmake_mkspecs_features_functions.prf b/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_functions.prf index 2bd426a08e8..d0ac2644e9d 100644 --- a/x11/qt5-qtbase/patches/patch-qtwebkit_Tools_qmake_mkspecs_features_functions.prf +++ b/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_functions.prf @@ -1,9 +1,9 @@ -$NetBSD: patch-qtwebkit_Tools_qmake_mkspecs_features_functions.prf,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-Tools_qmake_mkspecs_features_functions.prf,v 1.1 2014/12/30 17:23:48 adam Exp $ * Use libtool manner for libtool build ---- qtwebkit/Tools/qmake/mkspecs/features/functions.prf.orig 2013-11-27 01:01:20.000000000 +0000 -+++ qtwebkit/Tools/qmake/mkspecs/features/functions.prf +--- Tools/qmake/mkspecs/features/functions.prf.orig 2013-11-27 01:01:20.000000000 +0000 ++++ Tools/qmake/mkspecs/features/functions.prf @@ -262,8 +262,8 @@ defineTest(linkAgainstLibrary) { path = $$replace(source_dir, $$re_escape($${ROOT_WEBKIT_DIR}), $${ROOT_BUILD_DIR})/$$targetSubDir() diff --git a/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_production__build.prf b/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_production__build.prf new file mode 100644 index 00000000000..c79a4e2eb26 --- /dev/null +++ b/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_production__build.prf @@ -0,0 +1,15 @@ +$NetBSD: patch-Tools_qmake_mkspecs_features_production__build.prf,v 1.1 2014/12/30 17:23:48 adam Exp $ + +* Set CONFIGs for non-static (libtoolized) build + +--- Tools/qmake/mkspecs/features/production_build.prf.orig 2014-09-11 10:48:10.000000000 +0000 ++++ Tools/qmake/mkspecs/features/production_build.prf +@@ -7,7 +7,7 @@ CONFIG *= use_all_in_one_files + # resulting in the need of several gigabytes of memory at link-time. Reduce the pressure + # by compiling any static library like WTF or JSC with release flags instead and keep debug + # symbols for the static libraries that implement API. +-if(linux-*:!contains(QMAKE_HOST.arch, x86_64))|mingw:if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib):staticlib { ++if(linux-*:!contains(QMAKE_HOST.arch, x86_64))|mingw:if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib) { + !equals(TARGET, WebKit2):!equals(TARGET, WebKitWidgets) { + CONFIG += no_debug_info + CONFIG -= separate_debug_info diff --git a/x11/qt5-qtx11extras/Makefile b/x11/qt5-qtx11extras/Makefile index ab9f126ac07..c78d22b5f75 100644 --- a/x11/qt5-qtx11extras/Makefile +++ b/x11/qt5-qtx11extras/Makefile @@ -1,13 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/12/30 17:23:48 adam Exp $ +DISTNAME= qtx11extras-opensource-src-${QTVERSION} PKGNAME= qt5-qtx11extras-${QTVERSION} COMMENT= Qt5 module for X11 extras -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtx11extras - +BUILD_TARGET= sub-src INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} INSTALLATION_DIRS+= lib/pkgconfig @@ -15,9 +12,8 @@ INSTALLATION_DIRS+= lib/pkgconfig post-install: .for i in Qt5X11Extras.pc - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" diff --git a/x11/qt5-qtx11extras/buildlink3.mk b/x11/qt5-qtx11extras/buildlink3.mk index 153f5f2a57c..296a61bc14e 100644 --- a/x11/qt5-qtx11extras/buildlink3.mk +++ b/x11/qt5-qtx11extras/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2014/10/07 16:47:17 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2014/12/30 17:23:48 adam Exp $ BUILDLINK_TREE+= qt5-qtx11extras .if !defined(QT5_QTX11EXTRAS_BUILDLINK3_MK) QT5_QTX11EXTRAS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtx11extras+= qt5-qtx11extras>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtx11extras?= qt5-qtx11extras>=5.2.1 +BUILDLINK_API_DEPENDS.qt5-qtx11extras+= qt5-qtx11extras>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtx11extras+= qt5-qtx11extras>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtx11extras?= ../../x11/qt5-qtx11extras BUILDLINK_INCDIRS.qt5-qtx11extras+= qt5/include diff --git a/x11/qt5-qtx11extras/distinfo b/x11/qt5-qtx11extras/distinfo new file mode 100644 index 00000000000..5ee0b1bef58 --- /dev/null +++ b/x11/qt5-qtx11extras/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:48 adam Exp $ + +SHA1 (qtx11extras-opensource-src-5.4.0.tar.xz) = 999026cf8389c66af22ffb29767b87b1a793595b +RMD160 (qtx11extras-opensource-src-5.4.0.tar.xz) = c764f7862df3bc2400e340c4cc205f251cd28b18 +Size (qtx11extras-opensource-src-5.4.0.tar.xz) = 25456 bytes diff --git a/x11/qt5-qtxmlpatterns/Makefile b/x11/qt5-qtxmlpatterns/Makefile index 5f3e48df1ce..d2b633347c9 100644 --- a/x11/qt5-qtxmlpatterns/Makefile +++ b/x11/qt5-qtxmlpatterns/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:15 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/12/30 17:23:48 adam Exp $ +DISTNAME= qtxmlpatterns-opensource-src-${QTVERSION} PKGNAME= qt5-qtxmlpatterns-${QTVERSION} COMMENT= Qt5 module for XML Patterns -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtxmlpatterns +#NO_CONFIGURE= yes BUILD_TARGET= sub-tools INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -16,9 +14,8 @@ INSTALLATION_DIRS+= lib/pkgconfig post-install: .for i in Qt5XmlPatterns.pc - ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} + cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ + ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor .include "../../x11/qt5-qtbase/buildlink3.mk" diff --git a/x11/qt5-qtxmlpatterns/buildlink3.mk b/x11/qt5-qtxmlpatterns/buildlink3.mk index cfd992418dc..068207420ba 100644 --- a/x11/qt5-qtxmlpatterns/buildlink3.mk +++ b/x11/qt5-qtxmlpatterns/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/10/07 16:47:17 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2014/12/30 17:23:48 adam Exp $ BUILDLINK_TREE+= qt5-qtxmlpatterns .if !defined(QT5_QTXMLPATTERNS_BUILDLINK3_MK) QT5_QTXMLPATTERNS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.2.0 -BUILDLINK_ABI_DEPENDS.qt5-qtxmlpatterns?= qt5-qtxmlpatterns>=5.2.1 +BUILDLINK_API_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-qtxmlpatterns?= ../../x11/qt5-qtxmlpatterns BUILDLINK_INCDIRS.qt5-qtxmlpatterns+= qt5/include diff --git a/x11/qt5-qtxmlpatterns/distinfo b/x11/qt5-qtxmlpatterns/distinfo new file mode 100644 index 00000000000..92bc1a61dcc --- /dev/null +++ b/x11/qt5-qtxmlpatterns/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:48 adam Exp $ + +SHA1 (qtxmlpatterns-opensource-src-5.4.0.tar.xz) = e6d08bca4186b8c10e669836e5f6133ad59c9cce +RMD160 (qtxmlpatterns-opensource-src-5.4.0.tar.xz) = e623f0828cbe60c1108337d629cbc3f3ffba415c +Size (qtxmlpatterns-opensource-src-5.4.0.tar.xz) = 1307936 bytes diff --git a/x11/qt5-sqlite3/Makefile b/x11/qt5-sqlite3/Makefile index c4d47649ec7..b006af4251c 100644 --- a/x11/qt5-sqlite3/Makefile +++ b/x11/qt5-sqlite3/Makefile @@ -1,13 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2014/12/25 13:51:15 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/12/30 17:23:48 adam Exp $ +DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-sqlite3-${QTVERSION} -PKGREVISION= 1 COMMENT= Qt5 SQLite3 plugin -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib - -BUILD_DIRS= qtbase/src/plugins/sqldrivers +BUILD_DIRS= src/plugins/sqldrivers MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -16,10 +13,10 @@ CFLAGS.SunOS+= -D__EXTENSIONS__ # posix_fallocate() .include "../../x11/qt5-qtbase/Makefile.common" -post-configure: +do-configure: + ${RM} -f -r ${WRKSRC}/mkspecs cd ${WRKSRC}/${BUILD_DIRS} && \ - ${QTDIR}/bin/qmake "sql-plugins=sqlite" -o Makefile - + ${QTDIR}/bin/qmake "sql-plugins=sqlite" -o Makefile .include "../../databases/sqlite3/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" diff --git a/x11/qt5-sqlite3/buildlink3.mk b/x11/qt5-sqlite3/buildlink3.mk index cd4b6ab1ae1..aa2ec599874 100644 --- a/x11/qt5-sqlite3/buildlink3.mk +++ b/x11/qt5-sqlite3/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/10/07 16:47:17 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2014/12/30 17:23:48 adam Exp $ BUILDLINK_TREE+= qt5-sqlite3 .if !defined(QT5_SQLITE3_BUILDLINK3_MK) QT5_SQLITE3_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.2.0rc1 -BUILDLINK_ABI_DEPENDS.qt5-sqlite3?= qt5-sqlite3>=5.2.1 +BUILDLINK_API_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.4.0 +BUILDLINK_ABI_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.4.0 BUILDLINK_PKGSRCDIR.qt5-sqlite3?= ../../x11/qt5-sqlite3 BUILDLINK_LIBDIRS.qt5-sqlite3+= qt5/plugins diff --git a/x11/qt5-sqlite3/distinfo b/x11/qt5-sqlite3/distinfo new file mode 100644 index 00000000000..1f88252b9f1 --- /dev/null +++ b/x11/qt5-sqlite3/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/12/30 17:23:48 adam Exp $ + +SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd +RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909 +Size (qtbase-opensource-src-5.4.0.tar.xz) = 46109688 bytes diff --git a/x11/qt5/Makefile b/x11/qt5/Makefile index be63d7f7bd3..7907699bcc1 100644 --- a/x11/qt5/Makefile +++ b/x11/qt5/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2014/04/23 07:05:31 adam Exp $ +# $NetBSD: Makefile,v 1.5 2014/12/30 17:23:45 adam Exp $ DISTNAME= qt5-${QTVERSION} CATEGORIES= x11 MASTER_SITES= # none -COMMENT= "meta-package" forversion 5 of the QT GUI C++ toolkit +COMMENT= "meta-package" for version 5 of the QT GUI C++ toolkit META_PACKAGE= yes @@ -30,10 +30,14 @@ DEPENDS+= qt5-qtsvg-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtsvg DEPENDS+= qt5-qttools-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qttools DEPENDS+= qt5-qttranslations-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qttranslations DEPENDS+= qt5-qtwebkit-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebkit -DEPENDS+= qt5-qtx11extras-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtx11extras DEPENDS+= qt5-qtxmlpatterns-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtxmlpatterns DEPENDS+= qt5-sqlite3-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-sqlite3 #DEPENDS+= qt5-ibus-${QTVERSION}{,nb[0-9]*}:../../inputmethod/qt5-ibus -DEPENDS+= qt5-uim-[0-9]*:../../inputmethod/qt5-uim +#DEPENDS+= qt5-uim-[0-9]*:../../inputmethod/qt5-uim +.if ${OPSYS} == "Darwin" +DEPENDS+= qt5-qtmacextras-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtmacextras +.else +DEPENDS+= qt5-qtx11extras-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtx11extras +.endif .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5/Makefile.common b/x11/qt5/Makefile.common index 6aa2fd31e9d..16377d66f9d 100644 --- a/x11/qt5/Makefile.common +++ b/x11/qt5/Makefile.common @@ -1,15 +1,18 @@ -# $NetBSD: Makefile.common,v 1.3 2014/04/23 07:05:31 adam Exp $ +# $NetBSD: Makefile.common,v 1.4 2014/12/30 17:23:45 adam Exp $ # used by x11/qt5-qtbase/Makefile.common # used by inputmethod/qt5-uim/Makefile -QTDISTVER= 5.2.1 -QTVERSION= ${QTDISTVER:S/-rc/rc/} +QTVERSION= 5.4.0 .include "../../mk/bsd.prefs.mk" +CATEGORIES= x11 +MASTER_SITES= http://download.qt-project.org/official_releases/qt/${QTVERSION:R}/${QTVERSION}/submodules/ +EXTRACT_SUFX= .tar.xz +EXTRACT_USING= bsdtar + MAINTAINER?= ryoon@NetBSD.org HOMEPAGE= http://qt-project.org/ - LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v3 QTPREFIX= ${LOCALBASE}/qt5 |