added patch from Juergen Fischer to fix sqlite problem
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=47
This commit is contained in:
parent
1bac1d07b8
commit
36c8f6ec29
@ -6,6 +6,7 @@ Group: Applications/GIS
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: %{name}.desktop
|
||||
Source2: %{name}.rpmlintrc
|
||||
Patch: sqlite3.patch
|
||||
Url: http://www.qgis.org/
|
||||
Summary: Quantum GIS (QGIS) is a Geographic Information System (GIS)
|
||||
Packager: Otto Dassau <otto.dassau@gmx.de>
|
||||
@ -67,6 +68,7 @@ GRASS plugin for Quantum GIS required to interface with GRASS system.
|
||||
|
||||
%prep
|
||||
%setup
|
||||
%patch -p0
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS"
|
||||
@ -86,6 +88,7 @@ cmake -Wno-dev \
|
||||
-D QGIS_PLUGIN_SUBDIR=%{lib}/qgis \
|
||||
-D QGIS_MANUAL_SUBDIR=share/man \
|
||||
-D WITH_INTERNAL_SQLITE3=TRUE \
|
||||
-D SQLITE3_INCLUDE_DIR=%{buildroot}/src/core/sqlite3 \
|
||||
.
|
||||
|
||||
#echo "for 'make' run first:"
|
||||
|
97
sqlite3.patch
Normal file
97
sqlite3.patch
Normal file
@ -0,0 +1,97 @@
|
||||
Index: debian/rules
|
||||
===================================================================
|
||||
--- debian/rules (revision 9215)
|
||||
+++ debian/rules (working copy)
|
||||
@@ -36,6 +36,7 @@
|
||||
-D CMAKE_INSTALL_PREFIX=/usr \
|
||||
-D CMAKE_SKIP_RPATH=TRUE \
|
||||
-D BINDINGS_GLOBAL_INSTALL=TRUE \
|
||||
+ -D WITH_INTERNAL_SQLITE3=TRUE \
|
||||
../..
|
||||
|
||||
build: patch build-stamp
|
||||
Index: src/app/CMakeLists.txt
|
||||
===================================================================
|
||||
--- src/app/CMakeLists.txt (revision 9215)
|
||||
+++ src/app/CMakeLists.txt (working copy)
|
||||
@@ -189,11 +189,16 @@
|
||||
../plugins
|
||||
../python
|
||||
${PROJ_INCLUDE_DIR}
|
||||
- ${SQLITE3_INCLUDE_DIR}
|
||||
${GEOS_INCLUDE_DIR}
|
||||
${GDAL_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
+IF(WITH_INTERNAL_SQLITE3)
|
||||
+ INCLUDE_DIRECTORIES(../core/sqlite3)
|
||||
+ELSE(WITH_INTERNAL_SQLITE3)
|
||||
+ INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
|
||||
+ENDIF(WITH_INTERNAL_SQLITE3)
|
||||
+
|
||||
IF (POSTGRES_FOUND)
|
||||
INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
|
||||
ENDIF (POSTGRES_FOUND)
|
||||
Index: src/gui/CMakeLists.txt
|
||||
===================================================================
|
||||
--- src/gui/CMakeLists.txt (revision 9215)
|
||||
+++ src/gui/CMakeLists.txt (working copy)
|
||||
@@ -83,10 +83,15 @@
|
||||
${QT_QTSVG_LIBRARY}
|
||||
${QT_QTNETWORK_LIBRARY}
|
||||
${QT_QTMAIN_LIBRARY}
|
||||
- ${SQLITE3_LIBRARIES}
|
||||
qgis_core
|
||||
)
|
||||
|
||||
+IF (WITH_INTERNAL_SQLITE3)
|
||||
+ TARGET_LINK_LIBRARIES(qgis_gui
|
||||
+ ${SQLITE3_LIBRARIES}
|
||||
+ )
|
||||
+ENDIF(WITH_INTERNAL_SQLITE3)
|
||||
+
|
||||
INSTALL(TARGETS qgis_gui
|
||||
RUNTIME DESTINATION ${QGIS_BIN_DIR}
|
||||
LIBRARY DESTINATION ${QGIS_LIB_DIR}
|
||||
Index: src/helpviewer/CMakeLists.txt
|
||||
===================================================================
|
||||
--- src/helpviewer/CMakeLists.txt (revision 9215)
|
||||
+++ src/helpviewer/CMakeLists.txt (working copy)
|
||||
@@ -6,10 +6,15 @@
|
||||
main.cpp
|
||||
qgshelpserver.cpp
|
||||
qgshelpviewer.cpp
|
||||
- #../core/qgsapplication.cpp
|
||||
- #../core/qgslogger.cpp
|
||||
)
|
||||
|
||||
+IF(WITH_INTERNAL_SQLITE3)
|
||||
+ SET(HELP_SRCS
|
||||
+ ${HELP_SRCS}
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/../core/sqlite3/sqlite3.c
|
||||
+ )
|
||||
+ENDIF(WITH_INTERNAL_SQLITE3)
|
||||
+
|
||||
SET (HELP_UIS qgshelpviewerbase.ui)
|
||||
|
||||
SET (HELP_MOC_HDRS
|
||||
@@ -34,13 +39,17 @@
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../core
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
- ${SQLITE3_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
+
|
||||
TARGET_LINK_LIBRARIES(qgis_help
|
||||
- ${SQLITE3_LIBRARY}
|
||||
qgis_core
|
||||
)
|
||||
+
|
||||
+IF(NOT WITH_INTERNAL_SQLITE3)
|
||||
+ TARGET_LINK_LIBRARIES(qgis_help ${SQLITE3_LIBRARY})
|
||||
+ENDIF(NOT WITH_INTERNAL_SQLITE3)
|
||||
+
|
||||
IF (${QTVERSION} STRLESS "4.3.0")
|
||||
TARGET_LINK_LIBRARIES(qgis_help
|
||||
${QT_LIBRARIES}
|
Loading…
Reference in New Issue
Block a user