summaryrefslogtreecommitdiff
path: root/geography/qgis/patches
diff options
context:
space:
mode:
Diffstat (limited to 'geography/qgis/patches')
-rw-r--r--geography/qgis/patches/patch-CMakeLists.txt67
-rw-r--r--geography/qgis/patches/patch-ab13
-rw-r--r--geography/qgis/patches/patch-ac13
-rw-r--r--geography/qgis/patches/patch-ad8
-rw-r--r--geography/qgis/patches/patch-al6
-rw-r--r--geography/qgis/patches/patch-am10
-rw-r--r--geography/qgis/patches/patch-cmake_FindGEOS.cmake33
-rw-r--r--geography/qgis/patches/patch-python_core_sipcorepart1.cpp24
-rw-r--r--geography/qgis/patches/patch-python_core_sipcorepart3.cpp15
-rw-r--r--geography/qgis/patches/patch-src_app_CMakeLists.txt20
-rw-r--r--geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h24
-rw-r--r--geography/qgis/patches/patch-src_core_spatialite_spatialite.c21
-rw-r--r--geography/qgis/patches/patch-src_helpviewer_CMakeLists.txt28
13 files changed, 244 insertions, 38 deletions
diff --git a/geography/qgis/patches/patch-CMakeLists.txt b/geography/qgis/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..d103ee8dd19
--- /dev/null
+++ b/geography/qgis/patches/patch-CMakeLists.txt
@@ -0,0 +1,67 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Avoid application bundle on Mac OS X.
+
+--- CMakeLists.txt.orig 2011-12-10 18:23:35.000000000 +0000
++++ CMakeLists.txt
+@@ -5,11 +5,7 @@ SET(COMPLETE_VERSION ${CPACK_PACKAGE_VER
+ SET(RELEASE_NAME "Wroclaw")
+ SET(PROJECT_VERSION ${COMPLETE_VERSION})
+ PROJECT(qgis${PROJECT_VERSION})
+-IF (APPLE)
+- SET(QGIS_APP_NAME "QGIS")
+-ELSE (APPLE)
+- SET(QGIS_APP_NAME "qgis")
+-ENDIF (APPLE)
++SET(QGIS_APP_NAME "qgis")
+
+ # Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0
+ MATH(EXPR QGIS_VERSION_INT "${CPACK_PACKAGE_VERSION_MAJOR}*10000+${CPACK_PACKAGE_VERSION_MINOR}*100+${CPACK_PACKAGE_VERSION_PATCH}")
+@@ -286,10 +282,9 @@ ELSE (WIN32)
+
+ IF (APPLE)
+ # for Mac OS X, everything is put inside an application bundle
+- SET (QGIS_MACAPP_PREFIX ${CMAKE_INSTALL_PREFIX}/${QGIS_APP_NAME}.app/Contents)
+- SET (CMAKE_INSTALL_PREFIX ${QGIS_MACAPP_PREFIX}/MacOS)
+ # path for library references
+- SET (CMAKE_INSTALL_NAME_DIR @executable_path/lib)
++ #SET (CMAKE_INSTALL_PREFIX bin)
++ #SET (CMAKE_INSTALL_NAME_DIR @executable_path/lib)
+ # 4 bundling levels, each includes previous
+ # 0 nothing
+ # 1 Qt frameworks
+@@ -306,19 +301,11 @@ ELSE (WIN32)
+ FIND_LIBRARY(APP_SERVICES_LIBRARY ApplicationServices )
+
+ SET (DEFAULT_BIN_SUBDIR bin)
+- SET (QGIS_BIN_SUBDIR_REV ..)
+- SET (DEFAULT_CGIBIN_SUBDIR fcgi-bin)
+- SET (QGIS_CGIBIN_SUBDIR_REV ..)
++ SET (DEFAULT_CGIBIN_SUBDIR bin)
+ SET (DEFAULT_LIB_SUBDIR lib)
+- SET (QGIS_LIB_SUBDIR_REV ..)
+- SET (QGIS_FW_SUBDIR ../Frameworks)
+- SET (QGIS_FW_SUBDIR_REV ../MacOS)
+- SET (DEFAULT_DATA_SUBDIR ../Resources)
+- SET (QGIS_DATA_SUBDIR_REV ../MacOS)
+ SET (DEFAULT_LIBEXEC_SUBDIR lib/qgis)
+- SET (QGIS_LIBEXEC_SUBDIR_REV ../..)
+- SET (DEFAULT_PLUGIN_SUBDIR ../PlugIns/qgis)
+- SET (QGIS_PLUGIN_SUBDIR_REV ../../MacOS)
++ SET (DEFAULT_DATA_SUBDIR share/qgis)
++ SET (DEFAULT_PLUGIN_SUBDIR lib/qgis/plugins)
+ SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
+
+ ELSE (APPLE)
+@@ -500,9 +487,9 @@ IF (APPLE)
+ ENDIF (APPLE)
+
+ # manual page - makes sense only on unix systems
+-IF (UNIX AND NOT APPLE)
++IF (UNIX)
+ INSTALL (FILES qgis.1 DESTINATION ${QGIS_MANUAL_DIR}/man1)
+-ENDIF (UNIX AND NOT APPLE)
++ENDIF (UNIX)
+
+ INSTALL(FILES cmake/FindQGIS.cmake DESTINATION ${QGIS_DATA_DIR})
+
diff --git a/geography/qgis/patches/patch-ab b/geography/qgis/patches/patch-ab
deleted file mode 100644
index f01efed6ea2..00000000000
--- a/geography/qgis/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
-
---- src/analysis/interpolation/qgsinterpolator.cpp.orig 2009-12-14 12:39:35.000000000 +0000
-+++ src/analysis/interpolation/qgsinterpolator.cpp
-@@ -92,7 +92,7 @@ int QgsInterpolator::cacheBaseData()
- continue;
- }
- attributeValue = att_it.value().toDouble( &attributeConversionOk );
-- if ( !attributeConversionOk || isnan( attributeValue ) ) //don't consider vertices with attributes like 'nan' for the interpolation
-+ if ( !attributeConversionOk || isnanf( attributeValue ) ) //don't consider vertices with attributes like 'nan' for the interpolation
- {
- continue;
- }
diff --git a/geography/qgis/patches/patch-ac b/geography/qgis/patches/patch-ac
deleted file mode 100644
index f986743ab9c..00000000000
--- a/geography/qgis/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
-
---- src/analysis/interpolation/qgstininterpolator.cpp.orig 2009-11-22 14:41:00.000000000 +0000
-+++ src/analysis/interpolation/qgstininterpolator.cpp
-@@ -195,7 +195,7 @@ int QgsTINInterpolator::insertData( QgsF
- return 3;
- }
- attributeValue = att_it.value().toDouble( &attributeConversionOk );
-- if ( !attributeConversionOk || isnan( attributeValue ) ) //don't consider vertices with attributes like 'nan' for the interpolation
-+ if ( !attributeConversionOk || isnanf( attributeValue ) ) //don't consider vertices with attributes like 'nan' for the interpolation
- {
- return 4;
- }
diff --git a/geography/qgis/patches/patch-ad b/geography/qgis/patches/patch-ad
index a27c9554364..1a76ae4fa26 100644
--- a/geography/qgis/patches/patch-ad
+++ b/geography/qgis/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
+$NetBSD: patch-ad,v 1.2 2012/01/23 08:58:00 adam Exp $
---- src/plugins/grass/qtermwidget/kpty.cpp.orig 2009-12-31 06:59:10.000000000 +0000
+--- src/plugins/grass/qtermwidget/kpty.cpp.orig 2011-06-05 11:59:48.000000000 +0000
+++ src/plugins/grass/qtermwidget/kpty.cpp
-@@ -61,6 +61,8 @@
+@@ -66,6 +66,8 @@
#include <unistd.h>
#include <grp.h>
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
#if defined(HAVE_PTY_H)
# include <pty.h>
#endif
-@@ -565,7 +567,7 @@ void KPty::logout()
+@@ -570,7 +572,7 @@ void KPty::logout()
ut->ut_type = DEAD_PROCESS;
# endif
# ifdef HAVE_UTMPX
diff --git a/geography/qgis/patches/patch-al b/geography/qgis/patches/patch-al
index 65c644d8753..6f25757c997 100644
--- a/geography/qgis/patches/patch-al
+++ b/geography/qgis/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
+$NetBSD: patch-al,v 1.2 2012/01/23 08:58:00 adam Exp $
---- src/plugins/grass/CMakeLists.txt.orig 2009-12-03 09:13:55.000000000 +0000
+--- src/plugins/grass/CMakeLists.txt.orig 2011-06-05 11:59:48.000000000 +0000
+++ src/plugins/grass/CMakeLists.txt
-@@ -147,6 +147,10 @@ INCLUDE_DIRECTORIES(
+@@ -137,6 +137,10 @@ INCLUDE_DIRECTORIES(
qtermwidget
)
diff --git a/geography/qgis/patches/patch-am b/geography/qgis/patches/patch-am
index 68b704b06ea..3331d0dbca6 100644
--- a/geography/qgis/patches/patch-am
+++ b/geography/qgis/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
+$NetBSD: patch-am,v 1.2 2012/01/23 08:58:00 adam Exp $
---- src/providers/grass/CMakeLists.txt.orig 2009-11-28 16:02:15.000000000 +0000
+--- src/providers/grass/CMakeLists.txt.orig 2011-06-05 11:59:48.000000000 +0000
+++ src/providers/grass/CMakeLists.txt
-@@ -27,6 +27,7 @@ IF (WIN32)
+@@ -34,6 +34,7 @@ IF (WIN32)
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllexport)\"" )
ELSE (WIN32)
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES COMPILE_FLAGS "-DGRASS_EXPORT=" )
@@ -10,8 +10,8 @@ $NetBSD: patch-am,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
ENDIF (WIN32)
TARGET_LINK_LIBRARIES (qgisgrass
-@@ -48,6 +49,7 @@ IF (WIN32)
- SET_TARGET_PROPERTIES(grassprovider PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllimport)\"" )
+@@ -55,6 +56,7 @@ IF (WIN32)
+ SET_TARGET_PROPERTIES(grassprovider PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllexport)\"" )
ELSE (WIN32)
SET_TARGET_PROPERTIES(grassprovider PROPERTIES COMPILE_FLAGS "-DGRASS_EXPORT=" )
+ SET_TARGET_PROPERTIES(grassprovider PROPERTIES LINK_FLAGS "-L${GRASS_PREFIX}/lib -Wl,-rpath,${GRASS_PREFIX}/lib")
diff --git a/geography/qgis/patches/patch-cmake_FindGEOS.cmake b/geography/qgis/patches/patch-cmake_FindGEOS.cmake
new file mode 100644
index 00000000000..f084a37967f
--- /dev/null
+++ b/geography/qgis/patches/patch-cmake_FindGEOS.cmake
@@ -0,0 +1,33 @@
+$NetBSD: patch-cmake_FindGEOS.cmake,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Avoid application bundles.
+
+--- cmake/FindGEOS.cmake.orig 2011-06-07 06:45:26.000000000 +0000
++++ cmake/FindGEOS.cmake
+@@ -45,7 +45,7 @@ ELSE(WIN32)
+
+ # try to use framework on mac
+ # want clean framework path, not unix compatibility path
+- IF (APPLE)
++ IF (ELPPA)
+ IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
+ OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
+ OR NOT CMAKE_FIND_FRAMEWORK)
+@@ -70,7 +70,7 @@ ELSE(WIN32)
+ ENDIF (GEOS_LIBRARY)
+ SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
+ ENDIF ()
+- ENDIF (APPLE)
++ ENDIF (ELPPA)
+
+ IF (NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
+ # didn't find OS X framework, and was not set by user
+@@ -114,7 +114,7 @@ ELSE(WIN32)
+ ## split off the link dirs (for rpath)
+ ## use regular expression to match wildcard equivalent "-L*<endchar>"
+ ## with <endchar> is a space or a semicolon
+- STRING(REGEX MATCHALL "[-][L]([^ ;])+"
++ STRING(REGEX MATCH "[-][L]([^ ;])+"
+ GEOS_LINK_DIRECTORIES_WITH_PREFIX
+ "${GEOS_CONFIG_LIBS}" )
+ #MESSAGE("DBG GEOS_LINK_DIRECTORIES_WITH_PREFIX=${GEOS_LINK_DIRECTORIES_WITH_PREFIX}")
diff --git a/geography/qgis/patches/patch-python_core_sipcorepart1.cpp b/geography/qgis/patches/patch-python_core_sipcorepart1.cpp
new file mode 100644
index 00000000000..6ca56c4df05
--- /dev/null
+++ b/geography/qgis/patches/patch-python_core_sipcorepart1.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-python_core_sipcorepart1.cpp,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Fix C++ errors.
+
+--- python/core/sipcorepart1.cpp.orig 2012-01-23 06:43:32.000000000 +0000
++++ python/core/sipcorepart1.cpp
+@@ -6661,7 +6661,7 @@ static PyObject *meth_QgsSymbolV2_render
+ PyObject *sipParseErr = NULL;
+
+ {
+- const QgsSymbolV2 *sipCpp;
++ QgsSymbolV2 *sipCpp;
+
+ if (sipParseArgs(&sipParseErr, sipArgs, "B", &sipSelf, sipType_QgsSymbolV2, &sipCpp))
+ {
+@@ -7061,7 +7061,7 @@ static PyObject *meth_QgsSymbolV2RenderC
+
+ {
+ bool a0;
+- const QgsSymbolV2RenderContext *sipCpp;
++ QgsSymbolV2RenderContext *sipCpp;
+
+ if (sipParseArgs(&sipParseErr, sipArgs, "Bb", &sipSelf, sipType_QgsSymbolV2RenderContext, &sipCpp, &a0))
+ {
diff --git a/geography/qgis/patches/patch-python_core_sipcorepart3.cpp b/geography/qgis/patches/patch-python_core_sipcorepart3.cpp
new file mode 100644
index 00000000000..9205f6b7608
--- /dev/null
+++ b/geography/qgis/patches/patch-python_core_sipcorepart3.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-python_core_sipcorepart3.cpp,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Fix C++ errors.
+
+--- python/core/sipcorepart3.cpp.orig 2012-01-23 06:46:18.000000000 +0000
++++ python/core/sipcorepart3.cpp
+@@ -2968,7 +2968,7 @@ static PyObject *meth_QgsMapLayer_writeX
+ {
+ QDomNode * a0;
+ QDomDocument * a1;
+- const QgsMapLayer *sipCpp;
++ QgsMapLayer *sipCpp;
+
+ if (sipParseArgs(&sipParseErr, sipArgs, "BJ9J9", &sipSelf, sipType_QgsMapLayer, &sipCpp, sipType_QDomNode, &a0, sipType_QDomDocument, &a1))
+ {
diff --git a/geography/qgis/patches/patch-src_app_CMakeLists.txt b/geography/qgis/patches/patch-src_app_CMakeLists.txt
new file mode 100644
index 00000000000..fd8894eda67
--- /dev/null
+++ b/geography/qgis/patches/patch-src_app_CMakeLists.txt
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_app_CMakeLists.txt,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Avoid application bundle on Mac OS X.
+
+--- src/app/CMakeLists.txt.orig 2012-01-21 19:36:22.000000000 +0000
++++ src/app/CMakeLists.txt
+@@ -446,12 +446,7 @@ IF (SPATIALITE_FOUND)
+ TARGET_LINK_LIBRARIES (${QGIS_APP_NAME} ${SPATIALITE_LIBRARY})
+ ENDIF (SPATIALITE_FOUND)
+
+-IF (APPLE)
+- # For Mac OS X, the executable must be at the root of the bundle's executable folder
+- INSTALL(TARGETS ${QGIS_APP_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+-ELSE (APPLE)
+- INSTALL(TARGETS ${QGIS_APP_NAME} RUNTIME DESTINATION ${QGIS_BIN_DIR})
+-ENDIF (APPLE)
++INSTALL(TARGETS ${QGIS_APP_NAME} RUNTIME DESTINATION ${QGIS_BIN_DIR})
+
+ IF(MSVC)
+ INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
diff --git a/geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h b/geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h
new file mode 100644
index 00000000000..4ab1814ba91
--- /dev/null
+++ b/geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_core_spatialindex_include_Tools.h,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Fix building with Clang.
+
+--- src/core/spatialindex/include/Tools.h.orig 2011-06-07 07:42:08.000000000 +0000
++++ src/core/spatialindex/include/Tools.h
+@@ -407,7 +407,7 @@ namespace Tools
+ private:
+ std::map<std::string, Variant> m_propertySet;
+
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__clang__)
+ // MSVC's friend function syntax differs slightly from everyone elses:
+ // don't seem to need to qualify function name.
+ friend std::ostream& operator<<(
+@@ -620,7 +620,7 @@ namespace Tools
+ unsigned long long* m_a;
+ unsigned long m_k;
+
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__clang__)
+ // MSVC's friend function syntax differs slightly from everyone elses
+ // don't seem to need to qualify function name.
+ friend std::ostream& operator<<(
diff --git a/geography/qgis/patches/patch-src_core_spatialite_spatialite.c b/geography/qgis/patches/patch-src_core_spatialite_spatialite.c
new file mode 100644
index 00000000000..459f1292b69
--- /dev/null
+++ b/geography/qgis/patches/patch-src_core_spatialite_spatialite.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_core_spatialite_spatialite.c,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Fix types.
+
+--- src/core/spatialite/spatialite.c.orig 2011-06-07 07:44:51.000000000 +0000
++++ src/core/spatialite/spatialite.c
+@@ -57583,11 +57583,11 @@ Parse (void *yyp, /* The parser */
+
+ /* #include <inttypes.h> */
+ typedef int8_t flex_int8_t;
+-typedef uint8_t flex_uint8_t;
++typedef u_int8_t flex_uint8_t;
+ typedef int16_t flex_int16_t;
+-typedef uint16_t flex_uint16_t;
++typedef u_int16_t flex_uint16_t;
+ typedef int32_t flex_int32_t;
+-typedef uint32_t flex_uint32_t;
++typedef u_int32_t flex_uint32_t;
+ #else
+ typedef signed char flex_int8_t;
+ typedef short int flex_int16_t;
diff --git a/geography/qgis/patches/patch-src_helpviewer_CMakeLists.txt b/geography/qgis/patches/patch-src_helpviewer_CMakeLists.txt
new file mode 100644
index 00000000000..90e7745f21e
--- /dev/null
+++ b/geography/qgis/patches/patch-src_helpviewer_CMakeLists.txt
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_helpviewer_CMakeLists.txt,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Avoid application bundle on Mac OS X.
+
+--- src/helpviewer/CMakeLists.txt.orig 2011-12-10 18:23:35.000000000 +0000
++++ src/helpviewer/CMakeLists.txt
+@@ -54,7 +54,7 @@ QT4_WRAP_CPP (HELP_MOC_SRCS ${HELP_MOC_
+
+ #QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
+
+-ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
++ADD_EXECUTABLE (qgis_help ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../core
+@@ -97,11 +97,4 @@ SET_TARGET_PROPERTIES(qgis_help PROPERTI
+ ########################################################
+ # Install
+
+-IF (APPLE)
+- INSTALL (TARGETS qgis_help BUNDLE DESTINATION ${QGIS_BIN_DIR})
+- # needed because global install_name prefix is for main qgis app
+- INSTALL (CODE "EXECUTE_PROCESS(COMMAND install_name_tool -change ${CMAKE_INSTALL_NAME_DIR}/libqgis_core.${COMPLETE_VERSION}.dylib @executable_path/../../../../lib/libqgis_core.${COMPLETE_VERSION}.dylib \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/qgis_help.app/Contents/MacOS/qgis_help\")")
+- INSTALL (CODE "EXECUTE_PROCESS (COMMAND ln -sfh ../../../${QGIS_FW_SUBDIR} \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/qgis_help.app/Contents/Frameworks\")")
+-ELSE (APPLE)
+- INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR})
+-ENDIF (APPLE)
++INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR})
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 17:35:22 +0000