qt5: remove qt5jsbackend package

Upstream did not release a new version of this package since it is
superseded by the builtin qml engine found in new qt5declarative.

Fixes: http://autobuild.buildroot.net/results/3861aa91e03154c7d20f4157f0c3a1fa14838af1/
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 42724dc15d4ca772375c32e82ce6afe52fc2fe63..d2b8f103726a44d8a9d357c57e3f93657f6763ad 100644 (file)
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -20,7 +20,6 @@ source "package/qt5/qt5base/Config.in"
 source "package/qt5/qt5declarative/Config.in"
 source "package/qt5/qt5graphicaleffects/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
-source "package/qt5/qt5jsbackend/Config.in"
 source "package/qt5/qt5multimedia/Config.in"
 source "package/qt5/qt5quick1/Config.in"
 source "package/qt5/qt5quickcontrols/Config.in"

diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index c9a673658a665eb1ccacf74541f6602809cabd25..a1fb9a310274548e65915b208320620db0294bb3 100644 (file)
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -1,13 +1,20 @@
+config BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+       bool
+       # Javascript engine is only available on certain architectures
+       depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
+       # ARM needs BLX, so v5t+
+       depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
+       default y
+
 config BR2_PACKAGE_QT5DECLARATIVE
        bool "qt5declarative"
        select BR2_PACKAGE_QT5XMLPATTERNS
-       select BR2_PACKAGE_QT5JSBACKEND
        select BR2_PACKAGE_QT5BASE
        select BR2_PACKAGE_QT5BASE_GUI
        select BR2_PACKAGE_QT5BASE_EGLFS
        depends on BR2_PACKAGE_HAS_OPENGL_EGL
        depends on BR2_PACKAGE_HAS_OPENGL_ES
-       depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+       depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
        help
          Qt is a cross-platform application and UI framework for
          developers using C++.
@@ -18,4 +25,4 @@ config BR2_PACKAGE_QT5DECLARATIVE
 
 comment "qt5declarative requires an OpenGL-capable backend"
        depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
-               BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+               BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE

diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 11b928704037468f1db33d8a726ef6a210b493e6..6eb803aa6b492a120af09dd1d1fb26f6843606f4 100644 (file)
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -7,7 +7,7 @@
 QT5DECLARATIVE_VERSION = $(QT5_VERSION)
 QT5DECLARATIVE_SITE = $(QT5_SITE)
 QT5DECLARATIVE_SOURCE = qtdeclarative-opensource-src-$(QT5DECLARATIVE_VERSION).tar.xz
-QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns qt5jsbackend
+QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns
 QT5DECLARATIVE_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)

diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in
index ed0454ad6c659bc971c43e1df5e6be5ed677870c..4958586393e4d7980dca22f6754dd7f6e82da043 100644 (file)
--- a/package/qt5/qt5graphicaleffects/Config.in
+++ b/package/qt5/qt5graphicaleffects/Config.in
@@ -2,8 +2,7 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
        bool "qt5graphicaleffects"
        select BR2_PACKAGE_QT5BASE
        select BR2_PACKAGE_QT5DECLARATIVE
-       # qt5declarative -> qt5jsbackend
-       depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+       depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
        depends on BR2_PACKAGE_HAS_OPENGL_EGL
        depends on BR2_PACKAGE_HAS_OPENGL_ES
        help
@@ -16,4 +15,4 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
 
 comment "qt5graphicaleffects requires an OpenGL-capable backend"
        depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
-               BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+               BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE

diff --git a/package/qt5/qt5jsbackend/Config.in b/package/qt5/qt5jsbackend/Config.in
deleted file mode 100644 (file)
index d9301d0..0000000
--- a/package/qt5/qt5jsbackend/Config.in
+++ /dev/null
@@ -1,19 +0,0 @@
-config BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
-       bool
-       # v8 is only available on certain architectures
-       depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
-       # ARM needs BLX, so v5t+
-       depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
-       default y
-
-config BR2_PACKAGE_QT5JSBACKEND
-       bool "qt5jsbackend"
-       select BR2_PACKAGE_QT5BASE
-       depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
-       help
-         Qt is a cross-platform application and UI framework for
-         developers using C++.
-
-         This package corresponds to the qt5jsbackend module.
-
-         http://qt-project.org

diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-0001-dont-import-bz2-python-module.patch b/package/qt5/qt5jsbackend/qt5jsbackend-0001-dont-import-bz2-python-module.patch
deleted file mode 100644 (file)
index 08f343e..0000000
--- a/package/qt5/qt5jsbackend/qt5jsbackend-0001-dont-import-bz2-python-module.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Only import bz2 python module when needed
-
-The js2c.py script imports the bz2 module unconditionnally, which
-would require us to build the bzip2 support in host-python. Since in
-fact bzip2 support is not technically used when building this package,
-we ensure that the bz2 module is only imported when needed.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/src/3rdparty/v8/tools/js2c.py
-===================================================================
---- a/src/3rdparty/v8/tools/js2c.py
-+++ b/src/3rdparty/v8/tools/js2c.py
-@@ -33,7 +33,6 @@
- 
- import os, re, sys, string
- import jsmin
--import bz2
- 
- 
- def ToCAsciiArray(lines):
-@@ -344,6 +343,7 @@
-   else:
-     raw_sources_declaration = RAW_SOURCES_COMPRESSION_DECLARATION
-     if env['COMPRESSION'] == 'bz2':
-+      import bz2
-       all_sources = bz2.compress("".join(all_sources))
-     total_length = len(all_sources)
-     sources_data = ToCArray(all_sources)

diff --git a/package/qt5/qt5jsbackend/qt5jsbackend.mk b/package/qt5/qt5jsbackend/qt5jsbackend.mk
deleted file mode 100644 (file)
index 9eccd23..0000000
--- a/package/qt5/qt5jsbackend/qt5jsbackend.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-################################################################################
-#
-# qt5jsbackend
-#
-################################################################################
-
-QT5JSBACKEND_VERSION = $(QT5_VERSION)
-QT5JSBACKEND_SITE = $(QT5_SITE)
-QT5JSBACKEND_SOURCE = qtjsbackend-opensource-src-$(QT5JSBACKEND_VERSION).tar.xz
-QT5JSBACKEND_DEPENDENCIES = qt5base
-QT5JSBACKEND_INSTALL_STAGING = YES
-
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5JSBACKEND_LICENSE = LGPLv2.1 or GPLv3.0
-QT5JSBACKEND_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
-else
-QT5JSBACKEND_LICENSE = Commercial license
-QT5JSBACKEND_REDISTRIBUTE = NO
-endif
-
-define QT5JSBACKEND_CONFIGURE_CMDS
-       (cd $(@D); $(HOST_DIR)/usr/bin/qmake)
-endef
-
-define QT5JSBACKEND_BUILD_CMDS
-       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-endef
-
-define QT5JSBACKEND_INSTALL_STAGING_CMDS
-       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
-       $(QT5_LA_PRL_FILES_FIXUP)
-endef
-
-ifeq ($(BR2_PREFER_STATIC_LIB),)
-define QT5JSBACKEND_INSTALL_TARGET_CMDS
-       cp -dpf $(STAGING_DIR)/usr/lib/libQt5V8*.so.* $(TARGET_DIR)/usr/lib
-endef
-endif
-
-$(eval $(generic-package))

diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in
index 080cba22c15d3ddbb65422014155e6219ca4938f..62373e446c4605113346e0bde202ca40699a8864 100644 (file)
--- a/package/qt5/qt5multimedia/Config.in
+++ b/package/qt5/qt5multimedia/Config.in
@@ -4,8 +4,7 @@ config BR2_PACKAGE_QT5MULTIMEDIA
        select BR2_PACKAGE_QT5DECLARATIVE
        depends on BR2_PACKAGE_HAS_OPENGL_EGL
        depends on BR2_PACKAGE_HAS_OPENGL_ES
-       # qt5declarative -> qt5jsbackend
-       depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+       depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
        help
          Qt is a cross-platform application and UI framework for
          developers using C++.
@@ -16,4 +15,4 @@ config BR2_PACKAGE_QT5MULTIMEDIA
 
 comment "qt5multimedia requires an OpenGL-capable backend"
        depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
-               BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+               BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE

diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in
index 594b4f6945f1c16a8a0d31625dd36dd620cd6ae2..d3c71e3a5268d63166028dbf2e30246a9f844a39 100644 (file)
--- a/package/qt5/qt5quick1/Config.in
+++ b/package/qt5/qt5quick1/Config.in
@@ -6,12 +6,11 @@ config BR2_PACKAGE_QT5QUICK1
        select BR2_PACKAGE_QT5SCRIPT
        select BR2_PACKAGE_QT5XMLPATTERNS
        select BR2_PACKAGE_QT5DECLARATIVE
-       select BR2_PACKAGE_QT5JSBACKEND
        # This module does not support static linking
        depends on !BR2_PREFER_STATIC_LIB
        depends on BR2_PACKAGE_HAS_OPENGL_EGL
        depends on BR2_PACKAGE_HAS_OPENGL_ES
-       depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+       depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
        help
          Qt is a cross-platform application and UI framework for
          developers using C++.
@@ -21,6 +20,6 @@ config BR2_PACKAGE_QT5QUICK1
          http://qt-project.org
 
 comment "qt5quick1 needs a toolchain w/ dynamic library and an OpenGL-capable backend"
-       depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+       depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
        depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES || \
                BR2_PREFER_STATIC_LIB

diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
index f9bb3e8e3a21eba7755cc585e7ef5408a1b9f907..4cc011a4779c4aa53595c7cae4b6138a98fc9082 100644 (file)
--- a/package/qt5/qt5quick1/qt5quick1.mk
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -7,7 +7,7 @@
 QT5QUICK1_VERSION = $(QT5_VERSION)
 QT5QUICK1_SITE = $(QT5_SITE)
 QT5QUICK1_SOURCE = qtquick1-opensource-src-$(QT5QUICK1_VERSION).tar.xz
-QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative qt5jsbackend \
+QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative \
        $(if $(BR2_PACKAGE_QT5WEBKIT),qt5webkit)
 QT5QUICK1_INSTALL_STAGING = YES
 

diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
index 3d8063036d851f2df6b0d1736b638ccc055ad6d7..265132823f7567f8d0e93c87561c722f06a1d6e9 100644 (file)
--- a/package/qt5/qt5quickcontrols/Config.in
+++ b/package/qt5/qt5quickcontrols/Config.in
@@ -3,8 +3,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
        select BR2_PACKAGE_QT5BASE
        select BR2_PACKAGE_QT5BASE_NETWORK
        select BR2_PACKAGE_QT5DECLARATIVE
-       # qt5declarative -> qt5jsbackend
-       depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+       depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
        depends on BR2_PACKAGE_HAS_OPENGL_EGL
        depends on BR2_PACKAGE_HAS_OPENGL_ES
        help
@@ -17,4 +16,4 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
 
 comment "qt5quickcontrols requires an OpenGL-capable backend"
        depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
-               BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+               BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE