Remove obsolete sqlite patch
This commit is contained in:
parent
ec11c0f351
commit
0f9a165a5a
|
@ -1,65 +0,0 @@
|
|||
Index: /trunk/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
|
||||
===================================================================
|
||||
--- /trunk/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp (revision 27942)
|
||||
+++ /trunk/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp (revision 27949)
|
||||
@@ -36,4 +36,23 @@
|
||||
#ifdef HAVE_SQLITE_VFS
|
||||
|
||||
+/************************************************************************/
|
||||
+/* OGR2SQLITE_Register() */
|
||||
+/************************************************************************/
|
||||
+
|
||||
+CPL_C_START
|
||||
+int CPL_DLL OGR2SQLITE_static_register (sqlite3* hDB, char **pzErrMsg, void* pApi);
|
||||
+CPL_C_END
|
||||
+
|
||||
+/* We call this function so that each time a db is created, */
|
||||
+/* OGR2SQLITE_static_register is called, to initialize the sqlite3_api */
|
||||
+/* structure with the right pointers. */
|
||||
+/* We need to declare this function before including sqlite3ext.h, since */
|
||||
+/* sqlite 3.8.7, sqlite3_auto_extension can be a macro (#5725) */
|
||||
+
|
||||
+void OGR2SQLITE_Register()
|
||||
+{
|
||||
+ sqlite3_auto_extension ((void (*)(void)) OGR2SQLITE_static_register);
|
||||
+}
|
||||
+
|
||||
#define VIRTUAL_OGR_DYNAMIC_EXTENSION_ENABLED
|
||||
//#define DEBUG_OGR2SQLITE
|
||||
@@ -2403,16 +2422,11 @@
|
||||
/************************************************************************/
|
||||
|
||||
-CPL_C_START
|
||||
-int CPL_DLL OGR2SQLITE_static_register (sqlite3 * hDB, char **pzErrMsg,
|
||||
- const sqlite3_api_routines * pApi);
|
||||
-CPL_C_END
|
||||
-
|
||||
#ifndef WIN32
|
||||
extern const struct sqlite3_api_routines OGRSQLITE_static_routines;
|
||||
#endif
|
||||
|
||||
-int OGR2SQLITE_static_register (sqlite3 * hDB, char **pzErrMsg,
|
||||
- const sqlite3_api_routines * pApi)
|
||||
-{
|
||||
+int OGR2SQLITE_static_register (sqlite3 * hDB, char **pzErrMsg, void * _pApi)
|
||||
+{
|
||||
+ const sqlite3_api_routines * pApi = (const sqlite3_api_routines * )_pApi;
|
||||
#ifndef WIN32
|
||||
if( pApi->create_module == NULL )
|
||||
@@ -2450,16 +2464,3 @@
|
||||
}
|
||||
|
||||
-/************************************************************************/
|
||||
-/* OGR2SQLITE_Register() */
|
||||
-/************************************************************************/
|
||||
-
|
||||
-/* We call this function so that each time a db is created, */
|
||||
-/* OGR2SQLITE_static_register is called, to initialize the sqlite3_api */
|
||||
-/* structure with the right pointers. */
|
||||
-
|
||||
-void OGR2SQLITE_Register()
|
||||
-{
|
||||
- sqlite3_auto_extension ((void (*)(void)) OGR2SQLITE_static_register);
|
||||
-}
|
||||
-
|
||||
#endif // HAVE_SQLITE_VFS
|
|
@ -66,9 +66,6 @@ Patch2: %{name}-jni.patch
|
|||
# Fedora uses Alternatives for Java
|
||||
Patch8: %{name}-1.9.0-java.patch
|
||||
|
||||
# http://trac.osgeo.org/gdal/changeset/27949
|
||||
Patch9: %{name}-1.11.1-sqlite-crash.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: ant
|
||||
|
@ -269,7 +266,6 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4
|
|||
%patch1 -p1 -b .g2clib~
|
||||
%patch2 -p1 -b .jni~
|
||||
%patch8 -p1 -b .java~
|
||||
%patch9 -p3 -b .sqlite~
|
||||
|
||||
# Copy in PROVENANCE.TXT-fedora
|
||||
cp -p %SOURCE4 .
|
||||
|
@ -770,6 +766,7 @@ popd
|
|||
%changelog
|
||||
* Tue Feb 17 2015 Volker Fröhlich <volker27@gmx.at> - 1.11.2-1
|
||||
- New release
|
||||
- Remove obsolete sqlite patch
|
||||
|
||||
* Fri Jan 23 2015 Marek Kasik <mkasik@redhat.com> - 1.11.1-6
|
||||
- Rebuild (poppler-0.30.0)
|
||||
|
|
Loading…
Reference in New Issue