diff options
| -rw-r--r-- | Mk/bsd.qt.mk | 3 | ||||
| -rw-r--r-- | devel/qt4-corelib/Makefile | 2 | ||||
| -rw-r--r-- | devel/qt4/files/extrapatch-config.tests-unix-compile.test | 11 | ||||
| -rw-r--r-- | devel/qt5-core/Makefile | 12 | ||||
| -rw-r--r-- | devel/qt5/files/extrapatch-config.tests-unix-compile.test | 11 |
5 files changed, 28 insertions, 11 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index f13bb508ee88..23b96e47c406 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -166,7 +166,8 @@ CONFIGURE_ARGS+=-verbose . endif . if ${QT_DIST} == "base" || ${_QT_VERSION:M4*} -EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure +EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test . if ${_QT_VERSION:M5*} EXTRA_PATCHES+= ${.CURDIR:H:H}/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp . endif diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index 486ee0f3fe51..c3b1d1ebe920 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4/files/extrapatch-config.tests-unix-compile.test b/devel/qt4/files/extrapatch-config.tests-unix-compile.test new file mode 100644 index 000000000000..2046425ad53c --- /dev/null +++ b/devel/qt4/files/extrapatch-config.tests-unix-compile.test @@ -0,0 +1,11 @@ +--- config.tests/unix/compile.test.orig ++++ config.tests/unix/compile.test +@@ -13,7 +13,7 @@ + shift 7 + LFLAGS="$SYSROOT_FLAG" + INCLUDEPATH="" +-CXXFLAGS="$SYSROOT_FLAG" ++CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG" + MAC_ARCH_CXXFLAGS="" + MAC_ARCH_LFLAGS="" + while [ "$#" -gt 0 ]; do diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index 021b35daf257..2a8f4da65413 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -2,6 +2,7 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -14,14 +15,13 @@ LIB_DEPENDS= libicui18n.so:${PORTSDIR}/devel/icu \ USE_GNOME= glib20 USE_QT5= qmake_build buildtools_build QT_DIST= base -USES= iconv HAS_CONFIGURE= yes # Disable (almost) everything to install minimal qconfig.h. # -no-feature-* adds QT_NO_* (for features which have no switch or # that need to be detected). CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -no-libjpeg \ -no-openssl -no-gui -no-widgets -no-cups \ - -no-feature-iconv -no-dbus -no-xcb -no-opengl \ + -no-iconv -no-dbus -no-xcb -no-opengl \ -no-feature-glib -no-feature-alsa \ -no-feature-concurrent -no-feature-evdev \ -no-fontconfig -no-freetype \ @@ -34,17 +34,11 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/corelib INSTALL_WRKSRC= ${BUILD_WRKSRC} -QT_DEFINES= GLIB ICONV +QT_DEFINES= GLIB QT_CONFIG= glib icu .include <bsd.port.pre.mk> -.if ${ICONV_PREFIX} == "/usr" -QT_CONFIG+= sun-libiconv -.else -QT_CONFIG+= gnu-libiconv -.endif - post-install: ${INSTALL_DATA} ${WRKSRC}/src/3rdparty/harfbuzz/src/harfbuzz*.h \ ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/${QT5_VERSION:C/-.*//}/QtCore/private diff --git a/devel/qt5/files/extrapatch-config.tests-unix-compile.test b/devel/qt5/files/extrapatch-config.tests-unix-compile.test new file mode 100644 index 000000000000..2046425ad53c --- /dev/null +++ b/devel/qt5/files/extrapatch-config.tests-unix-compile.test @@ -0,0 +1,11 @@ +--- config.tests/unix/compile.test.orig ++++ config.tests/unix/compile.test +@@ -13,7 +13,7 @@ + shift 7 + LFLAGS="$SYSROOT_FLAG" + INCLUDEPATH="" +-CXXFLAGS="$SYSROOT_FLAG" ++CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG" + MAC_ARCH_CXXFLAGS="" + MAC_ARCH_LFLAGS="" + while [ "$#" -gt 0 ]; do |