Hi,
following gdal and mapserver updates, i've found some time to update
qgis to 1.7.0... using it since a while, works perfectly.
I doubt anyone else but me is doing GIS work on OpenBSD, but if you do,
please test it.
http://www.qgis.org/component/content/article/127-qgis-1-7-release.html
Landry
? 1.6.0-libqgis_analysis.so.1.2
? 1.6.0-libqgis_core.so.4.0
? 1.6.0-libqgis_gui.so.3.0
? 1.6.0-libqgispython.so.1.1
? libqgis_analysis.so.1.2
? libqgis_core.so.4.0
? libqgis_gui.so.3.0
? libqgispython.so.1.1
? libqgissqlanyconnection.so.0.0
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/qgis/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 8 Jun 2011 17:35:13 -0000 1.21
+++ Makefile 30 Jun 2011 09:07:12 -0000
@@ -4,15 +4,15 @@
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
-DISTNAME = qgis-1.6.0
-REVISION = 2
+DISTNAME = qgis-1.7.0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
-SHARED_LIBS = qgis_core 4.0 \
- qgis_gui 3.0 \
- qgis_analysis 1.2 \
- qgispython 1.1 # .1.3
+SHARED_LIBS = qgis_core 5.0 \
+ qgis_gui 4.0 \
+ qgis_analysis 1.3 \
+ qgispython 1.1 \
+ qgissqlanyconnection 0.0 # 1.7
HOMEPAGE = http://www.qgis.org/
@@ -53,11 +53,15 @@
mng png pthread gobject-2.0 util stdc++ z proj \
QtGui QtNetwork QtXml QtSql QtCore QtSvg \
QtWebKit gdal geos_c gsl gslcblas pq qwt fcgi
-WANTLIB += ${MODPY_WANTLIB}
+WANTLIB += ${MODPY_WANTLIB} jpeg tiff
CONFIGURE_ENV+= VERBOSE=1
+CONFIGURE_ARGS = -DWITH_MAPSERVER=TRUE
USE_GROFF = Yes
+
pre-configure:
+ # otherwise takes precedence over systemwide file
+ rm ${WRKSRC}/cmake/FindIconv.cmake
${SUBST_CMD} ${WRKSRC}/cmake/Find{GDAL,GEOS,Postgres}.cmake
post-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/geo/qgis/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 8 Dec 2010 09:07:48 -0000 1.6
+++ distinfo 30 Jun 2011 09:07:12 -0000
@@ -1,5 +1,5 @@
-MD5 (qgis-1.6.0.tar.bz2) = nqinhNlw9QCbDmJxggJI9g==
-RMD160 (qgis-1.6.0.tar.bz2) = 6YrvG/UpDcf0Qz/B7GSK0TJzYEw=
-SHA1 (qgis-1.6.0.tar.bz2) = gV59f0Zfh4w3hmsLw4NFu9dlQcw=
-SHA256 (qgis-1.6.0.tar.bz2) = +Z5ur7TECd0VkbuZubuJ4xwxD47uw+G6NXNIpscPn24=
-SIZE (qgis-1.6.0.tar.bz2) = 17479207
+MD5 (qgis-1.7.0.tar.bz2) = 2FBpkPUlY9Oce5FvUA8oLw==
+RMD160 (qgis-1.7.0.tar.bz2) = STA+q3VPHn/rzjiOZXJTVj9lq+0=
+SHA1 (qgis-1.7.0.tar.bz2) = 5g9A5yyS8YfTcl5rk8E2kdY6f6c=
+SHA256 (qgis-1.7.0.tar.bz2) = S4cehBgyyaTzzuGYEZjDCFCYPXPISGhIMvqRMWdnGjQ=
+SIZE (qgis-1.7.0.tar.bz2) = 23420823
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 8 Dec 2010 09:07:48 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.5 2010/12/08 09:07:48 landry Exp $
---- CMakeLists.txt.orig Sat Nov 13 19:29:21 2010
-+++ CMakeLists.txt Mon Nov 29 17:31:37 2010
-@@ -486,7 +486,7 @@ ENDIF (APPLE)
- # install stuff
-
- INSTALL (FILES AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS INSTALL CODING
-- DESTINATION ${QGIS_DATA_DIR}/doc)
-+ DESTINATION ${QGIS_DATA_DIR}/../doc/qgis)
-
- # manual page - makes sense only on unix systems
- IF (UNIX AND NOT APPLE)
Index: patches/patch-cmake_FindGDAL_cmake
===================================================================
RCS file: /cvs/ports/geo/qgis/patches/patch-cmake_FindGDAL_cmake,v
retrieving revision 1.2
diff -u -r1.2 patch-cmake_FindGDAL_cmake
--- patches/patch-cmake_FindGDAL_cmake 8 Dec 2010 09:07:48 -0000 1.2
+++ patches/patch-cmake_FindGDAL_cmake 30 Jun 2011 09:07:12 -0000
@@ -1,16 +1,12 @@
$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.2 2010/12/08 09:07:48 landry Exp $
---- cmake/FindGDAL.cmake.orig Mon Nov 29 17:53:59 2010
-+++ cmake/FindGDAL.cmake Mon Nov 29 17:54:19 2010
-@@ -134,11 +134,7 @@ ELSE(WIN32)
- STRING(REGEX REPLACE "[-][l]" "" GDAL_LIB_NAME
${GDAL_LIB_NAME_WITH_PREFIX} )
- ENDIF (GDAL_LIB_NAME_WITH_PREFIX)
-
-- IF (APPLE)
-- SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib
CACHE STRING INTERNAL)
-- ELSE (APPLE)
+--- cmake/FindGDAL.cmake.orig Sun Jun 5 13:59:48 2011
++++ cmake/FindGDAL.cmake Mon Jun 27 16:05:21 2011
+@@ -154,7 +154,7 @@ ELSE(WIN32)
+ SET(GDAL_LIBRARY
${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
+ ENDIF (NOT GDAL_LIBRARY)
+ ELSE (APPLE)
- SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so
CACHE STRING INTERNAL)
-- ENDIF (APPLE)
-+ FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATHS ${LOCALBASE}/lib)
++ FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATHS ${LOCALBASE}/lib)
+ ENDIF (APPLE)
ELSE(GDAL_CONFIG)
- MESSAGE("FindGDAL.cmake: gdal-config not found. Please set it
manually. GDAL_CONFIG=${GDAL_CONFIG}")
Index: patches/patch-cmake_FindGEOS_cmake
===================================================================
RCS file: /cvs/ports/geo/qgis/patches/patch-cmake_FindGEOS_cmake,v
retrieving revision 1.3
diff -u -r1.3 patch-cmake_FindGEOS_cmake
--- patches/patch-cmake_FindGEOS_cmake 8 Dec 2010 09:07:48 -0000 1.3
+++ patches/patch-cmake_FindGEOS_cmake 30 Jun 2011 09:07:12 -0000
@@ -1,16 +1,12 @@
$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.3 2010/12/08 09:07:48 landry Exp $
---- cmake/FindGEOS.cmake.orig Mon Nov 29 17:54:29 2010
-+++ cmake/FindGEOS.cmake Mon Nov 29 17:54:44 2010
-@@ -131,11 +131,7 @@ ELSE(WIN32)
- ENDIF (GEOS_LIB_NAME_WITH_PREFIX)
- #MESSAGE("DBG GEOS_LIB_NAME=${GEOS_LIB_NAME}")
-
-- IF (APPLE)
-- SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib
CACHE STRING INTERNAL)
-- ELSE (APPLE)
+--- cmake/FindGEOS.cmake.orig Sun Jun 5 13:59:48 2011
++++ cmake/FindGEOS.cmake Mon Jun 27 16:05:42 2011
+@@ -151,7 +151,7 @@ ELSE(WIN32)
+ SET(GEOS_LIBRARY
${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
+ ENDIF (NOT GEOS_LIBRARY)
+ ELSE (APPLE)
- SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.so
CACHE STRING INTERNAL)
-- ENDIF (APPLE)
-+ FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS ${LOCALBASE}/lib)
++ FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS ${LOCALBASE}/lib)
+ ENDIF (APPLE)
#MESSAGE("DBG GEOS_LIBRARY=${GEOS_LIBRARY}")
- ELSE(GEOS_CONFIG)
Index: patches/patch-doc_CMakeLists_txt
===================================================================
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_CMakeLists_txt 30 Jun 2011 09:07:12 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- doc/CMakeLists.txt.orig Mon Jun 27 16:03:14 2011
++++ doc/CMakeLists.txt Mon Jun 27 16:03:36 2011
+@@ -13,8 +13,8 @@ ENDIF(TXT2TAGS_EXECUTABLE)
+
+ SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html favicon.ico qgisdoc.css
AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)
+
+-INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
+-INSTALL(FILES images/qgis_new_80pct.png DESTINATION
${QGIS_DATA_DIR}/doc/images)
++INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/../doc/qgis)
++INSTALL(FILES images/qgis_new_80pct.png DESTINATION
${QGIS_DATA_DIR}/../doc/qgis/images)
+
+ IF(WITH_APIDOC)
+ FIND_PACKAGE(Doxygen)
Index: patches/patch-python_CMakeLists_txt
===================================================================
RCS file: patches/patch-python_CMakeLists_txt
diff -N patches/patch-python_CMakeLists_txt
--- patches/patch-python_CMakeLists_txt 17 May 2011 08:53:50 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-python_CMakeLists_txt,v 1.3 2011/05/17 08:53:50 dcoppa Exp $
-
-Fix build with newer PySIP/PyQt
-
---- python/CMakeLists.txt.orig Mon Oct 4 22:05:12 2010
-+++ python/CMakeLists.txt Mon May 16 11:14:35 2011
-@@ -43,6 +43,10 @@ IF(NOT PYQT4_VERSION_NUM LESS 263941) # 0x040705
- SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
- ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
-
-+IF(NOT PYQT4_VERSION_NUM LESS 264194) # 0x040802
-+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
-+ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
-+
- # core module
- FILE(GLOB sip_files_core core/*.sip)
- set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
Index: patches/patch-python_core_conversions_sip
===================================================================
RCS file: patches/patch-python_core_conversions_sip
diff -N patches/patch-python_core_conversions_sip
--- patches/patch-python_core_conversions_sip 17 May 2011 08:53:50 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-python_core_conversions_sip,v 1.3 2011/05/17 08:53:50 dcoppa
Exp $
-
-Fix build with newer PySIP/PyQt
-
---- python/core/conversions.sip.orig Sun Oct 3 11:11:28 2010
-+++ python/core/conversions.sip Mon May 16 11:14:35 2011
-@@ -15,6 +15,7 @@ which are not wrapped by PyQt:
- */
-
- %Feature QSETINT_CONVERSION
-+%Feature QSETTYPE_CONVERSION
-
- %ModuleHeaderCode
- // From Python 2.5, some functions use Py_ssize_t instead of int
-@@ -320,7 +321,7 @@ template <TYPE>
- };
- %End
-
--
-+%If (QSETTYPE_CONVERSION)
- template <TYPE>
- %MappedType QSet<TYPE>
- {
-@@ -394,8 +395,7 @@ template <TYPE>
- %End
-
- };
--
--
-+%End
-
- template<TYPE>
- %MappedType QMap<int, QMap<int, TYPE> >
Index: patches/patch-src_analysis_interpolation_qgsinterpolator_cpp
===================================================================
RCS file: patches/patch-src_analysis_interpolation_qgsinterpolator_cpp
diff -N patches/patch-src_analysis_interpolation_qgsinterpolator_cpp
--- patches/patch-src_analysis_interpolation_qgsinterpolator_cpp 23 May
2010 17:50:56 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_analysis_interpolation_qgsinterpolator_cpp,v 1.2
2010/05/23 17:50:56 espie Exp $
---- src/analysis/interpolation/qgsinterpolator.cpp.orig Sat Nov 28
18:07:29 2009
-+++ src/analysis/interpolation/qgsinterpolator.cpp Sun May 23 19:45:34 2010
-@@ -28,6 +28,11 @@
- #define isnan(f) _isnan(f)
- #endif
-
-+#if __GNUC__ >= 4
-+using std::isnan;
-+#else
-+using __gnu_cxx::isnan;
-+#endif
- QgsInterpolator::QgsInterpolator( const QList<LayerData>& layerData ):
mDataIsCached( false ), mLayerData( layerData )
- {
-
Index: patches/patch-src_analysis_interpolation_qgstininterpolator_cpp
===================================================================
RCS file: patches/patch-src_analysis_interpolation_qgstininterpolator_cpp
diff -N patches/patch-src_analysis_interpolation_qgstininterpolator_cpp
--- patches/patch-src_analysis_interpolation_qgstininterpolator_cpp 23 May
2010 17:50:56 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_analysis_interpolation_qgstininterpolator_cpp,v 1.3
2010/05/23 17:50:56 espie Exp $
---- src/analysis/interpolation/qgstininterpolator.cpp.orig Sun Nov 22
15:41:00 2009
-+++ src/analysis/interpolation/qgstininterpolator.cpp Sun May 23 19:46:46 2010
-@@ -36,6 +36,11 @@
- #include <float.h>
- #define isnan(f) _isnan(f)
- #endif
-+#if __GNUC__ >= 4
-+using std::isnan;
-+#else
-+using __gnu_cxx::isnan;
-+#endif
-
- QgsTINInterpolator::QgsTINInterpolator( const QList<LayerData>& inputData,
TIN_INTERPOLATION interpolation, bool showProgressDialog ): QgsInterpolator(
inputData ), mTriangulation( 0 ), \
- mTriangleInterpolator( 0 ), mIsInitialized( false ), mShowProgressDialog(
showProgressDialog ), mExportTriangulationToFile( false ), mInterpolation(
interpolation )
Index: patches/patch-src_app_attributetable_qgsattributetabledelegate_cpp
===================================================================
RCS file:
/cvs/ports/geo/qgis/patches/patch-src_app_attributetable_qgsattributetabledelegate_cpp,v
retrieving revision 1.3
diff -u -r1.3 patch-src_app_attributetable_qgsattributetabledelegate_cpp
--- patches/patch-src_app_attributetable_qgsattributetabledelegate_cpp 8 Dec
2010 09:07:48 -0000 1.3
+++ patches/patch-src_app_attributetable_qgsattributetabledelegate_cpp 30 Jun
2011 09:07:12 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_app_attributetable_qgsattributetabledelegate_cpp,v 1.3
2010/12/08 09:07:48 landry Exp $
Unroll some c++ too violent for g++3.3.
---- src/app/attributetable/qgsattributetabledelegate.cpp.orig Mon Apr 5
19:19:07 2010
-+++ src/app/attributetable/qgsattributetabledelegate.cpp Mon Nov 29
17:31:38 2010
-@@ -112,7 +112,9 @@ void QgsAttributeTableDelegate::paint( QPainter * pain
+--- src/app/attributetable/qgsattributetabledelegate.cpp.orig Sun Jun 5
13:59:48 2011
++++ src/app/attributetable/qgsattributetabledelegate.cpp Mon Jun 27
15:28:09 2011
+@@ -130,7 +130,9 @@ void QgsAttributeTableDelegate::paint( QPainter * pain
if ( option.state & QStyle::State_HasFocus )
{
QRect r = option.rect.adjusted( 1, 1, -1, -1 );
Index: patches/patch-src_app_qgisapp_cpp
===================================================================
RCS file: patches/patch-src_app_qgisapp_cpp
diff -N patches/patch-src_app_qgisapp_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_app_qgisapp_cpp 30 Jun 2011 09:07:12 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+Fix paths to docs
+--- src/app/qgisapp.cpp.orig Sun Jun 5 13:59:48 2011
++++ src/app/qgisapp.cpp Thu Jun 30 08:57:21 2011
+@@ -854,7 +854,7 @@ void QgisApp::createActions()
+ mActionQgisHomePage->setShortcut( QString() );
+ #endif
+
+- mActionHelpContents->setEnabled( QFileInfo( QgsApplication::pkgDataPath() +
"/doc/index.html" ).exists() );
++ mActionHelpContents->setEnabled( QFileInfo( QgsApplication::pkgDataPath() +
"/../doc/qgis/index.html" ).exists() );
+
+ connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT(
helpContents() ) );
+ connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT(
apiDocumentation() ) );
+@@ -4991,7 +4991,7 @@ void QgisApp::helpContents()
+
+ void QgisApp::apiDocumentation()
+ {
+- if ( QFileInfo( QgsApplication::pkgDataPath() + "/doc/api/index.html"
).exists() )
++ if ( QFileInfo( QgsApplication::pkgDataPath() +
"/../doc/qgis/api/index.html" ).exists() )
+ {
+ openURL( "api/index.html" );
+ }
+@@ -5011,7 +5011,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
+ // open help in user browser
+ if ( useQgisDocDirectory )
+ {
+- url = "file://" + QgsApplication::pkgDataPath() + "/doc/" + url;
++ url = "file://" + QgsApplication::pkgDataPath() + "/../doc/qgis/" + url;
+ }
+ #ifdef Q_OS_MACX
+ /* Use Mac OS X Launch Services which uses the user's default browser
Index: patches/patch-src_core_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/geo/qgis/patches/patch-src_core_CMakeLists_txt,v
retrieving revision 1.4
diff -u -r1.4 patch-src_core_CMakeLists_txt
--- patches/patch-src_core_CMakeLists_txt 8 Dec 2010 09:07:48 -0000
1.4
+++ patches/patch-src_core_CMakeLists_txt 30 Jun 2011 09:07:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.4 2010/12/08 09:07:48 landry Exp $
---- src/core/CMakeLists.txt.orig Thu Oct 28 01:58:43 2010
-+++ src/core/CMakeLists.txt Mon Nov 29 17:31:38 2010
-@@ -345,9 +345,9 @@ ENDIF(APPLE)
+--- src/core/CMakeLists.txt.orig Sun Jun 5 13:59:48 2011
++++ src/core/CMakeLists.txt Mon Jun 27 15:28:09 2011
+@@ -339,9 +339,9 @@ ENDIF(APPLE)
TARGET_LINK_LIBRARIES(qgis_core
${QT_QTMAIN_LIBRARY}
${QT_QTXML_LIBRARY}
Index: patches/patch-src_core_qgsapplication_cpp
===================================================================
RCS file: patches/patch-src_core_qgsapplication_cpp
diff -N patches/patch-src_core_qgsapplication_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_core_qgsapplication_cpp 30 Jun 2011 09:07:12 -0000
@@ -0,0 +1,48 @@
+$OpenBSD$
+Fix paths to various doc files, installed in share/doc/qgis
+per doc/CMakeLists.txt patch
+--- src/core/qgsapplication.cpp.orig Wed Jun 29 09:17:57 2011
++++ src/core/qgsapplication.cpp Wed Jun 29 09:19:38 2011
+@@ -245,21 +245,21 @@ const QString QgsApplication::themeName()
+ */
+ const QString QgsApplication::authorsFilePath()
+ {
+- return mPkgDataPath + QString( "/doc/AUTHORS" );
++ return mPkgDataPath + QString( "../doc/qgis/AUTHORS" );
+ }
+ /*!
+ Returns the path to the contributors file.
+ */
+ const QString QgsApplication::contributorsFilePath()
+ {
+- return mPkgDataPath + QString( "/doc/CONTRIBUTORS" );
++ return mPkgDataPath + QString( "../doc/qgis/CONTRIBUTORS" );
+ }
+ /*!
+ Returns the path to the sponsors file.
+ */
+ const QString QgsApplication::sponsorsFilePath()
+ {
+- return mPkgDataPath + QString( "/doc/SPONSORS" );
++ return mPkgDataPath + QString( "../doc/qgis/SPONSORS" );
+ }
+
+ /*!
+@@ -267,7 +267,7 @@ const QString QgsApplication::sponsorsFilePath()
+ */
+ const QString QgsApplication::donorsFilePath()
+ {
+- return mPkgDataPath + QString( "/doc/DONORS" );
++ return mPkgDataPath + QString( "../doc/qgis/DONORS" );
+ }
+
+ /*!
+@@ -276,7 +276,7 @@ const QString QgsApplication::donorsFilePath()
+ */
+ const QString QgsApplication::translatorsFilePath()
+ {
+- return mPkgDataPath + QString( "/doc/TRANSLATORS" );
++ return mPkgDataPath + QString( "../doc/qgis/TRANSLATORS" );
+ }
+ /*!
+ Returns the path to the developer image directory.
Index: patches/patch-src_core_spatialite_headers_spatialite_sqlite3_h
===================================================================
RCS file: patches/patch-src_core_spatialite_headers_spatialite_sqlite3_h
diff -N patches/patch-src_core_spatialite_headers_spatialite_sqlite3_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_core_spatialite_headers_spatialite_sqlite3_h 30 Jun
2011 09:07:12 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+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 */
+
+ /*
Index: patches/patch-src_core_spatialite_headers_spatialite_sqlite3ext_h
===================================================================
RCS file: patches/patch-src_core_spatialite_headers_spatialite_sqlite3ext_h
diff -N patches/patch-src_core_spatialite_headers_spatialite_sqlite3ext_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_core_spatialite_headers_spatialite_sqlite3ext_h 30 Jun
2011 09:07:12 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+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 */
+
+ /*
Index: patches/patch-src_core_spatialite_spatialite_c
===================================================================
RCS file: patches/patch-src_core_spatialite_spatialite_c
diff -N patches/patch-src_core_spatialite_spatialite_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_core_spatialite_spatialite_c 30 Jun 2011 09:07:12
-0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+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 */
+
+
Index: patches/patch-src_core_spatialite_sqlite3_c
===================================================================
RCS file: patches/patch-src_core_spatialite_sqlite3_c
diff -N patches/patch-src_core_spatialite_sqlite3_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_core_spatialite_sqlite3_c 30 Jun 2011 09:07:12 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+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 */
+
+
/******************************************************************************
Index: patches/patch-src_mapserver_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/geo/qgis/patches/patch-src_mapserver_CMakeLists_txt,v
retrieving revision 1.1
diff -u -r1.1 patch-src_mapserver_CMakeLists_txt
--- patches/patch-src_mapserver_CMakeLists_txt 8 Dec 2010 09:07:48 -0000
1.1
+++ patches/patch-src_mapserver_CMakeLists_txt 30 Jun 2011 09:07:12 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_mapserver_CMakeLists_txt,v 1.1 2010/12/08 09:07:48 landry
Exp $
install sld & xml in share/qgis
---- src/mapserver/CMakeLists.txt.orig Tue Nov 30 13:15:24 2010
-+++ src/mapserver/CMakeLists.txt Tue Nov 30 13:16:24 2010
-@@ -121,6 +121,6 @@ INSTALL(TARGETS
+--- src/mapserver/CMakeLists.txt.orig Sun Jun 5 13:59:48 2011
++++ src/mapserver/CMakeLists.txt Mon Jun 27 15:28:09 2011
+@@ -125,6 +125,6 @@ INSTALL(TARGETS
INSTALL(FILES
admin.sld
wms_metadata.xml
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/geo/qgis/pkg/PFRAG.shared,v
retrieving revision 1.7
diff -u -r1.7 PFRAG.shared
--- pkg/PFRAG.shared 8 Dec 2010 09:07:48 -0000 1.7
+++ pkg/PFRAG.shared 30 Jun 2011 09:07:12 -0000
@@ -3,6 +3,7 @@
@lib lib/libqgis_core.so.${LIBqgis_core_VERSION}
@lib lib/libqgis_gui.so.${LIBqgis_gui_VERSION}
@lib lib/libqgispython.so.${LIBqgispython_VERSION}
+@lib lib/libqgissqlanyconnection.so.${LIBqgissqlanyconnection_VERSION}
lib/qgis/
lib/qgis/plugins/
lib/qgis/plugins/libcoordinatecaptureplugin.so
@@ -13,6 +14,7 @@
lib/qgis/plugins/libdisplacementplugin.so
lib/qgis/plugins/libdxf2shpconverterplugin.so
lib/qgis/plugins/libevis.so
+lib/qgis/plugins/libgdalprovider.so
lib/qgis/plugins/libgeorefplugin.so
lib/qgis/plugins/libgpsimporterplugin.so
lib/qgis/plugins/libgpxprovider.so
@@ -20,17 +22,18 @@
lib/qgis/plugins/libmemoryprovider.so
lib/qgis/plugins/libnortharrowplugin.so
lib/qgis/plugins/libofflineeditingplugin.so
-lib/qgis/plugins/libogrconverterplugin.so
lib/qgis/plugins/libogrprovider.so
lib/qgis/plugins/liboracleplugin.so
lib/qgis/plugins/libosmprovider.so
lib/qgis/plugins/libpostgresprovider.so
-lib/qgis/plugins/libquickprintplugin.so
lib/qgis/plugins/librasterterrainplugin.so
+lib/qgis/plugins/libroadgraphplugin.so
lib/qgis/plugins/libscalebarplugin.so
lib/qgis/plugins/libspatialiteprovider.so
lib/qgis/plugins/libspatialqueryplugin.so
lib/qgis/plugins/libspitplugin.so
+lib/qgis/plugins/libsqlanywhereplugin.so
+lib/qgis/plugins/libsqlanywhereprovider.so
lib/qgis/plugins/libwfsplugin.so
lib/qgis/plugins/libwfsprovider.so
lib/qgis/plugins/libwmsprovider.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/qgis/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 8 Dec 2010 09:07:48 -0000 1.7
+++ pkg/PLIST 30 Jun 2011 09:07:12 -0000
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.7 2010/12/08 09:07:48 landry Exp $
%%SHARED%%
@bin bin/qgis
-@bin bin/qgis_help
@bin bin/qgis_mapserv.fcgi
include/qgis/
include/qgis/characterwidget.h
@@ -11,6 +10,7 @@
include/qgis/qgisgui.h
include/qgis/qgisinterface.h
include/qgis/qgisplugin.h
+include/qgis/qgsaddremoveitemcommand.h
include/qgis/qgsapplication.h
include/qgis/qgsattributeaction.h
include/qgis/qgsattributeeditor.h
@@ -51,11 +51,13 @@
include/qgis/qgsdatasourceuri.h
include/qgis/qgsdetaileditemdelegate.h
include/qgis/qgsdetaileditemwidget.h
+include/qgis/qgsdiagramrendererv2.h
include/qgis/qgsdistancearea.h
include/qgis/qgsencodingfiledialog.h
include/qgis/qgsexception.h
include/qgis/qgsfeature.h
include/qgis/qgsfield.h
+include/qgis/qgsfieldvalidator.h
include/qgis/qgsfiledropedit.h
include/qgis/qgsfillsymbollayerv2.h
include/qgis/qgsformannotationitem.h
@@ -125,6 +127,8 @@
include/qgis/qgsrasterbandstats.h
include/qgis/qgsrasterdataprovider.h
include/qgis/qgsrasterlayer.h
+include/qgis/qgsrasterprojector.h
+include/qgis/qgsrasterpyramid.h
include/qgis/qgsrastershader.h
include/qgis/qgsrastershaderfunction.h
include/qgis/qgsrastertransparency.h
@@ -141,6 +145,7 @@
include/qgis/qgsrulebasedrendererv2widget.h
include/qgis/qgsrunprocess.h
include/qgis/qgsscalecalculator.h
+include/qgis/qgssearchquerybuilder.h
include/qgis/qgssearchstring.h
include/qgis/qgssearchtreenode.h
include/qgis/qgssinglesymbolrenderer.h
@@ -149,6 +154,7 @@
include/qgis/qgssnapper.h
include/qgis/qgsspatialindex.h
include/qgis/qgsstylev2.h
+include/qgis/qgsstylev2exportimportdialog.h
include/qgis/qgsstylev2managerdialog.h
include/qgis/qgssymbol.h
include/qgis/qgssymbollayerv2.h
@@ -179,9 +185,9 @@
include/qgis/ui_qgsgenericprojectionselectorbase.h
include/qgis/ui_qgsmessageviewer.h
include/qgis/ui_qgsprojectionselectorbase.h
+include/qgis/ui_qgsquerybuilderbase.h
+@bin lib/qgis/qgis_help
@man man/man1/qgis.1
-@man man/man1/qgis_help.1
-share/applications/
share/applications/qgis.desktop
share/doc/qgis/
share/doc/qgis/AUTHORS
@@ -191,18 +197,18 @@
share/doc/qgis/INSTALL
share/doc/qgis/SPONSORS
share/doc/qgis/TRANSLATORS
+share/doc/qgis/favicon.ico
+share/doc/qgis/images/
+share/doc/qgis/images/qgis_new_80pct.png
+share/doc/qgis/index.html
+share/doc/qgis/qgisdoc.css
share/pixmaps/
share/pixmaps/qgis-icon.png
share/qgis/
+share/qgis/FindQGIS.cmake
share/qgis/admin.sld
-share/qgis/wms_metadata.xml
-share/qgis/doc/
-share/qgis/doc/favicon.ico
-share/qgis/doc/images/
-share/qgis/doc/images/qgis_new_80pct.png
-share/qgis/doc/index.html
-share/qgis/doc/qgisdoc.css
share/qgis/i18n/
+share/qgis/i18n/qgis_af.qm
share/qgis/i18n/qgis_ar.qm
share/qgis/i18n/qgis_bg.qm
share/qgis/i18n/qgis_ca_ES.qm
@@ -210,6 +216,7 @@
share/qgis/i18n/qgis_de.qm
share/qgis/i18n/qgis_el_GR.qm
share/qgis/i18n/qgis_es.qm
+share/qgis/i18n/qgis_fa.qm
share/qgis/i18n/qgis_fi.qm
share/qgis/i18n/qgis_fr.qm
share/qgis/i18n/qgis_he.qm
@@ -233,7 +240,9 @@
share/qgis/i18n/qgis_sk.qm
share/qgis/i18n/qgis_sl_SI.qm
share/qgis/i18n/qgis_sq_AL.qm
+share/qgis/i18n/qgis_sr_CS-Latn.qm
share/qgis/i18n/qgis_sv.qm
+share/qgis/i18n/qgis_ta.qm
share/qgis/i18n/qgis_th.qm
share/qgis/i18n/qgis_tr.qm
share/qgis/i18n/qgis_uk.qm
@@ -260,6 +269,7 @@
share/qgis/python/plugins/GdalTools/icons/
share/qgis/python/plugins/GdalTools/icons/about.png
share/qgis/python/plugins/GdalTools/icons/contour.png
+share/qgis/python/plugins/GdalTools/icons/dem.png
share/qgis/python/plugins/GdalTools/icons/grid.png
share/qgis/python/plugins/GdalTools/icons/merge.png
share/qgis/python/plugins/GdalTools/icons/nearblack.png
@@ -273,6 +283,7 @@
share/qgis/python/plugins/GdalTools/icons/raster-rgb.png
share/qgis/python/plugins/GdalTools/icons/rasterize.png
share/qgis/python/plugins/GdalTools/icons/sieve.png
+share/qgis/python/plugins/GdalTools/icons/tileindex.png
share/qgis/python/plugins/GdalTools/icons/translate.png
share/qgis/python/plugins/GdalTools/icons/vrt.png
share/qgis/python/plugins/GdalTools/icons/warp.png
@@ -286,6 +297,7 @@
share/qgis/python/plugins/GdalTools/tools/doBuildVRT.py
share/qgis/python/plugins/GdalTools/tools/doClipper.py
share/qgis/python/plugins/GdalTools/tools/doContour.py
+share/qgis/python/plugins/GdalTools/tools/doDEM.py
share/qgis/python/plugins/GdalTools/tools/doGrid.py
share/qgis/python/plugins/GdalTools/tools/doInfo.py
share/qgis/python/plugins/GdalTools/tools/doMerge.py
@@ -299,17 +311,24 @@
share/qgis/python/plugins/GdalTools/tools/doRgbPct.py
share/qgis/python/plugins/GdalTools/tools/doSettings.py
share/qgis/python/plugins/GdalTools/tools/doSieve.py
+share/qgis/python/plugins/GdalTools/tools/doTileIndex.py
share/qgis/python/plugins/GdalTools/tools/doTranslate.py
share/qgis/python/plugins/GdalTools/tools/doWarp.py
+share/qgis/python/plugins/GdalTools/tools/extentSelector.py
+share/qgis/python/plugins/GdalTools/tools/inOutSelector.py
share/qgis/python/plugins/GdalTools/tools/optionsTable.py
+share/qgis/python/plugins/GdalTools/tools/terrain.txt
share/qgis/python/plugins/GdalTools/tools/ui_dialogAbout.py
share/qgis/python/plugins/GdalTools/tools/ui_dialogBase.py
share/qgis/python/plugins/GdalTools/tools/ui_dialogSettings.py
+share/qgis/python/plugins/GdalTools/tools/ui_extentSelector.py
+share/qgis/python/plugins/GdalTools/tools/ui_inOutSelector.py
share/qgis/python/plugins/GdalTools/tools/ui_optionsTable.py
share/qgis/python/plugins/GdalTools/tools/ui_widgetBuildVRT.py
share/qgis/python/plugins/GdalTools/tools/ui_widgetClipper.py
share/qgis/python/plugins/GdalTools/tools/ui_widgetContour.py
share/qgis/python/plugins/GdalTools/tools/ui_widgetConvert.py
+share/qgis/python/plugins/GdalTools/tools/ui_widgetDEM.py
share/qgis/python/plugins/GdalTools/tools/ui_widgetGrid.py
share/qgis/python/plugins/GdalTools/tools/ui_widgetInfo.py
share/qgis/python/plugins/GdalTools/tools/ui_widgetMerge.py
@@ -320,16 +339,14 @@
share/qgis/python/plugins/GdalTools/tools/ui_widgetProximity.py
share/qgis/python/plugins/GdalTools/tools/ui_widgetRasterize.py
share/qgis/python/plugins/GdalTools/tools/ui_widgetSieve.py
+share/qgis/python/plugins/GdalTools/tools/ui_widgetTileIndex.py
share/qgis/python/plugins/GdalTools/tools/ui_widgetTranslate.py
share/qgis/python/plugins/GdalTools/tools/ui_widgetWarp.py
share/qgis/python/plugins/GdalTools/tools/widgetBatchBase.py
share/qgis/python/plugins/GdalTools/tools/widgetPluginBase.py
share/qgis/python/plugins/fTools/
share/qgis/python/plugins/fTools/__init__.py
-share/qgis/python/plugins/fTools/doAbout.py
share/qgis/python/plugins/fTools/fTools.py
-share/qgis/python/plugins/fTools/ftools_help.xml
-share/qgis/python/plugins/fTools/ftools_help.xsl
share/qgis/python/plugins/fTools/icons/
share/qgis/python/plugins/fTools/icons/default/
share/qgis/python/plugins/fTools/icons/default/analysis.png
@@ -423,7 +440,9 @@
share/qgis/python/plugins/fTools/icons/gis/union.png
share/qgis/python/plugins/fTools/icons/gis/unique.png
share/qgis/python/plugins/fTools/icons/gis/vector_grid.png
+share/qgis/python/plugins/fTools/icons/gis/voronoi.png
share/qgis/python/plugins/fTools/icons/logo.svg
+share/qgis/python/plugins/fTools/icons/logo_small.png
share/qgis/python/plugins/fTools/icons/menu_icons.svg
share/qgis/python/plugins/fTools/resources_rc.py
share/qgis/python/plugins/fTools/tools/
@@ -431,28 +450,26 @@
share/qgis/python/plugins/fTools/tools/doGeometry.py
share/qgis/python/plugins/fTools/tools/doGeoprocessing.py
share/qgis/python/plugins/fTools/tools/doIntersectLines.py
-share/qgis/python/plugins/fTools/tools/doJoinAttributes.py
share/qgis/python/plugins/fTools/tools/doMeanCoords.py
share/qgis/python/plugins/fTools/tools/doMergeShapes.py
share/qgis/python/plugins/fTools/tools/doPointDistance.py
share/qgis/python/plugins/fTools/tools/doPointsInPolygon.py
share/qgis/python/plugins/fTools/tools/doRandPoints.py
share/qgis/python/plugins/fTools/tools/doRandom.py
-share/qgis/python/plugins/fTools/tools/doReProject.py
share/qgis/python/plugins/fTools/tools/doRegPoints.py
share/qgis/python/plugins/fTools/tools/doSelectByLocation.py
+share/qgis/python/plugins/fTools/tools/doSimplify.py
share/qgis/python/plugins/fTools/tools/doSpatialJoin.py
share/qgis/python/plugins/fTools/tools/doSubsetSelect.py
share/qgis/python/plugins/fTools/tools/doSumLines.py
+share/qgis/python/plugins/fTools/tools/doValidate.py
share/qgis/python/plugins/fTools/tools/doVectorGrid.py
share/qgis/python/plugins/fTools/tools/doVectorSplit.py
share/qgis/python/plugins/fTools/tools/doVisual.py
share/qgis/python/plugins/fTools/tools/ftools_utils.py
-share/qgis/python/plugins/fTools/tools/ui_frmAbout.py
share/qgis/python/plugins/fTools/tools/ui_frmGeometry.py
share/qgis/python/plugins/fTools/tools/ui_frmGeoprocessing.py
share/qgis/python/plugins/fTools/tools/ui_frmIntersectLines.py
-share/qgis/python/plugins/fTools/tools/ui_frmJoinAttributes.py
share/qgis/python/plugins/fTools/tools/ui_frmMeanCoords.py
share/qgis/python/plugins/fTools/tools/ui_frmMergeShapes.py
share/qgis/python/plugins/fTools/tools/ui_frmPointDistance.py
@@ -461,6 +478,7 @@
share/qgis/python/plugins/fTools/tools/ui_frmRandom.py
share/qgis/python/plugins/fTools/tools/ui_frmReProject.py
share/qgis/python/plugins/fTools/tools/ui_frmRegPoints.py
+share/qgis/python/plugins/fTools/tools/ui_frmSimplify.py
share/qgis/python/plugins/fTools/tools/ui_frmSpatialJoin.py
share/qgis/python/plugins/fTools/tools/ui_frmSubsetSelect.py
share/qgis/python/plugins/fTools/tools/ui_frmSumLines.py
@@ -468,7 +486,6 @@
share/qgis/python/plugins/fTools/tools/ui_frmVectorSplit.py
share/qgis/python/plugins/fTools/tools/ui_frmVisual.py
share/qgis/python/plugins/fTools/tools/voronoi.py
-share/qgis/python/plugins/fTools/ui_frmAbout.py
share/qgis/python/plugins/mapserver_export/
share/qgis/python/plugins/mapserver_export/__init__.py
share/qgis/python/plugins/mapserver_export/mapserver_export.png
@@ -529,6 +546,11 @@
share/qgis/python/plugins/plugin_installer/ui_qgsplugininstallerrepositorybase.py
share/qgis/python/plugins/plugin_installer/unzip.py
share/qgis/python/plugins/plugin_installer/version_compare.py
+share/qgis/python/pyspatialite/
+share/qgis/python/pyspatialite/__init__.py
+share/qgis/python/pyspatialite/_spatialite.so
+share/qgis/python/pyspatialite/dbapi2.py
+share/qgis/python/pyspatialite/dump.py
share/qgis/python/qgis/
share/qgis/python/qgis/__init__.py
share/qgis/python/qgis/__init__.pyc
@@ -607,6 +629,9 @@
share/qgis/resources/context_help/QgsDelimitedTextPluginGui-ru_RU
share/qgis/resources/context_help/QgsDelimitedTextPluginGui-sk_SK
share/qgis/resources/context_help/QgsDelimitedTextPluginGui-sv_SE
+share/qgis/resources/context_help/QgsFieldCalculator-de_DE
+share/qgis/resources/context_help/QgsFieldCalculator-en_US
+share/qgis/resources/context_help/QgsFieldCalculator-fr_FR
share/qgis/resources/context_help/QgsGPSPluginGui-de_DE
share/qgis/resources/context_help/QgsGPSPluginGui-en_US
share/qgis/resources/context_help/QgsGPSPluginGui-it_IT
@@ -625,13 +650,10 @@
share/qgis/resources/context_help/QgsIdentifyResults-ru_RU
share/qgis/resources/context_help/QgsIdentifyResults-sk_SK
share/qgis/resources/context_help/QgsIdentifyResults-sv_SE
-share/qgis/resources/context_help/QgsMapserverExport-es_ES
-share/qgis/resources/context_help/QgsMapserverExport-pt_BR
-share/qgis/resources/context_help/QgsMapserverExport-ru_RU
-share/qgis/resources/context_help/QgsMapserverExport-sk_SK
share/qgis/resources/context_help/QgsMeasureDialog-de_DE
share/qgis/resources/context_help/QgsMeasureDialog-en_US
share/qgis/resources/context_help/QgsMeasureDialog-es_ES
+share/qgis/resources/context_help/QgsMeasureDialog-fr_FR
share/qgis/resources/context_help/QgsMeasureDialog-it_IT
share/qgis/resources/context_help/QgsMeasureDialog-ja_JP
share/qgis/resources/context_help/QgsMeasureDialog-pl_PL
@@ -642,6 +664,7 @@
share/qgis/resources/context_help/QgsNewConnection-de_DE
share/qgis/resources/context_help/QgsNewConnection-en_US
share/qgis/resources/context_help/QgsNewConnection-es_ES
+share/qgis/resources/context_help/QgsNewConnection-fr_FR
share/qgis/resources/context_help/QgsNewConnection-it_IT
share/qgis/resources/context_help/QgsNewConnection-ja_JP
share/qgis/resources/context_help/QgsNewConnection-pl_PL
@@ -649,15 +672,17 @@
share/qgis/resources/context_help/QgsNewConnection-ru_RU
share/qgis/resources/context_help/QgsNewConnection-sk_SK
share/qgis/resources/context_help/QgsNewConnection-sv_SE
-share/qgis/resources/context_help/QgsNewHttpConnection-pt_BR
share/qgis/resources/context_help/QgsNewOgrConnection-de_DE
share/qgis/resources/context_help/QgsNewOgrConnection-en_US
+share/qgis/resources/context_help/QgsNewOgrConnection-fr_FR
share/qgis/resources/context_help/QgsNewOgrConnection-it_IT
share/qgis/resources/context_help/QgsNewOgrConnection-ja_JP
share/qgis/resources/context_help/QgsNewOgrConnection-pt_BR
share/qgis/resources/context_help/QgsNewOgrConnection-ru_RU
share/qgis/resources/context_help/QgsNewSpatialiteLayerDialog-de_DE
share/qgis/resources/context_help/QgsNewSpatialiteLayerDialog-en_US
+share/qgis/resources/context_help/QgsNewSpatialiteLayerDialog-es_ES
+share/qgis/resources/context_help/QgsNewSpatialiteLayerDialog-fr_FR
share/qgis/resources/context_help/QgsNewSpatialiteLayerDialog-ja_JP
share/qgis/resources/context_help/QgsNewSpatialiteLayerDialog-pt_BR
share/qgis/resources/context_help/QgsNewVectorLayerDialog-de_DE
@@ -670,22 +695,26 @@
share/qgis/resources/context_help/QgsNewVectorLayerDialog-sk_SK
share/qgis/resources/context_help/QgsNorthArrowPluginGui-de_DE
share/qgis/resources/context_help/QgsNorthArrowPluginGui-en_US
+share/qgis/resources/context_help/QgsNorthArrowPluginGui-fr_FR
share/qgis/resources/context_help/QgsNorthArrowPluginGui-it_IT
share/qgis/resources/context_help/QgsNorthArrowPluginGui-ja_JP
share/qgis/resources/context_help/QgsNorthArrowPluginGui-pt_BR
share/qgis/resources/context_help/QgsOpenVectorLayerDialog-de_DE
share/qgis/resources/context_help/QgsOpenVectorLayerDialog-en_US
+share/qgis/resources/context_help/QgsOpenVectorLayerDialog-fr_FR
share/qgis/resources/context_help/QgsOpenVectorLayerDialog-it_IT
share/qgis/resources/context_help/QgsOpenVectorLayerDialog-ja_JP
share/qgis/resources/context_help/QgsOpenVectorLayerDialog-pt_BR
share/qgis/resources/context_help/QgsOpenVectorLayerDialog-ru_RU
share/qgis/resources/context_help/QgsOptions-de_DE
share/qgis/resources/context_help/QgsOptions-en_US
+share/qgis/resources/context_help/QgsOptions-fr_FR
share/qgis/resources/context_help/QgsOptions-it_IT
share/qgis/resources/context_help/QgsOptions-ja_JP
share/qgis/resources/context_help/QgsOptions-pt_BR
share/qgis/resources/context_help/QgsPgSourceSelect-de_DE
share/qgis/resources/context_help/QgsPgSourceSelect-en_US
+share/qgis/resources/context_help/QgsPgSourceSelect-fr_FR
share/qgis/resources/context_help/QgsPgSourceSelect-it_IT
share/qgis/resources/context_help/QgsPgSourceSelect-ja_JP
share/qgis/resources/context_help/QgsPgSourceSelect-pl_PL
@@ -695,6 +724,7 @@
share/qgis/resources/context_help/QgsPgSourceSelect-sv_SE
share/qgis/resources/context_help/QgsPluginInstallerDialog-de_DE
share/qgis/resources/context_help/QgsPluginInstallerDialog-en_US
+share/qgis/resources/context_help/QgsPluginInstallerDialog-fr_FR
share/qgis/resources/context_help/QgsPluginInstallerDialog-it_IT
share/qgis/resources/context_help/QgsPluginInstallerDialog-ja_JP
share/qgis/resources/context_help/QgsPluginInstallerDialog-pl_PL
@@ -702,6 +732,7 @@
share/qgis/resources/context_help/QgsProjectProperties-de_DE
share/qgis/resources/context_help/QgsProjectProperties-en_US
share/qgis/resources/context_help/QgsProjectProperties-es_ES
+share/qgis/resources/context_help/QgsProjectProperties-fr_FR
share/qgis/resources/context_help/QgsProjectProperties-it_IT
share/qgis/resources/context_help/QgsProjectProperties-ja_JP
share/qgis/resources/context_help/QgsProjectProperties-pl_PL
@@ -711,12 +742,15 @@
share/qgis/resources/context_help/QgsProjectProperties-sv_SE
share/qgis/resources/context_help/QgsScaleBarPluginGui-de_DE
share/qgis/resources/context_help/QgsScaleBarPluginGui-en_US
+share/qgis/resources/context_help/QgsScaleBarPluginGui-es_ES
+share/qgis/resources/context_help/QgsScaleBarPluginGui-fr_FR
share/qgis/resources/context_help/QgsScaleBarPluginGui-it_IT
share/qgis/resources/context_help/QgsScaleBarPluginGui-ja_JP
share/qgis/resources/context_help/QgsScaleBarPluginGui-pl_PL
share/qgis/resources/context_help/QgsScaleBarPluginGui-pt_BR
share/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-de_DE
share/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-en_US
+share/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-fr_FR
share/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-it_IT
share/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-ja_JP
share/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-pl_PL
@@ -729,6 +763,7 @@
share/qgis/resources/context_help/QgsVectorLayerProperties-de_DE
share/qgis/resources/context_help/QgsVectorLayerProperties-en_US
share/qgis/resources/context_help/QgsVectorLayerProperties-es_ES
+share/qgis/resources/context_help/QgsVectorLayerProperties-fr_FR
share/qgis/resources/context_help/QgsVectorLayerProperties-it_IT
share/qgis/resources/context_help/QgsVectorLayerProperties-ja_JP
share/qgis/resources/context_help/QgsVectorLayerProperties-pl_PL
@@ -739,6 +774,7 @@
share/qgis/resources/context_help/QgsVectorLayerSaveAsDialog-en_US
share/qgis/resources/context_help/QgsWMSSourceSelect-de_DE
share/qgis/resources/context_help/QgsWMSSourceSelect-en_US
+share/qgis/resources/context_help/QgsWMSSourceSelect-fr_FR
share/qgis/resources/context_help/QgsWMSSourceSelect-it_IT
share/qgis/resources/context_help/QgsWMSSourceSelect-ja_JP
share/qgis/resources/context_help/QgsWMSSourceSelect-pl_PL
@@ -746,6 +782,20 @@
share/qgis/resources/context_help/QgsWMSSourceSelect-ru_RU
share/qgis/resources/context_help/QgsWMSSourceSelect-sk_SK
share/qgis/resources/context_help/QgsWMSSourceSelect-sv_SE
+share/qgis/resources/context_help/RgSettingsDlg-de_DE
+share/qgis/resources/context_help/RgSettingsDlg-en_US
+share/qgis/resources/context_help/RgSettingsDlg-fr_FR
+share/qgis/resources/context_help/RgSettingsDlg-ru_RU
+share/qgis/resources/context_help/RgShortestPathWidget-de_DE
+share/qgis/resources/context_help/RgShortestPathWidget-en_US
+share/qgis/resources/context_help/RgShortestPathWidget-fr_FR
+share/qgis/resources/context_help/RgShortestPathWidget-ru_RU
+share/qgis/resources/context_help/SaNewConnection-de_DE
+share/qgis/resources/context_help/SaNewConnection-en_US
+share/qgis/resources/context_help/SaNewConnection-fr_FR
+share/qgis/resources/context_help/SaSourceSelect-de_DE
+share/qgis/resources/context_help/SaSourceSelect-en_US
+share/qgis/resources/context_help/SaSourceSelect-fr_FR
share/qgis/resources/context_help/eVisDatabaseConnectionGui-de_DE
share/qgis/resources/context_help/eVisDatabaseConnectionGui-en_US
share/qgis/resources/context_help/eVisDatabaseConnectionGui-es_ES
@@ -1121,5 +1171,6 @@
share/qgis/svg/transport/transport_train_station.svg
share/qgis/svg/transport/transport_train_station2.svg
share/qgis/svg/transport/transport_tram_stop.svg
+share/qgis/wms_metadata.xml
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
