From patchwork Fri Jul 11 11:46:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?RmF0aWggQcWfxLFjxLE=?= X-Patchwork-Id: 369134 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 4329A14007B for ; Fri, 11 Jul 2014 21:47:58 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0EE368B79A; Fri, 11 Jul 2014 11:47:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2g55HrEGAxXt; Fri, 11 Jul 2014 11:47:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 650578B793; Fri, 11 Jul 2014 11:47:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 04E021BF970 for ; Fri, 11 Jul 2014 11:47:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F2E7E8C18B for ; Fri, 11 Jul 2014 11:47:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cySmcsKB7MWN for ; Fri, 11 Jul 2014 11:47:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com [74.125.82.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id 783198C14E for ; Fri, 11 Jul 2014 11:47:52 +0000 (UTC) Received: by mail-wg0-f44.google.com with SMTP id m15so927983wgh.15 for ; Fri, 11 Jul 2014 04:47:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=mSdpnu6s110NVvmnREoUOvTOZCyWblUan//y/rGRH8s=; b=pqEPVUBykv/5pGNvbec3jpXCObaAFKZBq46FlKs3atSSd9Hx6RCvtYH5efrDNXqosD ICR1lwuAFniU/Ox+oLgF3e+A6lx2IBWXJnmMXIcQcN+U40Kr/hpxj6Uc0SZ3P+d3LcFk EOzJ8prqAjZCRPvG9h4IWWPjpG6g3h/zWfnYbUjSy0wSaPsbGKSNcdTspy/5hi8jq4cW 3xYLo+O2yqoqNgxBom9NYtGKaU4h5avcfR9teBMbf+OX8K+EXobfhbCj1AlXgP7pv6DR l6KrmBJm1taVzaulQ7gdA46mnvhc9Utzm7k6uNjZnnoaOs6EOiHRn6V+ljwnVq2q0N3d 0FZA== X-Received: by 10.180.212.113 with SMTP id nj17mr4381920wic.46.1405079265487; Fri, 11 Jul 2014 04:47:45 -0700 (PDT) Received: from viko.viko.com.tr ([31.145.32.62]) by mx.google.com with ESMTPSA id jb16sm6610869wic.10.2014.07.11.04.47.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jul 2014 04:47:44 -0700 (PDT) From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= To: buildroot@buildroot.org Date: Fri, 11 Jul 2014 14:46:52 +0300 Message-Id: <1405079212-25934-1-git-send-email-fatih.asici@gmail.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Cc: Massimo Callegari Subject: [Buildroot] [PATCH v3] qt5webkit-examples: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Massimo Callegari Signed-off-by: Massimo Callegari Signed-off-by: Fatih Aşıcı --- Changes v2 -> v3: - improved help text - fixed package name in comments - added qt5xmlpatterns to _DEPENDENCIES list when selected - fixed indentation issues (added missing tabs, removed spaces) - added mkdir for the target examples directory - passed -dpfr options to cp commands Changes v1 -> v2: - formatted qt5webkit-examples-0001-build.patch as requested --- package/qt5/Config.in | 1 + package/qt5/qt5webkit-examples/Config.in | 10 +++++ .../qt5webkit-examples-0001-build.patch | 30 +++++++++++++ .../qt5/qt5webkit-examples/qt5webkit-examples.mk | 51 ++++++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 package/qt5/qt5webkit-examples/Config.in create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index efdd9d4..1f6920a 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -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/qt5webkit-examples/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" diff --git a/package/qt5/qt5webkit-examples/Config.in b/package/qt5/qt5webkit-examples/Config.in new file mode 100644 index 0000000..6260f03 --- /dev/null +++ b/package/qt5/qt5webkit-examples/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT5WEBKIT_EXAMPLES + bool "qt5webkit examples" + depends on BR2_PACKAGE_QT5WEBKIT + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package contains examples for the qt5webkit module. + + http://qt-project.org diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch new file mode 100644 index 0000000..68964f0 --- /dev/null +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples-0001-build.patch @@ -0,0 +1,30 @@ +This patch improves the qt5webkit examples build for 2 aspects: + +# Allows to build even if qt5base examples are not enabled +# Builds xmlpatterns example only if the qt5xmlpattern package has been built + +Signed-off-by: Massimo Callegari + +Index: b/examples/webkitwidgets/webkitwidgets.pro +=================================================================== +--- /dev/null ++++ b/examples/webkitwidgets/webkitwidgets.pro +@@ -8,5 +8,6 @@ + framecapture \ + browser \ + embedded \ +- scroller \ +- xmlpatterns ++ scroller ++ ++qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns +Index: b/qtwebkit-examples.pro +=================================================================== +--- /dev/null ++++ b/qtwebkit-examples.pro +@@ -3,3 +3,4 @@ + load(qt_parts) + + SUBDIRS += doc ++SUBDIRS += examples + diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk new file mode 100644 index 0000000..8f9c9f9 --- /dev/null +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -0,0 +1,51 @@ +################################################################################ +# +# qt5webkit-examples +# +################################################################################ + +QT5WEBKIT_EXAMPLES_VERSION = $(QT5_VERSION) +QT5WEBKIT_EXAMPLES_SITE = $(QT5_SITE) +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz +QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit +QT5WEBKIT_EXAMPLES_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5WEBKIT_EXAMPLES_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 +# qt5webkit-examples. +else +QT5WEBKIT_EXAMPLES_LICENSE = Commercial license +QT5WEBKIT_EXAMPLES_REDISTRIBUTE = NO +endif + +ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y) +QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns +endif + +define QT5WEBKIT_EXAMPLES_CONFIGURE_CMDS + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) +endef + +define QT5WEBKIT_EXAMPLES_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5WEBKIT_EXAMPLES_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install +endef + +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +define QT5WEBKIT_EXAMPLES_INSTALL_QML + cp -dpfr $(@D)/examples/webkitqml $(TARGET_DIR)/usr/lib/qt/examples +endef +endif + +define QT5WEBKIT_EXAMPLES_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/lib/qt/examples + cp -dpfr $(@D)/examples/webkitwidgets $(TARGET_DIR)/usr/lib/qt/examples + $(QT5WEBKIT_EXAMPLES_INSTALL_QML) +endef + +$(eval $(generic-package))