[pkgsrc/trunk]: pkgsrc/x11/qt4-libs Make sure that /include/WebCore is not cr...

[nros <nros%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5f0b0aeac887
branches:  trunk
changeset: 347578:5f0b0aeac887
user:      nros <nros%pkgsrc.org@localhost>
date:      Wed May 25 07:46:47 2016 +0000

description:
Make sure that /include/WebCore is not created when building qt4.

diffstat:

 x11/qt4-libs/distinfo                                                            |   4 +-
 x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit2_DerivedSources.pro |  15 ++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 21ec15faaebb -r 5f0b0aeac887 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Wed May 25 07:16:36 2016 +0000
+++ b/x11/qt4-libs/distinfo     Wed May 25 07:46:47 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.107 2016/05/05 22:04:34 joerg Exp $
+$NetBSD: distinfo,v 1.108 2016/05/25 07:46:47 nros Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
 RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
@@ -67,7 +67,7 @@
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp) = 51b6bddf81978fd7ae6580132a74aeaec84b724f
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp) = a0a3d9d066aa6ae3c42cee198287b10e46e7f25d
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEventQt.cpp) = b28cf71983f8e71b82b1c634a10b3898ca13ede5
-SHA1 (patch-src_3rdparty_webkit_Source_WebKit2_DerivedSources.pro) = 7bce302381e5fb7a4607c5c7bdf7e62ae280e116
+SHA1 (patch-src_3rdparty_webkit_Source_WebKit2_DerivedSources.pro) = 7ae5feb79efd0836b74000e183b96f5775fd3043
 SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a
 SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268
 SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = 5fdc6d22ea52ac89d6ae68a1dcf9de775265429b
diff -r 21ec15faaebb -r 5f0b0aeac887 x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit2_DerivedSources.pro
--- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit2_DerivedSources.pro  Wed May 25 07:16:36 2016 +0000
+++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit2_DerivedSources.pro  Wed May 25 07:46:47 2016 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_3rdparty_webkit_Source_WebKit2_DerivedSources.pro,v 1.1 2016/04/29 11:17:31 nros Exp $
-* Don't create prl since it is created in /include/WebCore and not in
-  the source tree.
+$NetBSD: patch-src_3rdparty_webkit_Source_WebKit2_DerivedSources.pro,v 1.2 2016/05/25 07:46:47 nros Exp $
+* Don't create prl and put /include/WebCore inside the src directory
+  to not pullute /, it is empty and unused in qt4.
 --- src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro.orig 2016-04-29 10:42:47.000000000 +0000
 +++ src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
 @@ -1,7 +1,7 @@
@@ -12,3 +12,12 @@
  
  CONFIG(standalone_package) {
      isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
+@@ -158,7 +158,7 @@
+     HEADER_PATH = $$HEADER
+     HEADER_TARGET = $$replace(HEADER_PATH, [^a-zA-Z0-9_], -)
+     HEADER_TARGET = "qtheader-$${HEADER_TARGET}"
+-    DESTDIR = $$OUTPUT_DIR/include/"WebCore"
++    DESTDIR = $$PWD/../include/"WebCore"
+ 
+     eval($${HEADER_TARGET}.target = $$DESTDIR/$$HEADER_NAME)
+     eval($${HEADER_TARGET}.depends = $$HEADER_PATH)