| Message ID | 1458207749-19507-3-git-send-email-corjon.j@ecagroup.com |
|---|---|
| State | Accepted |
| Headers | show |
Julien, All, On Thu, Mar 17, 2016 at 10:42 AM, Julien Corjon <corjon.j@ecagroup.com> wrote: > > Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> > --- > package/qt5/Config.in | 1 - > package/qt5/qt5webkit/Config.in | 23 -------------- > package/qt5/qt5webkit/qt5webkit.hash | 2 -- > package/qt5/qt5webkit/qt5webkit.mk | 58 ------------------------------------ > 4 files changed, 84 deletions(-) > delete mode 100644 package/qt5/qt5webkit/Config.in > delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash > delete mode 100644 package/qt5/qt5webkit/qt5webkit.mk Are we sure we want to remove this package actually? The release says: "With Qt 5.6 the following modules are no longer part of the release packages, but users can still build them from source: - Qt WebKit - Qt Declarative (Qt Quick 1)" But the project has a qt5.6.0 branch just like the other modules: https://github.com/qtproject/qtwebkit/commits/5.6.0 Especially since we don't have any replacement I wouldn't merge this patch just yet. Plus webkit can run on a platform without GPU whereas WebEngine depends on OpenGL, I wouldn't mind keeping it, for i.MX7 platforms for instance. The package would need to be modified to use the github project instead of the release archives though. Let me know your thoughts. Regards, Gary
Gary, All, Le 21/03/2016 16:56, Gary Bisson a écrit : > Julien, All, > > On Thu, Mar 17, 2016 at 10:42 AM, Julien Corjon <corjon.j@ecagroup.com> wrote: >> >> Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> >> --- >> package/qt5/Config.in | 1 - >> package/qt5/qt5webkit/Config.in | 23 -------------- >> package/qt5/qt5webkit/qt5webkit.hash | 2 -- >> package/qt5/qt5webkit/qt5webkit.mk | 58 ------------------------------------ >> 4 files changed, 84 deletions(-) >> delete mode 100644 package/qt5/qt5webkit/Config.in >> delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash >> delete mode 100644 package/qt5/qt5webkit/qt5webkit.mk > > Are we sure we want to remove this package actually? The release says: > "With Qt 5.6 the following modules are no longer part of the release > packages, but users can still build them from source: > - Qt WebKit > - Qt Declarative (Qt Quick 1)" > > But the project has a qt5.6.0 branch just like the other modules: > https://github.com/qtproject/qtwebkit/commits/5.6.0 You're almost right, the project have a 5.6 branch but 5.6.0 version has not been tagged on deprecated modules. If we want to keep those in buildroot we have now to "randomly" choose a commit. > > Especially since we don't have any replacement I wouldn't merge this > patch just yet. Plus webkit can run on a platform without GPU whereas > WebEngine depends on OpenGL, I wouldn't mind keeping it, for i.MX7 > platforms for instance. I agree that platform without OpenGL support lose web browser ability from Qt and for that we should probably keep webkit in buildroot packages. But I'm not sure we should keep it in official Qt section since there not officially supported by Digia and Qt community. > > The package would need to be modified to use the github project > instead of the release archives though. If we use Qt repository we should use the official one (http://code.qt.io/cgit/qt/qtwebkit.git/) instead of github. > > Let me know your thoughts. > > Regards, > Gary > Regards, Julien
diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 32de7a0..95d3ab9 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -49,6 +49,5 @@ 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/Config.in" source "package/qt5/qt5webkit-examples/Config.in" endif diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in deleted file mode 100644 index 96d97cc..0000000 --- a/package/qt5/qt5webkit/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_QT5WEBKIT - bool "qt5webkit" - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5BASE_ICU - select BR2_PACKAGE_QT5BASE_GUI - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB - select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB - # This module does not support static linking - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_BINFMT_FLAT # icu - help - Qt is a cross-platform application and UI framework for - developers using C++. - - This package corresponds to 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/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash deleted file mode 100644 index 8517223..0000000 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz.mirrorlist -sha256 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69 qtwebkit-opensource-src-5.5.1.tar.xz diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk deleted file mode 100644 index 75ad1bf..0000000 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ /dev/null @@ -1,58 +0,0 @@ -################################################################################ -# -# qt5webkit -# -################################################################################ - -QT5WEBKIT_VERSION = $(QT5_VERSION) -QT5WEBKIT_SITE = $(QT5_SITE) -QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz -QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf host-bison host-flex -QT5WEBKIT_INSTALL_STAGING = YES - -QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5WEBKIT_LICENSE = LGPLv2+ (WebCore), 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_LICENSE_FILES += LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 -else -QT5WEBKIT_LICENSE = LGPLv2+ (WebCore), Commercial license -QT5WEBKIT_REDISTRIBUTE = NO -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5WEBKIT_DEPENDENCIES += qt5declarative -endif - -define QT5WEBKIT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5WEBKIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBKIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5WEBKIT_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/ -endef -endif - -define QT5WEBKIT_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebKit*.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ - $(QT5WEBKIT_INSTALL_TARGET_QMLS) -endef - -$(eval $(generic-package))
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> --- package/qt5/Config.in | 1 - package/qt5/qt5webkit/Config.in | 23 -------------- package/qt5/qt5webkit/qt5webkit.hash | 2 -- package/qt5/qt5webkit/qt5webkit.mk | 58 ------------------------------------ 4 files changed, 84 deletions(-) delete mode 100644 package/qt5/qt5webkit/Config.in delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash delete mode 100644 package/qt5/qt5webkit/qt5webkit.mk