| Message ID | 1464884168-24478-1-git-send-email-mr.zoltan.gyarmati@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
Hello, On Thu, 2 Jun 2016 18:16:08 +0200, Zoltan Gyarmati wrote: > Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> Thanks for this patch! > In upstream the Qt4 build is not supported since 2 releases, earlier we > built the latest Qt4 supporting version if Qt4 was built, but IMHO > if the upstream has stopped supporting Qt4 we also safe to do so. > Hopefully this transition period was enough for the dependecies to migrate > to Qt5. If somebody still uses Grantlee with Qt4 though, pls let me know and > i'll post an other patch with keeping Qt4 support. I think it is reasonable to drop the Qt4 support. > diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in > index 7895c7e..77e50e6 100644 > --- a/package/grantlee/Config.in > +++ b/package/grantlee/Config.in > @@ -1,16 +1,12 @@ > config BR2_PACKAGE_GRANTLEE > bool "grantlee" > depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # Qt Script This dependency was only related to Qt Script, so it can be dropped. > - depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \ > - (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) > + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5 > depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module Ditto. > # https://sourceware.org/bugzilla/show_bug.cgi?id=20173 > depends on !BR2_microblaze && !BR2_nios2 As a separate patch, it would be useful if you could re-test on microblaze and nios2, after removing the --fatal-warnings option, as suggested by Nick Clifton in this bug report? > - select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT > - select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT > - select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT > - select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5 > - select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 > + select BR2_PACKAGE_QT5SCRIPT > + select BR2_PACKAGE_QT5BASE_GUI > help > Qt implementation of the Django template framework > > @@ -19,6 +15,5 @@ config BR2_PACKAGE_GRANTLEE > comment "grantlee needs a toolchain with NPTL not affected by Binutils bug 19405" > depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL > depends on !BR2_microblaze && !BR2_nios2 > - depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \ > - (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || \ > + depends on (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || \ > BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 This comment is no longer needed. Could you rework your patch to fix those minor issues? Thanks a lot! Thomas
Hi Zoltan, Thomas, Le 03/06/2016 à 11:03, Thomas Petazzoni a écrit : > Hello, > > On Thu, 2 Jun 2016 18:16:08 +0200, Zoltan Gyarmati wrote: >> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > > Thanks for this patch! > >> In upstream the Qt4 build is not supported since 2 releases, earlier we >> built the latest Qt4 supporting version if Qt4 was built, but IMHO >> if the upstream has stopped supporting Qt4 we also safe to do so. >> Hopefully this transition period was enough for the dependecies to migrate >> to Qt5. If somebody still uses Grantlee with Qt4 though, pls let me know and >> i'll post an other patch with keeping Qt4 support. > > I think it is reasonable to drop the Qt4 support. > >> diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in >> index 7895c7e..77e50e6 100644 >> --- a/package/grantlee/Config.in >> +++ b/package/grantlee/Config.in >> @@ -1,16 +1,12 @@ >> config BR2_PACKAGE_GRANTLEE >> bool "grantlee" >> depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # Qt Script > > This dependency was only related to Qt Script, so it can be dropped. > >> - depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \ >> - (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) >> + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5 >> depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module > > Ditto. > >> # https://sourceware.org/bugzilla/show_bug.cgi?id=20173 >> depends on !BR2_microblaze && !BR2_nios2 > > As a separate patch, it would be useful if you could re-test on > microblaze and nios2, after removing the --fatal-warnings option, as > suggested by Nick Clifton in this bug report? With this patch applied, grantlee depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE which exclude nios2 and microblaze: config BR2_PACKAGE_QT5_JSCORE_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_ARM_CPU_ARMV4 default y Without this patch, grantlee build fine with qt4 (with .eh_frame sections warnings though) So, these architecture limitation can be removed. However, it's recommended to remove the --fatal-warnings option if it still present in 5.1.0. Best regards, Romain > >> - select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT >> - select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT >> - select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT >> - select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5 >> - select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 >> + select BR2_PACKAGE_QT5SCRIPT >> + select BR2_PACKAGE_QT5BASE_GUI >> help >> Qt implementation of the Django template framework >> >> @@ -19,6 +15,5 @@ config BR2_PACKAGE_GRANTLEE >> comment "grantlee needs a toolchain with NPTL not affected by Binutils bug 19405" >> depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL >> depends on !BR2_microblaze && !BR2_nios2 >> - depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \ >> - (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || \ >> + depends on (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || \ >> BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 > > This comment is no longer needed. > > Could you rework your patch to fix those minor issues? > > Thanks a lot! > > Thomas >
diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in index 7895c7e..77e50e6 100644 --- a/package/grantlee/Config.in +++ b/package/grantlee/Config.in @@ -1,16 +1,12 @@ config BR2_PACKAGE_GRANTLEE bool "grantlee" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # Qt Script - depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \ - (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5 depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module # https://sourceware.org/bugzilla/show_bug.cgi?id=20173 depends on !BR2_microblaze && !BR2_nios2 - select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT - select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT - select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT - select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5SCRIPT + select BR2_PACKAGE_QT5BASE_GUI help Qt implementation of the Django template framework @@ -19,6 +15,5 @@ config BR2_PACKAGE_GRANTLEE comment "grantlee needs a toolchain with NPTL not affected by Binutils bug 19405" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_microblaze && !BR2_nios2 - depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \ - (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || \ + depends on (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 diff --git a/package/grantlee/grantlee.hash b/package/grantlee/grantlee.hash index 7f02bb3..cdff778 100644 --- a/package/grantlee/grantlee.hash +++ b/package/grantlee/grantlee.hash @@ -1,3 +1,2 @@ # Locally calculated after checking pgp signature -sha256 191809bf4c9b7ef877af0fd29345061c2372edfb4506aa7d5df5c71a570fa0ac grantlee-0.5.1.tar.gz -sha256 eaf22ba92e53b8eb5dd8bca045fe81b734d3445445ed9e0c1af2a0a7c375b161 grantlee-5.0.0.tar.gz +sha256 ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478 grantlee-5.1.0.tar.gz diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk index a300106..f8d9f8d 100644 --- a/package/grantlee/grantlee.mk +++ b/package/grantlee/grantlee.mk @@ -3,21 +3,12 @@ # grantlee # ################################################################################ -# qt4 support dropped after 0.5.1, so we use the older version for qt4 -ifeq ($(BR2_PACKAGE_QT),y) -GRANTLEE_VERSION = 0.5.1 -else ifeq ($(BR2_PACKAGE_QT5),y) -GRANTLEE_VERSION = 5.0.0 -endif +GRANTLEE_VERSION = 5.1.0 GRANTLEE_SITE = http://downloads.grantlee.org GRANTLEE_INSTALL_STAGING = YES GRANTLEE_LICENSE = LGPLv2.1+ GRANTLEE_LICENSE_FILES = COPYING.LIB -ifeq ($(BR2_PACKAGE_QT),y) -GRANTLEE_DEPENDENCIES = qt -else ifeq ($(BR2_PACKAGE_QT5),y) GRANTLEE_DEPENDENCIES += qt5base qt5script -endif $(eval $(cmake-package))
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> --- In upstream the Qt4 build is not supported since 2 releases, earlier we built the latest Qt4 supporting version if Qt4 was built, but IMHO if the upstream has stopped supporting Qt4 we also safe to do so. Hopefully this transition period was enough for the dependecies to migrate to Qt5. If somebody still uses Grantlee with Qt4 though, pls let me know and i'll post an other patch with keeping Qt4 support. package/grantlee/Config.in | 13 ++++--------- package/grantlee/grantlee.hash | 3 +-- package/grantlee/grantlee.mk | 11 +---------- 3 files changed, 6 insertions(+), 21 deletions(-)