[Midnightbsd-cvs] mports [23458] trunk/www/webkit-qt5/files: add patches
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed May 9 18:01:29 EDT 2018
Revision: 23458
http://svnweb.midnightbsd.org/mports/?rev=23458
Author: laffer1
Date: 2018-05-09 18:01:28 -0400 (Wed, 09 May 2018)
Log Message:
-----------
add patches
Added Paths:
-----------
trunk/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp
trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro
trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp
trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro
trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro
trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro
Added: trunk/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp
===================================================================
--- trunk/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp (rev 0)
+++ trunk/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp 2018-05-09 22:01:28 UTC (rev 23458)
@@ -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 <leveldb/comparator.h>
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <memenv/memenv.h>
+ #include <leveldb/slice.h>
+ #include <string>
+ #include <wtf/PassOwnPtr.h>
Property changes on: trunk/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp
___________________________________________________________________
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
Added: trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro
===================================================================
--- trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro (rev 0)
+++ trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro 2018-05-09 22:01:28 UTC (rev 23458)
@@ -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: trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro
___________________________________________________________________
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
Added: trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp
===================================================================
--- trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp (rev 0)
+++ trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp 2018-05-09 22:01:28 UTC (rev 23458)
@@ -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 <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <memenv/memenv.h>
+
+ int main(int, char**)
+ {
Property changes on: trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp
___________________________________________________________________
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
Added: trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro
===================================================================
--- trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro (rev 0)
+++ trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro 2018-05-09 22:01:28 UTC (rev 23458)
@@ -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: trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro
___________________________________________________________________
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
Added: trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro
===================================================================
--- trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro (rev 0)
+++ trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro 2018-05-09 22:01:28 UTC (rev 23458)
@@ -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: trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro
___________________________________________________________________
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
Added: trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro
===================================================================
--- trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro (rev 0)
+++ trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro 2018-05-09 22:01:28 UTC (rev 23458)
@@ -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: trunk/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro
___________________________________________________________________
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
More information about the Midnightbsd-cvs
mailing list