[Buildroot] [Patch next v1 0/3] Fixes for qt5: bump latest version to 5.10.1

[Buildroot] [Patch next v1 0/3] Fixes for qt5: bump latest version to 5.10.1

[Peter Seiderer]

Some fixes for the 'qt5: bump latest version to  5.10.1' patch
from Ga?l Portray.

Peter Seiderer (3):
  sqlite: add option for meta-data about tables/queries
  qt5base: fix Qt5.10.1 sqlite plugin compile failure
  qt5multimedia: fix Qt5.10.1 target installation

 package/qt5/qt5base/Config.in              | 1 +
 package/qt5/qt5multimedia/qt5multimedia.mk | 4 +++-
 package/sqlite/Config.in                   | 7 +++++++
 package/sqlite/sqlite.mk                   | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

-- 
2.16.2

[Buildroot] [Patch next v1 1/3] sqlite: add option for meta-data about tables/queries

[Peter Seiderer]

Enables SQLITE_ENABLE_COLUMN_METADATA to gain access to:

  - sqlite3_column_database_name()
  - sqlite3_column_database_name16()
  - sqlite3_column_table_name()
  - sqlite3_column_table_name16()
  - sqlite3_column_origin_name()
  - sqlite3_column_origin_name16()

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/sqlite/Config.in | 7 +++++++
 package/sqlite/sqlite.mk | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
index ec7396860c..517af50e67 100644
--- a/package/sqlite/Config.in
+++ b/package/sqlite/Config.in
@@ -16,6 +16,13 @@ config BR2_PACKAGE_SQLITE_STAT3
 	  query planner that can help SQLite to choose a better query
 	  plan under certain situations.
 
+config BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA
+	bool "Enable convenient access to meta-data about tables and queries"
+	help
+	  When this option is defined there are some additional APIs
+	  enabled to acces meta-data about tables and queries (see
+	  https://sqlite.org/compile.html).
+
 config BR2_PACKAGE_SQLITE_ENABLE_FTS3
 	bool "Enable version 3 of the full-text search engine"
 	help
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index e8ce92df56..d0030d43ab 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -15,6 +15,10 @@ ifeq ($(BR2_PACKAGE_SQLITE_STAT3),y)
 SQLITE_CFLAGS += -DSQLITE_ENABLE_STAT3
 endif
 
+ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA),y)
+SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA
+endif
+
 ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y)
 SQLITE_CFLAGS += -DSQLITE_ENABLE_FTS3
 endif
-- 
2.16.2

[Buildroot] [Patch next v1 2/3] qt5base: fix Qt5.10.1 sqlite plugin compile failure

[Peter Seiderer]

Select BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA to gain
access to sqlite3_column_table_name16().

Fixes:

    qt5base-5.10.1/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp:217: undefined reference to `sqlite3_column_table_name16'

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/qt5/qt5base/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index b5755e2b9c..b9aba2d389 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -103,6 +103,7 @@ config BR2_PACKAGE_QT5BASE_SQLITE_QT
 config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM
 	bool "System SQLite"
 	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA
 	help
 	  Use system SQLite.
 
-- 
2.16.2

[Buildroot] [Patch next v1 3/3] qt5multimedia: fix Qt5.10.1 target installation

[Peter Seiderer]

Fixes:

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/qt5/qt5multimedia/qt5multimedia.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 6120403f30..6e48fd0a09 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -47,7 +47,9 @@ define QT5MULTIMEDIA_INSTALL_STAGING_CMDS
 	$(QT5_LA_PRL_FILES_FIXUP)
 endef
 
-ifeq ($(BR2_STATIC_LIBS),)
+# since Qt5.10.1 libqgsttools was renamed to libQtMultimediaGstTools
+# and is installed by the default target install step below
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_STATIC_LIBS),)
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
 define QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB
 	cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib
-- 
2.16.2

[Buildroot] [Patch next v1 3/3] qt5multimedia: fix Qt5.10.1 target installation

[Peter Seiderer]

On Fri, 23 Feb 2018 19:38:30 +0100, Peter Seiderer <ps.report@gmx.net> wrote:

> Fixes:
> 

Ups, one line of the commit message got lost...

> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
>  package/qt5/qt5multimedia/qt5multimedia.mk | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
> index 6120403f30..6e48fd0a09 100644
> --- a/package/qt5/qt5multimedia/qt5multimedia.mk
> +++ b/package/qt5/qt5multimedia/qt5multimedia.mk
> @@ -47,7 +47,9 @@ define QT5MULTIMEDIA_INSTALL_STAGING_CMDS
>  	$(QT5_LA_PRL_FILES_FIXUP)
>  endef
>  
> -ifeq ($(BR2_STATIC_LIBS),)
> +# since Qt5.10.1 libqgsttools was renamed to libQtMultimediaGstTools
> +# and is installed by the default target install step below
> +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_STATIC_LIBS),)

...and did add to the wrong if scope (the !BR2_STATIC_LIBS scope encloses
the mentioned default target install step too)...

Will send an update of the patchset...

Regards,
Peter

>  ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
>  define QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB
>  	cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib