View | Details | Raw Unified | Return to bug 221339 | Differences between
and this patch

Collapse All | Expand All

(-)www/qt5-webkit/Makefile (-69 / +37 lines)
Lines 1-81 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	webkit
3
PORTNAME=		webkit
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=		5.212.0-alpha2
5
PORTREVISION=	1
5
CATEGORIES=		www
6
CATEGORIES=	www
6
MASTER_SITES=		https://github.com/annulen/${PORTNAME}/releases/download/qt${PORTNAME}-${PORTVERSION}/
7
MASTER_SITE_SUBDIR=	community_releases/${QT5_VERSION:R}/${QT5_VERSION}/
7
PKGNAMEPREFIX=		qt5-
8
PKGNAMEPREFIX=	qt5-
8
DISTNAME=		qt${PORTNAME}-${DISTVERSION}
9
9
10
MAINTAINER=	kde@FreeBSD.org
10
MAINTAINER=		kde@FreeBSD.org
11
COMMENT=	Qt WebKit implementation
11
COMMENT=		QtWebKit with a more modern WebKit code base
12
12
13
LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
13
LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig \
14
		libicui18n.so:devel/icu \
14
			libgstapp-1.0.so:multimedia/gstreamer1-plugins \
15
		libleveldb.so:databases/leveldb \
15
			libgstbase-1.0.so:multimedia/gstreamer1 \
16
		libpng.so:graphics/png \
16
			libhyphen.so:textproc/hyphen \
17
		libwebp.so:graphics/webp
17
			libicui18n.so:devel/icu \
18
BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
18
			libpng16.so:graphics/png \
19
			libwebp.so:graphics/webp
19
20
20
DISTINFO_FILE=	${MASTERDIR}/distinfo
21
USES=			bison cmake:outsource gperf jpeg pathfix perl5 pkgconfig \
22
			python:build sqlite:3 tar:xz
23
USE_GNOME=		glib20 libxml2 libxslt
24
USE_GSTREAMER1=		core
25
USE_QT5=		core gui location network opengl printsupport \
26
			qml quick sensors testlib webchannel widgets \
27
			buildtools_build qmake_build
28
USE_RUBY=		yes
29
USE_XORG=		x11 xcomposite xrender
21
30
22
BROKEN_sparc64=	cannot build: uses i386 assembler
31
# Fix pkgconfig install paths.
32
PATHFIX_CMAKELISTSTXT=	PlatformQt.cmake
23
33
24
USE_GL=		gl
25
USE_GNOME=	libxml2 libxslt
26
USE_PERL5=	build
27
USE_QT5=	core gui network opengl printsupport qml quick sql \
28
		widgets buildtools_build
29
QT_DIST=	${PORTNAME}
30
USE_RUBY=	yes
31
RUBY_NO_RUN_DEPENDS=	yes
34
RUBY_NO_RUN_DEPENDS=	yes
32
USE_XORG=	x11 xcomposite xrender
33
USES=		bison gperf jpeg perl5 pkgconfig python:build qmake:outsource \
34
		sqlite
35
# Use flex(1) from ports.
36
MAKE_ENV=	PATH="${LOCALBASE}/bin:${PATH}"
37
# "all" builds many more targets. The default one is called "first" in
38
# QtWebKit, and is invoked by default when make is called without arguments.
39
ALL_TARGET=	first
40
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
41
35
42
QT_DEFINES=	ACCESSIBILITY
36
CMAKE_ARGS=		-DPORT:STRING="Qt" \
43
QT_CONFIG=	accessibility accessibility-atspi-bridge
37
			-DKDE_INSTALL_INCLUDEDIR:PATH="${QT_INCDIR_REL}" \
38
			-DKDE_INSTALL_LIBDIR:PATH="${QT_LIBDIR_REL}" \
39
			-DENABLE_OPENGL:BOOL=TRUE \
40
			-DUSE_QT_MULTIMEDIA:BOOL=FALSE
44
41
45
OPTIONS_DEFINE=	GSTREAMER
42
# Add -DNDEBUG to CXXFLAGS which in turn gets sucked into
46
OPTIONS_DEFAULT=GSTREAMER
43
# CMAKE_CXX_FLAGS_RELEASE where we actually want to have it.
44
# [for the ASSERT in Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp ]
45
CXXFLAGS+=		-DNDEBUG
47
46
48
GSTREAMER_USE=	GNOME=glib20 GSTREAMER1=yes
47
PLIST_SUB=		FULLVER="${PORTVERSION:R}"
49
48
50
.include <bsd.port.pre.mk>
49
.include <bsd.port.mk>
51
52
# Base ld(1) segfaults on PowerPC (inherited from Qt 4):
53
# http://bugs.freebsd.org/173042
54
.if ${ARCH} == "powerpc"
55
BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
56
.endif
57
58
post-patch:
59
	${REINPLACE_CMD} -e 's,python,${PYTHON_VERSION},g' \
60
		-e 's,$$$${PYTHON},${PYTHON_VERSION},g' \
61
		${WRKSRC}/Source/WebCore/DerivedSources.make \
62
		${WRKSRC}/Source/WebCore/DerivedSources.pri \
63
		${WRKSRC}/Source/WebKit2/DerivedSources.make \
64
		${WRKSRC}/Source/WebKit2/DerivedSources.pri \
65
		${WRKSRC}/Source/JavaScriptCore/DerivedSources.make \
66
		${WRKSRC}/Source/JavaScriptCore/DerivedSources.pri \
67
		${WRKSRC}/Tools/qmake/mkspecs/features/configure.prf
68
69
pre-configure:
70
	@${REINPLACE_CMD} -Ee 's|linux-?\*|unix|g' \
71
		${WRKSRC}/Source/JavaScriptCore/DerivedSources.pri \
72
		${WRKSRC}/Source/JavaScriptCore/JavaScriptCore.pri \
73
		${WRKSRC}/Source/JavaScriptCore/Target.pri \
74
		${WRKSRC}/Source/WebCore/WebCore.pri \
75
		${WRKSRC}/Tools/qmake/mkspecs/features/features.prf
76
.if ! ${PORT_OPTIONS:MGSTREAMER}
77
	@${REINPLACE_CMD} -e 's|packagesExist.*gstreamer.*|false {|' \
78
		${WRKSRC}/Tools/qmake/mkspecs/features/features.prf
79
.endif
80
81
.include <bsd.port.post.mk>
(-)www/qt5-webkit/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1484659684
1
TIMESTAMP = 1502177654
2
SHA256 (KDE/Qt/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz) = a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03
2
SHA256 (qtwebkit-5.212.0-alpha2.tar.xz) = f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a
3
SIZE (KDE/Qt/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz) = 35298736
3
SIZE (qtwebkit-5.212.0-alpha2.tar.xz) = 12456284
(-)www/qt5-webkit/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h (-11 lines)
Lines 1-11 Link Here
1
--- Source/JavaScriptCore/assembler/ARMAssembler.h
2
+++ Source/JavaScriptCore/assembler/ARMAssembler.h
3
@@ -1064,6 +1064,8 @@
4
             linuxPageFlush(current, end);
5
 #elif OS(WINCE)
6
             CacheRangeFlush(code, size, CACHE_SYNC_ALL);
7
+#elif CPU(ARM_TRADITIONAL) && OS(FREEBSD) && COMPILER(CLANG)
8
+            __clear_cache(code, reinterpret_cast<char*>(code) + size);
9
 #elif OS(QNX) && ENABLE(ASSEMBLER_WX_EXCLUSIVE)
10
             UNUSED_PARAM(code);
11
             UNUSED_PARAM(size);
(-)www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h (-12 lines)
Lines 1-12 Link Here
1
This patch reportedly fixes build for ARM. See PR 208569
2
3
--- Source/WTF/wtf/Platform.h.orig	2016-04-10 06:48:36 UTC
4
+++ Source/WTF/wtf/Platform.h
5
@@ -218,6 +218,7 @@
6
 #elif defined(__ARM_ARCH_6__) \
7
     || defined(__ARM_ARCH_6J__) \
8
     || defined(__ARM_ARCH_6K__) \
9
+    || defined(__ARM_ARCH_6KZ__) \
10
     || defined(__ARM_ARCH_6Z__) \
11
     || defined(__ARM_ARCH_6ZK__) \
12
     || defined(__ARM_ARCH_6T2__) \
(-)www/qt5-webkit/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp (-11 lines)
Lines 1-11 Link Here
1
--- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig	2016-04-10 06:48:37 UTC
2
+++ Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
3
@@ -403,7 +403,7 @@ TOSTRING(neonDrawLighting) ":" NL
4
     "vmin.f32 " TMP2_D0 ", " TMP2_D0 ", " CONST_ONE_HI_D NL
5
     "vmul.f32 " TMP3_Q ", " COLOR_Q ", " TMP2_D0 "[1]" NL
6
     "vcvt.u32.f32 " TMP3_Q ", " TMP3_Q NL
7
-    "vmov.u32 r2, r3, " TMP3_S0 ", " TMP3_S1 NL
8
+    "vmov r2, r3, " TMP3_S0 ", " TMP3_S1 NL
9
     // The color values are stored in-place.
10
     "strb r2, [" PIXELS_R ", #-11]" NL
11
     "strb r3, [" PIXELS_R ", #-10]" NL
(-)www/qt5-webkit/files/patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h (+11 lines)
Line 0 Link Here
1
--- Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h.orig	2017-06-15 23:36:48 UTC
2
+++ Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h
3
@@ -33,7 +33,7 @@ struct GraphicsSurfaceToken {
4
 
5
 #if OS(DARWIN)
6
     typedef mach_port_t BufferHandle;
7
-#elif OS(LINUX)
8
+#elif OS(LINUX) || OS(FREEBSD)
9
     typedef uint32_t BufferHandle;
10
 #elif OS(WINDOWS)
11
     typedef HANDLE BufferHandle;
(-)www/qt5-webkit/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp (-13 lines)
Lines 1-13 Link Here
1
databases/leveldb installs the memenv.h header into a different location.
2
3
--- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp.orig	2016-09-26 15:03:55 UTC
4
+++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
5
@@ -38,7 +38,7 @@
6
 #include <leveldb/comparator.h>
7
 #include <leveldb/db.h>
8
 #include <leveldb/env.h>
9
-#include <helpers/memenv/memenv.h>
10
+#include <memenv/memenv.h>
11
 #include <leveldb/slice.h>
12
 #include <string>
13
 #include <wtf/PassOwnPtr.h>
(-)www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake (+18 lines)
Line 0 Link Here
1
--- Source/WebKit/PlatformQt.cmake.orig	2017-06-15 23:36:48 UTC
2
+++ Source/WebKit/PlatformQt.cmake
3
@@ -481,6 +481,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
4
         BASE_NAME Qt5WebKit
5
         DEPS "${WEBKIT_PKGCONGIG_DEPS}"
6
         FILENAME_VAR WebKit_PKGCONFIG_FILENAME
7
+        DESCRIPTION "Qt WebKit module"
8
     )
9
     set(ECM_PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.")
10
     install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
11
@@ -671,6 +672,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
12
         BASE_NAME Qt5WebKitWidgets
13
         DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}"
14
         FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME
15
+        DESCRIPTION "Qt WebKitWidgets module"
16
     )
17
     install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
18
 endif ()
(-)www/qt5-webkit/files/patch-Source__JavaScriptCore__runtime__JSCJSValueInlines.h (-26 lines)
Lines 1-26 Link Here
1
--- ./Source/JavaScriptCore/runtime/JSCJSValueInlines.h.orig	2013-10-22 01:49:45.000000000 -0700
2
+++ ./Source/JavaScriptCore/runtime/JSCJSValueInlines.h	2013-11-08 00:51:34.238960064 -0800
3
@@ -198,7 +198,11 @@
4
         u.asBits.tag = CellTag;
5
     else
6
         u.asBits.tag = EmptyValueTag;
7
+#if defined(__sparc64__)
8
+    u.asBits.payload = reinterpret_cast<int64_t>(ptr);
9
+#else
10
     u.asBits.payload = reinterpret_cast<int32_t>(ptr);
11
+#endif
12
 }
13
 
14
 inline JSValue::JSValue(const JSCell* ptr)
15
@@ -207,7 +211,11 @@
16
         u.asBits.tag = CellTag;
17
     else
18
         u.asBits.tag = EmptyValueTag;
19
+#if defined(__sparc64__)
20
+    u.asBits.payload = reinterpret_cast<int64_t>(const_cast<JSCell*>(ptr));
21
+#else
22
     u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
23
+#endif
24
 }
25
 
26
 inline JSValue::operator bool() const
(-)www/qt5-webkit/files/patch-Source__QtWebKit.pro (-17 lines)
Lines 1-17 Link Here
1
Do not go into the examples/ directory, which contains only platformplugin/.
2
3
Even though it is not part of the default target, it is included in `make
4
install', and platformplugin's .pro file has a DESTDIR setting that causes the
5
file system to be touched even though there is nothing to build or install.
6
--- Source/QtWebKit.pro
7
+++ Source/QtWebKit.pro
8
@@ -38,9 +38,4 @@ build?(webkit1) {
9
         tests.file = tests.pri
10
         SUBDIRS += tests
11
     }
12
-
13
-    examples.file = WebKit/qt/examples/examples.pro
14
-    examples.CONFIG += no_default_target
15
-    examples.makefile = Makefile
16
-    SUBDIRS += examples
17
 }
(-)www/qt5-webkit/files/patch-Source__WebCore__page__NavigatorBase.cpp (-20 lines)
Lines 1-20 Link Here
1
--- ./Source/WebCore/page/NavigatorBase.cpp.orig	2012-12-18 20:04:33.000000000 +0100
2
+++ ./Source/WebCore/page/NavigatorBase.cpp	2013-01-07 04:01:53.177339022 +0100
3
@@ -30,7 +30,7 @@
4
 #include "NetworkStateNotifier.h"
5
 #include <wtf/text/WTFString.h>
6
 
7
-#if OS(LINUX)
8
+#if OS(LINUX) || OS(FREEBSD)
9
 #include "sys/utsname.h"
10
 #include <wtf/StdLibExtras.h>
11
 #endif
12
@@ -86,7 +86,7 @@
13
 
14
 String NavigatorBase::platform() const
15
 {
16
-#if OS(LINUX)
17
+#if OS(LINUX) || OS(FREEBSD)
18
     if (!String(WEBCORE_NAVIGATOR_PLATFORM).isEmpty())
19
         return WEBCORE_NAVIGATOR_PLATFORM;
20
     struct utsname osname;
(-)www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurface.h (-11 lines)
Lines 1-11 Link Here
1
--- ./Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h.orig	2012-12-18 20:04:31.000000000 +0100
2
+++ ./Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h	2012-12-28 13:00:05.846909692 +0100
3
@@ -36,7 +36,7 @@
4
 typedef IOSurfaceRef PlatformGraphicsSurface;
5
 #endif
6
 
7
-#if OS(LINUX)
8
+#if OS(LINUX) || OS(FREEBSD)
9
 typedef uint32_t PlatformGraphicsSurface;
10
 #endif
11
 
(-)www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurfaceToken.h (-11 lines)
Lines 1-11 Link Here
1
--- ./Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h.orig	2012-12-18 20:04:31.000000000 +0100
2
+++ ./Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h	2012-12-28 13:02:03.566975217 +0100
3
@@ -35,7 +35,7 @@
4
 
5
 #if OS(DARWIN)
6
     typedef mach_port_t BufferHandle;
7
-#elif OS(LINUX)
8
+#elif OS(LINUX) || OS(FREEBSD)
9
     typedef uint32_t BufferHandle;
10
 #elif OS(WINDOWS)
11
     typedef HANDLE BufferHandle;
(-)www/qt5-webkit/files/patch-Source_cmake_ECMGeneratePkgConfigFile.cmake (+38 lines)
Line 0 Link Here
1
--- Source/cmake/ECMGeneratePkgConfigFile.cmake.orig	2017-06-02 18:33:03 UTC
2
+++ Source/cmake/ECMGeneratePkgConfigFile.cmake
3
@@ -83,7 +83,7 @@
4
 
5
 function(ECM_GENERATE_PKGCONFIG_FILE)
6
   set(options INSTALL)
7
-  set(oneValueArgs BASE_NAME LIB_NAME FILENAME_VAR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR)
8
+  set(oneValueArgs BASE_NAME LIB_NAME FILENAME_VAR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR DESCRIPTION)
9
   set(multiValueArgs DEPS DEFINES)
10
 
11
   cmake_parse_arguments(EGPF "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
12
@@ -119,6 +119,9 @@ function(ECM_GENERATE_PKGCONFIG_FILE)
13
           set(EGPF_LIB_INSTALL_DIR "lib")
14
       endif()
15
   endif()
16
+  if(NOT EGPF_DESCRIPTION)
17
+    message(FATAL_ERROR "Required argument DESCRIPTION missing in ECM_GENERATE_PKGCONFIG_FILE() call")
18
+  endif()
19
 
20
   set(PKGCONFIG_TARGET_BASENAME ${EGPF_BASE_NAME})
21
   set(PKGCONFIG_TARGET_LIBNAME ${EGPF_LIB_NAME})
22
@@ -148,6 +151,7 @@ function(ECM_GENERATE_PKGCONFIG_FILE)
23
   file(WRITE ${PKGCONFIG_FILENAME}
24
 "
25
 Name: ${PKGCONFIG_TARGET_LIBNAME}
26
+Description: ${EGPF_DESCRIPTION}
27
 Version: ${PROJECT_VERSION}
28
 Libs: -L${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR} -l${PKGCONFIG_TARGET_LIBNAME}
29
 Cflags: ${PKGCONFIG_TARGET_INCLUDES} ${PKGCONFIG_TARGET_DEFINES}
30
@@ -156,7 +160,7 @@ Requires: ${PKGCONFIG_TARGET_DEPS}
31
   )
32
 
33
   if(EGPF_INSTALL)
34
-    set(ECM_PKGCONFIG_INSTALL_DIR "${EGPF_LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.")
35
+    set(ECM_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.")
36
     install(FILES ${PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR})
37
   endif()
38
 endfunction()
(-)www/qt5-webkit/files/patch-Source_cmake_KDEInstallDirs.cmake (+22 lines)
Line 0 Link Here
1
--- Source/cmake/KDEInstallDirs.cmake.orig	2017-06-15 23:36:48 UTC
2
+++ Source/cmake/KDEInstallDirs.cmake
3
@@ -420,7 +420,7 @@ endif()
4
 if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED)
5
     set(KF5_LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_LIBEXECDIR_KF5}")
6
 endif()
7
-_define_relative(CMAKEPACKAGEDIR LIBDIR "cmake"
8
+_define_relative(CMAKEPACKAGEDIR "" "lib/cmake"
9
     "CMake packages, including config files"
10
     CMAKECONFIG_INSTALL_PREFIX)
11
 
12
@@ -442,8 +442,8 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
13
     file(RELATIVE_PATH LIB_INSTALL_DIR ${qt_install_prefix} ${qt_lib_dir})
14
     set(KDE_INSTALL_LIBDIR ${LIB_INSTALL_DIR})
15
 
16
-    set(CMAKECONFIG_INSTALL_PREFIX "${LIB_INSTALL_DIR}/cmake")
17
-    set(KDE_INSTALL_CMAKEPACKAGEDIR "${LIB_INSTALL_DIR}/cmake")
18
+    set(CMAKECONFIG_INSTALL_PREFIX "${qt_install_prefix}/lib/cmake")
19
+    set(KDE_INSTALL_CMAKEPACKAGEDIR "${qt_install_prefix}/lib/cmake")
20
 
21
     query_qmake(qt_include_dir QT_INSTALL_HEADERS)
22
     file(RELATIVE_PATH INCLUDE_INSTALL_DIR ${qt_install_prefix} ${qt_include_dir})
(-)www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro (-13 lines)
Lines 1-13 Link Here
1
Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of
2
the directories make tries to enter in case it exists (because of .OBJDIR).
3
Since qmake will create it because of OBJECTS_DIR, make will invoke the
4
compiler from there and fail because it's trying to pass "-o obj/foo.o" while
5
already in obj/.
6
7
--- Tools/qmake/config.tests/glx/glx.pro.orig	2016-09-26 14:56:31 UTC
8
+++ Tools/qmake/config.tests/glx/glx.pro
9
@@ -1,4 +1,3 @@
10
 SOURCES = glx.cpp
11
-OBJECTS_DIR = obj
12
 LIBS += -lX11 -lGL
13
 
(-)www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp (-13 lines)
Lines 1-13 Link Here
1
databases/leveldb installs the memenv.h header into a different location.
2
3
--- Tools/qmake/config.tests/leveldb/leveldb.cpp.orig	2016-09-26 15:03:32 UTC
4
+++ Tools/qmake/config.tests/leveldb/leveldb.cpp
5
@@ -19,7 +19,7 @@
6
 
7
 #include <leveldb/db.h>
8
 #include <leveldb/env.h>
9
-#include <helpers/memenv/memenv.h>
10
+#include <memenv/memenv.h>
11
 
12
 int main(int, char**)
13
 {
(-)www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro (-14 lines)
Lines 1-14 Link Here
1
Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of
2
the directories make tries to enter in case it exists (because of .OBJDIR).
3
Since qmake will create it because of OBJECTS_DIR, make will invoke the
4
compiler from there and fail because it's trying to pass "-o obj/foo.o" while
5
already in obj/.
6
7
--- Tools/qmake/config.tests/leveldb/leveldb.pro.orig	2016-09-26 14:57:15 UTC
8
+++ Tools/qmake/config.tests/leveldb/leveldb.pro
9
@@ -1,5 +1,4 @@
10
 SOURCES = leveldb.cpp
11
-OBJECTS_DIR = obj
12
 LIBS += -lleveldb -lmemenv
13
 
14
 load(qt_build_config)
(-)www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro (-12 lines)
Lines 1-12 Link Here
1
Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of
2
the directories make tries to enter in case it exists (because of .OBJDIR).
3
Since qmake will create it because of OBJECTS_DIR, make will invoke the
4
compiler from there and fail because it's trying to pass "-o obj/foo.o" while
5
already in obj/.
6
7
--- Tools/qmake/config.tests/libXcomposite/libXcomposite.pro.orig	2016-09-26 14:56:58 UTC
8
+++ Tools/qmake/config.tests/libXcomposite/libXcomposite.pro
9
@@ -1,3 +1,2 @@
10
 SOURCES = libXcomposite.cpp
11
-OBJECTS_DIR = obj
12
 LIBS += -lXcomposite -lX11
(-)www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro (-12 lines)
Lines 1-12 Link Here
1
Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of
2
the directories make tries to enter in case it exists (because of .OBJDIR).
3
Since qmake will create it because of OBJECTS_DIR, make will invoke the
4
compiler from there and fail because it's trying to pass "-o obj/foo.o" while
5
already in obj/.
6
7
--- Tools/qmake/config.tests/libXrender/libXrender.pro.orig	2016-09-26 14:56:47 UTC
8
+++ Tools/qmake/config.tests/libXrender/libXrender.pro
9
@@ -1,3 +1,2 @@
10
 SOURCES = libXrender.cpp
11
-OBJECTS_DIR = obj
12
 LIBS += -lXrender -lX11
(-)www/qt5-webkit/pkg-descr (+4 lines)
Line 0 Link Here
1
Qt WebKit is the port of WebKit on top of Qt.
2
This is a project aiming to upgrade QtWebKit to modern WebKit code base.
3
4
WWW: https://github.com/annulen/webkit
(-)www/qt5-webkit/pkg-plist (-38 / +12 lines)
Lines 1-39 Link Here
1
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/bytearraytestdata.h
2
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qhttpheader_p.h
1
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qhttpheader_p.h
3
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquicknetworkreply_p.h
4
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquicknetworkrequest_p.h
5
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquickurlschemedelegate_p.h
6
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquickwebpage_p.h
7
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquickwebpage_p_p.h
8
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquickwebview_p.h
9
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquickwebview_p_p.h
10
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qrawwebview_p.h
11
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qrawwebview_p_p.h
12
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qtwebsecurityorigin_p.h
13
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebchannelwebkittransport_p.h
14
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebdatabase_p.h
2
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebdatabase_p.h
15
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebdownloaditem_p.h
16
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebdownloaditem_p_p.h
17
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebelement_p.h
3
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebelement_p.h
18
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebhistory_p.h
4
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebhistory_p.h
19
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebiconimageprovider_p.h
20
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebkittest_p.h
21
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebloadrequest_p.h
22
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebnavigationhistory_p.h
23
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebnavigationhistory_p_p.h
24
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebnavigationrequest_p.h
25
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebpermissionrequest_p.h
26
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebplugindatabase_p.h
5
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebplugindatabase_p.h
27
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebpreferences_p.h
28
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebpreferences_p_p.h
29
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebscriptworld.h
30
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebscriptworld_p.h
6
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebscriptworld_p.h
31
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebsecurityorigin_p.h
7
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebsecurityorigin_p.h
32
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/testwindow.h
33
%%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/util.h
34
%%QT_INCDIR%%/QtWebKit/QWebDatabase
8
%%QT_INCDIR%%/QtWebKit/QWebDatabase
35
%%QT_INCDIR%%/QtWebKit/QWebElement
9
%%QT_INCDIR%%/QtWebKit/QWebElement
36
%%QT_INCDIR%%/QtWebKit/QWebElementCollection
10
%%QT_INCDIR%%/QtWebKit/QWebElementCollection
11
%%QT_INCDIR%%/QtWebKit/QWebFullScreenRequest
37
%%QT_INCDIR%%/QtWebKit/QWebFullScreenVideoHandler
12
%%QT_INCDIR%%/QtWebKit/QWebFullScreenVideoHandler
38
%%QT_INCDIR%%/QtWebKit/QWebHapticFeedbackPlayer
13
%%QT_INCDIR%%/QtWebKit/QWebHapticFeedbackPlayer
39
%%QT_INCDIR%%/QtWebKit/QWebHistory
14
%%QT_INCDIR%%/QtWebKit/QWebHistory
Lines 55-60 Link Here
55
%%QT_INCDIR%%/QtWebKit/qtwebkitversion.h
30
%%QT_INCDIR%%/QtWebKit/qtwebkitversion.h
56
%%QT_INCDIR%%/QtWebKit/qwebdatabase.h
31
%%QT_INCDIR%%/QtWebKit/qwebdatabase.h
57
%%QT_INCDIR%%/QtWebKit/qwebelement.h
32
%%QT_INCDIR%%/QtWebKit/qwebelement.h
33
%%QT_INCDIR%%/QtWebKit/qwebfullscreenrequest.h
58
%%QT_INCDIR%%/QtWebKit/qwebhistory.h
34
%%QT_INCDIR%%/QtWebKit/qwebhistory.h
59
%%QT_INCDIR%%/QtWebKit/qwebhistoryinterface.h
35
%%QT_INCDIR%%/QtWebKit/qwebhistoryinterface.h
60
%%QT_INCDIR%%/QtWebKit/qwebkitglobal.h
36
%%QT_INCDIR%%/QtWebKit/qwebkitglobal.h
Lines 81-106 Link Here
81
%%QT_INCDIR%%/QtWebKitWidgets/qwebinspector.h
57
%%QT_INCDIR%%/QtWebKitWidgets/qwebinspector.h
82
%%QT_INCDIR%%/QtWebKitWidgets/qwebpage.h
58
%%QT_INCDIR%%/QtWebKitWidgets/qwebpage.h
83
%%QT_INCDIR%%/QtWebKitWidgets/qwebview.h
59
%%QT_INCDIR%%/QtWebKitWidgets/qwebview.h
84
%%QT_CMAKEDIR%%/Qt5WebKit/Qt5WebKitConfig.cmake
60
lib/cmake/Qt5WebKit/Qt5WebKitConfig.cmake
85
%%QT_CMAKEDIR%%/Qt5WebKit/Qt5WebKitConfigVersion.cmake
61
lib/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake
86
%%QT_CMAKEDIR%%/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake
62
lib/cmake/Qt5WebKit/WebKitTargets-%%CMAKE_BUILD_TYPE%%.cmake
87
%%QT_CMAKEDIR%%/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake
63
lib/cmake/Qt5WebKit/WebKitTargets.cmake
88
%%QT_LIBDIR%%/libQt5WebKit.prl
64
lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake
65
lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake
66
lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake
67
lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets.cmake
89
%%QT_LIBDIR%%/libQt5WebKit.so
68
%%QT_LIBDIR%%/libQt5WebKit.so
90
%%QT_LIBDIR%%/libQt5WebKit.so.5
69
%%QT_LIBDIR%%/libQt5WebKit.so.5
91
%%QT_LIBDIR%%/libQt5WebKit.so.%%SHORTVER%%
92
%%QT_LIBDIR%%/libQt5WebKit.so.%%FULLVER%%
70
%%QT_LIBDIR%%/libQt5WebKit.so.%%FULLVER%%
93
%%DEBUG%%%%QT_LIBDIR%%/libQt5WebKit.so.%%FULLVER%%.debug
94
%%QT_LIBDIR%%/libQt5WebKitWidgets.prl
95
%%QT_LIBDIR%%/libQt5WebKitWidgets.so
71
%%QT_LIBDIR%%/libQt5WebKitWidgets.so
96
%%QT_LIBDIR%%/libQt5WebKitWidgets.so.5
72
%%QT_LIBDIR%%/libQt5WebKitWidgets.so.5
97
%%QT_LIBDIR%%/libQt5WebKitWidgets.so.%%SHORTVER%%
98
%%QT_LIBDIR%%/libQt5WebKitWidgets.so.%%FULLVER%%
73
%%QT_LIBDIR%%/libQt5WebKitWidgets.so.%%FULLVER%%
99
%%DEBUG%%%%QT_LIBDIR%%/libQt5WebKitWidgets.so.%%FULLVER%%.debug
100
%%QT_MKSPECDIR%%/modules/qt_lib_webkit.pri
74
%%QT_MKSPECDIR%%/modules/qt_lib_webkit.pri
101
%%QT_MKSPECDIR%%/modules/qt_lib_webkit_private.pri
102
%%QT_MKSPECDIR%%/modules/qt_lib_webkitwidgets.pri
75
%%QT_MKSPECDIR%%/modules/qt_lib_webkitwidgets.pri
103
%%QT_MKSPECDIR%%/modules/qt_lib_webkitwidgets_private.pri
104
%%QT_QMLDIR%%/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so
76
%%QT_QMLDIR%%/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so
105
%%QT_QMLDIR%%/QtWebKit/experimental/qmldir
77
%%QT_QMLDIR%%/QtWebKit/experimental/qmldir
106
%%QT_QMLDIR%%/QtWebKit/libqmlwebkitplugin.so
78
%%QT_QMLDIR%%/QtWebKit/libqmlwebkitplugin.so
Lines 108-112 Link Here
108
%%QT_QMLDIR%%/QtWebKit/qmldir
80
%%QT_QMLDIR%%/QtWebKit/qmldir
109
libdata/pkgconfig/Qt5WebKit.pc
81
libdata/pkgconfig/Qt5WebKit.pc
110
libdata/pkgconfig/Qt5WebKitWidgets.pc
82
libdata/pkgconfig/Qt5WebKitWidgets.pc
83
%%QT_LIBEXECDIR%%/QtWebDatabaseProcess
84
%%QT_LIBEXECDIR%%/QtWebNetworkProcess
111
%%QT_LIBEXECDIR%%/QtWebPluginProcess
85
%%QT_LIBEXECDIR%%/QtWebPluginProcess
112
%%QT_LIBEXECDIR%%/QtWebProcess
86
%%QT_LIBEXECDIR%%/QtWebProcess

Return to bug 221339