Skip to contentSkip to conversation

New package: qt5webkitexamples

PATCH New Massimo Callegari 3 participants 3 messages Jun 11, 2014 – Jun 13, 2014

lore
Share & tools
lore

Massimo Callegari

author
#0 lore raw

PATCH 1/1 New package: qt5webkitexamples

Signed-off-by Massimo Callegari <[email protected]>
---
 package/qt5/Config.in                              |  1 +
 package/qt5/qt5webkitexamples/Config.in            | 12 +++++++
 package/qt5/qt5webkitexamples/qt5webkitexamples.mk | 40 ++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 package/qt5/qt5webkitexamples/Config.in
 create mode 100644 package/qt5/qt5webkitexamples/qt5webkitexamples.mk
package/qt5/Config.in +1 -0
index efdd9d4..024fa94 100644
@@ -40,6 +40,7 @@ source "package/qt5/qt5sensors/Config.in"
 source "package/qt5/qt5serialport/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5webkit/Config.in"
+source "package/qt5/qt5webkitexamples/Config.in"
 source "package/qt5/qt5websockets/Config.in"
 source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
package/qt5/qt5webkitexamples/Config.in new file +12 -0
new file mode 100644
index 0000000..18cb476
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_QT5WEBKITEXAMPLES
+	bool "qt5webkit examples"
+	depends on BR2_PACKAGE_QT5WEBKIT
+	depends on BR2_PACKAGE_QT5XMLPATTERNS
+	select BR2_PACKAGE_QT5BASE_EXAMPLES
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5webkit examples module.
+
+	  http://qt-project.org
package/qt5/qt5webkitexamples/qt5webkitexamples.mk new file +40 -0
new file mode 100644
index 0000000..435f114
@@ -0,0 +1,40 @@
+################################################################################
+#
+# qt5webkitexamples
+#
+################################################################################
+
+QT5WEBKITEXAMPLES_VERSION = $(QT5_VERSION)
+QT5WEBKITEXAMPLES_SITE = $(QT5_SITE)
+QT5WEBKITEXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKITEXAMPLES_VERSION).tar.xz
+QT5WEBKITEXAMPLES_DEPENDENCIES = qt5webkit
+QT5WEBKITEXAMPLES_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5WEBKITEXAMPLES_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5script.
+else
+QT5WEBKITEXAMPLES_LICENSE = Commercial license
+QT5WEBKITEXAMPLES_REDISTRIBUTE = NO
+endif
+
+define QT5WEBKITEXAMPLES_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5WEBKITEXAMPLES_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5WEBKITEXAMPLES_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+define QT5WEBKITEXAMPLES_INSTALL_TARGET_CMDS
+	cp -af $(@D)/examples/webkitqml $(TARGET_DIR)/usr/lib/qt/examples
+    cp -af $(@D)/examples/webkitwidgets $(TARGET_DIR)/usr/lib/qt/examples
+endef
+
+$(eval $(generic-package))
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 New package: qt5webkitexamples

Hi,

Quoted 8 lines · On Wednesday 11 June 2014 13:05:20 Massimo Callegari wrote:
Signed-off-by Massimo Callegari <[email protected]>
---
 package/qt5/Config.in                              |  1 +
 package/qt5/qt5webkitexamples/Config.in            | 12 +++++++
 package/qt5/qt5webkitexamples/qt5webkitexamples.mk | 40
++++++++++++++++++++++ 3 files changed, 53 insertions(+)
 create mode 100644 package/qt5/qt5webkitexamples/Config.in
 create mode 100644 package/qt5/qt5webkitexamples/qt5webkitexamples.mk

I think the name should be qt5webkit-examples. Better to keep it closer to the original name.

Quoted 18 lines
package/qt5/Config.in +1 -0
index efdd9d4..024fa94 100644
@@ -40,6 +40,7 @@ source "package/qt5/qt5sensors/Config.in"
 source "package/qt5/qt5serialport/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5webkit/Config.in"
+source "package/qt5/qt5webkitexamples/Config.in"
 source "package/qt5/qt5websockets/Config.in"
 source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
(quoted diff) +0 -0

b/package/qt5/qt5webkitexamples/Config.in new file mode 100644 index 0000000..18cb476

package/qt5/qt5webkitexamples/Config.in line 2

Quoted 2 lines
package/qt5/qt5webkitexamples/Config.in new file +2 -0
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_QT5WEBKITEXAMPLES
+	bool "qt5webkit examples"

What about hiding this menu entry and making this package default if BR2_PACKAGE_QT5BASE_EXAMPLES?

Quoted 25 lines
package/qt5/qt5webkitexamples/Config.in new file +10 -0
+	depends on BR2_PACKAGE_QT5WEBKIT
+	depends on BR2_PACKAGE_QT5XMLPATTERNS
+	select BR2_PACKAGE_QT5BASE_EXAMPLES
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5webkit examples module.
+
+	  http://qt-project.org
(quoted diff) +0 -0

b/package/qt5/qt5webkitexamples/qt5webkitexamples.mk new file mode 100644 index 0000000..435f114

package/qt5/qt5webkitexamples/qt5webkitexamples.mk new file +1 -0
@@ -0,0 +1,40 @@
+##########################################################################

###### +#

package/qt5/qt5webkitexamples/qt5webkitexamples.mk new file +3 -0
+# qt5webkitexamples
+#
+##########################################################################

###### +

package/qt5/qt5webkitexamples/qt5webkitexamples.mk new file +3 -0
+QT5WEBKITEXAMPLES_VERSION = $(QT5_VERSION)
+QT5WEBKITEXAMPLES_SITE = $(QT5_SITE)
+QT5WEBKITEXAMPLES_SOURCE =
Quoted 2 lines

qtwebkit-examples-opensource-src-$(QT5WEBKITEXAMPLES_VERSION).tar.xz +QT5WEBKITEXAMPLES_DEPENDENCIES = qt5webkit

Add qt5xmlpatterns here.

package/qt5/qt5webkitexamples/qt5webkitexamples.mk line 17

Quoted 7 lines
package/qt5/qt5webkitexamples/qt5webkitexamples.mk new file +7 -0
+QT5WEBKITEXAMPLES_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5WEBKITEXAMPLES_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5script.

Copy/paste error: qt5script -> qt5webkit-examples

Quoted 10 lines
package/qt5/qt5webkitexamples/qt5webkitexamples.mk new file +10 -0
+else
+QT5WEBKITEXAMPLES_LICENSE = Commercial license
+QT5WEBKITEXAMPLES_REDISTRIBUTE = NO
+endif
+
+define QT5WEBKITEXAMPLES_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5WEBKITEXAMPLES_BUILD_CMDS

package/qt5/qt5webkitexamples/qt5webkitexamples.mk line 37

Quoted 10 lines
package/qt5/qt5webkitexamples/qt5webkitexamples.mk new file +10 -0
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5WEBKITEXAMPLES_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+define QT5WEBKITEXAMPLES_INSTALL_TARGET_CMDS
+	cp -af $(@D)/examples/webkitqml $(TARGET_DIR)/usr/lib/qt/examples
+    cp -af $(@D)/examples/webkitwidgets $(TARGET_DIR)/usr/lib/qt/examples

This line uses spaces instead of tab.

Quoted 3 lines
package/qt5/qt5webkitexamples/qt5webkitexamples.mk new file +3 -0
+endef
+
+$(eval $(generic-package))
#2 lore raw

PATCH 1/1 New package: qt5webkitexamples

Dear Fatih A??c?,

Quoted 10 lines · Fatih A??c?

package/qt5/qt5webkitexamples/Config.in line 2

Quoted 7 lines

b/package/qt5/qt5webkitexamples/Config.in new file mode 100644 index 0000000..18cb476

package/qt5/qt5webkitexamples/Config.in new file +2 -0
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_QT5WEBKITEXAMPLES
+	bool "qt5webkit examples"

What about hiding this menu entry and making this package default if BR2_PACKAGE_QT5BASE_EXAMPLES?

Since it's a separate package/tarball upstream, I'd prefer to have the option to build/install it or not.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com