Add qt5-qtbase 5.6.2 and 5.7.1 packages
This commit is contained in:
Mark Davies
parent
b7e4151920
commit
5600ac3760
75 changed files with 8812 additions and 0 deletions
2
Makefile
2
Makefile
|
|
@ -3659,6 +3659,8 @@ SUBDIR+= qt4-libqtlua
|
|||
SUBDIR+= qt5-libqtlua
|
||||
SUBDIR+= qt5-qscintilla
|
||||
SUBDIR+= qt5-qtbase-git
|
||||
SUBDIR+= qt5-qtbase56
|
||||
SUBDIR+= qt5-qtbase57
|
||||
SUBDIR+= qtaccountsservice
|
||||
SUBDIR+= qtcreator
|
||||
SUBDIR+= qtcurve-gtk2
|
||||
|
|
|
|||
15
qt5-qtbase56/DESCR
Normal file
15
qt5-qtbase56/DESCR
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
|
||||
maintaining GUI (graphical user interface) applications.
|
||||
|
||||
Qt is written in C++ and is fully object-oriented. It has everything you need
|
||||
to create professional GUI applications. And it enables you to create them
|
||||
quickly.
|
||||
|
||||
Qt is a multi-platform toolkit. When developing software with Qt, you can run
|
||||
it on the X Window System (Unix/X11) or Microsoft Windows NT and Windows 95/98.
|
||||
Simply recompile your source code on the platform you want.
|
||||
|
||||
Qt cuts down the complexity in implementing large and complex systems. Its
|
||||
ingenious signal-slot technology enables true component programming.
|
||||
|
||||
This package tracks Qt5 qtbase submodule.
|
||||
18
qt5-qtbase56/MESSAGE
Normal file
18
qt5-qtbase56/MESSAGE
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
===========================================================================
|
||||
$NetBSD: MESSAGE,v 1.2 2014/08/19 10:37:53 wiz Exp $
|
||||
|
||||
To allow this package to coexist with other versions of Qt
|
||||
it has been installed in ${PREFIX}/qt5/{bin,include,lib,doc} etc.
|
||||
|
||||
You should be able to select this version of Qt when compiling
|
||||
programs which use it by ensuring that
|
||||
|
||||
1) QTDIR is set to ${PREFIX}/qt5
|
||||
|
||||
2) Use the "configure" argument "--with-qt-dir=${PREFIX}/qt5"
|
||||
|
||||
3) Use the "cmake" argument "-DCMAKE_PREFIX_PATH:PATH=${PREFIX}/qt5"
|
||||
|
||||
4) you may also have to put ${PREFIX}/qt5/bin in your PATH
|
||||
|
||||
===========================================================================
|
||||
226
qt5-qtbase56/Makefile
Normal file
226
qt5-qtbase56/Makefile
Normal file
|
|
@ -0,0 +1,226 @@
|
|||
# $NetBSD: Makefile,v 1.39 2016/12/04 21:46:54 marino Exp $
|
||||
|
||||
DISTNAME= qtbase-opensource-src-${QTVERSION}
|
||||
PKGNAME= qt5-qtbase-${QTVERSION}
|
||||
COMMENT= C++ X GUI toolkit
|
||||
|
||||
#.include "../../x11/qt5-qtbase/Makefile.common"
|
||||
.include "Makefile.common"
|
||||
|
||||
#GCC_REQD += 5.0
|
||||
|
||||
.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+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
|
||||
CONFIGURE_ARGS+= -accessibility
|
||||
CONFIGURE_ARGS+= -dbus-linked
|
||||
CONFIGURE_ARGS+= -fontconfig
|
||||
CONFIGURE_ARGS+= -force-pkg-config
|
||||
CONFIGURE_ARGS+= -icu
|
||||
CONFIGURE_ARGS+= -openssl-linked
|
||||
CONFIGURE_ARGS+= -nomake examples
|
||||
CONFIGURE_ARGS+= -nomake tests
|
||||
CONFIGURE_ARGS+= -no-pch
|
||||
CONFIGURE_ARGS+= -no-sql-db2
|
||||
CONFIGURE_ARGS+= -no-sql-ibase
|
||||
CONFIGURE_ARGS+= -no-sql-mysql
|
||||
CONFIGURE_ARGS+= -no-sql-oci
|
||||
CONFIGURE_ARGS+= -no-sql-odbc
|
||||
CONFIGURE_ARGS+= -no-sql-psql
|
||||
CONFIGURE_ARGS+= -no-sql-sqlite
|
||||
CONFIGURE_ARGS+= -no-sql-sqlite2
|
||||
CONFIGURE_ARGS+= -no-sql-tds
|
||||
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
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
.if ${OPSYS} != "Darwin"
|
||||
CONFIGURE_ARGS+= -iconv
|
||||
QMAKE_CONF= qmake.conf
|
||||
. if ${OPSYS} != "SunOS" && \
|
||||
(!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
|
||||
CONFIGURE_ARGS+= -reduce-relocations
|
||||
. endif
|
||||
.else
|
||||
QMAKE_CONF= qmake.conf.mac
|
||||
.endif
|
||||
|
||||
PLIST_VARS+= egl
|
||||
|
||||
.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++
|
||||
LDFLAGS+= -lexecinfo
|
||||
.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" || ${OPSYS} == "FreeBSD"
|
||||
. if exists(/usr/lib/libexecinfo.so)
|
||||
LDFLAGS+= -lexecinfo
|
||||
. endif
|
||||
.endif
|
||||
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
|
||||
LDFLAGS+= -lkvm # see patch-src_corelib_io_qlockfile__unix.cpp
|
||||
.endif
|
||||
|
||||
REPLACE_PERL+= bin/syncqt.pl
|
||||
|
||||
PTHREAD_OPTS+= require
|
||||
UNLIMIT_RESOURCES= datasize
|
||||
|
||||
BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX}
|
||||
|
||||
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
|
||||
|
||||
SUBST_CLASSES+= opt path
|
||||
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,,'
|
||||
|
||||
SUBST_STAGE.path= pre-configure
|
||||
SUBST_MESSAGE.path= Add to default XDG path.
|
||||
SUBST_FILES.path= src/corelib/io/qstandardpaths_unix.cpp
|
||||
SUBST_VARS.path= LOCALBASE
|
||||
|
||||
BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
|
||||
|
||||
PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \
|
||||
Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \
|
||||
Qt5OpenGLExtensions.pc Qt5PlatformSupport.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:@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} && ./bin/qmake -o Makefile
|
||||
|
||||
post-install:
|
||||
.for i in ${PC_FILES}
|
||||
cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
|
||||
ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
|
||||
.endfor
|
||||
cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} \
|
||||
${MAKE_PROGRAM} install_mkspecs
|
||||
# The pri file has WRKSRC in it.
|
||||
${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"
|
||||
# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus
|
||||
USE_DBUS-ARCH-DEPS_H= yes
|
||||
.include "../../sysutils/dbus/buildlink3.mk"
|
||||
.include "../../textproc/icu/buildlink3.mk"
|
||||
.if ${OPSYS} != "Darwin"
|
||||
.include "../../graphics/glu/buildlink3.mk"
|
||||
. if !empty(MESALIB_SUPPORTS_EGL:Myes)
|
||||
PLIST.egl= yes
|
||||
. endif
|
||||
.include "../../x11/libxcb/buildlink3.mk"
|
||||
.include "../../x11/xcb-util/buildlink3.mk"
|
||||
.include "../../x11/xcb-util-image/buildlink3.mk"
|
||||
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
|
||||
.include "../../x11/xcb-util-wm/buildlink3.mk"
|
||||
.include "../../x11/libSM/buildlink3.mk"
|
||||
.include "../../x11/libX11/buildlink3.mk"
|
||||
.include "../../x11/libXext/buildlink3.mk"
|
||||
.include "../../x11/libXcursor/buildlink3.mk"
|
||||
.include "../../x11/libXft/buildlink3.mk"
|
||||
.include "../../x11/libXmu/buildlink3.mk"
|
||||
.include "../../x11/libXrandr/buildlink3.mk"
|
||||
.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"
|
||||
65
qt5-qtbase56/Makefile.common
Normal file
65
qt5-qtbase56/Makefile.common
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
# $NetBSD: Makefile.common,v 1.19 2016/02/26 11:27:16 jperkin Exp $
|
||||
# used by x11/qt5-mysql/Makefile
|
||||
# used by x11/qt5-odbc/Makefile
|
||||
# used by x11/qt5-psql/Makefile
|
||||
# used by x11/qt5-qtbase/Makefile
|
||||
# used by x11/qt5-qtdeclarative/Makefile
|
||||
# used by x11/qt5-qtdoc/Makefile
|
||||
# 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
|
||||
# used by x11/qt5-qtscript/Makefile
|
||||
# used by x11/qt5-qtsensors/Makefile
|
||||
# used by x11/qt5-qtserialport/Makefile
|
||||
# used by x11/qt5-qtsvg/Makefile
|
||||
# used by x11/qt5-qttools/Makefile
|
||||
# used by x11/qt5-qttranslations/Makefile
|
||||
# used by x11/qt5-qtwebchannel/Makefile
|
||||
# used by x11/qt5-qtwebkit/Makefile
|
||||
# used by x11/qt5-qtwebsockets/Makefile
|
||||
# used by x11/qt5-qtx11extras/Makefile
|
||||
# used by x11/qt5-qtxmlpatterns/Makefile
|
||||
# used by x11/qt5-sqlite3/Makefile
|
||||
|
||||
.include "../../x11/qt5/Makefile.common"
|
||||
QTVERSION= 5.6.2
|
||||
.include "options.mk"
|
||||
|
||||
.include "../../mk/dlopen.buildlink3.mk"
|
||||
BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
|
||||
|
||||
USE_LANGUAGES= c c++
|
||||
USE_LIBTOOL= yes
|
||||
USE_TOOLS+= gmake perl:build pkg-config
|
||||
|
||||
# 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
|
||||
|
||||
# SunOS ld doesn't support -rpath-link
|
||||
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${PREFIX}/qt5/lib
|
||||
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${WRKSRC}/lib
|
||||
|
||||
MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
|
||||
PLIST_VARS+= mac unix
|
||||
.if ${OPSYS} == "Darwin"
|
||||
PLIST.mac= yes
|
||||
.else
|
||||
PLIST.unix= yes
|
||||
.endif
|
||||
|
||||
# avoid creating a .qt directory in the users home directory
|
||||
SCRIPTS_ENV+= HOME=${WRKDIR}
|
||||
|
||||
.if empty(PKGPATH:Mwip/qt5-qtbase56) \
|
||||
&& 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
|
||||
2942
qt5-qtbase56/PLIST
Normal file
2942
qt5-qtbase56/PLIST
Normal file
File diff suppressed because it is too large
Load diff
15
qt5-qtbase56/PLIST.Linux
Normal file
15
qt5-qtbase56/PLIST.Linux
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
@comment $NetBSD: PLIST.Linux,v 1.2 2016/01/03 21:15:57 markd Exp $
|
||||
qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevKeyboardPlugin.cmake
|
||||
qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevMousePlugin.cmake
|
||||
qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevTabletPlugin.cmake
|
||||
qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake
|
||||
qt5/lib/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake
|
||||
qt5/lib/cmake/Qt5Network/Qt5Network_QConnmanEnginePlugin.cmake
|
||||
qt5/lib/cmake/Qt5Network/Qt5Network_QNetworkManagerEnginePlugin.cmake
|
||||
qt5/plugins/bearer/libqconnmanbearer.la
|
||||
qt5/plugins/bearer/libqnmbearer.la
|
||||
qt5/plugins/generic/libqevdevkeyboardplugin.la
|
||||
qt5/plugins/generic/libqevdevmouseplugin.la
|
||||
qt5/plugins/generic/libqevdevtabletplugin.la
|
||||
qt5/plugins/generic/libqevdevtouchplugin.la
|
||||
qt5/plugins/platforms/libqlinuxfb.la
|
||||
58
qt5-qtbase56/buildlink3.mk
Normal file
58
qt5-qtbase56/buildlink3.mk
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
# $NetBSD: buildlink3.mk,v 1.16 2016/12/04 05:17:15 ryoon Exp $
|
||||
|
||||
BUILDLINK_TREE+= qt5-qtbase
|
||||
|
||||
.if !defined(QT5_QTBASE_BUILDLINK3_MK)
|
||||
QT5_QTBASE_BUILDLINK3_MK:=
|
||||
|
||||
BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.5.1
|
||||
BUILDLINK_ABI_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.5.1nb9
|
||||
BUILDLINK_PKGSRCDIR.qt5-qtbase?= ../../x11/qt5-qtbase
|
||||
|
||||
BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include
|
||||
BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/lib
|
||||
BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/plugins
|
||||
|
||||
QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5
|
||||
CMAKE_PREFIX_PATH+= ${QTDIR}
|
||||
|
||||
CONFIGURE_ENV+= QTDIR=${QTDIR}
|
||||
MAKE_ENV+= QTDIR=${QTDIR}
|
||||
|
||||
PTHREAD_OPTS+= require
|
||||
|
||||
.include "../../mk/bsd.fast.prefs.mk"
|
||||
|
||||
.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 "../../sysutils/dbus/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"
|
||||
.include "../../x11/xcb-util/buildlink3.mk"
|
||||
.include "../../x11/xcb-util-image/buildlink3.mk"
|
||||
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
|
||||
.include "../../x11/xcb-util-wm/buildlink3.mk"
|
||||
.include "../../x11/libSM/buildlink3.mk"
|
||||
.include "../../x11/libX11/buildlink3.mk"
|
||||
.include "../../x11/libXcursor/buildlink3.mk"
|
||||
.include "../../x11/libXft/buildlink3.mk"
|
||||
.include "../../x11/libXmu/buildlink3.mk"
|
||||
.include "../../x11/libXrandr/buildlink3.mk"
|
||||
.include "../../x11/libXrender/buildlink3.mk"
|
||||
.include "../../x11/libxkbcommon/buildlink3.mk"
|
||||
.endif
|
||||
.endif # QT5_QTBASE_BUILDLINK3_MK
|
||||
|
||||
BUILDLINK_TREE+= -qt5-qtbase
|
||||
32
qt5-qtbase56/distinfo
Normal file
32
qt5-qtbase56/distinfo
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
$NetBSD: distinfo,v 1.31 2016/12/04 21:46:54 marino Exp $
|
||||
|
||||
SHA1 (qtbase-opensource-src-5.6.2.tar.xz) = f728a6b8a50e12d7da9b70c8093c484d48b33ca8
|
||||
RMD160 (qtbase-opensource-src-5.6.2.tar.xz) = 55b2d2d9474cb565e872eed1ab0e8e01bf5031a8
|
||||
SHA512 (qtbase-opensource-src-5.6.2.tar.xz) = ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321
|
||||
Size (qtbase-opensource-src-5.6.2.tar.xz) = 46825164 bytes
|
||||
SHA1 (patch-config.tests_unix_compile.test) = f8a70435bdff0fb5f37e74eddeafbb6a49655e10
|
||||
SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764
|
||||
SHA1 (patch-configure) = 2ca581b1ff59646cdaf64ff9286549c5de33b905
|
||||
SHA1 (patch-mkspecs_features_create__cmake.prf) = 3f6b3a592e29f5529e5c87dbac036c165470eac4
|
||||
SHA1 (patch-mkspecs_features_qt__module__pris.prf) = 623df7b7ffa1c8e56ceebc565efe936c74ae1c48
|
||||
SHA1 (patch-mkspecs_features_simd.prf) = 7dbe61df6252adebeac374e3541bc5ff4c93909b
|
||||
SHA1 (patch-qmake_Makefile.unix) = 0b15e96b78b38c8ebbfeaf86310c63afac7b7c4c
|
||||
SHA1 (patch-qmake_generators_makefile.cpp) = 457453c2027081fe7db5bc4a87e8b62af0993022
|
||||
SHA1 (patch-qmake_generators_unix_unixmake.cpp) = e670b4a27f5f48ae73e851b887a8309e81266d6e
|
||||
SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = ad739a3eb3806a6962ae224dc090d22102685904
|
||||
SHA1 (patch-qmake_qmake.pri) = 142f2b7d0dbfbc829afc9f83bf8be8b3054b8cf7
|
||||
SHA1 (patch-src_concurrent_qtconcurrentiteratekernel.cpp) = 295cf573cf435e0edeeefb49144f84c7c6e7559c
|
||||
SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66fd1b85d101
|
||||
SHA1 (patch-src_corelib_io_io.pri) = 9a59b621441291f388860b523f80b59730632328
|
||||
SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938
|
||||
SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 49e63522770c3c7863ccc04cc8841a73fa781a94
|
||||
SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 04f5137a5530d69c183ce188df6eee65550ba2f8
|
||||
SHA1 (patch-src_openglextensions_openglextensions.pro) = e79effc1433ddda744b79d7e1f47764fee406580
|
||||
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) = 0eb333ed8193ef056dc2c4ed99fb9d207c31fa02
|
||||
SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb
|
||||
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
|
||||
70
qt5-qtbase56/files/qmake.conf
Normal file
70
qt5-qtbase56/files/qmake.conf
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
#
|
||||
# qmake configuration for pkgsrc
|
||||
#
|
||||
|
||||
MAKEFILE_GENERATOR = UNIX
|
||||
QMAKE_PLATFORM = unix
|
||||
CONFIG += qt warn_on release link_prl incremental gdb_dwarf_index
|
||||
CONFIG += compile_libtool
|
||||
QMAKE_INCREMENTAL_STYLE = sublib
|
||||
|
||||
QMAKE_COMPILER = @CC@
|
||||
|
||||
QMAKE_CC = @CC@
|
||||
QMAKE_LEX = @LEX@
|
||||
QMAKE_LEXFLAGS =
|
||||
QMAKE_YACC = @YACC@
|
||||
QMAKE_YACCFLAGS = -d
|
||||
QMAKE_CFLAGS = @CFLAGS@
|
||||
#QMAKE_CFLAGS_THREAD = -D_REENTRANT
|
||||
|
||||
QMAKE_CXX = @CXX@
|
||||
QMAKE_CXXFLAGS = @CXXFLAGS@ -DQ_TRAILING_DIR_SEP
|
||||
# alloca usage requires GNU extensions
|
||||
QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
|
||||
|
||||
QMAKE_INCDIR = @LOCALBASE@/include
|
||||
QMAKE_LIBDIR = @LOCALBASE@/lib
|
||||
QMAKE_INCDIR_X11 = @X11BASE@/include
|
||||
QMAKE_LIBDIR_X11 = @X11BASE@/lib
|
||||
QMAKE_INCDIR_OPENGL = @X11BASE@/include
|
||||
QMAKE_LIBDIR_OPENGL = @X11BASE@/lib
|
||||
|
||||
QMAKE_LINK = @CXX@
|
||||
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)
|
||||
|
||||
# --- 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_LIBS =
|
||||
QMAKE_LIBS_DYNLOAD =
|
||||
QMAKE_LIBS_X11 = -lXext -lX11 -lm @SYS_LIBS@
|
||||
QMAKE_LIBS_OPENGL = -lGL
|
||||
QMAKE_LIBS_OPENGL_QT = -lGL
|
||||
QMAKE_LIBS_THREAD = @PTHREAD_LIBS@
|
||||
|
||||
QMAKE_AR = @AR@ cqs
|
||||
QMAKE_OBJCOPY = objcopy
|
||||
QMAKE_RANLIB = @QMAKE_RANLIB@
|
||||
|
||||
QMAKE_MOC = $(QTDIR)/bin/moc
|
||||
QMAKE_UIC = $(QTDIR)/bin/uic
|
||||
QMAKE_UIC3 = $(QTDIR)/bin/uic3
|
||||
QMAKE_RCC = $(QTDIR)/bin/rcc
|
||||
|
||||
QMAKE_MKDIR = @MKDIR@
|
||||
|
||||
include(../common/gcc-base-unix.conf)
|
||||
include(../common/unix.conf)
|
||||
load(qt_config)
|
||||
61
qt5-qtbase56/files/qmake.conf.mac
Normal file
61
qt5-qtbase56/files/qmake.conf.mac
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
#
|
||||
# qmake configuration for pkgsrc
|
||||
#
|
||||
|
||||
MAKEFILE_GENERATOR = UNIX
|
||||
QMAKE_PLATFORM = darwin mac macx osx
|
||||
CONFIG += qt warn_on release link_prl incremental global_init_link_order lib_version_first plugin_no_soname
|
||||
CONFIG += compile_libtool
|
||||
QMAKE_INCREMENTAL_STYLE = sublib
|
||||
|
||||
QMAKE_COMPILER = @CC@
|
||||
|
||||
QMAKE_CC = @CC@
|
||||
QMAKE_LEX = @LEX@
|
||||
QMAKE_LEXFLAGS =
|
||||
QMAKE_YACC = @YACC@
|
||||
QMAKE_CFLAGS = @CFLAGS@
|
||||
#QMAKE_CFLAGS_THREAD = -D_REENTRANT
|
||||
|
||||
QMAKE_CXX = @CXX@
|
||||
QMAKE_CXXFLAGS = @CXXFLAGS@ -DQ_TRAILING_DIR_SEP
|
||||
QMAKE_CXXFLAGS_CXX11 = -std=c++0x
|
||||
|
||||
QMAKE_INCDIR = @LOCALBASE@/include
|
||||
QMAKE_LIBDIR = @LOCALBASE@/lib
|
||||
#QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \
|
||||
# /System/Library/Frameworks/AGL.framework/Headers/
|
||||
|
||||
QMAKE_LINK = @CXX@
|
||||
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 = @LDFLAGS@
|
||||
QMAKE_LFLAGS_RPATH =
|
||||
QMAKE_LFLAGS_THREAD = @PTHREAD_LDFLAGS@
|
||||
# -all_load required to make Objective-C categories work in static builds.
|
||||
QMAKE_LFLAGS_STATIC_LIB = -all_load
|
||||
|
||||
QMAKE_FIX_RPATH = install_name_tool -id
|
||||
QMAKE_EXTENSION_SHLIB = dylib
|
||||
|
||||
QMAKE_LIBS =
|
||||
QMAKE_LIBS_DYNLOAD =
|
||||
QMAKE_LIBS_THREAD =
|
||||
QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL
|
||||
|
||||
QMAKE_AR = @AR@ cq
|
||||
QMAKE_NM = nm -P
|
||||
QMAKE_RANLIB = @QMAKE_RANLIB@
|
||||
|
||||
QMAKE_MOC = $(QTDIR)/bin/moc
|
||||
QMAKE_UIC = $(QTDIR)/bin/uic
|
||||
QMAKE_UIC3 = $(QTDIR)/bin/uic3
|
||||
QMAKE_RCC = $(QTDIR)/bin/rcc
|
||||
|
||||
QMAKE_MKDIR = @MKDIR@
|
||||
|
||||
include(../common/gcc-base-mac.conf)
|
||||
include(../common/unix.conf)
|
||||
load(qt_config)
|
||||
35
qt5-qtbase56/options.mk
Normal file
35
qt5-qtbase56/options.mk
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
# $NetBSD: options.mk,v 1.7 2016/01/18 20:52:43 nros Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.qt5
|
||||
PKG_SUPPORTED_OPTIONS= cups debug gtk2
|
||||
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
PLIST_VARS+= cups gtk2
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mcups)
|
||||
. include "../../print/cups/buildlink3.mk"
|
||||
CONFIGURE_ARGS+= -cups
|
||||
PLIST.cups= yes
|
||||
.else
|
||||
CONFIGURE_ARGS+= -no-cups
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mgtk2)
|
||||
. include "../../x11/gtk2/buildlink3.mk"
|
||||
CONFIGURE_ARGS+= -gtkstyle
|
||||
PLIST.gtk2= yes
|
||||
.else
|
||||
CONFIGURE_ARGS+= -no-gtkstyle
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mdebug)
|
||||
# this does not work - builds libQtBoostracp_debug
|
||||
CC+= -ggdb
|
||||
CXX+= -ggdb
|
||||
CONFIGURE_ARGS+= -debug
|
||||
INSTALL_UNSTRIPPED= yes
|
||||
.else
|
||||
CONFIGURE_ARGS+= -release
|
||||
CONFIGURE_ARGS+= -no-debug
|
||||
.endif
|
||||
13
qt5-qtbase56/patches/patch-config.tests_unix_compile.test
Normal file
13
qt5-qtbase56/patches/patch-config.tests_unix_compile.test
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD$
|
||||
|
||||
--- config.tests/unix/compile.test.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ config.tests/unix/compile.test
|
||||
@@ -42,7 +42,7 @@ while [ "$#" -gt 0 ]; do
|
||||
CFLAGS="$CFLAGS \"$PARAM\""
|
||||
CXXFLAGS="$CXXFLAGS \"$PARAM\""
|
||||
;;
|
||||
- -L*|-l*|-pthread)
|
||||
+ -L*|-l*|-Wl*|-pthread)
|
||||
LFLAGS="$LFLAGS \"$PARAM\""
|
||||
;;
|
||||
-I*)
|
||||
18
qt5-qtbase56/patches/patch-config.tests_unix_iconv_iconv.cpp
Normal file
18
qt5-qtbase56/patches/patch-config.tests_unix_iconv_iconv.cpp
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
$NetBSD: patch-config.tests_unix_iconv_iconv.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
|
||||
|
||||
* Fix for NetBSD iconv(3)
|
||||
|
||||
--- 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("", "");
|
||||
|
||||
+#if defined(__NetBSD__)
|
||||
+ const char *inp;
|
||||
+#else
|
||||
char *inp;
|
||||
+#endif
|
||||
char *outp;
|
||||
size_t inbytes, outbytes;
|
||||
iconv(x, &inp, &inbytes, &outp, &outbytes);
|
||||
81
qt5-qtbase56/patches/patch-configure
Normal file
81
qt5-qtbase56/patches/patch-configure
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
$NetBSD: patch-configure,v 1.4 2016/03/14 06:12:17 dbj Exp $
|
||||
|
||||
* Don't use SDKs on OS X
|
||||
* Add NetBSD/sparc{,64} support
|
||||
|
||||
--- configure.orig 2016-09-16 05:49:42.000000000 +0000
|
||||
+++ configure
|
||||
@@ -338,7 +338,6 @@ getQMakeConf()
|
||||
{
|
||||
if [ -z "$specvals" ]; then
|
||||
specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables "host_build"`
|
||||
- if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi
|
||||
fi
|
||||
getSingleQMakeVariable "$1" "$specvals"
|
||||
}
|
||||
@@ -347,7 +346,6 @@ getXQMakeConf()
|
||||
{
|
||||
if [ -z "$xspecvals" ]; then
|
||||
xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" | extractQMakeVariables "!host_build"`
|
||||
- if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi
|
||||
fi
|
||||
getSingleQMakeVariable "$1" "$xspecvals"
|
||||
}
|
||||
@@ -543,7 +541,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
|
||||
exit 2
|
||||
fi
|
||||
|
||||
- if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
|
||||
+ if ! /usr/bin/xcrun -find cc >/dev/null 2>&1; then
|
||||
echo >&2
|
||||
echo " Xcode not set up properly. You may need to confirm the license" >&2
|
||||
echo " agreement by running /usr/bin/xcodebuild without arguments." >&2
|
||||
@@ -2979,6 +2977,19 @@ if [ -z "$PLATFORM" ]; then
|
||||
UNIX_SV:*)
|
||||
PLATFORM=unixware-g++
|
||||
;;
|
||||
+ NetBSD:*:sparc)
|
||||
+ if [ "$OPT_VERBOSE" = "yes" ]; then
|
||||
+ echo " NetBSD on SPARC"
|
||||
+ fi
|
||||
+ CFG_HOST_ARCH=sparc
|
||||
+ ;;
|
||||
+ NetBSD:*:sparc64)
|
||||
+ if [ "$OPT_VERBOSE" = "yes" ]; then
|
||||
+ echo " NetBSD on SPARC64"
|
||||
+ fi
|
||||
+ CFG_HOST_ARCH=sparc
|
||||
+ CFG_HOST_BITSIZE=64
|
||||
+ ;;
|
||||
QNX:*)
|
||||
PLATFORM=unsupported/qnx-g++
|
||||
;;
|
||||
@@ -3568,11 +3579,11 @@ if [ "$CFG_USE_GOLD_LINKER" != "no" ]; t
|
||||
fi
|
||||
|
||||
# auto-detect --enable-new-dtags support
|
||||
-if linkerSupportsFlag $TEST_COMPILER --enable-new-dtags; then
|
||||
- CFG_ENABLE_NEW_DTAGS=yes
|
||||
-else
|
||||
+#if linkerSupportsFlag $TEST_COMPILER --enable-new-dtags; then
|
||||
+# CFG_ENABLE_NEW_DTAGS=yes
|
||||
+#else
|
||||
CFG_ENABLE_NEW_DTAGS=no
|
||||
-fi
|
||||
+#fi
|
||||
|
||||
# auto-detect -fstack-protector-strong support (for QNX only currently)
|
||||
if [ "$XPLATFORM_QNX" = "yes" ]; then
|
||||
@@ -4104,10 +4115,12 @@ if true; then ###[ '!' -f "$outpath/bin/
|
||||
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
|
||||
EXTRA_OBJS="$EXTRA_OBJS \
|
||||
qsettings_mac.o \
|
||||
+ qstring_mac.o \
|
||||
qcore_mac.o \
|
||||
qcore_mac_objc.o"
|
||||
EXTRA_SRCS="$EXTRA_SRCS \
|
||||
\"\$(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp\" \
|
||||
+ \"\$(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm\" \
|
||||
\"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \
|
||||
\"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\""
|
||||
fi
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
$NetBSD: patch-mkspecs_features_create__cmake.prf,v 1.2 2015/10/29 14:48:04 adam Exp $
|
||||
|
||||
Fix for shared libraries naming on Darwin.
|
||||
|
||||
--- mkspecs/features/create_cmake.prf.orig 2015-10-13 04:35:32.000000000 +0000
|
||||
+++ mkspecs/features/create_cmake.prf
|
||||
@@ -147,7 +147,7 @@ contains(CONFIG, plugin) {
|
||||
}
|
||||
} else {
|
||||
mac {
|
||||
- isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
|
||||
+ isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so
|
||||
else: CMAKE_PlUGIN_EXT = .a
|
||||
|
||||
CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
|
||||
@@ -213,8 +213,8 @@ mac {
|
||||
CMAKE_LIB_FILE_LOCATION_RELEASE = Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.framework/Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
|
||||
CMAKE_BUILD_IS_FRAMEWORK = "true"
|
||||
} else {
|
||||
- CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$$eval(QT.$${MODULE}.VERSION).dylib
|
||||
- CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$$eval(QT.$${MODULE}.VERSION).dylib
|
||||
+ CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$${QT_MAJOR_VERSION}.dylib
|
||||
+ CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QT_MAJOR_VERSION}.dylib
|
||||
}
|
||||
}
|
||||
} else:win32 {
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-mkspecs_features_qt__module__pris.prf,v 1.1 2014/12/30 17:23:46 adam Exp $
|
||||
|
||||
* Build libtoolized shared libraries
|
||||
|
||||
--- mkspecs/features/qt_module_pris.prf.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ mkspecs/features/qt_module_pris.prf
|
||||
@@ -51,7 +51,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$
|
||||
module_rundep =
|
||||
module_build_type = v2
|
||||
static: \
|
||||
- module_build_type += staticlib
|
||||
+ module_build_type +=
|
||||
lib_bundle {
|
||||
module_build_type += lib_bundle
|
||||
MODULE_FRAMEWORKS = " \$\$QT_MODULE_LIB_BASE"
|
||||
38
qt5-qtbase56/patches/patch-mkspecs_features_simd.prf
Normal file
38
qt5-qtbase56/patches/patch-mkspecs_features_simd.prf
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
$NetBSD: patch-mkspecs_features_simd.prf,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
* Use libtool
|
||||
|
||||
--- mkspecs/features/simd.prf.orig 2014-12-05 16:24:38.000000000 +0000
|
||||
+++ mkspecs/features/simd.prf
|
||||
@@ -33,12 +33,12 @@ defineTest(addSimdCompiler) {
|
||||
export(SOURCES)
|
||||
} else {
|
||||
# We need special compiler flags
|
||||
- $${name}_compiler.commands = $$QMAKE_CXX -c $(CXXFLAGS) $$cflags $(INCPATH) ${QMAKE_FILE_IN}
|
||||
+ $${name}_compiler.commands = $(LIBTOOL) --silent --mode=compile $$QMAKE_CXX -c $(CXXFLAGS) $$cflags $(INCPATH) ${QMAKE_FILE_IN}
|
||||
msvc: $${name}_compiler.commands += -Fo${QMAKE_FILE_OUT}
|
||||
- else: $${name}_compiler.commands += -o ${QMAKE_FILE_OUT}
|
||||
+ else: $${name}_compiler.commands += -o $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
|
||||
|
||||
$${name}_compiler.dependency_type = TYPE_C
|
||||
- $${name}_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
|
||||
+ $${name}_compiler.output = $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
|
||||
$${name}_compiler.input = $$sources_var
|
||||
$${name}_compiler.variable_out = OBJECTS
|
||||
$${name}_compiler.name = compiling[$${name}] ${QMAKE_FILE_IN}
|
||||
@@ -62,12 +62,12 @@ defineTest(addSimdCompiler) {
|
||||
SOURCES += $$eval($$asm_var)
|
||||
export(SOURCES)
|
||||
} else {
|
||||
- $${name}_assembler.commands = $$QMAKE_CC -c $(CFLAGS)
|
||||
+ $${name}_assembler.commands = $(LIBTOOL) --silent --mode=compile $$QMAKE_CC -c $(CFLAGS)
|
||||
!contains(QT_CPU_FEATURES, $${name}): $${name}_assembler.commands += $$cflags
|
||||
clang:no_clang_integrated_as: $${name}_assembler.commands += -fno-integrated-as
|
||||
- $${name}_assembler.commands += $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
|
||||
+ $${name}_assembler.commands += $(INCPATH) ${QMAKE_FILE_IN} -o $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
|
||||
$${name}_assembler.dependency_type = TYPE_C
|
||||
- $${name}_assembler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
|
||||
+ $${name}_assembler.output = $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
|
||||
$${name}_assembler.input = $$asm_var
|
||||
$${name}_assembler.variable_out = OBJECTS
|
||||
$${name}_assembler.name = assembling[$${name}] ${QMAKE_FILE_IN}
|
||||
42
qt5-qtbase56/patches/patch-qmake_Makefile.unix
Normal file
42
qt5-qtbase56/patches/patch-qmake_Makefile.unix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
$NetBSD: patch-qmake_Makefile.unix,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
* Pass environmental variables from pkgsrc
|
||||
|
||||
--- qmake/Makefile.unix.orig 2016-09-16 05:49:42.000000000 +0000
|
||||
+++ qmake/Makefile.unix
|
||||
@@ -75,6 +75,7 @@ DEPEND_SRC = \
|
||||
$(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp \
|
||||
$(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp \
|
||||
$(SOURCE_PATH)/src/corelib/tools/qhash.cpp $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp \
|
||||
+ $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm \
|
||||
$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm \
|
||||
$(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \
|
||||
$(SOURCE_PATH)/src/corelib/io/qsettings.cpp $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \
|
||||
@@ -94,7 +95,7 @@ DEPEND_SRC = \
|
||||
$(SOURCE_PATH)/src/corelib/json/qjsonvalue.cpp \
|
||||
$(QTSRCS)
|
||||
|
||||
-CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
|
||||
+CPPFLAGS += -g $(EXTRA_CPPFLAGS) \
|
||||
-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 \
|
||||
@@ -108,7 +109,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_NO_STANDARDPATHS
|
||||
|
||||
-CXXFLAGS = $(EXTRA_CXXFLAGS) $(CPPFLAGS)
|
||||
+CXXFLAGS += $(EXTRA_CXXFLAGS) $(CPPFLAGS)
|
||||
|
||||
first all: $(BUILD_PATH)/bin/qmake$(EXEEXT)
|
||||
qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT)
|
||||
@@ -289,6 +290,9 @@ qstring.o: $(SOURCE_PATH)/src/corelib/to
|
||||
qstring_compat.o: $(SOURCE_PATH)/src/corelib/tools/qstring_compat.cpp
|
||||
$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring_compat.cpp
|
||||
|
||||
+qstring_mac.o: $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm
|
||||
+ $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm
|
||||
+
|
||||
qstringbuilder.o: $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp
|
||||
$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp
|
||||
|
||||
15
qt5-qtbase56/patches/patch-qmake_generators_makefile.cpp
Normal file
15
qt5-qtbase56/patches/patch-qmake_generators_makefile.cpp
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-qmake_generators_makefile.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
* Libtoolized
|
||||
|
||||
--- qmake/generators/makefile.cpp.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ qmake/generators/makefile.cpp
|
||||
@@ -3297,7 +3297,7 @@ MakefileGenerator::writePkgConfigFile()
|
||||
pkgConfiglibName = bundle.toQString();
|
||||
} else {
|
||||
if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir))
|
||||
- t << "-L${libdir} ";
|
||||
+ t << "-Wl,-R${libdir} -L${libdir} ";
|
||||
pkgConfiglibName = "-l" + project->first("QMAKE_ORIG_TARGET");
|
||||
if (project->isActiveConfig("shared"))
|
||||
pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString();
|
||||
147
qt5-qtbase56/patches/patch-qmake_generators_unix_unixmake.cpp
Normal file
147
qt5-qtbase56/patches/patch-qmake_generators_unix_unixmake.cpp
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
$NetBSD$
|
||||
|
||||
* fix install target so that destdir is added when installing QMAKE_TARGET
|
||||
* re-add compile_libtool support that was ripped out in qt 5.6
|
||||
|
||||
--- qmake/generators/unix/unixmake.cpp.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ qmake/generators/unix/unixmake.cpp
|
||||
@@ -45,6 +45,8 @@ UnixMakefileGenerator::init()
|
||||
project->values("ICON") = project->values("RC_FILE");
|
||||
if(project->isEmpty("QMAKE_EXTENSION_PLUGIN"))
|
||||
project->values("QMAKE_EXTENSION_PLUGIN").append(project->first("QMAKE_EXTENSION_SHLIB"));
|
||||
+ if(project->isEmpty("QMAKE_LIBTOOL"))
|
||||
+ project->values("QMAKE_LIBTOOL").append("libtool --silent");
|
||||
|
||||
project->values("QMAKE_ORIG_TARGET") = project->values("TARGET");
|
||||
|
||||
@@ -150,6 +152,8 @@ UnixMakefileGenerator::init()
|
||||
|
||||
if(project->isActiveConfig("GNUmake") && !project->isEmpty("QMAKE_CFLAGS_DEPS"))
|
||||
include_deps = true; //do not generate deps
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ Option::obj_ext = ".lo"; //override the .o
|
||||
|
||||
MakefileGenerator::init();
|
||||
|
||||
@@ -224,7 +228,7 @@ UnixMakefileGenerator::init()
|
||||
project->values(runCompImp).append(compilerExecutable + " " + compile_flag + " " + var("QMAKE_CC_O_FLAG") + "\"$@\" \"$<\"");
|
||||
}
|
||||
|
||||
- if (project->isActiveConfig("mac") && !project->isEmpty("TARGET") &&
|
||||
+ if (project->isActiveConfig("mac") && !project->isEmpty("TARGET") && !project->isActiveConfig("compile_libtool") &&
|
||||
((project->isActiveConfig("build_pass") || project->isEmpty("BUILDS")))) {
|
||||
ProString bundle;
|
||||
if(project->isActiveConfig("bundle") && !project->isEmpty("QMAKE_BUNDLE_EXTENSION")) {
|
||||
@@ -306,6 +310,51 @@ UnixMakefileGenerator::init()
|
||||
project->values("QMAKE_INTERNAL_PRL_LIBS") << "QMAKE_AR_SUBLIBS";
|
||||
}
|
||||
}
|
||||
+
|
||||
+ if(project->isActiveConfig("compile_libtool")) {
|
||||
+ static const char * const libtoolify[] = {
|
||||
+ "QMAKE_RUN_CC", "QMAKE_RUN_CC_IMP", "QMAKE_RUN_CXX", "QMAKE_RUN_CXX_IMP",
|
||||
+ "QMAKE_LINK_THREAD", "QMAKE_LINK", "QMAKE_AR_CMD", "QMAKE_LINK_SHLIB_CMD", 0
|
||||
+ };
|
||||
+ for (int i = 0; libtoolify[i]; i++) {
|
||||
+ ProStringList &l = project->values(libtoolify[i]);
|
||||
+ if(!l.isEmpty()) {
|
||||
+ QString libtool_flags, comp_flags;
|
||||
+ if (!strncmp(libtoolify[i], "QMAKE_LINK", 10) || !strcmp(libtoolify[i], "QMAKE_AR_CMD")) {
|
||||
+ libtool_flags += " --mode=link";
|
||||
+ if(project->isActiveConfig("staticlib")) {
|
||||
+ comp_flags += " -static";
|
||||
+ } else {
|
||||
+ if(!project->isEmpty("QMAKE_LIB_FLAG")) {
|
||||
+ if(project->isActiveConfig("plugin"))
|
||||
+ comp_flags += " -avoid-version";
|
||||
+ else {
|
||||
+ int maj = project->first("VER_MAJ").toInt();
|
||||
+ int min = project->first("VER_MIN").toInt();
|
||||
+ int pat = project->first("VER_PAT").toInt();
|
||||
+ comp_flags += " -version-info " + QString::number(maj + min) +
|
||||
+ ":" + QString::number(pat) +
|
||||
+ ":" + QString::number(min);
|
||||
+ }
|
||||
+ if (strcmp(libtoolify[i], "QMAKE_AR_CMD")) {
|
||||
+ QString rpath = Option::fixPathToTargetOS(project->first("target.path").toQString(), false);
|
||||
+ if(rpath.right(1) != Option::dir_sep)
|
||||
+ rpath += Option::dir_sep;
|
||||
+ comp_flags += " -rpath " + escapeFilePath(Option::fixPathToTargetOS(rpath, false));
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ if(project->isActiveConfig("plugin"))
|
||||
+ comp_flags += " -module";
|
||||
+ } else {
|
||||
+ libtool_flags += " --mode=compile";
|
||||
+ }
|
||||
+ l.first().prepend("$(LIBTOOL)" + libtool_flags + " ");
|
||||
+ if(!comp_flags.isEmpty())
|
||||
+ l.first() += comp_flags;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
QStringList
|
||||
@@ -410,6 +459,16 @@ UnixMakefileGenerator::findLibraries(boo
|
||||
goto found;
|
||||
}
|
||||
}
|
||||
+ if (project->isActiveConfig("compile_libtool")) {
|
||||
+ for (int dep_i = 0; dep_i < libdirs.size(); ++dep_i) {
|
||||
+ if (exists(libdirs[dep_i].local() + '/'
|
||||
+ + project->first("QMAKE_PREFIX_SHLIB") + lib + Option::libtool_ext)) {
|
||||
+ (*it) = libdirs[dep_i].real() + Option::dir_sep
|
||||
+ + project->first("QMAKE_PREFIX_SHLIB") + lib + Option::libtool_ext;
|
||||
+ goto found;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
found: ;
|
||||
} else if (target_mode == TARG_MAC_MODE && opt.startsWith("-F")) {
|
||||
QMakeLocalFileName f(opt.mid(2));
|
||||
@@ -536,7 +595,7 @@ UnixMakefileGenerator::defaultInstall(co
|
||||
QString ret, destdir = project->first("DESTDIR").toQString();
|
||||
if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
|
||||
destdir += Option::dir_sep;
|
||||
- QString targetdir = fileFixify(project->first("target.path").toQString(), FileFixifyAbsolute);
|
||||
+ QString targetdir = project->first("target.path").toQString();
|
||||
if(targetdir.right(1) != Option::dir_sep)
|
||||
targetdir += Option::dir_sep;
|
||||
|
||||
@@ -570,6 +629,25 @@ UnixMakefileGenerator::defaultInstall(co
|
||||
uninst.append("-$(DEL_FILE) " + dst);
|
||||
}
|
||||
|
||||
+ if (bundle == NoBundle && project->isActiveConfig("compile_libtool")) {
|
||||
+ QString src_targ = escapeFilePath(target);
|
||||
+ if(src_targ == "$(TARGET)")
|
||||
+ src_targ = "$(TARGETL)";
|
||||
+ QString dst_dir = targetdir;
|
||||
+ if(QDir::isRelativePath(dst_dir))
|
||||
+ dst_dir = Option::fixPathToTargetOS(dst_dir);
|
||||
+ dst_dir = Option::fixPathToTargetOS(dst_dir);
|
||||
+ if(!ret.isEmpty())
|
||||
+ ret += "\n\t";
|
||||
+ if(project->first("TEMPLATE") == "app") {
|
||||
+ ret += "-$(LIBTOOL) --mode=install cp \"" + Option::fixPathToTargetOS(destdir + src_targ, false) + "\" \"" + filePrefixRoot(root, dst_dir) + "\"";
|
||||
+ } else {
|
||||
+ ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\"";
|
||||
+ }
|
||||
+ if(!uninst.isEmpty())
|
||||
+ uninst.append("\n\t");
|
||||
+ uninst.append("-$(LIBTOOL) --mode=uninstall " + src_targ);
|
||||
+ } else
|
||||
{
|
||||
QString src_targ = target;
|
||||
if(!destdir.isEmpty())
|
||||
@@ -691,7 +769,7 @@ UnixMakefileGenerator::defaultInstall(co
|
||||
if(type == "prl" && project->isActiveConfig("create_prl") && !project->isActiveConfig("no_install_prl") &&
|
||||
!project->isEmpty("QMAKE_INTERNAL_PRL_FILE"))
|
||||
meta = prlFileName(false);
|
||||
- if (type == "libtool" && project->isActiveConfig("create_libtool"))
|
||||
+ if (type == "libtool" && project->isActiveConfig("create_libtool") && !project->isActiveConfig("compile_libtool"))
|
||||
meta = libtoolFileName(false);
|
||||
if(type == "pkgconfig" && project->isActiveConfig("create_pc"))
|
||||
meta = pkgConfigFileName(false);
|
||||
156
qt5-qtbase56/patches/patch-qmake_generators_unix_unixmake2.cpp
Normal file
156
qt5-qtbase56/patches/patch-qmake_generators_unix_unixmake2.cpp
Normal file
|
|
@ -0,0 +1,156 @@
|
|||
$NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
* Libtoolized
|
||||
* add back compile_libtool support that was ripped out in qt5.6
|
||||
|
||||
--- qmake/generators/unix/unixmake2.cpp.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ qmake/generators/unix/unixmake2.cpp
|
||||
@@ -50,6 +50,10 @@ UnixMakefileGenerator::writePrlFile(QTex
|
||||
MakefileGenerator::writePrlFile(t);
|
||||
// libtool support
|
||||
if(project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib") { //write .la
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ warn_msg(WarnLogic, "create_libtool specified with compile_libtool can lead to conflicting .la\n"
|
||||
+ "formats, create_libtool has been disabled\n");
|
||||
+ else
|
||||
writeLibtoolFile();
|
||||
}
|
||||
// pkg-config support
|
||||
@@ -169,12 +173,12 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
t << "####### Compiler, tools and options\n\n";
|
||||
t << "CC = " << var("QMAKE_CC") << endl;
|
||||
t << "CXX = " << var("QMAKE_CXX") << endl;
|
||||
- t << "DEFINES = "
|
||||
+ t << "DEFINES += "
|
||||
<< varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
|
||||
<< varGlue("DEFINES","-D"," -D","") << endl;
|
||||
- t << "CFLAGS = " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
|
||||
- t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
|
||||
- t << "INCPATH =";
|
||||
+ t << "CFLAGS += " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
|
||||
+ t << "CXXFLAGS += " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
|
||||
+ t << "INCPATH +=";
|
||||
{
|
||||
QString isystem = var("QMAKE_CFLAGS_ISYSTEM");
|
||||
const ProStringList &incs = project->values("INCLUDEPATH");
|
||||
@@ -198,13 +202,15 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
|
||||
if(!project->isActiveConfig("staticlib")) {
|
||||
t << "LINK = " << var("QMAKE_LINK") << endl;
|
||||
- t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl;
|
||||
- t << "LIBS = $(SUBLIBS) " << fixLibFlags("QMAKE_LIBS").join(' ') << ' '
|
||||
+ t << "LFLAGS += " << var("QMAKE_LFLAGS") << endl;
|
||||
+ t << "LIBS += $(SUBLIBS) " << fixLibFlags("QMAKE_LIBS").join(' ') << ' '
|
||||
<< fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << endl;
|
||||
}
|
||||
|
||||
t << "AR = " << var("QMAKE_AR") << endl;
|
||||
t << "RANLIB = " << var("QMAKE_RANLIB") << endl;
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ t << "LIBTOOL = " << var("QMAKE_LIBTOOL") << endl;
|
||||
t << "SED = " << var("QMAKE_STREAM_EDITOR") << endl;
|
||||
t << "STRIP = " << var("QMAKE_STRIP") << endl;
|
||||
|
||||
@@ -265,6 +271,8 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
if (destd.endsWith('\\'))
|
||||
destd += '\\';
|
||||
t << "DESTDIR = " << destd << endl;
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ t << "TARGETL = " << fileVar("TARGET_la") << endl;
|
||||
t << "TARGET = " << fileVar("TARGET") << endl; // ### mixed use!
|
||||
if(project->isActiveConfig("plugin")) {
|
||||
t << "TARGETD = " << fileVar("TARGET") << endl;
|
||||
@@ -273,6 +281,8 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
if(!project->isEmpty("QMAKE_BUNDLE")) {
|
||||
t << "TARGETD = " << fileVar("TARGET_x.y") << endl;
|
||||
t << "TARGET0 = " << fileVar("TARGET_") << endl;
|
||||
+ } else if(project->isActiveConfig("compile_libtool")) {
|
||||
+ t << "TARGETD = " << var("TARGET_la") << endl;
|
||||
} else if (!project->isActiveConfig("unversioned_libname")) {
|
||||
t << "TARGET0 = " << fileVar("TARGET_") << endl;
|
||||
if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
|
||||
@@ -578,7 +588,9 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
if(!project->isEmpty("QMAKE_PRE_LINK"))
|
||||
t << "\n\t" << var("QMAKE_PRE_LINK");
|
||||
|
||||
- if (project->isActiveConfig("plugin")) {
|
||||
+ if(project->isActiveConfig("compile_libtool")) {
|
||||
+ t << "\n\t" << var("QMAKE_LINK_SHLIB_CMD");
|
||||
+ } else if (project->isActiveConfig("plugin")) {
|
||||
t << "\n\t"
|
||||
<< "-$(DEL_FILE) $(TARGET)\n\t"
|
||||
<< var("QMAKE_LINK_SHLIB_CMD");
|
||||
@@ -722,7 +734,7 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
writeMakeQmake(t);
|
||||
if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake")) {
|
||||
QStringList meta_files;
|
||||
- if (project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib") { //libtool
|
||||
+ if (project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib" && !project->isActiveConfig("compile_libtool")) { //libtool
|
||||
meta_files += libtoolFileName();
|
||||
}
|
||||
if(project->isActiveConfig("create_pc") && project->first("TEMPLATE") == "lib") { //pkg-config
|
||||
@@ -957,6 +969,9 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
|
||||
t << "clean:" << clean_targets << "\n\t";
|
||||
if(!project->isEmpty("OBJECTS")) {
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ t << "-$(LIBTOOL) --mode=clean $(DEL_FILE) $(OBJECTS)\n\t";
|
||||
+ else
|
||||
t << "-$(DEL_FILE) $(OBJECTS)\n\t";
|
||||
}
|
||||
if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER")) {
|
||||
@@ -1013,6 +1028,8 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
if(!project->isEmpty("QMAKE_BUNDLE")) {
|
||||
QString bundlePath = escapeFilePath(destdir + project->first("QMAKE_BUNDLE"));
|
||||
t << "\t-$(DEL_FILE) -r " << bundlePath << endl;
|
||||
+ } else if(project->isActiveConfig("compile_libtool")) {
|
||||
+ t << "\t-$(LIBTOOL) --mode=clean $(DEL_FILE) $(TARGET)\n";
|
||||
} else if (project->isActiveConfig("staticlib") || project->isActiveConfig("plugin")) {
|
||||
t << "\t-$(DEL_FILE) " << escapeFilePath(destdir) << "$(TARGET) \n";
|
||||
} else if (project->values("QMAKE_APP_FLAG").isEmpty()) {
|
||||
@@ -1139,18 +1156,26 @@ 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");
|
||||
- if(project->values("QMAKE_AR_CMD").isEmpty())
|
||||
+ if(project->values("QMAKE_AR_CMD").isEmpty()) {
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)");
|
||||
+ else
|
||||
project->values("QMAKE_AR_CMD").append("$(AR) $(DESTDIR)$(TARGET) $(OBJECTS)");
|
||||
+ }
|
||||
} else {
|
||||
project->values("TARGETA").append(project->first("DESTDIR") + project->first("QMAKE_PREFIX_STATICLIB")
|
||||
+ project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_STATICLIB"));
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ project->values("TARGET_la") = ProStringList(project->first("DESTDIR") + "lib" + project->first("TARGET") + Option::libtool_ext);
|
||||
|
||||
ProStringList &ar_cmd = project->values("QMAKE_AR_CMD");
|
||||
if (!ar_cmd.isEmpty())
|
||||
ar_cmd[0] = ar_cmd.at(0).toQString().replace(QLatin1String("(TARGET)"), QLatin1String("(TARGETA)"));
|
||||
else
|
||||
ar_cmd.append("$(AR) $(TARGETA) $(OBJECTS)");
|
||||
- if (!project->isEmpty("QMAKE_BUNDLE")) {
|
||||
+ if(project->isActiveConfig("compile_libtool")) {
|
||||
+ project->values("TARGET") = project->values("TARGET_la");
|
||||
+ } else if (!project->isEmpty("QMAKE_BUNDLE")) {
|
||||
ProString bundle_loc = project->first("QMAKE_BUNDLE_LOCATION");
|
||||
if(!bundle_loc.isEmpty() && !bundle_loc.startsWith("/"))
|
||||
bundle_loc.prepend("/");
|
||||
@@ -1304,7 +1329,7 @@ void UnixMakefileGenerator::init2()
|
||||
project->values("QMAKE_CFLAGS") += project->values("QMAKE_CFLAGS_PLUGIN");
|
||||
project->values("QMAKE_CXXFLAGS") += project->values("QMAKE_CXXFLAGS_PLUGIN");
|
||||
project->values("QMAKE_LFLAGS") += project->values("QMAKE_LFLAGS_PLUGIN");
|
||||
- if (project->isActiveConfig("plugin_with_soname"))
|
||||
+ if (project->isActiveConfig("plugin_with_soname") && !project->isActiveConfig("compile_libtool"))
|
||||
project->values("QMAKE_LFLAGS") += project->values("QMAKE_LFLAGS_SONAME");
|
||||
} else {
|
||||
project->values("QMAKE_LFLAGS") += project->values("QMAKE_LFLAGS_SHLIB");
|
||||
@@ -1323,6 +1348,7 @@ void UnixMakefileGenerator::init2()
|
||||
project->first("VER_MIN") + "." +
|
||||
project->first("VER_PAT"));
|
||||
}
|
||||
+ if(!project->isActiveConfig("compile_libtool"))
|
||||
project->values("QMAKE_LFLAGS") += project->values("QMAKE_LFLAGS_SONAME");
|
||||
}
|
||||
}
|
||||
15
qt5-qtbase56/patches/patch-qmake_qmake.pri
Normal file
15
qt5-qtbase56/patches/patch-qmake_qmake.pri
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-qmake_qmake.pri,v 1.1 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
Fix building on Darwin.
|
||||
|
||||
--- qmake/qmake.pri.orig 2015-07-20 09:25:44.000000000 +0000
|
||||
+++ qmake/qmake.pri
|
||||
@@ -136,7 +136,7 @@ bootstrap { #Qt code
|
||||
SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp
|
||||
mac {
|
||||
SOURCES += qcore_mac.cpp qsettings_mac.cpp
|
||||
- OBJECTIVE_SOURCES += qcore_mac_objc.mm qlocale_mac.mm
|
||||
+ OBJECTIVE_SOURCES += qcore_mac_objc.mm qlocale_mac.mm qstring_mac.mm
|
||||
LIBS += -framework ApplicationServices -framework CoreServices -framework Foundation
|
||||
} else {
|
||||
SOURCES += qlocale_unix.cpp
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
$NetBSD: patch-src_concurrent_qtconcurrentiteratekernel.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
Fix building on Darwin.
|
||||
|
||||
--- src/concurrent/qtconcurrentiteratekernel.cpp.orig 2013-11-27 01:01:16.000000000 +0000
|
||||
+++ src/concurrent/qtconcurrentiteratekernel.cpp
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
#include "qtconcurrentiteratekernel.h"
|
||||
|
||||
-#if defined(Q_OS_MAC)
|
||||
+#if defined(Q_OS_MAC) || defined(__APPLE__)
|
||||
#include <mach/mach.h>
|
||||
#include <mach/mach_time.h>
|
||||
#include <unistd.h>
|
||||
@@ -67,7 +67,7 @@ enum {
|
||||
MedianSize = 7
|
||||
};
|
||||
|
||||
-#if defined(Q_OS_MAC)
|
||||
+#if defined(Q_OS_MAC) || defined(__APPLE__)
|
||||
|
||||
static qint64 getticks()
|
||||
{
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
$NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
|
||||
|
||||
* Add DragonFly support
|
||||
* Add NetBSD support
|
||||
|
||||
--- 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>
|
||||
|
||||
+// for __DragonFly_version
|
||||
+#if defined(__DragonFly__)
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+
|
||||
// unistd.h is needed for the _XOPEN_UNIX macro
|
||||
#include <unistd.h>
|
||||
-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
|
||||
+#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) || defined(Q_OS_NETBSD) || defined(__DragonFly__)
|
||||
# include <langinfo.h>
|
||||
#endif
|
||||
|
||||
@@ -71,6 +76,9 @@
|
||||
# else
|
||||
# define UTF16 "UTF-16LE"
|
||||
# endif
|
||||
+#elif defined(__DragonFly__) && __DragonFly_version__ < 197700
|
||||
+# define NO_BOM
|
||||
+# define UTF16 "UTF-16"
|
||||
#else
|
||||
# define UTF16 "UTF-16"
|
||||
#endif
|
||||
@@ -223,7 +231,7 @@ QString QIconvCodec::convertToUnicode(co
|
||||
IconvState *state = *pstate;
|
||||
size_t inBytesLeft = len;
|
||||
// best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
|
||||
-#ifdef GNU_LIBICONV
|
||||
+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
|
||||
// GNU doesn't disagree with POSIX :/
|
||||
const char *inBytes = chars;
|
||||
#else
|
||||
@@ -322,7 +330,7 @@ static bool setByteOrder(iconv_t cd)
|
||||
size_t outBytesLeft = sizeof buf;
|
||||
size_t inBytesLeft = sizeof bom;
|
||||
|
||||
-#if defined(GNU_LIBICONV)
|
||||
+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
|
||||
const char **inBytesPtr = const_cast<const char **>(&inBytes);
|
||||
#else
|
||||
char **inBytesPtr = &inBytes;
|
||||
@@ -342,7 +350,7 @@ QByteArray QIconvCodec::convertFromUnico
|
||||
char *outBytes;
|
||||
size_t inBytesLeft;
|
||||
|
||||
-#if defined(GNU_LIBICONV)
|
||||
+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
|
||||
const char **inBytesPtr = const_cast<const char **>(&inBytes);
|
||||
#else
|
||||
char **inBytesPtr = &inBytes;
|
||||
@@ -482,11 +490,13 @@ iconv_t QIconvCodec::createIconv_t(const
|
||||
#endif
|
||||
const char *codeset = empty_codeset;
|
||||
cd = iconv_open(to ? to : codeset, from ? from : codeset);
|
||||
+#elif defined(__NetBSD)
|
||||
+ const char *codeset = 0;
|
||||
#else
|
||||
char *codeset = 0;
|
||||
#endif
|
||||
|
||||
-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
|
||||
+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__)
|
||||
if (cd == (iconv_t) -1) {
|
||||
codeset = nl_langinfo(CODESET);
|
||||
if (codeset)
|
||||
25
qt5-qtbase56/patches/patch-src_corelib_io_io.pri
Normal file
25
qt5-qtbase56/patches/patch-src_corelib_io_io.pri
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
$NetBSD: patch-src_corelib_io_io.pri,v 1.4 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
* Add DragonFly support
|
||||
* Patch sent and merged upstream:
|
||||
http://codereview.qt-project.org/#/c/111741/
|
||||
* fix linux test.
|
||||
|
||||
--- src/corelib/io/io.pri.orig 2014-12-05 16:24:37.000000000 +0000
|
||||
+++ src/corelib/io/io.pri
|
||||
@@ -172,13 +172,13 @@ win32 {
|
||||
io/qstorageinfo_unix.cpp
|
||||
}
|
||||
|
||||
- linux|if(qnx:contains(QT_CONFIG, inotify)) {
|
||||
+ linux*|if(qnx:contains(QT_CONFIG, inotify)) {
|
||||
SOURCES += io/qfilesystemwatcher_inotify.cpp
|
||||
HEADERS += io/qfilesystemwatcher_inotify_p.h
|
||||
}
|
||||
|
||||
!nacl {
|
||||
- freebsd-*|mac|darwin-*|openbsd-*|netbsd-*:{
|
||||
+ freebsd-*|mac|darwin-*|openbsd-*|netbsd-*|dragonfly-*:{
|
||||
SOURCES += io/qfilesystemwatcher_kqueue.cpp
|
||||
HEADERS += io/qfilesystemwatcher_kqueue_p.h
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
$NetBSD: patch-src_corelib_io_qstandardpaths_unix.cpp,v 1.1 2016/02/04 10:41:13 markd Exp $
|
||||
|
||||
Add $LOCALBASE/share to search path
|
||||
|
||||
--- src/corelib/io/qstandardpaths_unix.cpp.orig 2015-10-13 04:35:31.000000000 +0000
|
||||
+++ src/corelib/io/qstandardpaths_unix.cpp
|
||||
@@ -255,6 +255,7 @@ static QStringList xdgDataDirs()
|
||||
// http://standards.freedesktop.org/basedir-spec/latest/
|
||||
QString xdgDataDirsEnv = QFile::decodeName(qgetenv("XDG_DATA_DIRS"));
|
||||
if (xdgDataDirsEnv.isEmpty()) {
|
||||
+ dirs.append(QString::fromLatin1("@LOCALBASE@/share"));
|
||||
dirs.append(QString::fromLatin1("/usr/local/share"));
|
||||
dirs.append(QString::fromLatin1("/usr/share"));
|
||||
} else {
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.6 2016/12/04 21:46:54 marino Exp $
|
||||
|
||||
* fix build on SunOS
|
||||
|
||||
--- src/corelib/io/qstorageinfo_unix.cpp.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ src/corelib/io/qstorageinfo_unix.cpp
|
||||
@@ -94,7 +94,7 @@
|
||||
# if !defined(ST_RDONLY)
|
||||
# define ST_RDONLY 1 // hack for missing define on Android
|
||||
# endif
|
||||
-#elif defined(Q_OS_HAIKU)
|
||||
+#elif defined(Q_OS_HAIKU) || defined(Q_OS_SOLARIS)
|
||||
# define QT_STATFSBUF struct statvfs
|
||||
# define QT_STATFS ::statvfs
|
||||
#else
|
||||
|
|
@ -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 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ src/network/kernel/qhostinfo_unix.cpp
|
||||
@@ -123,6 +123,8 @@ static bool resolveLibraryInternal()
|
||||
if (!local_res_nclose)
|
||||
local_res_ninit = 0;
|
||||
}
|
||||
+ if (local_res_ninit)
|
||||
+ local_res_init = 0;
|
||||
#endif
|
||||
|
||||
return true;
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
$NetBSD: patch-src_openglextensions_openglextensions.pro,v 1.1 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
Build shared library.
|
||||
|
||||
--- src/openglextensions/openglextensions.pro.orig 2015-10-26 11:22:39.000000000 +0000
|
||||
+++ src/openglextensions/openglextensions.pro
|
||||
@@ -1,5 +1,4 @@
|
||||
TARGET = QtOpenGLExtensions
|
||||
-CONFIG += static
|
||||
|
||||
contains(QT_CONFIG, opengl):CONFIG += opengl
|
||||
contains(QT_CONFIG, opengles2):CONFIG += opengles2
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-src_platformsupport_platformsupport.pro,v 1.1 2014/12/30 17:23:46 adam Exp $
|
||||
|
||||
* Libtoolized and make it shared library
|
||||
|
||||
--- 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
|
||||
|
||||
-CONFIG += static internal_module
|
||||
+CONFIG += internal_module
|
||||
mac:LIBS_PRIVATE += -lz
|
||||
|
||||
DEFINES += QT_NO_CAST_FROM_ASCII
|
||||
|
|
@ -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
|
||||
|
|
@ -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"));
|
||||
12
qt5-qtbase56/patches/patch-src_tools_bootstrap_bootstrap.pro
Normal file
12
qt5-qtbase56/patches/patch-src_tools_bootstrap_bootstrap.pro
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
$NetBSD: patch-src_tools_bootstrap_bootstrap.pro,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
* Create shared library .so file libQt5Bootstrap.la.
|
||||
|
||||
--- src/tools/bootstrap/bootstrap.pro.orig 2015-07-27 10:28:43.000000000 +0000
|
||||
+++ src/tools/bootstrap/bootstrap.pro
|
||||
@@ -1,4 +1,4 @@
|
||||
-option(host_build)
|
||||
+#option(host_build)
|
||||
|
||||
TARGET = QtBootstrap
|
||||
QT =
|
||||
14
qt5-qtbase56/patches/patch-src_tools_moc_main.cpp
Normal file
14
qt5-qtbase56/patches/patch-src_tools_moc_main.cpp
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
$NetBSD: patch-src_tools_moc_main.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
rh#756395, https://bugreports.qt-project.org/browse/QTBUG-22829
|
||||
|
||||
--- src/tools/moc/main.cpp.orig 2013-11-27 01:01:11.000000000 +0000
|
||||
+++ src/tools/moc/main.cpp
|
||||
@@ -192,6 +192,7 @@ int runMoc(int argc, char **argv)
|
||||
Moc moc;
|
||||
pp.macros["Q_MOC_RUN"];
|
||||
pp.macros["__cplusplus"];
|
||||
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
|
||||
|
||||
// Don't stumble over GCC extensions
|
||||
Macro dummyVariadicFunctionMacro;
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-src_widgets_graphicsview_qgraphicsitem__p.h,v 1.1 2014/12/30 17:23:46 adam Exp $
|
||||
|
||||
--- 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;
|
||||
const QGraphicsItem *p2 = t2;
|
||||
- while (t1 && t1 != t2) {
|
||||
+ while (t1 && t2 && t1 != t2) {
|
||||
p1 = t1;
|
||||
p2 = t2;
|
||||
t1 = t1->d_ptr->parent;
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
$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.
|
||||
|
||||
--- 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
|
||||
# Add special cases
|
||||
-SUBDIRS += testProcessSpacesArgs/nospace.pro \
|
||||
- testProcessSpacesArgs/onespace.pro \
|
||||
- testProcessSpacesArgs/twospaces.pro \
|
||||
- testSpaceInName
|
||||
+SUBDIRS += testProcessSpacesArgs/nospace.pro
|
||||
|
||||
win32:!wince* {
|
||||
SUBDIRS += \
|
||||
|
|
@ -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
|
||||
|
||||
15
qt5-qtbase57/DESCR
Normal file
15
qt5-qtbase57/DESCR
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
|
||||
maintaining GUI (graphical user interface) applications.
|
||||
|
||||
Qt is written in C++ and is fully object-oriented. It has everything you need
|
||||
to create professional GUI applications. And it enables you to create them
|
||||
quickly.
|
||||
|
||||
Qt is a multi-platform toolkit. When developing software with Qt, you can run
|
||||
it on the X Window System (Unix/X11) or Microsoft Windows NT and Windows 95/98.
|
||||
Simply recompile your source code on the platform you want.
|
||||
|
||||
Qt cuts down the complexity in implementing large and complex systems. Its
|
||||
ingenious signal-slot technology enables true component programming.
|
||||
|
||||
This package tracks Qt5 qtbase submodule.
|
||||
18
qt5-qtbase57/MESSAGE
Normal file
18
qt5-qtbase57/MESSAGE
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
===========================================================================
|
||||
$NetBSD: MESSAGE,v 1.2 2014/08/19 10:37:53 wiz Exp $
|
||||
|
||||
To allow this package to coexist with other versions of Qt
|
||||
it has been installed in ${PREFIX}/qt5/{bin,include,lib,doc} etc.
|
||||
|
||||
You should be able to select this version of Qt when compiling
|
||||
programs which use it by ensuring that
|
||||
|
||||
1) QTDIR is set to ${PREFIX}/qt5
|
||||
|
||||
2) Use the "configure" argument "--with-qt-dir=${PREFIX}/qt5"
|
||||
|
||||
3) Use the "cmake" argument "-DCMAKE_PREFIX_PATH:PATH=${PREFIX}/qt5"
|
||||
|
||||
4) you may also have to put ${PREFIX}/qt5/bin in your PATH
|
||||
|
||||
===========================================================================
|
||||
224
qt5-qtbase57/Makefile
Normal file
224
qt5-qtbase57/Makefile
Normal file
|
|
@ -0,0 +1,224 @@
|
|||
# $NetBSD: Makefile,v 1.39 2016/12/04 21:46:54 marino Exp $
|
||||
|
||||
DISTNAME= qtbase-opensource-src-${QTVERSION}
|
||||
PKGNAME= qt5-qtbase-${QTVERSION}
|
||||
COMMENT= C++ X GUI toolkit
|
||||
|
||||
#.include "../../x11/qt5-qtbase/Makefile.common"
|
||||
.include "Makefile.common"
|
||||
|
||||
.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+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
|
||||
CONFIGURE_ARGS+= -accessibility
|
||||
CONFIGURE_ARGS+= -dbus-linked
|
||||
CONFIGURE_ARGS+= -fontconfig
|
||||
CONFIGURE_ARGS+= -force-pkg-config
|
||||
CONFIGURE_ARGS+= -icu
|
||||
CONFIGURE_ARGS+= -openssl-linked
|
||||
CONFIGURE_ARGS+= -nomake examples
|
||||
CONFIGURE_ARGS+= -nomake tests
|
||||
CONFIGURE_ARGS+= -no-pch
|
||||
CONFIGURE_ARGS+= -no-sql-db2
|
||||
CONFIGURE_ARGS+= -no-sql-ibase
|
||||
CONFIGURE_ARGS+= -no-sql-mysql
|
||||
CONFIGURE_ARGS+= -no-sql-oci
|
||||
CONFIGURE_ARGS+= -no-sql-odbc
|
||||
CONFIGURE_ARGS+= -no-sql-psql
|
||||
CONFIGURE_ARGS+= -no-sql-sqlite
|
||||
CONFIGURE_ARGS+= -no-sql-sqlite2
|
||||
CONFIGURE_ARGS+= -no-sql-tds
|
||||
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
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
.if ${OPSYS} != "Darwin"
|
||||
CONFIGURE_ARGS+= -iconv
|
||||
QMAKE_CONF= qmake.conf
|
||||
. if ${OPSYS} != "SunOS" && \
|
||||
(!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
|
||||
CONFIGURE_ARGS+= -reduce-relocations
|
||||
. endif
|
||||
.else
|
||||
QMAKE_CONF= qmake.conf.mac
|
||||
.endif
|
||||
|
||||
PLIST_VARS+= egl
|
||||
|
||||
.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++
|
||||
LDFLAGS+= -lexecinfo
|
||||
.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" || ${OPSYS} == "FreeBSD"
|
||||
. if exists(/usr/lib/libexecinfo.so)
|
||||
LDFLAGS+= -lexecinfo
|
||||
. endif
|
||||
.endif
|
||||
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
|
||||
LDFLAGS+= -lkvm # see patch-src_corelib_io_qlockfile__unix.cpp
|
||||
.endif
|
||||
|
||||
REPLACE_PERL+= bin/syncqt.pl
|
||||
|
||||
PTHREAD_OPTS+= require
|
||||
UNLIMIT_RESOURCES= datasize
|
||||
|
||||
BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX}
|
||||
|
||||
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
|
||||
|
||||
SUBST_CLASSES+= opt path
|
||||
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,,'
|
||||
|
||||
SUBST_STAGE.path= pre-configure
|
||||
SUBST_MESSAGE.path= Add to default XDG path.
|
||||
SUBST_FILES.path= src/corelib/io/qstandardpaths_unix.cpp
|
||||
SUBST_VARS.path= LOCALBASE
|
||||
|
||||
BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
|
||||
|
||||
PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \
|
||||
Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \
|
||||
Qt5OpenGLExtensions.pc Qt5PlatformSupport.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:@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} && ./bin/qmake -o Makefile
|
||||
|
||||
post-install:
|
||||
.for i in ${PC_FILES}
|
||||
cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
|
||||
ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
|
||||
.endfor
|
||||
cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} \
|
||||
${MAKE_PROGRAM} install_mkspecs
|
||||
# The pri file has WRKSRC in it.
|
||||
${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"
|
||||
# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus
|
||||
USE_DBUS-ARCH-DEPS_H= yes
|
||||
.include "../../sysutils/dbus/buildlink3.mk"
|
||||
.include "../../textproc/icu/buildlink3.mk"
|
||||
.if ${OPSYS} != "Darwin"
|
||||
.include "../../graphics/glu/buildlink3.mk"
|
||||
. if !empty(MESALIB_SUPPORTS_EGL:Myes)
|
||||
PLIST.egl= yes
|
||||
. endif
|
||||
.include "../../x11/libxcb/buildlink3.mk"
|
||||
.include "../../x11/xcb-util/buildlink3.mk"
|
||||
.include "../../x11/xcb-util-image/buildlink3.mk"
|
||||
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
|
||||
.include "../../x11/xcb-util-wm/buildlink3.mk"
|
||||
.include "../../x11/libSM/buildlink3.mk"
|
||||
.include "../../x11/libX11/buildlink3.mk"
|
||||
.include "../../x11/libXext/buildlink3.mk"
|
||||
.include "../../x11/libXcursor/buildlink3.mk"
|
||||
.include "../../x11/libXft/buildlink3.mk"
|
||||
.include "../../x11/libXmu/buildlink3.mk"
|
||||
.include "../../x11/libXrandr/buildlink3.mk"
|
||||
.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"
|
||||
65
qt5-qtbase57/Makefile.common
Normal file
65
qt5-qtbase57/Makefile.common
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
# $NetBSD: Makefile.common,v 1.19 2016/02/26 11:27:16 jperkin Exp $
|
||||
# used by x11/qt5-mysql/Makefile
|
||||
# used by x11/qt5-odbc/Makefile
|
||||
# used by x11/qt5-psql/Makefile
|
||||
# used by x11/qt5-qtbase/Makefile
|
||||
# used by x11/qt5-qtdeclarative/Makefile
|
||||
# used by x11/qt5-qtdoc/Makefile
|
||||
# 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
|
||||
# used by x11/qt5-qtscript/Makefile
|
||||
# used by x11/qt5-qtsensors/Makefile
|
||||
# used by x11/qt5-qtserialport/Makefile
|
||||
# used by x11/qt5-qtsvg/Makefile
|
||||
# used by x11/qt5-qttools/Makefile
|
||||
# used by x11/qt5-qttranslations/Makefile
|
||||
# used by x11/qt5-qtwebchannel/Makefile
|
||||
# used by x11/qt5-qtwebkit/Makefile
|
||||
# used by x11/qt5-qtwebsockets/Makefile
|
||||
# used by x11/qt5-qtx11extras/Makefile
|
||||
# used by x11/qt5-qtxmlpatterns/Makefile
|
||||
# used by x11/qt5-sqlite3/Makefile
|
||||
|
||||
.include "../../x11/qt5/Makefile.common"
|
||||
QTVERSION= 5.7.1
|
||||
.include "options.mk"
|
||||
|
||||
.include "../../mk/dlopen.buildlink3.mk"
|
||||
BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
|
||||
|
||||
USE_LANGUAGES= c c++
|
||||
USE_LIBTOOL= yes
|
||||
USE_TOOLS+= gmake perl:build pkg-config
|
||||
|
||||
# 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
|
||||
|
||||
# SunOS ld doesn't support -rpath-link
|
||||
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${PREFIX}/qt5/lib
|
||||
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${WRKSRC}/lib
|
||||
|
||||
MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
|
||||
PLIST_VARS+= mac unix
|
||||
.if ${OPSYS} == "Darwin"
|
||||
PLIST.mac= yes
|
||||
.else
|
||||
PLIST.unix= yes
|
||||
.endif
|
||||
|
||||
# avoid creating a .qt directory in the users home directory
|
||||
SCRIPTS_ENV+= HOME=${WRKDIR}
|
||||
|
||||
.if empty(PKGPATH:Mwip/qt5-qtbase57) \
|
||||
&& 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
|
||||
2942
qt5-qtbase57/PLIST
Normal file
2942
qt5-qtbase57/PLIST
Normal file
File diff suppressed because it is too large
Load diff
15
qt5-qtbase57/PLIST.Linux
Normal file
15
qt5-qtbase57/PLIST.Linux
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
@comment $NetBSD: PLIST.Linux,v 1.2 2016/01/03 21:15:57 markd Exp $
|
||||
qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevKeyboardPlugin.cmake
|
||||
qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevMousePlugin.cmake
|
||||
qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevTabletPlugin.cmake
|
||||
qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake
|
||||
qt5/lib/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake
|
||||
qt5/lib/cmake/Qt5Network/Qt5Network_QConnmanEnginePlugin.cmake
|
||||
qt5/lib/cmake/Qt5Network/Qt5Network_QNetworkManagerEnginePlugin.cmake
|
||||
qt5/plugins/bearer/libqconnmanbearer.la
|
||||
qt5/plugins/bearer/libqnmbearer.la
|
||||
qt5/plugins/generic/libqevdevkeyboardplugin.la
|
||||
qt5/plugins/generic/libqevdevmouseplugin.la
|
||||
qt5/plugins/generic/libqevdevtabletplugin.la
|
||||
qt5/plugins/generic/libqevdevtouchplugin.la
|
||||
qt5/plugins/platforms/libqlinuxfb.la
|
||||
58
qt5-qtbase57/buildlink3.mk
Normal file
58
qt5-qtbase57/buildlink3.mk
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
# $NetBSD: buildlink3.mk,v 1.16 2016/12/04 05:17:15 ryoon Exp $
|
||||
|
||||
BUILDLINK_TREE+= qt5-qtbase
|
||||
|
||||
.if !defined(QT5_QTBASE_BUILDLINK3_MK)
|
||||
QT5_QTBASE_BUILDLINK3_MK:=
|
||||
|
||||
BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.5.1
|
||||
BUILDLINK_ABI_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.5.1nb9
|
||||
BUILDLINK_PKGSRCDIR.qt5-qtbase?= ../../x11/qt5-qtbase
|
||||
|
||||
BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include
|
||||
BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/lib
|
||||
BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/plugins
|
||||
|
||||
QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5
|
||||
CMAKE_PREFIX_PATH+= ${QTDIR}
|
||||
|
||||
CONFIGURE_ENV+= QTDIR=${QTDIR}
|
||||
MAKE_ENV+= QTDIR=${QTDIR}
|
||||
|
||||
PTHREAD_OPTS+= require
|
||||
|
||||
.include "../../mk/bsd.fast.prefs.mk"
|
||||
|
||||
.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 "../../sysutils/dbus/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"
|
||||
.include "../../x11/xcb-util/buildlink3.mk"
|
||||
.include "../../x11/xcb-util-image/buildlink3.mk"
|
||||
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
|
||||
.include "../../x11/xcb-util-wm/buildlink3.mk"
|
||||
.include "../../x11/libSM/buildlink3.mk"
|
||||
.include "../../x11/libX11/buildlink3.mk"
|
||||
.include "../../x11/libXcursor/buildlink3.mk"
|
||||
.include "../../x11/libXft/buildlink3.mk"
|
||||
.include "../../x11/libXmu/buildlink3.mk"
|
||||
.include "../../x11/libXrandr/buildlink3.mk"
|
||||
.include "../../x11/libXrender/buildlink3.mk"
|
||||
.include "../../x11/libxkbcommon/buildlink3.mk"
|
||||
.endif
|
||||
.endif # QT5_QTBASE_BUILDLINK3_MK
|
||||
|
||||
BUILDLINK_TREE+= -qt5-qtbase
|
||||
32
qt5-qtbase57/distinfo
Normal file
32
qt5-qtbase57/distinfo
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
$NetBSD: distinfo,v 1.31 2016/12/04 21:46:54 marino Exp $
|
||||
|
||||
SHA1 (qtbase-opensource-src-5.7.1.tar.xz) = a3ddcde8978d3a05bb4342fce364a792472a16e6
|
||||
RMD160 (qtbase-opensource-src-5.7.1.tar.xz) = b26efab64209d4fe5b0532690c9d3902e7a70102
|
||||
SHA512 (qtbase-opensource-src-5.7.1.tar.xz) = 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
|
||||
Size (qtbase-opensource-src-5.7.1.tar.xz) = 44992616 bytes
|
||||
SHA1 (patch-config.tests_unix_compile.test) = f8a70435bdff0fb5f37e74eddeafbb6a49655e10
|
||||
SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764
|
||||
SHA1 (patch-configure) = 553b824dc0500a45245ae762a73ce895c17ada07
|
||||
SHA1 (patch-mkspecs_features_create__cmake.prf) = 3f6b3a592e29f5529e5c87dbac036c165470eac4
|
||||
SHA1 (patch-mkspecs_features_qt__module__pris.prf) = 623df7b7ffa1c8e56ceebc565efe936c74ae1c48
|
||||
SHA1 (patch-mkspecs_features_simd.prf) = 7dbe61df6252adebeac374e3541bc5ff4c93909b
|
||||
SHA1 (patch-qmake_Makefile.unix) = f2c057497bc46e015e6c77db385594aa1f2e2a29
|
||||
SHA1 (patch-qmake_generators_makefile.cpp) = 457453c2027081fe7db5bc4a87e8b62af0993022
|
||||
SHA1 (patch-qmake_generators_unix_unixmake.cpp) = e670b4a27f5f48ae73e851b887a8309e81266d6e
|
||||
SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = ad739a3eb3806a6962ae224dc090d22102685904
|
||||
SHA1 (patch-qmake_qmake.pri) = 142f2b7d0dbfbc829afc9f83bf8be8b3054b8cf7
|
||||
SHA1 (patch-src_concurrent_qtconcurrentiteratekernel.cpp) = 295cf573cf435e0edeeefb49144f84c7c6e7559c
|
||||
SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66fd1b85d101
|
||||
SHA1 (patch-src_corelib_io_io.pri) = 9a59b621441291f388860b523f80b59730632328
|
||||
SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938
|
||||
SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 49e63522770c3c7863ccc04cc8841a73fa781a94
|
||||
SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 04f5137a5530d69c183ce188df6eee65550ba2f8
|
||||
SHA1 (patch-src_openglextensions_openglextensions.pro) = e79effc1433ddda744b79d7e1f47764fee406580
|
||||
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) = 0eb333ed8193ef056dc2c4ed99fb9d207c31fa02
|
||||
SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb
|
||||
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
|
||||
70
qt5-qtbase57/files/qmake.conf
Normal file
70
qt5-qtbase57/files/qmake.conf
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
#
|
||||
# qmake configuration for pkgsrc
|
||||
#
|
||||
|
||||
MAKEFILE_GENERATOR = UNIX
|
||||
QMAKE_PLATFORM = unix
|
||||
CONFIG += qt warn_on release link_prl incremental gdb_dwarf_index
|
||||
CONFIG += compile_libtool
|
||||
QMAKE_INCREMENTAL_STYLE = sublib
|
||||
|
||||
QMAKE_COMPILER = @CC@
|
||||
|
||||
QMAKE_CC = @CC@
|
||||
QMAKE_LEX = @LEX@
|
||||
QMAKE_LEXFLAGS =
|
||||
QMAKE_YACC = @YACC@
|
||||
QMAKE_YACCFLAGS = -d
|
||||
QMAKE_CFLAGS = @CFLAGS@
|
||||
#QMAKE_CFLAGS_THREAD = -D_REENTRANT
|
||||
|
||||
QMAKE_CXX = @CXX@
|
||||
QMAKE_CXXFLAGS = @CXXFLAGS@ -DQ_TRAILING_DIR_SEP
|
||||
# alloca usage requires GNU extensions
|
||||
QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
|
||||
|
||||
QMAKE_INCDIR = @LOCALBASE@/include
|
||||
QMAKE_LIBDIR = @LOCALBASE@/lib
|
||||
QMAKE_INCDIR_X11 = @X11BASE@/include
|
||||
QMAKE_LIBDIR_X11 = @X11BASE@/lib
|
||||
QMAKE_INCDIR_OPENGL = @X11BASE@/include
|
||||
QMAKE_LIBDIR_OPENGL = @X11BASE@/lib
|
||||
|
||||
QMAKE_LINK = @CXX@
|
||||
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)
|
||||
|
||||
# --- 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_LIBS =
|
||||
QMAKE_LIBS_DYNLOAD =
|
||||
QMAKE_LIBS_X11 = -lXext -lX11 -lm @SYS_LIBS@
|
||||
QMAKE_LIBS_OPENGL = -lGL
|
||||
QMAKE_LIBS_OPENGL_QT = -lGL
|
||||
QMAKE_LIBS_THREAD = @PTHREAD_LIBS@
|
||||
|
||||
QMAKE_AR = @AR@ cqs
|
||||
QMAKE_OBJCOPY = objcopy
|
||||
QMAKE_RANLIB = @QMAKE_RANLIB@
|
||||
|
||||
QMAKE_MOC = $(QTDIR)/bin/moc
|
||||
QMAKE_UIC = $(QTDIR)/bin/uic
|
||||
QMAKE_UIC3 = $(QTDIR)/bin/uic3
|
||||
QMAKE_RCC = $(QTDIR)/bin/rcc
|
||||
|
||||
QMAKE_MKDIR = @MKDIR@
|
||||
|
||||
include(../common/gcc-base-unix.conf)
|
||||
include(../common/unix.conf)
|
||||
load(qt_config)
|
||||
61
qt5-qtbase57/files/qmake.conf.mac
Normal file
61
qt5-qtbase57/files/qmake.conf.mac
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
#
|
||||
# qmake configuration for pkgsrc
|
||||
#
|
||||
|
||||
MAKEFILE_GENERATOR = UNIX
|
||||
QMAKE_PLATFORM = darwin mac macx osx
|
||||
CONFIG += qt warn_on release link_prl incremental global_init_link_order lib_version_first plugin_no_soname
|
||||
CONFIG += compile_libtool
|
||||
QMAKE_INCREMENTAL_STYLE = sublib
|
||||
|
||||
QMAKE_COMPILER = @CC@
|
||||
|
||||
QMAKE_CC = @CC@
|
||||
QMAKE_LEX = @LEX@
|
||||
QMAKE_LEXFLAGS =
|
||||
QMAKE_YACC = @YACC@
|
||||
QMAKE_CFLAGS = @CFLAGS@
|
||||
#QMAKE_CFLAGS_THREAD = -D_REENTRANT
|
||||
|
||||
QMAKE_CXX = @CXX@
|
||||
QMAKE_CXXFLAGS = @CXXFLAGS@ -DQ_TRAILING_DIR_SEP
|
||||
QMAKE_CXXFLAGS_CXX11 = -std=c++0x
|
||||
|
||||
QMAKE_INCDIR = @LOCALBASE@/include
|
||||
QMAKE_LIBDIR = @LOCALBASE@/lib
|
||||
#QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \
|
||||
# /System/Library/Frameworks/AGL.framework/Headers/
|
||||
|
||||
QMAKE_LINK = @CXX@
|
||||
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 = @LDFLAGS@
|
||||
QMAKE_LFLAGS_RPATH =
|
||||
QMAKE_LFLAGS_THREAD = @PTHREAD_LDFLAGS@
|
||||
# -all_load required to make Objective-C categories work in static builds.
|
||||
QMAKE_LFLAGS_STATIC_LIB = -all_load
|
||||
|
||||
QMAKE_FIX_RPATH = install_name_tool -id
|
||||
QMAKE_EXTENSION_SHLIB = dylib
|
||||
|
||||
QMAKE_LIBS =
|
||||
QMAKE_LIBS_DYNLOAD =
|
||||
QMAKE_LIBS_THREAD =
|
||||
QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL
|
||||
|
||||
QMAKE_AR = @AR@ cq
|
||||
QMAKE_NM = nm -P
|
||||
QMAKE_RANLIB = @QMAKE_RANLIB@
|
||||
|
||||
QMAKE_MOC = $(QTDIR)/bin/moc
|
||||
QMAKE_UIC = $(QTDIR)/bin/uic
|
||||
QMAKE_UIC3 = $(QTDIR)/bin/uic3
|
||||
QMAKE_RCC = $(QTDIR)/bin/rcc
|
||||
|
||||
QMAKE_MKDIR = @MKDIR@
|
||||
|
||||
include(../common/gcc-base-mac.conf)
|
||||
include(../common/unix.conf)
|
||||
load(qt_config)
|
||||
35
qt5-qtbase57/options.mk
Normal file
35
qt5-qtbase57/options.mk
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
# $NetBSD: options.mk,v 1.7 2016/01/18 20:52:43 nros Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.qt5
|
||||
PKG_SUPPORTED_OPTIONS= cups debug gtk3
|
||||
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
PLIST_VARS+= cups gtk3
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mcups)
|
||||
. include "../../print/cups/buildlink3.mk"
|
||||
CONFIGURE_ARGS+= -cups
|
||||
PLIST.cups= yes
|
||||
.else
|
||||
CONFIGURE_ARGS+= -no-cups
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mgtk2)
|
||||
. include "../../x11/gtk3/buildlink3.mk"
|
||||
CONFIGURE_ARGS+= -gtk
|
||||
PLIST.gtk3= yes
|
||||
.else
|
||||
CONFIGURE_ARGS+= -no-gtk
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mdebug)
|
||||
# this does not work - builds libQtBoostracp_debug
|
||||
CC+= -ggdb
|
||||
CXX+= -ggdb
|
||||
CONFIGURE_ARGS+= -debug
|
||||
INSTALL_UNSTRIPPED= yes
|
||||
.else
|
||||
CONFIGURE_ARGS+= -release
|
||||
CONFIGURE_ARGS+= -no-debug
|
||||
.endif
|
||||
13
qt5-qtbase57/patches/patch-config.tests_unix_compile.test
Normal file
13
qt5-qtbase57/patches/patch-config.tests_unix_compile.test
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD$
|
||||
|
||||
--- config.tests/unix/compile.test.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ config.tests/unix/compile.test
|
||||
@@ -42,7 +42,7 @@ while [ "$#" -gt 0 ]; do
|
||||
CFLAGS="$CFLAGS \"$PARAM\""
|
||||
CXXFLAGS="$CXXFLAGS \"$PARAM\""
|
||||
;;
|
||||
- -L*|-l*|-pthread)
|
||||
+ -L*|-l*|-Wl*|-pthread)
|
||||
LFLAGS="$LFLAGS \"$PARAM\""
|
||||
;;
|
||||
-I*)
|
||||
18
qt5-qtbase57/patches/patch-config.tests_unix_iconv_iconv.cpp
Normal file
18
qt5-qtbase57/patches/patch-config.tests_unix_iconv_iconv.cpp
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
$NetBSD: patch-config.tests_unix_iconv_iconv.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
|
||||
|
||||
* Fix for NetBSD iconv(3)
|
||||
|
||||
--- 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("", "");
|
||||
|
||||
+#if defined(__NetBSD__)
|
||||
+ const char *inp;
|
||||
+#else
|
||||
char *inp;
|
||||
+#endif
|
||||
char *outp;
|
||||
size_t inbytes, outbytes;
|
||||
iconv(x, &inp, &inbytes, &outp, &outbytes);
|
||||
95
qt5-qtbase57/patches/patch-configure
Normal file
95
qt5-qtbase57/patches/patch-configure
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
$NetBSD: patch-configure,v 1.4 2016/03/14 06:12:17 dbj Exp $
|
||||
|
||||
* Don't use SDKs on OS X
|
||||
* Add NetBSD/sparc{,64} support
|
||||
|
||||
--- configure.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ configure
|
||||
@@ -328,7 +328,6 @@ getQMakeConf()
|
||||
{
|
||||
if [ -z "$specvals" ]; then
|
||||
specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" "$HOST_VARS_FILE" | extractQMakeVariables "host_build"`
|
||||
- if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi
|
||||
fi
|
||||
getSingleQMakeVariable "$1" "$specvals"
|
||||
}
|
||||
@@ -337,7 +336,6 @@ getXQMakeConf()
|
||||
{
|
||||
if [ -z "$xspecvals" ]; then
|
||||
xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" "$DEVICE_VARS_FILE" | extractQMakeVariables "!host_build"`
|
||||
- if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi
|
||||
fi
|
||||
getSingleQMakeVariable "$1" "$xspecvals"
|
||||
}
|
||||
@@ -548,7 +546,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
|
||||
exit 2
|
||||
fi
|
||||
|
||||
- if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
|
||||
+ if ! /usr/bin/xcrun -find cc >/dev/null 2>&1; then
|
||||
echo >&2
|
||||
echo " Xcode not set up properly. You may need to confirm the license" >&2
|
||||
echo " agreement by running /usr/bin/xcodebuild without arguments." >&2
|
||||
@@ -2993,6 +2991,19 @@ if [ -z "$PLATFORM" ]; then
|
||||
UNIX_SV:*)
|
||||
PLATFORM=unixware-g++
|
||||
;;
|
||||
+ NetBSD:*:sparc)
|
||||
+ if [ "$OPT_VERBOSE" = "yes" ]; then
|
||||
+ echo " NetBSD on SPARC"
|
||||
+ fi
|
||||
+ CFG_HOST_ARCH=sparc
|
||||
+ ;;
|
||||
+ NetBSD:*:sparc64)
|
||||
+ if [ "$OPT_VERBOSE" = "yes" ]; then
|
||||
+ echo " NetBSD on SPARC64"
|
||||
+ fi
|
||||
+ CFG_HOST_ARCH=sparc
|
||||
+ CFG_HOST_BITSIZE=64
|
||||
+ ;;
|
||||
QNX:*)
|
||||
PLATFORM=unsupported/qnx-g++
|
||||
;;
|
||||
@@ -4003,10 +4014,12 @@ if true; then ###[ '!' -f "$outpath/bin/
|
||||
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
|
||||
EXTRA_OBJS="$EXTRA_OBJS \
|
||||
qsettings_mac.o \
|
||||
+ qstring_mac.o \
|
||||
qcore_mac.o \
|
||||
qcore_mac_objc.o"
|
||||
EXTRA_SRCS="$EXTRA_SRCS \
|
||||
\"\$(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp\" \
|
||||
+ \"\$(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm\" \
|
||||
\"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \
|
||||
\"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\""
|
||||
fi
|
||||
@@ -4368,11 +4381,11 @@ if [ "$CFG_USE_GOLD_LINKER" != "no" ]; t
|
||||
fi
|
||||
|
||||
# auto-detect --enable-new-dtags support
|
||||
-if linkerSupportsFlag $TEST_COMPILER --enable-new-dtags; then
|
||||
- CFG_ENABLE_NEW_DTAGS=yes
|
||||
-else
|
||||
+#if linkerSupportsFlag $TEST_COMPILER --enable-new-dtags; then
|
||||
+# CFG_ENABLE_NEW_DTAGS=yes
|
||||
+#else
|
||||
CFG_ENABLE_NEW_DTAGS=no
|
||||
-fi
|
||||
+#fi
|
||||
|
||||
# auto-detect -fstack-protector-strong support (for QNX only currently)
|
||||
if [ "$XPLATFORM_QNX" = "yes" ]; then
|
||||
@@ -4621,13 +4634,7 @@ if [ "${CFG_AVX512}" = "auto" ]; then
|
||||
CFG_AVX512=f
|
||||
CFG_AVX512_UPPER=AVX512F
|
||||
for feature in er cd pf dq bw vl ifma vbmi; do
|
||||
- if [ -n "$BASH_VERSION" ] && [ "${BASH_VERSION%%.*}" -gt 3 ]; then
|
||||
- upper=${feature^^*}
|
||||
- elif [ -n "$ZSH_VERSION" ]; then
|
||||
- upper=${(U)feature}
|
||||
- else
|
||||
upper=`echo $feature | tr a-z A-Z`
|
||||
- fi
|
||||
if compileTest common/avx512 "avx512$feature" AVX512=$upper; then
|
||||
CFG_AVX512="$CFG_AVX512 $feature"
|
||||
CFG_AVX512_UPPER="$CFG_AVX512_UPPER AVX512$upper"
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
$NetBSD: patch-mkspecs_features_create__cmake.prf,v 1.2 2015/10/29 14:48:04 adam Exp $
|
||||
|
||||
Fix for shared libraries naming on Darwin.
|
||||
|
||||
--- mkspecs/features/create_cmake.prf.orig 2015-10-13 04:35:32.000000000 +0000
|
||||
+++ mkspecs/features/create_cmake.prf
|
||||
@@ -147,7 +147,7 @@ contains(CONFIG, plugin) {
|
||||
}
|
||||
} else {
|
||||
mac {
|
||||
- isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
|
||||
+ isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so
|
||||
else: CMAKE_PlUGIN_EXT = .a
|
||||
|
||||
CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
|
||||
@@ -213,8 +213,8 @@ mac {
|
||||
CMAKE_LIB_FILE_LOCATION_RELEASE = Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.framework/Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
|
||||
CMAKE_BUILD_IS_FRAMEWORK = "true"
|
||||
} else {
|
||||
- CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$$eval(QT.$${MODULE}.VERSION).dylib
|
||||
- CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$$eval(QT.$${MODULE}.VERSION).dylib
|
||||
+ CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$${QT_MAJOR_VERSION}.dylib
|
||||
+ CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QT_MAJOR_VERSION}.dylib
|
||||
}
|
||||
}
|
||||
} else:win32 {
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-mkspecs_features_qt__module__pris.prf,v 1.1 2014/12/30 17:23:46 adam Exp $
|
||||
|
||||
* Build libtoolized shared libraries
|
||||
|
||||
--- mkspecs/features/qt_module_pris.prf.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ mkspecs/features/qt_module_pris.prf
|
||||
@@ -51,7 +51,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$
|
||||
module_rundep =
|
||||
module_build_type = v2
|
||||
static: \
|
||||
- module_build_type += staticlib
|
||||
+ module_build_type +=
|
||||
lib_bundle {
|
||||
module_build_type += lib_bundle
|
||||
MODULE_FRAMEWORKS = " \$\$QT_MODULE_LIB_BASE"
|
||||
38
qt5-qtbase57/patches/patch-mkspecs_features_simd.prf
Normal file
38
qt5-qtbase57/patches/patch-mkspecs_features_simd.prf
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
$NetBSD: patch-mkspecs_features_simd.prf,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
* Use libtool
|
||||
|
||||
--- mkspecs/features/simd.prf.orig 2014-12-05 16:24:38.000000000 +0000
|
||||
+++ mkspecs/features/simd.prf
|
||||
@@ -33,12 +33,12 @@ defineTest(addSimdCompiler) {
|
||||
export(SOURCES)
|
||||
} else {
|
||||
# We need special compiler flags
|
||||
- $${name}_compiler.commands = $$QMAKE_CXX -c $(CXXFLAGS) $$cflags $(INCPATH) ${QMAKE_FILE_IN}
|
||||
+ $${name}_compiler.commands = $(LIBTOOL) --silent --mode=compile $$QMAKE_CXX -c $(CXXFLAGS) $$cflags $(INCPATH) ${QMAKE_FILE_IN}
|
||||
msvc: $${name}_compiler.commands += -Fo${QMAKE_FILE_OUT}
|
||||
- else: $${name}_compiler.commands += -o ${QMAKE_FILE_OUT}
|
||||
+ else: $${name}_compiler.commands += -o $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
|
||||
|
||||
$${name}_compiler.dependency_type = TYPE_C
|
||||
- $${name}_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
|
||||
+ $${name}_compiler.output = $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
|
||||
$${name}_compiler.input = $$sources_var
|
||||
$${name}_compiler.variable_out = OBJECTS
|
||||
$${name}_compiler.name = compiling[$${name}] ${QMAKE_FILE_IN}
|
||||
@@ -62,12 +62,12 @@ defineTest(addSimdCompiler) {
|
||||
SOURCES += $$eval($$asm_var)
|
||||
export(SOURCES)
|
||||
} else {
|
||||
- $${name}_assembler.commands = $$QMAKE_CC -c $(CFLAGS)
|
||||
+ $${name}_assembler.commands = $(LIBTOOL) --silent --mode=compile $$QMAKE_CC -c $(CFLAGS)
|
||||
!contains(QT_CPU_FEATURES, $${name}): $${name}_assembler.commands += $$cflags
|
||||
clang:no_clang_integrated_as: $${name}_assembler.commands += -fno-integrated-as
|
||||
- $${name}_assembler.commands += $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
|
||||
+ $${name}_assembler.commands += $(INCPATH) ${QMAKE_FILE_IN} -o $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
|
||||
$${name}_assembler.dependency_type = TYPE_C
|
||||
- $${name}_assembler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
|
||||
+ $${name}_assembler.output = $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
|
||||
$${name}_assembler.input = $$asm_var
|
||||
$${name}_assembler.variable_out = OBJECTS
|
||||
$${name}_assembler.name = assembling[$${name}] ${QMAKE_FILE_IN}
|
||||
42
qt5-qtbase57/patches/patch-qmake_Makefile.unix
Normal file
42
qt5-qtbase57/patches/patch-qmake_Makefile.unix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
$NetBSD: patch-qmake_Makefile.unix,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
* Pass environmental variables from pkgsrc
|
||||
|
||||
--- qmake/Makefile.unix.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ qmake/Makefile.unix
|
||||
@@ -75,6 +75,7 @@ DEPEND_SRC = \
|
||||
$(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp \
|
||||
$(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp \
|
||||
$(SOURCE_PATH)/src/corelib/tools/qhash.cpp $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp \
|
||||
+ $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm \
|
||||
$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm \
|
||||
$(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \
|
||||
$(SOURCE_PATH)/src/corelib/io/qsettings.cpp $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \
|
||||
@@ -94,7 +95,7 @@ DEPEND_SRC = \
|
||||
$(SOURCE_PATH)/src/corelib/json/qjsonvalue.cpp \
|
||||
$(QTSRCS)
|
||||
|
||||
-CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
|
||||
+CPPFLAGS += -g $(EXTRA_CPPFLAGS) \
|
||||
-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 \
|
||||
@@ -109,7 +110,7 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
|
||||
-DQT_NO_FOREACH \
|
||||
-DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_JSON_READONLY -DQT_NO_STANDARDPATHS
|
||||
|
||||
-CXXFLAGS = $(EXTRA_CXXFLAGS) $(CPPFLAGS)
|
||||
+CXXFLAGS += $(EXTRA_CXXFLAGS) $(CPPFLAGS)
|
||||
|
||||
first all: $(BUILD_PATH)/bin/qmake$(EXEEXT)
|
||||
qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT)
|
||||
@@ -290,6 +291,9 @@ qstring.o: $(SOURCE_PATH)/src/corelib/to
|
||||
qstring_compat.o: $(SOURCE_PATH)/src/corelib/tools/qstring_compat.cpp
|
||||
$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring_compat.cpp
|
||||
|
||||
+qstring_mac.o: $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm
|
||||
+ $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm
|
||||
+
|
||||
qstringbuilder.o: $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp
|
||||
$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp
|
||||
|
||||
15
qt5-qtbase57/patches/patch-qmake_generators_makefile.cpp
Normal file
15
qt5-qtbase57/patches/patch-qmake_generators_makefile.cpp
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-qmake_generators_makefile.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
* Libtoolized
|
||||
|
||||
--- qmake/generators/makefile.cpp.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ qmake/generators/makefile.cpp
|
||||
@@ -3297,7 +3297,7 @@ MakefileGenerator::writePkgConfigFile()
|
||||
pkgConfiglibName = bundle.toQString();
|
||||
} else {
|
||||
if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir))
|
||||
- t << "-L${libdir} ";
|
||||
+ t << "-Wl,-R${libdir} -L${libdir} ";
|
||||
pkgConfiglibName = "-l" + project->first("QMAKE_ORIG_TARGET");
|
||||
if (project->isActiveConfig("shared"))
|
||||
pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString();
|
||||
147
qt5-qtbase57/patches/patch-qmake_generators_unix_unixmake.cpp
Normal file
147
qt5-qtbase57/patches/patch-qmake_generators_unix_unixmake.cpp
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
$NetBSD$
|
||||
|
||||
* fix install target so that destdir is added when installing QMAKE_TARGET
|
||||
* re-add compile_libtool support that was ripped out in qt 5.6
|
||||
|
||||
--- qmake/generators/unix/unixmake.cpp.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ qmake/generators/unix/unixmake.cpp
|
||||
@@ -45,6 +45,8 @@ UnixMakefileGenerator::init()
|
||||
project->values("ICON") = project->values("RC_FILE");
|
||||
if(project->isEmpty("QMAKE_EXTENSION_PLUGIN"))
|
||||
project->values("QMAKE_EXTENSION_PLUGIN").append(project->first("QMAKE_EXTENSION_SHLIB"));
|
||||
+ if(project->isEmpty("QMAKE_LIBTOOL"))
|
||||
+ project->values("QMAKE_LIBTOOL").append("libtool --silent");
|
||||
|
||||
project->values("QMAKE_ORIG_TARGET") = project->values("TARGET");
|
||||
|
||||
@@ -150,6 +152,8 @@ UnixMakefileGenerator::init()
|
||||
|
||||
if(project->isActiveConfig("GNUmake") && !project->isEmpty("QMAKE_CFLAGS_DEPS"))
|
||||
include_deps = true; //do not generate deps
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ Option::obj_ext = ".lo"; //override the .o
|
||||
|
||||
MakefileGenerator::init();
|
||||
|
||||
@@ -224,7 +228,7 @@ UnixMakefileGenerator::init()
|
||||
project->values(runCompImp).append(compilerExecutable + " " + compile_flag + " " + var("QMAKE_CC_O_FLAG") + "\"$@\" \"$<\"");
|
||||
}
|
||||
|
||||
- if (project->isActiveConfig("mac") && !project->isEmpty("TARGET") &&
|
||||
+ if (project->isActiveConfig("mac") && !project->isEmpty("TARGET") && !project->isActiveConfig("compile_libtool") &&
|
||||
((project->isActiveConfig("build_pass") || project->isEmpty("BUILDS")))) {
|
||||
ProString bundle;
|
||||
if(project->isActiveConfig("bundle") && !project->isEmpty("QMAKE_BUNDLE_EXTENSION")) {
|
||||
@@ -306,6 +310,51 @@ UnixMakefileGenerator::init()
|
||||
project->values("QMAKE_INTERNAL_PRL_LIBS") << "QMAKE_AR_SUBLIBS";
|
||||
}
|
||||
}
|
||||
+
|
||||
+ if(project->isActiveConfig("compile_libtool")) {
|
||||
+ static const char * const libtoolify[] = {
|
||||
+ "QMAKE_RUN_CC", "QMAKE_RUN_CC_IMP", "QMAKE_RUN_CXX", "QMAKE_RUN_CXX_IMP",
|
||||
+ "QMAKE_LINK_THREAD", "QMAKE_LINK", "QMAKE_AR_CMD", "QMAKE_LINK_SHLIB_CMD", 0
|
||||
+ };
|
||||
+ for (int i = 0; libtoolify[i]; i++) {
|
||||
+ ProStringList &l = project->values(libtoolify[i]);
|
||||
+ if(!l.isEmpty()) {
|
||||
+ QString libtool_flags, comp_flags;
|
||||
+ if (!strncmp(libtoolify[i], "QMAKE_LINK", 10) || !strcmp(libtoolify[i], "QMAKE_AR_CMD")) {
|
||||
+ libtool_flags += " --mode=link";
|
||||
+ if(project->isActiveConfig("staticlib")) {
|
||||
+ comp_flags += " -static";
|
||||
+ } else {
|
||||
+ if(!project->isEmpty("QMAKE_LIB_FLAG")) {
|
||||
+ if(project->isActiveConfig("plugin"))
|
||||
+ comp_flags += " -avoid-version";
|
||||
+ else {
|
||||
+ int maj = project->first("VER_MAJ").toInt();
|
||||
+ int min = project->first("VER_MIN").toInt();
|
||||
+ int pat = project->first("VER_PAT").toInt();
|
||||
+ comp_flags += " -version-info " + QString::number(maj + min) +
|
||||
+ ":" + QString::number(pat) +
|
||||
+ ":" + QString::number(min);
|
||||
+ }
|
||||
+ if (strcmp(libtoolify[i], "QMAKE_AR_CMD")) {
|
||||
+ QString rpath = Option::fixPathToTargetOS(project->first("target.path").toQString(), false);
|
||||
+ if(rpath.right(1) != Option::dir_sep)
|
||||
+ rpath += Option::dir_sep;
|
||||
+ comp_flags += " -rpath " + escapeFilePath(Option::fixPathToTargetOS(rpath, false));
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ if(project->isActiveConfig("plugin"))
|
||||
+ comp_flags += " -module";
|
||||
+ } else {
|
||||
+ libtool_flags += " --mode=compile";
|
||||
+ }
|
||||
+ l.first().prepend("$(LIBTOOL)" + libtool_flags + " ");
|
||||
+ if(!comp_flags.isEmpty())
|
||||
+ l.first() += comp_flags;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
QStringList
|
||||
@@ -410,6 +459,16 @@ UnixMakefileGenerator::findLibraries(boo
|
||||
goto found;
|
||||
}
|
||||
}
|
||||
+ if (project->isActiveConfig("compile_libtool")) {
|
||||
+ for (int dep_i = 0; dep_i < libdirs.size(); ++dep_i) {
|
||||
+ if (exists(libdirs[dep_i].local() + '/'
|
||||
+ + project->first("QMAKE_PREFIX_SHLIB") + lib + Option::libtool_ext)) {
|
||||
+ (*it) = libdirs[dep_i].real() + Option::dir_sep
|
||||
+ + project->first("QMAKE_PREFIX_SHLIB") + lib + Option::libtool_ext;
|
||||
+ goto found;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
found: ;
|
||||
} else if (target_mode == TARG_MAC_MODE && opt.startsWith("-F")) {
|
||||
QMakeLocalFileName f(opt.mid(2));
|
||||
@@ -536,7 +595,7 @@ UnixMakefileGenerator::defaultInstall(co
|
||||
QString ret, destdir = project->first("DESTDIR").toQString();
|
||||
if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
|
||||
destdir += Option::dir_sep;
|
||||
- QString targetdir = fileFixify(project->first("target.path").toQString(), FileFixifyAbsolute);
|
||||
+ QString targetdir = project->first("target.path").toQString();
|
||||
if(targetdir.right(1) != Option::dir_sep)
|
||||
targetdir += Option::dir_sep;
|
||||
|
||||
@@ -570,6 +629,25 @@ UnixMakefileGenerator::defaultInstall(co
|
||||
uninst.append("-$(DEL_FILE) " + dst);
|
||||
}
|
||||
|
||||
+ if (bundle == NoBundle && project->isActiveConfig("compile_libtool")) {
|
||||
+ QString src_targ = escapeFilePath(target);
|
||||
+ if(src_targ == "$(TARGET)")
|
||||
+ src_targ = "$(TARGETL)";
|
||||
+ QString dst_dir = targetdir;
|
||||
+ if(QDir::isRelativePath(dst_dir))
|
||||
+ dst_dir = Option::fixPathToTargetOS(dst_dir);
|
||||
+ dst_dir = Option::fixPathToTargetOS(dst_dir);
|
||||
+ if(!ret.isEmpty())
|
||||
+ ret += "\n\t";
|
||||
+ if(project->first("TEMPLATE") == "app") {
|
||||
+ ret += "-$(LIBTOOL) --mode=install cp \"" + Option::fixPathToTargetOS(destdir + src_targ, false) + "\" \"" + filePrefixRoot(root, dst_dir) + "\"";
|
||||
+ } else {
|
||||
+ ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\"";
|
||||
+ }
|
||||
+ if(!uninst.isEmpty())
|
||||
+ uninst.append("\n\t");
|
||||
+ uninst.append("-$(LIBTOOL) --mode=uninstall " + src_targ);
|
||||
+ } else
|
||||
{
|
||||
QString src_targ = target;
|
||||
if(!destdir.isEmpty())
|
||||
@@ -691,7 +769,7 @@ UnixMakefileGenerator::defaultInstall(co
|
||||
if(type == "prl" && project->isActiveConfig("create_prl") && !project->isActiveConfig("no_install_prl") &&
|
||||
!project->isEmpty("QMAKE_INTERNAL_PRL_FILE"))
|
||||
meta = prlFileName(false);
|
||||
- if (type == "libtool" && project->isActiveConfig("create_libtool"))
|
||||
+ if (type == "libtool" && project->isActiveConfig("create_libtool") && !project->isActiveConfig("compile_libtool"))
|
||||
meta = libtoolFileName(false);
|
||||
if(type == "pkgconfig" && project->isActiveConfig("create_pc"))
|
||||
meta = pkgConfigFileName(false);
|
||||
156
qt5-qtbase57/patches/patch-qmake_generators_unix_unixmake2.cpp
Normal file
156
qt5-qtbase57/patches/patch-qmake_generators_unix_unixmake2.cpp
Normal file
|
|
@ -0,0 +1,156 @@
|
|||
$NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
* Libtoolized
|
||||
* add back compile_libtool support that was ripped out in qt5.6
|
||||
|
||||
--- qmake/generators/unix/unixmake2.cpp.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ qmake/generators/unix/unixmake2.cpp
|
||||
@@ -50,6 +50,10 @@ UnixMakefileGenerator::writePrlFile(QTex
|
||||
MakefileGenerator::writePrlFile(t);
|
||||
// libtool support
|
||||
if(project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib") { //write .la
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ warn_msg(WarnLogic, "create_libtool specified with compile_libtool can lead to conflicting .la\n"
|
||||
+ "formats, create_libtool has been disabled\n");
|
||||
+ else
|
||||
writeLibtoolFile();
|
||||
}
|
||||
// pkg-config support
|
||||
@@ -169,12 +173,12 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
t << "####### Compiler, tools and options\n\n";
|
||||
t << "CC = " << var("QMAKE_CC") << endl;
|
||||
t << "CXX = " << var("QMAKE_CXX") << endl;
|
||||
- t << "DEFINES = "
|
||||
+ t << "DEFINES += "
|
||||
<< varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
|
||||
<< varGlue("DEFINES","-D"," -D","") << endl;
|
||||
- t << "CFLAGS = " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
|
||||
- t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
|
||||
- t << "INCPATH =";
|
||||
+ t << "CFLAGS += " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
|
||||
+ t << "CXXFLAGS += " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
|
||||
+ t << "INCPATH +=";
|
||||
{
|
||||
QString isystem = var("QMAKE_CFLAGS_ISYSTEM");
|
||||
const ProStringList &incs = project->values("INCLUDEPATH");
|
||||
@@ -198,13 +202,15 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
|
||||
if(!project->isActiveConfig("staticlib")) {
|
||||
t << "LINK = " << var("QMAKE_LINK") << endl;
|
||||
- t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl;
|
||||
- t << "LIBS = $(SUBLIBS) " << fixLibFlags("QMAKE_LIBS").join(' ') << ' '
|
||||
+ t << "LFLAGS += " << var("QMAKE_LFLAGS") << endl;
|
||||
+ t << "LIBS += $(SUBLIBS) " << fixLibFlags("QMAKE_LIBS").join(' ') << ' '
|
||||
<< fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << endl;
|
||||
}
|
||||
|
||||
t << "AR = " << var("QMAKE_AR") << endl;
|
||||
t << "RANLIB = " << var("QMAKE_RANLIB") << endl;
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ t << "LIBTOOL = " << var("QMAKE_LIBTOOL") << endl;
|
||||
t << "SED = " << var("QMAKE_STREAM_EDITOR") << endl;
|
||||
t << "STRIP = " << var("QMAKE_STRIP") << endl;
|
||||
|
||||
@@ -265,6 +271,8 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
if (destd.endsWith('\\'))
|
||||
destd += '\\';
|
||||
t << "DESTDIR = " << destd << endl;
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ t << "TARGETL = " << fileVar("TARGET_la") << endl;
|
||||
t << "TARGET = " << fileVar("TARGET") << endl; // ### mixed use!
|
||||
if(project->isActiveConfig("plugin")) {
|
||||
t << "TARGETD = " << fileVar("TARGET") << endl;
|
||||
@@ -273,6 +281,8 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
if(!project->isEmpty("QMAKE_BUNDLE")) {
|
||||
t << "TARGETD = " << fileVar("TARGET_x.y") << endl;
|
||||
t << "TARGET0 = " << fileVar("TARGET_") << endl;
|
||||
+ } else if(project->isActiveConfig("compile_libtool")) {
|
||||
+ t << "TARGETD = " << var("TARGET_la") << endl;
|
||||
} else if (!project->isActiveConfig("unversioned_libname")) {
|
||||
t << "TARGET0 = " << fileVar("TARGET_") << endl;
|
||||
if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
|
||||
@@ -578,7 +588,9 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
if(!project->isEmpty("QMAKE_PRE_LINK"))
|
||||
t << "\n\t" << var("QMAKE_PRE_LINK");
|
||||
|
||||
- if (project->isActiveConfig("plugin")) {
|
||||
+ if(project->isActiveConfig("compile_libtool")) {
|
||||
+ t << "\n\t" << var("QMAKE_LINK_SHLIB_CMD");
|
||||
+ } else if (project->isActiveConfig("plugin")) {
|
||||
t << "\n\t"
|
||||
<< "-$(DEL_FILE) $(TARGET)\n\t"
|
||||
<< var("QMAKE_LINK_SHLIB_CMD");
|
||||
@@ -722,7 +734,7 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
writeMakeQmake(t);
|
||||
if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake")) {
|
||||
QStringList meta_files;
|
||||
- if (project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib") { //libtool
|
||||
+ if (project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib" && !project->isActiveConfig("compile_libtool")) { //libtool
|
||||
meta_files += libtoolFileName();
|
||||
}
|
||||
if(project->isActiveConfig("create_pc") && project->first("TEMPLATE") == "lib") { //pkg-config
|
||||
@@ -957,6 +969,9 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
|
||||
t << "clean:" << clean_targets << "\n\t";
|
||||
if(!project->isEmpty("OBJECTS")) {
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ t << "-$(LIBTOOL) --mode=clean $(DEL_FILE) $(OBJECTS)\n\t";
|
||||
+ else
|
||||
t << "-$(DEL_FILE) $(OBJECTS)\n\t";
|
||||
}
|
||||
if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER")) {
|
||||
@@ -1013,6 +1028,8 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
if(!project->isEmpty("QMAKE_BUNDLE")) {
|
||||
QString bundlePath = escapeFilePath(destdir + project->first("QMAKE_BUNDLE"));
|
||||
t << "\t-$(DEL_FILE) -r " << bundlePath << endl;
|
||||
+ } else if(project->isActiveConfig("compile_libtool")) {
|
||||
+ t << "\t-$(LIBTOOL) --mode=clean $(DEL_FILE) $(TARGET)\n";
|
||||
} else if (project->isActiveConfig("staticlib") || project->isActiveConfig("plugin")) {
|
||||
t << "\t-$(DEL_FILE) " << escapeFilePath(destdir) << "$(TARGET) \n";
|
||||
} else if (project->values("QMAKE_APP_FLAG").isEmpty()) {
|
||||
@@ -1139,18 +1156,26 @@ 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");
|
||||
- if(project->values("QMAKE_AR_CMD").isEmpty())
|
||||
+ if(project->values("QMAKE_AR_CMD").isEmpty()) {
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)");
|
||||
+ else
|
||||
project->values("QMAKE_AR_CMD").append("$(AR) $(DESTDIR)$(TARGET) $(OBJECTS)");
|
||||
+ }
|
||||
} else {
|
||||
project->values("TARGETA").append(project->first("DESTDIR") + project->first("QMAKE_PREFIX_STATICLIB")
|
||||
+ project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_STATICLIB"));
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ project->values("TARGET_la") = ProStringList(project->first("DESTDIR") + "lib" + project->first("TARGET") + Option::libtool_ext);
|
||||
|
||||
ProStringList &ar_cmd = project->values("QMAKE_AR_CMD");
|
||||
if (!ar_cmd.isEmpty())
|
||||
ar_cmd[0] = ar_cmd.at(0).toQString().replace(QLatin1String("(TARGET)"), QLatin1String("(TARGETA)"));
|
||||
else
|
||||
ar_cmd.append("$(AR) $(TARGETA) $(OBJECTS)");
|
||||
- if (!project->isEmpty("QMAKE_BUNDLE")) {
|
||||
+ if(project->isActiveConfig("compile_libtool")) {
|
||||
+ project->values("TARGET") = project->values("TARGET_la");
|
||||
+ } else if (!project->isEmpty("QMAKE_BUNDLE")) {
|
||||
ProString bundle_loc = project->first("QMAKE_BUNDLE_LOCATION");
|
||||
if(!bundle_loc.isEmpty() && !bundle_loc.startsWith("/"))
|
||||
bundle_loc.prepend("/");
|
||||
@@ -1304,7 +1329,7 @@ void UnixMakefileGenerator::init2()
|
||||
project->values("QMAKE_CFLAGS") += project->values("QMAKE_CFLAGS_PLUGIN");
|
||||
project->values("QMAKE_CXXFLAGS") += project->values("QMAKE_CXXFLAGS_PLUGIN");
|
||||
project->values("QMAKE_LFLAGS") += project->values("QMAKE_LFLAGS_PLUGIN");
|
||||
- if (project->isActiveConfig("plugin_with_soname"))
|
||||
+ if (project->isActiveConfig("plugin_with_soname") && !project->isActiveConfig("compile_libtool"))
|
||||
project->values("QMAKE_LFLAGS") += project->values("QMAKE_LFLAGS_SONAME");
|
||||
} else {
|
||||
project->values("QMAKE_LFLAGS") += project->values("QMAKE_LFLAGS_SHLIB");
|
||||
@@ -1323,6 +1348,7 @@ void UnixMakefileGenerator::init2()
|
||||
project->first("VER_MIN") + "." +
|
||||
project->first("VER_PAT"));
|
||||
}
|
||||
+ if(!project->isActiveConfig("compile_libtool"))
|
||||
project->values("QMAKE_LFLAGS") += project->values("QMAKE_LFLAGS_SONAME");
|
||||
}
|
||||
}
|
||||
15
qt5-qtbase57/patches/patch-qmake_qmake.pri
Normal file
15
qt5-qtbase57/patches/patch-qmake_qmake.pri
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-qmake_qmake.pri,v 1.1 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
Fix building on Darwin.
|
||||
|
||||
--- qmake/qmake.pri.orig 2015-07-20 09:25:44.000000000 +0000
|
||||
+++ qmake/qmake.pri
|
||||
@@ -136,7 +136,7 @@ bootstrap { #Qt code
|
||||
SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp
|
||||
mac {
|
||||
SOURCES += qcore_mac.cpp qsettings_mac.cpp
|
||||
- OBJECTIVE_SOURCES += qcore_mac_objc.mm qlocale_mac.mm
|
||||
+ OBJECTIVE_SOURCES += qcore_mac_objc.mm qlocale_mac.mm qstring_mac.mm
|
||||
LIBS += -framework ApplicationServices -framework CoreServices -framework Foundation
|
||||
} else {
|
||||
SOURCES += qlocale_unix.cpp
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
$NetBSD: patch-src_concurrent_qtconcurrentiteratekernel.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
Fix building on Darwin.
|
||||
|
||||
--- src/concurrent/qtconcurrentiteratekernel.cpp.orig 2013-11-27 01:01:16.000000000 +0000
|
||||
+++ src/concurrent/qtconcurrentiteratekernel.cpp
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
#include "qtconcurrentiteratekernel.h"
|
||||
|
||||
-#if defined(Q_OS_MAC)
|
||||
+#if defined(Q_OS_MAC) || defined(__APPLE__)
|
||||
#include <mach/mach.h>
|
||||
#include <mach/mach_time.h>
|
||||
#include <unistd.h>
|
||||
@@ -67,7 +67,7 @@ enum {
|
||||
MedianSize = 7
|
||||
};
|
||||
|
||||
-#if defined(Q_OS_MAC)
|
||||
+#if defined(Q_OS_MAC) || defined(__APPLE__)
|
||||
|
||||
static qint64 getticks()
|
||||
{
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
$NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
|
||||
|
||||
* Add DragonFly support
|
||||
* Add NetBSD support
|
||||
|
||||
--- 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>
|
||||
|
||||
+// for __DragonFly_version
|
||||
+#if defined(__DragonFly__)
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+
|
||||
// unistd.h is needed for the _XOPEN_UNIX macro
|
||||
#include <unistd.h>
|
||||
-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
|
||||
+#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) || defined(Q_OS_NETBSD) || defined(__DragonFly__)
|
||||
# include <langinfo.h>
|
||||
#endif
|
||||
|
||||
@@ -71,6 +76,9 @@
|
||||
# else
|
||||
# define UTF16 "UTF-16LE"
|
||||
# endif
|
||||
+#elif defined(__DragonFly__) && __DragonFly_version__ < 197700
|
||||
+# define NO_BOM
|
||||
+# define UTF16 "UTF-16"
|
||||
#else
|
||||
# define UTF16 "UTF-16"
|
||||
#endif
|
||||
@@ -223,7 +231,7 @@ QString QIconvCodec::convertToUnicode(co
|
||||
IconvState *state = *pstate;
|
||||
size_t inBytesLeft = len;
|
||||
// best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
|
||||
-#ifdef GNU_LIBICONV
|
||||
+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
|
||||
// GNU doesn't disagree with POSIX :/
|
||||
const char *inBytes = chars;
|
||||
#else
|
||||
@@ -322,7 +330,7 @@ static bool setByteOrder(iconv_t cd)
|
||||
size_t outBytesLeft = sizeof buf;
|
||||
size_t inBytesLeft = sizeof bom;
|
||||
|
||||
-#if defined(GNU_LIBICONV)
|
||||
+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
|
||||
const char **inBytesPtr = const_cast<const char **>(&inBytes);
|
||||
#else
|
||||
char **inBytesPtr = &inBytes;
|
||||
@@ -342,7 +350,7 @@ QByteArray QIconvCodec::convertFromUnico
|
||||
char *outBytes;
|
||||
size_t inBytesLeft;
|
||||
|
||||
-#if defined(GNU_LIBICONV)
|
||||
+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
|
||||
const char **inBytesPtr = const_cast<const char **>(&inBytes);
|
||||
#else
|
||||
char **inBytesPtr = &inBytes;
|
||||
@@ -482,11 +490,13 @@ iconv_t QIconvCodec::createIconv_t(const
|
||||
#endif
|
||||
const char *codeset = empty_codeset;
|
||||
cd = iconv_open(to ? to : codeset, from ? from : codeset);
|
||||
+#elif defined(__NetBSD)
|
||||
+ const char *codeset = 0;
|
||||
#else
|
||||
char *codeset = 0;
|
||||
#endif
|
||||
|
||||
-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
|
||||
+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__)
|
||||
if (cd == (iconv_t) -1) {
|
||||
codeset = nl_langinfo(CODESET);
|
||||
if (codeset)
|
||||
25
qt5-qtbase57/patches/patch-src_corelib_io_io.pri
Normal file
25
qt5-qtbase57/patches/patch-src_corelib_io_io.pri
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
$NetBSD: patch-src_corelib_io_io.pri,v 1.4 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
* Add DragonFly support
|
||||
* Patch sent and merged upstream:
|
||||
http://codereview.qt-project.org/#/c/111741/
|
||||
* fix linux test.
|
||||
|
||||
--- src/corelib/io/io.pri.orig 2014-12-05 16:24:37.000000000 +0000
|
||||
+++ src/corelib/io/io.pri
|
||||
@@ -172,13 +172,13 @@ win32 {
|
||||
io/qstorageinfo_unix.cpp
|
||||
}
|
||||
|
||||
- linux|if(qnx:contains(QT_CONFIG, inotify)) {
|
||||
+ linux*|if(qnx:contains(QT_CONFIG, inotify)) {
|
||||
SOURCES += io/qfilesystemwatcher_inotify.cpp
|
||||
HEADERS += io/qfilesystemwatcher_inotify_p.h
|
||||
}
|
||||
|
||||
!nacl {
|
||||
- freebsd-*|mac|darwin-*|openbsd-*|netbsd-*:{
|
||||
+ freebsd-*|mac|darwin-*|openbsd-*|netbsd-*|dragonfly-*:{
|
||||
SOURCES += io/qfilesystemwatcher_kqueue.cpp
|
||||
HEADERS += io/qfilesystemwatcher_kqueue_p.h
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
$NetBSD: patch-src_corelib_io_qstandardpaths_unix.cpp,v 1.1 2016/02/04 10:41:13 markd Exp $
|
||||
|
||||
Add $LOCALBASE/share to search path
|
||||
|
||||
--- src/corelib/io/qstandardpaths_unix.cpp.orig 2015-10-13 04:35:31.000000000 +0000
|
||||
+++ src/corelib/io/qstandardpaths_unix.cpp
|
||||
@@ -255,6 +255,7 @@ static QStringList xdgDataDirs()
|
||||
// http://standards.freedesktop.org/basedir-spec/latest/
|
||||
QString xdgDataDirsEnv = QFile::decodeName(qgetenv("XDG_DATA_DIRS"));
|
||||
if (xdgDataDirsEnv.isEmpty()) {
|
||||
+ dirs.append(QString::fromLatin1("@LOCALBASE@/share"));
|
||||
dirs.append(QString::fromLatin1("/usr/local/share"));
|
||||
dirs.append(QString::fromLatin1("/usr/share"));
|
||||
} else {
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.6 2016/12/04 21:46:54 marino Exp $
|
||||
|
||||
* fix build on SunOS
|
||||
|
||||
--- src/corelib/io/qstorageinfo_unix.cpp.orig 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ src/corelib/io/qstorageinfo_unix.cpp
|
||||
@@ -94,7 +94,7 @@
|
||||
# if !defined(ST_RDONLY)
|
||||
# define ST_RDONLY 1 // hack for missing define on Android
|
||||
# endif
|
||||
-#elif defined(Q_OS_HAIKU)
|
||||
+#elif defined(Q_OS_HAIKU) || defined(Q_OS_SOLARIS)
|
||||
# define QT_STATFSBUF struct statvfs
|
||||
# define QT_STATFS ::statvfs
|
||||
#else
|
||||
|
|
@ -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 2016-12-01 08:17:04.000000000 +0000
|
||||
+++ src/network/kernel/qhostinfo_unix.cpp
|
||||
@@ -123,6 +123,8 @@ static bool resolveLibraryInternal()
|
||||
if (!local_res_nclose)
|
||||
local_res_ninit = 0;
|
||||
}
|
||||
+ if (local_res_ninit)
|
||||
+ local_res_init = 0;
|
||||
#endif
|
||||
|
||||
return true;
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
$NetBSD: patch-src_openglextensions_openglextensions.pro,v 1.1 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
Build shared library.
|
||||
|
||||
--- src/openglextensions/openglextensions.pro.orig 2015-10-26 11:22:39.000000000 +0000
|
||||
+++ src/openglextensions/openglextensions.pro
|
||||
@@ -1,5 +1,4 @@
|
||||
TARGET = QtOpenGLExtensions
|
||||
-CONFIG += static
|
||||
|
||||
contains(QT_CONFIG, opengl):CONFIG += opengl
|
||||
contains(QT_CONFIG, opengles2):CONFIG += opengles2
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-src_platformsupport_platformsupport.pro,v 1.1 2014/12/30 17:23:46 adam Exp $
|
||||
|
||||
* Libtoolized and make it shared library
|
||||
|
||||
--- 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
|
||||
|
||||
-CONFIG += static internal_module
|
||||
+CONFIG += internal_module
|
||||
mac:LIBS_PRIVATE += -lz
|
||||
|
||||
DEFINES += QT_NO_CAST_FROM_ASCII
|
||||
|
|
@ -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
|
||||
|
|
@ -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"));
|
||||
12
qt5-qtbase57/patches/patch-src_tools_bootstrap_bootstrap.pro
Normal file
12
qt5-qtbase57/patches/patch-src_tools_bootstrap_bootstrap.pro
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
$NetBSD: patch-src_tools_bootstrap_bootstrap.pro,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
* Create shared library .so file libQt5Bootstrap.la.
|
||||
|
||||
--- src/tools/bootstrap/bootstrap.pro.orig 2015-07-27 10:28:43.000000000 +0000
|
||||
+++ src/tools/bootstrap/bootstrap.pro
|
||||
@@ -1,4 +1,4 @@
|
||||
-option(host_build)
|
||||
+#option(host_build)
|
||||
|
||||
TARGET = QtBootstrap
|
||||
QT =
|
||||
14
qt5-qtbase57/patches/patch-src_tools_moc_main.cpp
Normal file
14
qt5-qtbase57/patches/patch-src_tools_moc_main.cpp
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
$NetBSD: patch-src_tools_moc_main.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
|
||||
|
||||
rh#756395, https://bugreports.qt-project.org/browse/QTBUG-22829
|
||||
|
||||
--- src/tools/moc/main.cpp.orig 2013-11-27 01:01:11.000000000 +0000
|
||||
+++ src/tools/moc/main.cpp
|
||||
@@ -192,6 +192,7 @@ int runMoc(int argc, char **argv)
|
||||
Moc moc;
|
||||
pp.macros["Q_MOC_RUN"];
|
||||
pp.macros["__cplusplus"];
|
||||
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
|
||||
|
||||
// Don't stumble over GCC extensions
|
||||
Macro dummyVariadicFunctionMacro;
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-src_widgets_graphicsview_qgraphicsitem__p.h,v 1.1 2014/12/30 17:23:46 adam Exp $
|
||||
|
||||
--- 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;
|
||||
const QGraphicsItem *p2 = t2;
|
||||
- while (t1 && t1 != t2) {
|
||||
+ while (t1 && t2 && t1 != t2) {
|
||||
p1 = t1;
|
||||
p2 = t2;
|
||||
t1 = t1->d_ptr->parent;
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
$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.
|
||||
|
||||
--- 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
|
||||
# Add special cases
|
||||
-SUBDIRS += testProcessSpacesArgs/nospace.pro \
|
||||
- testProcessSpacesArgs/onespace.pro \
|
||||
- testProcessSpacesArgs/twospaces.pro \
|
||||
- testSpaceInName
|
||||
+SUBDIRS += testProcessSpacesArgs/nospace.pro
|
||||
|
||||
win32:!wince* {
|
||||
SUBDIRS += \
|
||||
|
|
@ -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
|
||||
|
||||
Loading…
Reference in a new issue