Moar cvs add/rm

This commit is contained in:
landry 2014-08-20 09:00:36 +00:00
parent c7bf069305
commit 12c992023a
5 changed files with 12 additions and 80 deletions

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_app_qgsabout_cpp,v 1.3 2014/08/20 09:00:36 landry Exp $
--- src/app/qgsabout.cpp.orig Mon Aug 18 17:22:49 2014
+++ src/app/qgsabout.cpp Mon Aug 18 17:23:11 2014
@@ -220,7 +220,7 @@ void QgsAbout::setWhatsNew( )
QString myStyle = QgsApplication::reportStyleSheet();
txtWhatsNew->clear();
txtWhatsNew->document()->setDefaultStyleSheet( myStyle );
- txtWhatsNew->setSource( "file:///" + QgsApplication::pkgDataPath() + "/doc/news.html" );
+ txtWhatsNew->setSource( "file:///" + QgsApplication::pkgDataPath() + "/../doc/qgis/news.html" );
}
void QgsAbout::setPluginInfo()

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_core_spatialite_headers_spatialite_sqlite3_h,v 1.1 2011/07/07 20:34:27 landry Exp $
http://hub.qgis.org/issues/4030
--- src/core/spatialite/headers/spatialite/sqlite3.h.orig Tue Jun 28 16:21:50 2011
+++ src/core/spatialite/headers/spatialite/sqlite3.h Tue Jun 28 16:22:07 2011
@@ -3,6 +3,7 @@
** for linker symbols declared into the sqlite3 code
** internally embedded into SpatiaLite
*/
+#ifndef __OpenBSD__
#define sqlite3_version SPLite3_version
#define sqlite3_libversion SPLite3_libversion
#define sqlite3_sourceid SPLite3_sourceid
@@ -225,6 +226,7 @@
#define sqlite3_global_recover SPLite3_global_recover
#define sqlite3_thread_cleanup SPLite3_thread_cleanup
#define sqlite3_fts3_enable_parentheses SPLite3_fts3_enable_parentheses
+#endif
/* end SpatiaLite/sqlite3 alias macros */
/*

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_core_spatialite_headers_spatialite_sqlite3ext_h,v 1.1 2011/07/07 20:34:27 landry Exp $
http://hub.qgis.org/issues/4030
--- src/core/spatialite/headers/spatialite/sqlite3ext.h.orig Tue Jun 28 16:22:10 2011
+++ src/core/spatialite/headers/spatialite/sqlite3ext.h Tue Jun 28 16:22:24 2011
@@ -3,6 +3,7 @@
** for linker symbols declared into the sqlite3 code
** internally embedded into SpatiaLite
*/
+#ifndef __OpenBSD__
#define sqlite3_version SPLite3_version
#define sqlite3_libversion SPLite3_libversion
#define sqlite3_sourceid SPLite3_sourceid
@@ -225,6 +226,7 @@
#define sqlite3_global_recover SPLite3_global_recover
#define sqlite3_thread_cleanup SPLite3_thread_cleanup
#define sqlite3_fts3_enable_parentheses SPLite3_fts3_enable_parentheses
+#endif
/* end SpatiaLite/sqlite3 alias macros */
/*

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_core_spatialite_spatialite_c,v 1.1 2011/07/07 20:34:27 landry Exp $
http://hub.qgis.org/issues/4030
--- src/core/spatialite/spatialite.c.orig Tue Jun 28 15:57:23 2011
+++ src/core/spatialite/spatialite.c Tue Jun 28 15:57:41 2011
@@ -109,6 +109,7 @@ extern const char * locale_charset (void);
** for linker symbols declared into the sqlite3 code
** internally embedded into SpatiaLite
*/
+#ifndef __OpenBSD__
#define sqlite3_version SPLite3_version
#define sqlite3_libversion SPLite3_libversion
#define sqlite3_sourceid SPLite3_sourceid
@@ -331,6 +332,7 @@ extern const char * locale_charset (void);
#define sqlite3_global_recover SPLite3_global_recover
#define sqlite3_thread_cleanup SPLite3_thread_cleanup
#define sqlite3_fts3_enable_parentheses SPLite3_fts3_enable_parentheses
+#endif
/* end SpatiaLite/sqlite3 alias macros */

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_core_spatialite_sqlite3_c,v 1.1 2011/07/07 20:34:27 landry Exp $
http://hub.qgis.org/issues/4030
--- src/core/spatialite/sqlite3.c.orig Tue Jun 28 15:57:46 2011
+++ src/core/spatialite/sqlite3.c Tue Jun 28 15:58:01 2011
@@ -10,6 +10,7 @@
** any linker symbol potentially conflicting with
** an external sqlite3 library
*/
+#ifndef __OpenBSD__
#define sqlite3_version SPLite3_version
#define sqlite3_libversion SPLite3_libversion
#define sqlite3_sourceid SPLite3_sourceid
@@ -225,6 +226,7 @@
#define sqlite3_global_recover SPLite3_global_recover
#define sqlite3_thread_cleanup SPLite3_thread_cleanup
#define sqlite3_fts3_enable_parentheses SPLite3_fts3_enable_parentheses
+#endif
/* End SpatiaLite alias-MACROs */
/******************************************************************************