diff options
Diffstat (limited to 'www/qt5-webengine')
| -rw-r--r-- | www/qt5-webengine/Makefile | 16 | ||||
| -rw-r--r-- | www/qt5-webengine/files/extra-patch-10 | 11 |
2 files changed, 1 insertions, 26 deletions
diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index a5bf72360d22..3817aff190bc 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -87,20 +87,6 @@ QMAKE_CONFIGURE_ARGS= -proprietary-codecs -system-ffmpeg # dependencies correctly in the generated Makefiles, use the right target here. ALL_TARGET= first -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 -.endif # ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 - -# 1101513 is 11-STABLE after merging clang, llvm, lld, lldb, compiler-rt and -# libc++ 6.0.0 release, and several follow-up fixes. -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101513 -BUILD_DEPENDS+= clang60:devel/llvm60 -CC= clang60 -CXX= clang++60 -.endif # ${OPSYS} == FreeBSD && ${OSVERSION} < 1101513 - # We need ar(1) from ports because the Chromium code uses the @file syntax. # We then need to ensure ld(1) from ports is used because of the archives ar(1) # generated. @@ -144,4 +130,4 @@ pre-configure: # Rerun syncqt.pl -- otherwise the resulting package misses some forwarding headers. cd ${WRKSRC} && ${QT_BINDIR}/syncqt.pl -version ${QT5_VERSION} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/qt5-webengine/files/extra-patch-10 b/www/qt5-webengine/files/extra-patch-10 deleted file mode 100644 index e3b99ae8aed1..000000000000 --- a/www/qt5-webengine/files/extra-patch-10 +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/skia/src/core/SkSmallAllocator.h.orig 2017-02-01 20:16:14.715097000 +0100 -+++ src/3rdparty/chromium/third_party/skia/src/core/SkSmallAllocator.h 2017-02-01 20:24:56.680605000 +0100 -@@ -20,7 +20,7 @@ - // abstract type. The complication with max_align_t is that it is defined differently for - // different builds. - namespace { --#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) -+#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) || defined(__FreeBSD__) - // Use std::max_align_t for compiles that follow the standard. - #include <cstddef> - using SystemAlignment = std::max_align_t; |