Skip to contentSkip to conversation

grantlee: version bump and allow building with qt5

PATCH New Zoltan Gyarmati 2 participants 2 messages Nov 9, 2014 – Nov 22, 2014

lore
Share & tools
lore

Zoltan Gyarmati

author
#0 lore raw

PATCH 1/1 grantlee: version bump and allow building with qt5

Signed-off-by Zoltan Gyarmati <[email protected]>
---
 package/grantlee/Config.in                         | 14 ++++----
 .../grantlee-0.2.0-fix-lphread-link-error.patch    | 42 ----------------------
 package/grantlee/grantlee.mk                       | 15 ++++++--
 3 files changed, 20 insertions(+), 51 deletions(-)
 delete mode 100644 package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch
package/grantlee/Config.in +8 -6
index ce1342c..8f763f7 100644
@@ -1,11 +1,13 @@
 config BR2_PACKAGE_GRANTLEE
 	bool "grantlee"
-	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
-	depends on BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT_STL
-	select BR2_PACKAGE_QT_SCRIPT
-	select BR2_PACKAGE_QT_GUI_MODULE
+	depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT && BR2_PACKAGE_QT) || BR2_PACKAGE_QT5
+	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
 	help
-	  Qt implemantation of the Django template framework
+	  Qt implementation of the Django template framework
 
 	  http://www.grantlee.org
+
package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch deleted +0 -42

42 lines not on this page · raw message

package/grantlee/grantlee.mk +12 -3
index 539578b..a300106 100644
@@ -3,12 +3,21 @@
 # grantlee
 #
 ################################################################################
-
-GRANTLEE_VERSION = 0.2.0
+# 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_SITE = http://downloads.grantlee.org
 GRANTLEE_INSTALL_STAGING = YES
-GRANTLEE_DEPENDENCIES = qt
 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))
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 grantlee: version bump and allow building with qt5

Dear Zoltan Gyarmati,

Quoted 7 lines · Zoltan Gyarmati
Signed-off-by Zoltan Gyarmati <[email protected]>
---
 package/grantlee/Config.in                         | 14 ++++----
 .../grantlee-0.2.0-fix-lphread-link-error.patch    | 42 ----------------------
 package/grantlee/grantlee.mk                       | 15 ++++++--
 3 files changed, 20 insertions(+), 51 deletions(-)
 delete mode 100644 package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch

Patch applied to next, thanks. I've done a test build with both qt4 and qt5, and it worked fine for me. In the future, we'll probably want to remove the qt4 version of grantlee, since upstream doesn't support qt4 anymore.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com