From patchwork Thu Mar 17 09:42:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Corjon X-Patchwork-Id: 598962 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 3qQk161fBQz9s0M for ; Thu, 17 Mar 2016 20:42:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9D15195803; Thu, 17 Mar 2016 09:42:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k+WRaFLBHwdL; Thu, 17 Mar 2016 09:42:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 996EC95815; Thu, 17 Mar 2016 09:42:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 075DA1C11F8 for ; Thu, 17 Mar 2016 09:42:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 01649957EC for ; Thu, 17 Mar 2016 09:42:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mlgQ4ElDdsBr for ; Thu, 17 Mar 2016 09:42:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 7D062933BF for ; Thu, 17 Mar 2016 09:42:40 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id l124so7871901wmf.2 for ; Thu, 17 Mar 2016 02:42:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ka7uAHEpK4KGs2yc6Yj/vYjsJfbDVi2vergxufsTuBw=; b=YgxqR+C2h2Br4ebYhcOTKyMd0Dt4M7g2SW91SBRj4KSs8fvI0kG2Injua7aMa3GZ4C DtUNqkcuCh/hvFy8OHDYHctz7XiFu3NmeEr2Adtb9I7/gUMkXJ5I31ive+pDWgs8lSdQ j+Wp6k19A9ENR5hGG5UYZ2oFmB4UJg0UxVtAMQBLp+bJAib5QuT0ASHLpU5gIxYM6Fjf +ZGzVH6IzCyPO7o28cO2v7ebZrtv/ZvZgPfkKX7cx+KTFmJXczRo4uf59mDbwba4BRKq 0FDA2vQ/oMdvXnI1QsWUR0N1aASiBukz/xwf+lugzYIQ5oFVBWm5LwbW52o3LkvCKLE9 6PxQ== X-Gm-Message-State: AD7BkJIhzyEyvzz8SbKgQa125nv7+h+XHwmtJIIneGwmYzIvQvaH7kLBRe34ffQKaVxLeA== X-Received: by 10.28.142.213 with SMTP id q204mr33352214wmd.69.1458207759113; Thu, 17 Mar 2016 02:42:39 -0700 (PDT) Received: from mic341-linux.sinters-int.fr ([195.200.174.78]) by smtp.gmail.com with ESMTPSA id e127sm29476187wma.20.2016.03.17.02.42.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Mar 2016 02:42:38 -0700 (PDT) From: Julien Corjon To: buildroot@buildroot.org Date: Thu, 17 Mar 2016 10:42:27 +0100 Message-Id: <1458207749-19507-4-git-send-email-corjon.j@ecagroup.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458207749-19507-1-git-send-email-corjon.j@ecagroup.com> References: <1458207749-19507-1-git-send-email-corjon.j@ecagroup.com> Cc: software.eca-sinters@ecagroup.com, daniel.nystrom@timeterminal.se Subject: [Buildroot] [PATCH 3/5] package/qt5webkit-examples: remove obsolete package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Julien Corjon --- package/qt5/Config.in | 1 - package/qt5/qt5webkit-examples/0001-build.patch | 30 ------------- package/qt5/qt5webkit-examples/Config.in | 14 ------ .../qt5/qt5webkit-examples/qt5webkit-examples.hash | 2 - .../qt5/qt5webkit-examples/qt5webkit-examples.mk | 50 ---------------------- 5 files changed, 97 deletions(-) delete mode 100644 package/qt5/qt5webkit-examples/0001-build.patch delete mode 100644 package/qt5/qt5webkit-examples/Config.in delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.hash delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 95d3ab9..f673daa 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -49,5 +49,4 @@ source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" comment "legacy compatibility" source "package/qt5/qt5script/Config.in" -source "package/qt5/qt5webkit-examples/Config.in" endif diff --git a/package/qt5/qt5webkit-examples/0001-build.patch b/package/qt5/qt5webkit-examples/0001-build.patch deleted file mode 100644 index 68964f0..0000000 --- a/package/qt5/qt5webkit-examples/0001-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -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/Config.in b/package/qt5/qt5webkit-examples/Config.in deleted file mode 100644 index 3f9c243..0000000 --- a/package/qt5/qt5webkit-examples/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -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. - - This package has been tagged as deprecated since version - 5.5.0 and should be replaced by Qt WebEngine module in - new design. - - http://qt.io diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash deleted file mode 100644 index b28e0da..0000000 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-examples-opensource-src-5.5.1.tar.xz.mirrorlist -sha256 098935b42d6d249027d1a635e4e70edc3d2969dd860f825b36aec06fc72e46c6 qtwebkit-examples-opensource-src-5.5.1.tar.xz diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk deleted file mode 100644 index b687ac7..0000000 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# 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 - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5WEBKIT_EXAMPLES_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2 -# Source files contain references to LGPL_EXCEPTION.txt but it is not included -# in the archive. -QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 -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))