[Buildroot] [PATCH v2] qt5webkit: Get sources from Qt-5-unofficial-builds

[Julien CORJON]

Alexey,

I like the idea of fetching obsolete submodules from Qt hosting instead 
of external github. But, as url say it's snapshot, we will probably have 
to change hash file more often... Maybe we will have to get rid of hash 
files for theses obsolete submodules.

Still I'm much more for this solution so :
Reviewed-by: Julien Corjon <corjon.j at ecagroup.com>

Regards,

Julien Corjon

Le 09/11/2016 à 14:59, Alexey Brodkin a écrit :
> Instead of messing with git we may get tarballs of obsolete but still
> existing submodules as we used to but from a bit different location.
>
> It turned out Qt people still create packages for obsolete submodules
> for so-called "unofficial builds", see [1].
>
> [1] https://wiki.qt.io/Qt-5-unofficial-builds
>
> Signed-off-by: Alexey Brodkin <abrodkin at synopsys.com>
> Cc: Yegor Yefremov <yegorslists at googlemail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
> Cc: Peter Seiderer <ps.report at gmx.net>
> Cc: "Yann E. MORIN" <yann.morin.1998 at free.fr>
> Cc: Jerzy Grzegorek <jerzy.grzegorek at trzebnica.net>
> Cc: Peter Korsgaard <peter at korsgaard.com>
> Cc: Julien Corjon <corjon.j at ecagroup.com>
> Cc: Gary Bisson <gary.bisson at boundarydevices.com>
> Cc: Jérôme Pouiller <jezz at sysmic.org>
> ---
>
> Changes v1 -> v2:
>  * Fixes copy-pasted QT5WEBKIT_VERSION
>    (was QT5WEBKIT_EXAMPLES_VERSION)
>    Thanks to Jérôme!
>
>  package/qt5/qt5.mk                   |  1 +
>  package/qt5/qt5webkit/qt5webkit.hash |  4 ++--
>  package/qt5/qt5webkit/qt5webkit.mk   | 14 +++-----------
>  3 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
> index d25f663662ee..e937e234b596 100644
> --- a/package/qt5/qt5.mk
> +++ b/package/qt5/qt5.mk
> @@ -1,6 +1,7 @@
>  QT5_VERSION_MAJOR = 5.6
>  QT5_VERSION = $(QT5_VERSION_MAJOR).2
>  QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
> +QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
>  include $(sort $(wildcard package/qt5/*/*.mk))
>
>  define QT5_LA_PRL_FILES_FIXUP
> diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash
> index 96b8bdd6909a..309f776b3ff3 100644
> --- a/package/qt5/qt5webkit/qt5webkit.hash
> +++ b/package/qt5/qt5webkit/qt5webkit.hash
> @@ -1,2 +1,2 @@
> -# locally computed
> -sha256 bdd659573e7e75cd4ad57b7160a7353d98d21a6fef06e4fb9e114a5b1f1e9dab qt5webkit-b35917bcb44d7f200af0f4ac68a126fa0aa8d93d.tar.gz
> +# Hash from: http://download.qt.io/snapshots/qt/5.6/5.6.2/latest_src/submodules/qtwebkit-opensource-src-5.6.2.tar.xz.mirrorlist
> +sha256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 qtwebkit-opensource-src-5.6.2.tar.xz
> diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
> index 378cdf78573e..980d2aff0167 100644
> --- a/package/qt5/qt5webkit/qt5webkit.mk
> +++ b/package/qt5/qt5webkit/qt5webkit.mk
> @@ -4,10 +4,9 @@
>  #
>  ################################################################################
>
> -QT5WEBKIT_VERSION = b35917bcb44d7f200af0f4ac68a126fa0aa8d93d
> -# Using GitHub since it supports downloading tarballs from random commits.
> -# The http://code.qt.io/cgit/qt/qtwebkit.git/ repo doesn't allow to do so.
> -QT5WEBKIT_SITE = $(call github,qtproject,qtwebkit,$(QT5WEBKIT_VERSION))
> +QT5WEBKIT_VERSION = $(QT5_VERSION)
> +QT5WEBKIT_SITE = $(QT5_SNAPSHOTS_SITE)
> +QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
>  QT5WEBKIT_DEPENDENCIES = \
>  	host-bison host-flex host-gperf host-python host-ruby \
>  	qt5base sqlite
> @@ -43,14 +42,7 @@ define QT5WEBKIT_PYTHON2_SYMLINK
>  endef
>  QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
>
> -# Since we get the source from git, generated header files are not included.
> -# qmake detects that header file generation (using the syncqt tool) must be
> -# done based on the existence of a .git directory (cfr. the git_build config
> -# option which is set in qt_build_paths.prf).
> -# So, to make sure that qmake detects that header files must be generated,
> -# create an empty .git directory.
>  define QT5WEBKIT_CONFIGURE_CMDS
> -	mkdir -p $(@D)/.git
>  	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
>  endef
>
>