Index: head/www/webkit-qt5/Makefile =================================================================== --- head/www/webkit-qt5/Makefile (revision 422802) +++ head/www/webkit-qt5/Makefile (revision 422803) @@ -1,80 +1,81 @@ # $FreeBSD$ PORTNAME= webkit DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITE_SUBDIR= community_releases/${QT5_VERSION:R}/${QT5_VERSION}/ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt WebKit implementation LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libicui18n.so:devel/icu \ + libleveldb.so:databases/leveldb \ libpng.so:graphics/png \ libwebp.so:graphics/webp BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex DISTINFO_FILE= ${MASTERDIR}/distinfo BROKEN_sparc64= cannot build: uses i386 assembler USE_GL= gl USE_GNOME= libxml2 libxslt USE_PERL5= build USE_QT5= core gui network opengl printsupport qml quick sql \ widgets buildtools_build QT_DIST= ${PORTNAME} USE_RUBY= yes RUBY_NO_RUN_DEPENDS= yes USE_XORG= x11 xcomposite xrender USES= bison gperf jpeg perl5 pkgconfig python:build qmake:outsource \ sqlite # Use flex(1) from ports. MAKE_ENV= PATH="${LOCALBASE}/bin:${PATH}" # "all" builds many more targets. The default one is called "first" in # QtWebKit, and is invoked by default when make is called without arguments. ALL_TARGET= first USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_DEFINES= ACCESSIBILITY QT_CONFIG= accessibility accessibility-atspi-bridge OPTIONS_DEFINE= GSTREAMER OPTIONS_DEFAULT=GSTREAMER GSTREAMER_USE= GNOME=glib20 GSTREAMER1=yes .include # Base ld(1) segfaults on PowerPC (inherited from Qt 4): # http://bugs.freebsd.org/173042 .if ${ARCH} == "powerpc" BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils .endif post-patch: ${REINPLACE_CMD} -e 's,python,${PYTHON_VERSION},g' \ -e 's,$$$${PYTHON},${PYTHON_VERSION},g' \ ${WRKSRC}/Source/WebCore/DerivedSources.make \ ${WRKSRC}/Source/WebCore/DerivedSources.pri \ ${WRKSRC}/Source/WebKit2/DerivedSources.make \ ${WRKSRC}/Source/WebKit2/DerivedSources.pri \ ${WRKSRC}/Source/JavaScriptCore/DerivedSources.make \ ${WRKSRC}/Source/JavaScriptCore/DerivedSources.pri \ ${WRKSRC}/Tools/qmake/mkspecs/features/configure.prf pre-configure: @${REINPLACE_CMD} -Ee 's|linux-?\*|unix|g' \ ${WRKSRC}/Source/JavaScriptCore/DerivedSources.pri \ ${WRKSRC}/Source/JavaScriptCore/JavaScriptCore.pri \ ${WRKSRC}/Source/JavaScriptCore/Target.pri \ ${WRKSRC}/Source/WebCore/WebCore.pri \ ${WRKSRC}/Tools/qmake/mkspecs/features/features.prf .if ! ${PORT_OPTIONS:MGSTREAMER} @${REINPLACE_CMD} -e 's|packagesExist.*gstreamer.*|false {|' \ ${WRKSRC}/Tools/qmake/mkspecs/features/features.prf .endif .include Index: head/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp =================================================================== --- head/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp (nonexistent) +++ head/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp (revision 422803) @@ -0,0 +1,13 @@ +databases/leveldb installs the memenv.h header into a different location. + +--- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp.orig 2016-09-26 15:03:55 UTC ++++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp +@@ -38,7 +38,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include Property changes on: head/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro =================================================================== --- head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro (nonexistent) +++ head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro (revision 422803) @@ -0,0 +1,13 @@ +Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of +the directories make tries to enter in case it exists (because of .OBJDIR). +Since qmake will create it because of OBJECTS_DIR, make will invoke the +compiler from there and fail because it's trying to pass "-o obj/foo.o" while +already in obj/. + +--- Tools/qmake/config.tests/glx/glx.pro.orig 2016-09-26 14:56:31 UTC ++++ Tools/qmake/config.tests/glx/glx.pro +@@ -1,4 +1,3 @@ + SOURCES = glx.cpp +-OBJECTS_DIR = obj + LIBS += -lX11 -lGL + Property changes on: head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp =================================================================== --- head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp (nonexistent) +++ head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp (revision 422803) @@ -0,0 +1,13 @@ +databases/leveldb installs the memenv.h header into a different location. + +--- Tools/qmake/config.tests/leveldb/leveldb.cpp.orig 2016-09-26 15:03:32 UTC ++++ Tools/qmake/config.tests/leveldb/leveldb.cpp +@@ -19,7 +19,7 @@ + + #include + #include +-#include ++#include + + int main(int, char**) + { Property changes on: head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro =================================================================== --- head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro (nonexistent) +++ head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro (revision 422803) @@ -0,0 +1,14 @@ +Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of +the directories make tries to enter in case it exists (because of .OBJDIR). +Since qmake will create it because of OBJECTS_DIR, make will invoke the +compiler from there and fail because it's trying to pass "-o obj/foo.o" while +already in obj/. + +--- Tools/qmake/config.tests/leveldb/leveldb.pro.orig 2016-09-26 14:57:15 UTC ++++ Tools/qmake/config.tests/leveldb/leveldb.pro +@@ -1,5 +1,4 @@ + SOURCES = leveldb.cpp +-OBJECTS_DIR = obj + LIBS += -lleveldb -lmemenv + + load(qt_build_config) Property changes on: head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro =================================================================== --- head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro (nonexistent) +++ head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro (revision 422803) @@ -0,0 +1,12 @@ +Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of +the directories make tries to enter in case it exists (because of .OBJDIR). +Since qmake will create it because of OBJECTS_DIR, make will invoke the +compiler from there and fail because it's trying to pass "-o obj/foo.o" while +already in obj/. + +--- Tools/qmake/config.tests/libXcomposite/libXcomposite.pro.orig 2016-09-26 14:56:58 UTC ++++ Tools/qmake/config.tests/libXcomposite/libXcomposite.pro +@@ -1,3 +1,2 @@ + SOURCES = libXcomposite.cpp +-OBJECTS_DIR = obj + LIBS += -lXcomposite -lX11 Property changes on: head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro =================================================================== --- head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro (nonexistent) +++ head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro (revision 422803) @@ -0,0 +1,12 @@ +Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of +the directories make tries to enter in case it exists (because of .OBJDIR). +Since qmake will create it because of OBJECTS_DIR, make will invoke the +compiler from there and fail because it's trying to pass "-o obj/foo.o" while +already in obj/. + +--- Tools/qmake/config.tests/libXrender/libXrender.pro.orig 2016-09-26 14:56:47 UTC ++++ Tools/qmake/config.tests/libXrender/libXrender.pro +@@ -1,3 +1,2 @@ + SOURCES = libXrender.cpp +-OBJECTS_DIR = obj + LIBS += -lXrender -lX11 Property changes on: head/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property