webkit-gtk: Add `debug' and `introspection' options (both in a WIP state)

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat May 27 14:20:24 2017 +0200
Changeset:	5b1d54ab0f9d49f4985d44939055c5e0095314ec

Modified Files:
	webkit-gtk/Makefile
	webkit-gtk/PLIST
	webkit-gtk/options.mk

Log Message:
webkit-gtk: Add `debug' and `introspection' options (both in a WIP state)

- `introspection' option still not tested (when disabled)
- `debug' option ATM break the build in the same way it was previously
documented:

CMakeFiles/JavaScriptCore.dir/runtime/CustomGetterSetter.cpp.o: In function `JSC::CustomGetterSetter* JSC::jsCast<JSC::CustomGetterSetter*>(JSC::JSValue)':
/tmp/pkgsrc/wip/webkit-gtk/work/webkitgtk-2.16.3/Source/JavaScriptCore/runtime/JSCell.h:280: undefined reference to `JSC::HeapCell::vm() const'
CMakeFiles/JavaScriptCore.dir/runtime/FunctionExecutableDump.cpp.o: In function `JSC::JSCell::structure() const':
/tmp/pkgsrc/wip/webkit-gtk/work/webkitgtk-2.16.3/Source/JavaScriptCore/runtime/JSCellInlines.h:110: undefined reference to `JSC::HeapCell::vm() const'
/tmp/pkgsrc/wip/webkit-gtk/work/webkitgtk-2.16.3/Source/JavaScriptCore/runtime/JSCellInlines.h:110: undefined reference to `JSC::HeapCell::vm() const'
/tmp/pkgsrc/wip/webkit-gtk/work/webkitgtk-2.16.3/Source/JavaScriptCore/runtime/JSCellInlines.h:110: undefined reference to `JSC::HeapCell::vm() const'
/tmp/pkgsrc/wip/webkit-gtk/work/webkitgtk-2.16.3/Source/JavaScriptCore/runtime/JSCellInlines.h:110: undefined reference to `JSC::HeapCell::vm() const'
CMakeFiles/JavaScriptCore.dir/runtime/FunctionExecutableDump.cpp.o:/tmp/pkgsrc/wip/webkit-gtk/work/webkitgtk-2.16.3/Source/JavaScriptCore/runtime/JSCellInlines.h:110: more undefined references to `JSC::HeapCell::vm() const' follow
Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/build.make:23839: recipe for target 'lib/libjavascriptcoregtk-4.0.so.18.5.10' failed
gmake[2]: *** [lib/libjavascriptcoregtk-4.0.so.18.5.10] Error 1
CMakeFiles/Makefile2:310: recipe for target 'Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/all' failed
gmake[1]: *** [Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/all] Error 2
Makefile:151: recipe for target 'all' failed
gmake: *** [all] Error 2
*** Error code 2

Stop.
make[1]: stopped in /usr/pkgsrc/wip/webkit-gtk
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/wip/webkit-gtk

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5b1d54ab0f9d49f4985d44939055c5e0095314ec

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk/Makefile   |  4 ----
 webkit-gtk/PLIST      | 12 ++++++------
 webkit-gtk/options.mk | 28 ++++++++++++++++++++++++++--
 3 files changed, 32 insertions(+), 12 deletions(-)

diffs:
diff --git a/webkit-gtk/Makefile b/webkit-gtk/Makefile
index 7cadb3d867..fc1b75781c 100644
--- a/webkit-gtk/Makefile
+++ b/webkit-gtk/Makefile
@@ -75,10 +75,6 @@ CXXFLAGS+=	-Wno-c++11-narrowing
 
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.5
-BUILDLINK_DEPMETHOD.gobject-introspection+=	build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-CMAKE_ARGS+=	-DENABLE_INTROSPECTION=ON
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 # A correct Webkit build requires flex 2.5.33
diff --git a/webkit-gtk/PLIST b/webkit-gtk/PLIST
index a6a901884f..2b354edcc9 100644
--- a/webkit-gtk/PLIST
+++ b/webkit-gtk/PLIST
@@ -185,9 +185,9 @@ include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h
 include/webkitgtk-4.0/webkitdom/webkitdom.h
 include/webkitgtk-4.0/webkitdom/webkitdomautocleanups.h
 include/webkitgtk-4.0/webkitdom/webkitdomdefines.h
-lib/girepository-1.0/JavaScriptCore-4.0.typelib
-lib/girepository-1.0/WebKit2-4.0.typelib
-lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
+${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-4.0.typelib
+${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib
+${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lib/libjavascriptcoregtk-4.0.so
 lib/libjavascriptcoregtk-4.0.so.18
 lib/libjavascriptcoregtk-4.0.so.18.5.10
@@ -204,9 +204,9 @@ libexec/webkit2gtk-4.0/WebKitPluginProcess
 libexec/webkit2gtk-4.0/WebKitPluginProcess2
 libexec/webkit2gtk-4.0/WebKitWebProcess
 libexec/webkit2gtk-4.0/jsc
-share/gir-1.0/JavaScriptCore-4.0.gir
-share/gir-1.0/WebKit2-4.0.gir
-share/gir-1.0/WebKit2WebExtension-4.0.gir
+${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir
+${PLIST.introspection}share/gir-1.0/WebKit2-4.0.gir
+${PLIST.introspection}share/gir-1.0/WebKit2WebExtension-4.0.gir
 share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/bg/LC_MESSAGES/WebKit2GTK-4.0.mo
diff --git a/webkit-gtk/options.mk b/webkit-gtk/options.mk
index b8a31d3e6c..2c7ae4c2ff 100644
--- a/webkit-gtk/options.mk
+++ b/webkit-gtk/options.mk
@@ -2,8 +2,10 @@
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.webkit-gtk
-PKG_SUPPORTED_OPTIONS=	enchant opengl webkit-jit
-PKG_SUGGESTED_OPTIONS=	enchant opengl
+PKG_SUPPORTED_OPTIONS=	debug enchant introspection opengl webkit-jit
+PKG_SUGGESTED_OPTIONS=	enchant introspection opengl
+
+PLIST_VARS=	introspection
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -47,3 +49,25 @@ CMAKE_ARGS+=	-DENABLE_SPELLCHECK=ON
 .else
 CMAKE_ARGS+=	-DENABLE_SPELLCHECK=OFF
 .endif
+
+#
+# Debug build
+#
+.if !empty(PKG_OPTIONS:Mdebug)
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Debug
+.else
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+.endif
+
+#
+# Introspection
+#
+.if !empty(PKG_OPTIONS:Mintrospection)
+PLIST.introspection=				yes
+BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.5
+BUILDLINK_DEPMETHOD.gobject-introspection+=	build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CMAKE_ARGS+=	-DENABLE_INTROSPECTION=ON
+.else
+CMAKE_ARGS+=	-DENABLE_INTROSPECTION=OFF
+.endif