From 24904d9c92eac9a686ed87248afdf254888e4c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 1 Apr 2016 02:49:43 +0200
Subject: [PATCH] qt5: add new modules

Qt5.6.0 introduced new modules
+ qt5-3d{,-devel} : C++ and QML APIs for 3D graphics
+ qt5-canvas3d : Canvas 3D component
+ qt5-serialbus{,-devel}: Serial bus component
+ qt5-webview{,-devel}: WebView component
There is also a new subcomponent "positioning" inside qt5-location.
For now this is not created as a separate module, because the install
target for qtlocation installs both components.
---
 common/shlibs               |  8 +++++
 srcpkgs/qt5-3d              |  1 +
 srcpkgs/qt5-3d-devel        |  1 +
 srcpkgs/qt5-canvas3d        |  1 +
 srcpkgs/qt5-serialbus       |  1 +
 srcpkgs/qt5-serialbus-devel |  1 +
 srcpkgs/qt5-webview         |  1 +
 srcpkgs/qt5-webview-devel   |  1 +
 srcpkgs/qt5/template        | 66 ++++++++++++++++++++++++++++++-------
 9 files changed, 70 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/qt5-3d
 create mode 120000 srcpkgs/qt5-3d-devel
 create mode 120000 srcpkgs/qt5-canvas3d
 create mode 120000 srcpkgs/qt5-serialbus
 create mode 120000 srcpkgs/qt5-serialbus-devel
 create mode 120000 srcpkgs/qt5-webview
 create mode 120000 srcpkgs/qt5-webview-devel

diff --git a/common/shlibs b/common/shlibs
index c193ac602ae..9a3f266fc41 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1838,7 +1838,15 @@ libabw-0.1.so.1 libabw-0.1.0_1
 libcmis-0.5.so.5 libcmis-0.5.0_1
 libcmis-c-0.5.so.5 libcmis-0.5.0_1
 libQt5Bluetooth.so.5 qt5-connectivity-5.6.0_1
+libQt53DCore.so.5 qt5-3d-5.6.0_1
+libQt53DInput.so.5 qt5-3d-5.6.0_1
+libQt53DLogic.so.5 qt5-3d-5.6.0_1
+libQt53DRender.so.5 qt5-3d-5.6.0_1
+libQt53DQuick.so.5 qt5-3d-5.6.0_1
+libQt53DQuickInput.so.5 qt5-3d-5.6.0_1
+libQt53DQuickRender.so.5 qt5-3d-5.6.0_1
 libQt5Nfc.so.5 qt5-connectivity-5.6.0_1
+libQt5WebView.so.5 qt5-webview-5.6.0_1
 libQt5Qml.so.5 qt5-declarative-5.6.0_1
 libQt5Quick.so.5 qt5-declarative-5.6.0_1
 libQt5QuickTest.so.5 qt5-declarative-5.6.0_1
diff --git a/srcpkgs/qt5-3d b/srcpkgs/qt5-3d
new file mode 120000
index 00000000000..75793eb6664
--- /dev/null
+++ b/srcpkgs/qt5-3d
@@ -0,0 +1 @@
+qt5
\ No newline at end of file
diff --git a/srcpkgs/qt5-3d-devel b/srcpkgs/qt5-3d-devel
new file mode 120000
index 00000000000..75793eb6664
--- /dev/null
+++ b/srcpkgs/qt5-3d-devel
@@ -0,0 +1 @@
+qt5
\ No newline at end of file
diff --git a/srcpkgs/qt5-canvas3d b/srcpkgs/qt5-canvas3d
new file mode 120000
index 00000000000..75793eb6664
--- /dev/null
+++ b/srcpkgs/qt5-canvas3d
@@ -0,0 +1 @@
+qt5
\ No newline at end of file
diff --git a/srcpkgs/qt5-serialbus b/srcpkgs/qt5-serialbus
new file mode 120000
index 00000000000..75793eb6664
--- /dev/null
+++ b/srcpkgs/qt5-serialbus
@@ -0,0 +1 @@
+qt5
\ No newline at end of file
diff --git a/srcpkgs/qt5-serialbus-devel b/srcpkgs/qt5-serialbus-devel
new file mode 120000
index 00000000000..75793eb6664
--- /dev/null
+++ b/srcpkgs/qt5-serialbus-devel
@@ -0,0 +1 @@
+qt5
\ No newline at end of file
diff --git a/srcpkgs/qt5-webview b/srcpkgs/qt5-webview
new file mode 120000
index 00000000000..75793eb6664
--- /dev/null
+++ b/srcpkgs/qt5-webview
@@ -0,0 +1 @@
+qt5
\ No newline at end of file
diff --git a/srcpkgs/qt5-webview-devel b/srcpkgs/qt5-webview-devel
new file mode 120000
index 00000000000..75793eb6664
--- /dev/null
+++ b/srcpkgs/qt5-webview-devel
@@ -0,0 +1 @@
+qt5
\ No newline at end of file
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index d7d5ae08370..204f66eebaf 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -138,7 +138,25 @@ do_install() {
 	done
 	_move_examples
 }
-
+qt5-3d-devel_package() {
+	short_desc+=" - C++ and QML APIs for 3D graphics (development)"
+	depends="qt5-3d-${version}_${revision} qt5-devel-${version}_${revision}"
+	pkg_install() {
+		_install_devel qt3d
+	}
+}
+qt5-3d_package() {
+	short_desc+=" - C++ and QML APIs for 3D graphics"
+	pkg_install() {
+		_install_subpkg qt3d
+	}
+}
+qt5-canvas3d_package() {
+	short_desc+=" - Canvas 3D component"
+	pkg_install() {
+		_install_subpkg qtcanvas3d
+	}
+}
 qt5-connectivity-devel_package() {
 	short_desc+=" - Connectivity component (development)"
 	depends="qt5-connectivity-${version}_${revision} qt5-devel-${version}_${revision}"
@@ -204,14 +222,14 @@ qt5-imageformats_package() {
 	}
 }
 qt5-location-devel_package() {
-	short_desc+=" - Location component (development)"
+	short_desc+=" - Location and Positioning components (development)"
 	depends="qt5-location-${version}_${revision} qt5-devel-${version}_${revision}"
 	pkg_install() {
 		_install_devel qtlocation
 	}
 }
 qt5-location_package() {
-	short_desc+=" - Location component"
+	short_desc+=" - Location and Positioning components"
 	pkg_install() {
 		_install_subpkg qtlocation
 	}
@@ -267,15 +285,28 @@ qt5-sensors_package() {
 		_install_subpkg qtsensors
 	}
 }
+qt5-serialbus-devel_package() {
+	short_desc+=" - Serial bus component (development)"
+	depends="qt5-serialbus-${version}_${revision} qt5-devel-${version}_${revision}"
+	pkg_install() {
+		_install_devel qtserialbus
+	}
+}
+qt5-serialbus_package() {
+	short_desc+=" - Serial bus component"
+	pkg_install() {
+		_install_subpkg qtserialbus
+	}
+}
 qt5-serialport-devel_package() {
-	short_desc+=" - Serialport component (development)"
+	short_desc+=" - Serial port component (development)"
 	depends="qt5-serialport-${version}_${revision} qt5-devel-${version}_${revision}"
 	pkg_install() {
 		_install_devel qtserialport
 	}
 }
 qt5-serialport_package() {
-	short_desc+=" - Serialport component"
+	short_desc+=" - Serial port component"
 	pkg_install() {
 		_install_subpkg qtserialport
 	}
@@ -307,44 +338,57 @@ qt5-wayland_package() {
 	}
 }
 qt5-webchannel-devel_package() {
-	short_desc+=" - Webchannel component (development)"
+	short_desc+=" - WebChannel component (development)"
 	depends="qt5-webchannel-${version}_${revision} qt5-devel-${version}_${revision}"
 	pkg_install() {
 		_install_devel qtwebchannel
 	}
 }
 qt5-webchannel_package() {
-	short_desc+=" - Webchannel component"
+	short_desc+=" - WebChannel component"
 	pkg_install() {
 		_install_subpkg qtwebchannel
 	}
 }
 qt5-webengine-devel_package() {
-	short_desc+=" - Webengine component (development)"
+	short_desc+=" - WebEngine component (development)"
 	depends="qt5-webengine-${version}_${revision} qt5-devel-${version}_${revision}"
 	pkg_install() {
 		_install_devel qtwebengine
 	}
 }
 qt5-webengine_package() {
-	short_desc+=" - Webengine component"
+	short_desc+=" - WebEngine component"
 	pkg_install() {
 		_install_subpkg qtwebengine
 	}
 }
 qt5-websockets-devel_package() {
-	short_desc+=" - Websockets component (development)"
+	short_desc+=" - WebSockets component (development)"
 	depends="qt5-websockets-${version}_${revision} qt5-devel-${version}_${revision}"
 	pkg_install() {
 		_install_devel qtwebsockets
 	}
 }
 qt5-websockets_package() {
-	short_desc+=" - Websockets component"
+	short_desc+=" - WebSockets component"
 	pkg_install() {
 		_install_subpkg qtwebsockets
 	}
 }
+qt5-webview-devel_package() {
+	short_desc+=" - WebView component (development)"
+	depends="qt5-webview-${version}_${revision} qt5-devel-${version}_${revision}"
+	pkg_install() {
+		_install_devel qtwebview
+	}
+}
+qt5-webview_package() {
+	short_desc+=" - WebView component"
+	pkg_install() {
+		_install_subpkg qtwebview
+	}
+}
 qt5-x11extras-devel_package() {
 	short_desc+=" - X11 extras (development)"
 	depends="qt5-x11extras-${version}_${revision} qt5-devel-${version}_${revision}"