commit 441ba81d604cfffa1445d8556699fd06d85ed56f
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date:   Tue Oct 18 23:03:27 2016 +0200

    - rel 7; libgda includes dbsql.h (from db5.3-sql-devel) and sqlite3.h (from 
sqlite3-devel) which are conflicting. Prevent from including sqlite3 if not 
needed.

 libgda5-sqlite.patch | 19 +++++++++++++++++++
 libgda5.spec         |  4 +++-
 2 files changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/libgda5.spec b/libgda5.spec
index d509ad6..dcdbdd9 100644
--- a/libgda5.spec
+++ b/libgda5.spec
@@ -23,7 +23,7 @@ Summary:      GNU Data Access library
 Summary(pl.UTF-8):     Biblioteka GNU Data Access
 Name:          libgda5
 Version:       5.2.4
-Release:       6
+Release:       7
 License:       LGPL v2+/GPL v2+
 Group:         Libraries
 Source0:       
http://ftp.gnome.org/pub/GNOME/sources/libgda/5.2/libgda-%{version}.tar.xz
@@ -36,6 +36,7 @@ Patch4:               %{name}-yelp.patch
 Patch5:                java-arch.patch
 Patch6:                java8.patch
 Patch7:                vapigen-detect.patch
+Patch8:                %{name}-sqlite.patch
 URL:           http://www.gnome-db.org/
 %{?with_firebird:BuildRequires:        Firebird-devel}
 BuildRequires: autoconf >= 2.68
@@ -391,6 +392,7 @@ Narzędzia graficzne dla GDA.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 # included version is bash-specific, use system file
diff --git a/libgda5-sqlite.patch b/libgda5-sqlite.patch
new file mode 100644
index 0000000..eda2910
--- /dev/null
+++ b/libgda5-sqlite.patch
@@ -0,0 +1,19 @@
+--- libgda-5.2.4/libgda/sqlite/gda-sqlite-pstmt.h~     2015-06-12 
22:05:14.000000000 +0200
++++ libgda-5.2.4/libgda/sqlite/gda-sqlite-pstmt.h      2016-10-18 
22:45:26.179827250 +0200
+@@ -24,12 +24,16 @@
+ #ifdef STATIC_SQLITE
+ #include "sqlite-src/sqlite3.h"
+ #else
++  #ifdef WITH_BDBSQLITE
++    #include <dbsql.h>
++  #else
+ #  ifdef HAVE_SQLITE
+ #    include <sqlite3.h>
+ #  else
+ #    include "sqlite-src/sqlite3.h"
+ #endif
+ #endif
++#endif
+ 
+ G_BEGIN_DECLS
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgda5.git/commitdiff/441ba81d604cfffa1445d8556699fd06d85ed56f

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to