cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Long awaited update to QGIS 2.4.0.

Browse Source 
Since 1.8, QGIS requires bison > 2.4 at build time, but since noone
cares enough our bison is still stuck at 2.3. To workaround this,
add the parsers generated with a WIP bison 2.6.2 to files/, and comment
out the Cmake goo to call/detect bison.

Add patches from http://hub.qgis.org/issues/10762.

I've used QGIS 1.8, 2.0, 2.2 and 2.4 without issues since > 2 years.
This commit is contained in:
landry 2014-08-20 08:54:45 +00:00
parent 473b56742d
commit c7bf069305
38 changed files with 8903 additions and 701 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
geo/qgis/Makefile
View File

@ -1,22 +1,19 @@
# $OpenBSD: Makefile,v 1.31 2014/08/10 09:58:05 espie Exp $
BROKEN-powerpc= doesn't build, assembler error: operand out of range
# $OpenBSD: Makefile,v 1.32 2014/08/20 08:54:45 landry Exp $
COMMENT = desktop geographical information system
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
SHARED_ONLY = Yes
DISTNAME = qgis-1.7.4
REVISION = 0
DISTNAME = qgis-2.4.0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
SHARED_LIBS = qgis_core 5.1 \
qgis_gui 4.0 \
qgis_analysis 1.3 \
qgispython 1.1 \
qgissqlanyconnection 0.0 # 1.7
SHARED_LIBS = qgis_core 6.0 \
qgis_gui 5.0 \
qgis_analysis 2.0 \
qgispython 2.0 \
qgis_networkanalysis 0.0 \
qgissqlanyconnection 0.0 # 2.0
HOMEPAGE = http://www.qgis.org/
@ -32,11 +29,14 @@ MODULES = devel/cmake \
lang/python
BUILD_DEPENDS = x11/py-qt4>=4.8.4 \
geo/gdal,-python \
devel/bison
geo/gdal,-python
# need to update bison...
# devel/bison>=2.4
RUN_DEPENDS = x11/py-qt4>=4.8.4 \
geo/gdal,-python \
databases/py-psycopg2 \
devel/desktop-file-utils
LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
@ -46,28 +46,35 @@ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
www/fcgi \
geo/gdal \
geo/geos \
geo/spatialite/libspatialite \
geo/spatialindex \
devel/gsl \
databases/postgresql
WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat \
fontconfig freetype glib-2.0 gthread-2.0 lcms m \
fontconfig freetype glib-2.0 gobject-2.0 gthread-2.0 lcms m \
mng png pthread util stdc++ z proj \
QtGui QtNetwork QtXml QtSql QtCore QtSvg \
QtWebKit gdal geos_c gsl gslcblas pq qwt fcgi
QtGui QtNetwork QtXml QtSql QtCore QtScript QtSvg \
QtWebKit gdal geos_c gsl gslcblas pq qwt fcgi \
QtTest spatialindex spatialite sqlite3
WANTLIB += ${MODPY_WANTLIB} jpeg tiff
CONFIGURE_ENV+= VERBOSE=1
CONFIGURE_ARGS = -DWITH_MAPSERVER=TRUE
CONFIGURE_ARGS = -DWITH_MAPSERVER=TRUE -DWITH_PYSPATIALITE=TRUE
pre-configure:
# otherwise takes precedence over systemwide file
rm ${WRKSRC}/cmake/FindIconv.cmake
rm -f ${WRKSRC}/cmake/FindIconv.cmake
${SUBST_CMD} ${WRKSRC}/cmake/Find{GDAL,GEOS,Postgres}.cmake
#install bison-2.6-generated files
cp ${FILESDIR}/qgsrastercalcparser.{c,h}pp ${WRKSRC}/src/analysis/raster/
cp ${FILESDIR}/qgsexpressionparser.{c,h}pp ${WRKSRC}/src/core/
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{pixmaps,applications}
ln ${PREFIX}/share/{qgis/images/icons,pixmaps}/qgis-icon.png
${SUBST_DATA} ${WRKSRC}/debian/qgis.desktop \
ln -f ${PREFIX}/share/{qgis/images/icons,pixmaps}/qgis-icon.png
${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
-c ${WRKSRC}/debian/qgis.desktop \
${PREFIX}/share/applications/qgis.desktop
.include <bsd.port.mk>

4
geo/qgis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qgis-1.7.4.tar.bz2) = 4wK9Z2t1Vnam+m2gxBbXNpTsok5nro40u/eNE+47fqY=
SIZE (qgis-1.7.4.tar.bz2) = 25618352
SHA256 (qgis-2.4.0.tar.bz2) = cRt9gd3/RbCDoh8FyKpQk6ajig7kLfzIcyNPzvH83XY=
SIZE (qgis-2.4.0.tar.bz2) = 85228657

2109
geo/qgis/files/qgsexpressionparser.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

129
geo/qgis/files/qgsexpressionparser.hpp Normal file
View File

@ -0,0 +1,129 @@
/* A Bison parser, made by GNU Bison 2.6.2. */
/* Bison interface for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
as a parser skeleton. Alternatively, if you modify or redistribute
the parser skeleton itself, you may (at your option) remove this
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
#ifndef EXP_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP
# define EXP_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
#endif
#if YYDEBUG
extern int exp_debug;
#endif
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
OR = 258,
AND = 259,
EQ = 260,
NE = 261,
LE = 262,
GE = 263,
LT = 264,
GT = 265,
REGEXP = 266,
LIKE = 267,
IS = 268,
PLUS = 269,
MINUS = 270,
MUL = 271,
DIV = 272,
MOD = 273,
CONCAT = 274,
POW = 275,
NOT = 276,
IN = 277,
NUMBER_FLOAT = 278,
NUMBER_INT = 279,
NULLVALUE = 280,
CASE = 281,
WHEN = 282,
THEN = 283,
ELSE = 284,
END = 285,
STRING = 286,
COLUMN_REF = 287,
FUNCTION = 288,
SPECIAL_COL = 289,
COMMA = 290,
Unknown_CHARACTER = 291,
UMINUS = 292
};
#endif
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
/* Line 2049 of yacc.c */
#line 57 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
QgsExpression::Node* node;
QgsExpression::NodeList* nodelist;
double numberFloat;
int numberInt;
QString* text;
QgsExpression::BinaryOperator b_op;
QgsExpression::UnaryOperator u_op;
QgsExpression::WhenThen* whenthen;
QgsExpression::WhenThenList* whenthenlist;
/* Line 2049 of yacc.c */
#line 107 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/core/qgsexpressionparser.hpp"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
#endif
extern YYSTYPE exp_lval;
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int exp_parse (void *YYPARSE_PARAM);
#else
int exp_parse ();
#endif
#else /* ! YYPARSE_PARAM */
#if defined __STDC__ || defined __cplusplus
int exp_parse (void);
#else
int exp_parse ();
#endif
#endif /* ! YYPARSE_PARAM */
#endif /* !EXP_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP */

1857
geo/qgis/files/qgsrastercalcparser.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

93
geo/qgis/files/qgsrastercalcparser.hpp Normal file
View File

@ -0,0 +1,93 @@
/* A Bison parser, made by GNU Bison 2.6.2. */
/* Bison interface for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
as a parser skeleton. Alternatively, if you modify or redistribute
the parser skeleton itself, you may (at your option) remove this
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
#ifndef RASTER_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP
# define RASTER_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
#endif
#if YYDEBUG
extern int rasterdebug;
#endif
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
RASTER_BAND_REF = 258,
NUMBER = 259,
FUNCTION = 260,
AND = 261,
OR = 262,
NE = 263,
GE = 264,
LE = 265,
UMINUS = 266
};
#endif
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
/* Line 2049 of yacc.c */
#line 52 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
QgsRasterCalcNode* node; double number; QgsRasterCalcNode::Operator op;
/* Line 2049 of yacc.c */
#line 71 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/analysis/qgsrastercalcparser.hpp"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
#endif
extern YYSTYPE rasterlval;
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int rasterparse (void *YYPARSE_PARAM);
#else
int rasterparse ();
#endif
#else /* ! YYPARSE_PARAM */
#if defined __STDC__ || defined __cplusplus
int rasterparse (void);
#else
int rasterparse ();
#endif
#endif /* ! YYPARSE_PARAM */
#endif /* !RASTER_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP */

38
geo/qgis/patches/patch-CMakeLists_txt Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-CMakeLists_txt,v 1.7 2014/08/20 08:54:45 landry Exp $
chunk 1: dont look for bison, since >2.4 is required..
chunk 2: http://hub.qgis.org/issues/3999
lots of undefined refs to syms in libc, we dont link shlibs with -lc
--- CMakeLists.txt.orig Fri Jun 27 14:00:08 2014
+++ CMakeLists.txt Mon Aug 18 11:34:39 2014
@@ -141,13 +141,13 @@ IF (NOT FLEX_EXECUTABLE)
MESSAGE(FATAL_ERROR "Couldn't find Flex")
ENDIF (NOT FLEX_EXECUTABLE)
-INCLUDE(Bison)
+#INCLUDE(Bison)
-FIND_BISON()
+#FIND_BISON()
-IF (NOT BISON_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Couldn't find Bison")
-ENDIF (NOT BISON_EXECUTABLE)
+#IF (NOT BISON_EXECUTABLE)
+# MESSAGE(FATAL_ERROR "Couldn't find Bison")
+#ENDIF (NOT BISON_EXECUTABLE)
#############################################################
# search for dependencies
@@ -496,12 +496,6 @@ IF (WIN32)
SET(DLLIMPORT "__declspec(dllimport)")
SET(DLLEXPORT "__declspec(dllexport)")
ELSE (WIN32)
- IF(PEDANTIC AND NOT APPLE)
- SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
- SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
- ENDIF(PEDANTIC AND NOT APPLE)
-
SET(DLLIMPORT "")
SET(DLLEXPORT "")
ENDIF(WIN32)

8
geo/qgis/patches/patch-cmake_FindGDAL_cmake
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.3 2011/07/07 20:34:27 landry Exp $
--- 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)
$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.4 2014/08/20 08:54:45 landry Exp $
--- cmake/FindGDAL.cmake.orig Fri Jun 27 14:00:08 2014
+++ cmake/FindGDAL.cmake Mon Aug 18 15:49:46 2014
@@ -158,7 +158,7 @@ ELSE(WIN32)
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
ENDIF (NOT GDAL_LIBRARY)
ELSE (APPLE)

10
geo/qgis/patches/patch-cmake_FindGEOS_cmake
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.4 2011/07/07 20:34:27 landry Exp $
--- 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)
$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.5 2014/08/20 08:54:45 landry Exp $
--- cmake/FindGEOS.cmake.orig Fri Jun 27 14:00:08 2014
+++ cmake/FindGEOS.cmake Mon Aug 18 15:49:46 2014
@@ -145,7 +145,7 @@ ELSE(WIN32)
SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
ENDIF (NOT GEOS_LIBRARY)
ELSE (APPLE)
@ -9,4 +9,4 @@ $OpenBSD: patch-cmake_FindGEOS_cmake,v 1.4 2011/07/07 20:34:27 landry Exp $
+ FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS ${LOCALBASE}/lib)
ENDIF (APPLE)
#MESSAGE("DBG GEOS_LIBRARY=${GEOS_LIBRARY}")

22
geo/qgis/patches/patch-cmake_FindPostgres_cmake
View File

@ -1,16 +1,12 @@
$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.3 2010/12/08 09:07:48 landry Exp $
--- cmake/FindPostgres.cmake.orig Sat Oct 16 16:52:43 2010
+++ cmake/FindPostgres.cmake Mon Nov 29 17:31:37 2010
@@ -57,11 +57,7 @@ ELSE(WIN32)
EXEC_PROGRAM(${POSTGRES_CONFIG}
ARGS --libdir
OUTPUT_VARIABLE PG_TMP)
- IF (APPLE)
- SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
- ELSE (APPLE)
$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.4 2014/08/20 08:54:45 landry Exp $
--- cmake/FindPostgres.cmake.orig Fri Jun 27 14:00:08 2014
+++ cmake/FindPostgres.cmake Mon Aug 18 15:49:46 2014
@@ -96,7 +96,7 @@ ELSE(WIN32)
ENDFOREACH(_LIBNAME ${_LIBS})
ELSE (CYGWIN)
- SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
- ENDIF (APPLE)
+ FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS ${LOCALBASE}/lib)
+ FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS ${LOCALBASE}/lib)
ENDIF (APPLE)
ENDIF(POSTGRES_CONFIG)
ENDIF(UNIX)

14
geo/qgis/patches/patch-debian_qgis_desktop
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-debian_qgis_desktop,v 1.2 2010/01/11 20:13:31 landry Exp $
--- debian/qgis.desktop.orig Sat Dec 19 17:36:54 2009
+++ debian/qgis.desktop Mon Jan 11 16:39:31 2010
@@ -5,8 +5,8 @@ Version=1.0
GenericName=Geographical Information System
GenericName[de]=Geographisches Informationssystem
Icon=qgis-icon
$OpenBSD: patch-debian_qgis_desktop,v 1.3 2014/08/20 08:54:45 landry Exp $
--- debian/qgis.desktop.orig Fri Jun 27 14:00:08 2014
+++ debian/qgis.desktop Tue Jul 1 08:56:15 2014
@@ -48,8 +48,8 @@ GenericName[tr]=Coğrafi bilgi sistemi
GenericName[uk]=Геоінформаційна система
GenericName[uz]=Geografik axborot tizimi
Icon=qgis
-TryExec=/usr/bin/qgis
-Exec=/usr/bin/qgis %F
+TryExec=${TRUEPREFIX}/bin/qgis

14
geo/qgis/patches/patch-doc_CMakeLists_txt
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.5 2011/12/29 21:44:06 landry Exp $
--- doc/CMakeLists.txt.orig Sat Dec 10 19:23:35 2011
+++ doc/CMakeLists.txt Wed Dec 28 22:24:16 2011
@@ -13,8 +13,8 @@ ENDIF(TXT2TAGS_EXECUTABLE)
$OpenBSD: patch-doc_CMakeLists_txt,v 1.6 2014/08/20 08:54:45 landry Exp $
--- doc/CMakeLists.txt.orig Fri Jun 27 14:00:08 2014
+++ doc/CMakeLists.txt Tue Jul 1 08:54:51 2014
@@ -22,8 +22,8 @@ ENDIF(TXT2TAGS_EXECUTABLE)
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html changelog.html favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENSE)
-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 ../images/icons/qgis-icon-60x60.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)
+INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/../doc/qgis/images)
IF(WITH_APIDOC)
FIND_PACKAGE(Doxygen)

21
geo/qgis/patches/patch-src_analysis_CMakeLists_txt Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_analysis_CMakeLists_txt,v 1.1 2014/08/20 08:54:45 landry Exp $
dont call bison to generate the parser, and build the pregenerated file instead
--- src/analysis/CMakeLists.txt.orig Fri Jun 27 14:00:08 2014
+++ src/analysis/CMakeLists.txt Mon Aug 18 13:32:52 2014
@@ -33,6 +33,7 @@ SET(QGIS_ANALYSIS_SRCS
raster/qgsrelief.cpp
raster/qgsrastercalcnode.cpp
raster/qgsrastercalculator.cpp
+ raster/qgsrastercalcparser.cpp
raster/qgsrastermatrix.cpp
vector/mersenne-twister.cpp
vector/qgsgeometryanalyzer.cpp
@@ -64,7 +65,7 @@ ENDIF (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(BEFORE raster)
ADD_FLEX_FILES_PREFIX(QGIS_ANALYSIS_SRCS raster raster/qgsrastercalclexer.ll)
-ADD_BISON_FILES_PREFIX(QGIS_ANALYSIS_SRCS raster raster/qgsrastercalcparser.yy)
+#ADD_BISON_FILES_PREFIX(QGIS_ANALYSIS_SRCS raster raster/qgsrastercalcparser.yy)
IF (PEDANTIC AND MSVC)
# disable warnings

15
geo/qgis/patches/patch-src_app_attributetable_qgsattributetabledelegate_cpp
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_app_attributetable_qgsattributetabledelegate_cpp,v 1.4 2011/07/07 20:34:27 landry Exp $
Unroll some c++ too violent for g++3.3.
--- 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 );
- QPen p( QBrush( QColor( 0, 255, 127 ) ), 2 );
+ QColor c = QColor( 0, 255, 127 );
+ QBrush b = QBrush( c );
+ QPen p( b, 2 );
painter->save();
painter->setPen( p );
painter->drawRect( r );

12
geo/qgis/patches/patch-src_app_qgisapp_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.3 2012/11/01 07:25:36 landry Exp $
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.4 2014/08/20 08:54:45 landry Exp $
Fix paths to docs
--- src/app/qgisapp.cpp.orig Wed Feb 22 21:48:14 2012
+++ src/app/qgisapp.cpp Wed Oct 31 11:09:36 2012
@@ -855,7 +855,7 @@ void QgisApp::createActions()
--- src/app/qgisapp.cpp.orig Fri Jun 27 14:00:08 2014
+++ src/app/qgisapp.cpp Tue Jul 1 08:53:16 2014
@@ -1247,7 +1247,7 @@ void QgisApp::createActions()
mActionQgisHomePage->setShortcut( QString() );
#endif
@ -11,7 +11,7 @@ Fix paths to docs
connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );
connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );
@@ -4880,7 +4880,7 @@ void QgisApp::helpContents()
@@ -7496,7 +7496,7 @@ void QgisApp::helpContents()
void QgisApp::apiDocumentation()
{
@ -20,7 +20,7 @@ Fix paths to docs
{
openURL( "api/index.html" );
}
@@ -4900,7 +4900,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
@@ -7521,7 +7521,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
// open help in user browser
if ( useQgisDocDirectory )
{

12
geo/qgis/patches/patch-src_app_qgsabout_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_app_qgsabout_cpp,v 1.1 2012/11/01 07:25:36 landry Exp $
--- src/app/qgsabout.cpp.orig Wed Oct 31 15:17:46 2012
+++ src/app/qgsabout.cpp Wed Oct 31 15:18:25 2012
@@ -224,7 +224,7 @@ void QgsAbout::setWhatsNew( )
QString myStyle = QgsApplication::reportStyleSheet();
txtWhatsNew->clear();
txtWhatsNew->document()->setDefaultStyleSheet( myStyle );
- txtWhatsNew->setSource( "file:///" + QgsApplication::pkgDataPath() + "/doc/changelog.html" );
+ txtWhatsNew->setSource( "file:///" + QgsApplication::pkgDataPath() + "/../doc/qgis/changelog.html" );
}
void QgsAbout::setPluginInfo()

40
geo/qgis/patches/patch-src_core_CMakeLists_txt
View File

@ -1,16 +1,34 @@
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.5 2011/07/07 20:34:27 landry Exp $
--- 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)
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.6 2014/08/20 08:54:45 landry Exp $
chunk 1/2: dont call bison to generate the parser, and build the pregenerated file instead
--- src/core/CMakeLists.txt.orig Fri Jun 27 14:00:08 2014
+++ src/core/CMakeLists.txt Mon Aug 18 13:32:26 2014
@@ -74,6 +74,7 @@ SET(QGIS_CORE_SRCS
qgsdistancearea.cpp
qgserror.cpp
qgsexpression.cpp
+ qgsexpressionparser.cpp
qgsexpression_texts.cpp
qgsfeature.cpp
qgsfeatureiterator.cpp
@@ -317,7 +318,7 @@ ENDIF (WITH_INTERNAL_SPATIALITE)
ADD_FLEX_FILES(QGIS_CORE_SRCS qgsexpressionlexer.ll)
-ADD_BISON_FILES(QGIS_CORE_SRCS qgsexpressionparser.yy)
+#ADD_BISON_FILES(QGIS_CORE_SRCS qgsexpressionparser.yy)
SET(QGIS_CORE_MOC_HDRS
@@ -715,9 +716,9 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
TARGET_LINK_LIBRARIES(qgis_core
${QT_QTMAIN_LIBRARY}
${QT_QTXML_LIBRARY}
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTNETWORK_LIBRARY}
${QT_QTMAIN_LIBRARY}
${QT_QTXML_LIBRARY}
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTNETWORK_LIBRARY}
+ ${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIB_DEPENDENCIES}
+ ${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIB_DEPENDENCIES}
+ ${QT_QTNETWORK_LIBRARY} ${QT_QTNETWORK_LIB_DEPENDENCIES}
${QT_QTSVG_LIBRARY}
${QT_QTSVG_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
${PROJ_LIBRARY}

43
geo/qgis/patches/patch-src_core_qgsapplication_cpp
View File

@ -1,48 +1,57 @@
$OpenBSD: patch-src_core_qgsapplication_cpp,v 1.1 2011/07/07 20:34:27 landry Exp $
$OpenBSD: patch-src_core_qgsapplication_cpp,v 1.2 2014/08/20 08:54:45 landry Exp $
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()
--- src/core/qgsapplication.cpp.orig Fri Jun 27 14:00:08 2014
+++ src/core/qgsapplication.cpp Mon Aug 18 17:26:32 2014
@@ -421,21 +421,21 @@ const QString QgsApplication::themeName()
*/
const QString QgsApplication::authorsFilePath()
{
- return mPkgDataPath + QString( "/doc/AUTHORS" );
+ return mPkgDataPath + QString( "../doc/qgis/AUTHORS" );
- return ABISYM( mPkgDataPath ) + QString( "/doc/AUTHORS" );
+ return ABISYM( 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" );
- return ABISYM( mPkgDataPath ) + QString( "/doc/CONTRIBUTORS" );
+ return ABISYM( 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" );
- return ABISYM( mPkgDataPath ) + QString( "/doc/SPONSORS" );
+ return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/SPONSORS" );
}
/*!
@@ -267,7 +267,7 @@ const QString QgsApplication::sponsorsFilePath()
@@ -443,7 +443,7 @@ const QString QgsApplication::sponsorsFilePath()
*/
const QString QgsApplication::donorsFilePath()
{
- return mPkgDataPath + QString( "/doc/DONORS" );
+ return mPkgDataPath + QString( "../doc/qgis/DONORS" );
- return ABISYM( mPkgDataPath ) + QString( "/doc/DONORS" );
+ return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/DONORS" );
}
/*!
@@ -276,7 +276,7 @@ const QString QgsApplication::donorsFilePath()
@@ -452,7 +452,7 @@ const QString QgsApplication::donorsFilePath()
*/
const QString QgsApplication::translatorsFilePath()
{
- return mPkgDataPath + QString( "/doc/TRANSLATORS" );
+ return mPkgDataPath + QString( "../doc/qgis/TRANSLATORS" );
- return ABISYM( mPkgDataPath ) + QString( "/doc/TRANSLATORS" );
+ return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/TRANSLATORS" );
}
/*!
@@ -460,7 +460,7 @@ const QString QgsApplication::translatorsFilePath()
*/
const QString QgsApplication::licenceFilePath()
{
- return ABISYM( mPkgDataPath ) + QString( "/doc/LICENSE" );
+ return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/LICENSE" );
}
/*!
Returns the path to the developer image directory.

32
geo/qgis/patches/patch-src_core_qgsmaplayerregistry_h
View File

@ -1,32 +0,0 @@
$OpenBSD: patch-src_core_qgsmaplayerregistry_h,v 1.1 2013/11/08 22:40:38 sthen Exp $
commit 641359d3cb70706f367014648cd961e905bca2dd
Author: Christian Urich <christian.urich@gmail.com>
Date: Tue Sep 10 12:21:08 2013 +1000
Fix with newer sip
--- src/core/qgsmaplayerregistry.h.orig Wed Feb 22 20:48:14 2012
+++ src/core/qgsmaplayerregistry.h Fri Nov 8 10:31:53 2013
@@ -121,16 +121,17 @@ class CORE_EXPORT QgsMapLayerRegistry : public QObject
//! protected constructor
QgsMapLayerRegistry( QObject * parent = 0 );
+ /** debugging member
+ invoked when a connect() is made to this object
+ */
+ void connectNotify( const char * signal );
+
private:
static QgsMapLayerRegistry* mInstance;
QMap<QString, QgsMapLayer*> mMapLayers;
- /** debugging member
- invoked when a connect() is made to this object
- */
- void connectNotify( const char * signal );
}; // class QgsMapLayerRegistry

16
geo/qgis/patches/patch-src_core_qgssearchstringparser_yy
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_core_qgssearchstringparser_yy,v 1.2 2012/11/01 07:25:36 landry Exp $
--- src/core/qgssearchstringparser.yy.orig Wed Feb 22 21:48:14 2012
+++ src/core/qgssearchstringparser.yy Wed Oct 31 11:09:36 2012
@@ -18,6 +18,12 @@
/* $Id: patch-src_core_qgssearchstringparser_yy,v 1.2 2012/11/01 07:25:36 landry Exp $ */
%{
+// XXX
+// these conflict with scopedpointer
+// and the parser generator re-defines these as enums anyways
+#undef X
+#undef Y
+
#include <qglobal.h>
#include <QList>
#include <cstdlib>

16
geo/qgis/patches/patch-src_core_qgsvectorlayerfeatureiterator_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_core_qgsvectorlayerfeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
http://osgeo-org.1560.x6.nabble.com/Compiling-QGIS-2-4-with-GCC-4-4-debian-squeeze-td5146777.html
http://hub.qgis.org/issues/10762
--- src/core/qgsvectorlayerfeatureiterator.cpp.orig Tue Jul 1 09:06:45 2014
+++ src/core/qgsvectorlayerfeatureiterator.cpp Tue Jul 1 09:06:56 2014
@@ -84,7 +84,7 @@ QgsFeatureIterator QgsVectorLayerFeatureSource::getFea
QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayerFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
- : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
+ : QgsAbstractFeatureIteratorFromSource<QgsVectorLayerFeatureSource>( source, ownSource, request )
, mEditGeometrySimplifier( 0 )
{

34
geo/qgis/patches/patch-src_gui_qgsmapcanvas_h
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-src_gui_qgsmapcanvas_h,v 1.1 2013/11/08 22:40:38 sthen Exp $
Adapted from commit 641359d3cb70706f367014648cd961e905bca2dd
Author: Christian Urich <christian.urich@gmail.com>
Date: Tue Sep 10 12:21:08 2013 +1000
Fix with newer sip
--- src/gui/qgsmapcanvas.h.orig Wed Feb 22 20:48:14 2012
+++ src/gui/qgsmapcanvas.h Fri Nov 8 10:35:47 2013
@@ -389,6 +389,11 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
/// Handle pattern for implementation object
std::auto_ptr<CanvasProperties> mCanvasProperties;
+ /**debugging member
+ invoked when a connect() is made to this object
+ */
+ void connectNotify( const char * signal );
+
private:
/// this class is non-copyable
/**
@@ -432,11 +437,6 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
rendering may put their sizes into this list. The canvas then picks up
the last entry in case a lot of resize events arrive in short time*/
QList< QPair<int, int> > mResizeQueue;
-
- /**debugging member
- invoked when a connect() is made to this object
- */
- void connectNotify( const char * signal );
//! current layer in legend
QgsMapLayer* mCurrentLayer;

32
geo/qgis/patches/patch-src_helpviewer_CMakeLists_txt
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-src_helpviewer_CMakeLists_txt,v 1.1 2010/05/11 06:41:30 dcoppa Exp $
--- src/helpviewer/CMakeLists.txt.orig Mon May 10 11:35:40 2010
+++ src/helpviewer/CMakeLists.txt Mon May 10 11:40:05 2010
@@ -79,9 +79,9 @@ IF (${QTVERSION} STRLESS "4.3.0")
)
ELSE (${QTVERSION} STRLESS "4.3.0")
TARGET_LINK_LIBRARIES(qgis_help
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTNETWORK_LIBRARY}
+ ${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIB_DEPENDENCIES}
+ ${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIB_DEPENDENCIES}
+ ${QT_QTNETWORK_LIBRARY} ${QT_QTNETWORK_LIB_DEPENDENCIES}
${QT_QTSVG_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
$OpenBSD: patch-src_helpviewer_CMakeLists_txt,v 1.2 2014/08/20 08:54:45 landry Exp $
--- src/helpviewer/CMakeLists.txt.orig Wed Sep 11 01:06:52 2013
+++ src/helpviewer/CMakeLists.txt Tue Sep 24 22:17:13 2013
@@ -70,9 +70,9 @@ IF (NOT WITH_INTERNAL_SPATIALITE)
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
TARGET_LINK_LIBRARIES(qgis_help
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTNETWORK_LIBRARY}
+ ${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIB_DEPENDENCIES}
+ ${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIB_DEPENDENCIES}
+ ${QT_QTNETWORK_LIBRARY} ${QT_QTNETWORK_LIB_DEPENDENCIES}
${QT_QTSVG_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTWEBKIT_LIBRARY}

10
geo/qgis/patches/patch-src_mapserver_CMakeLists_txt
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_mapserver_CMakeLists_txt,v 1.2 2011/07/07 20:34:27 landry Exp $
$OpenBSD: patch-src_mapserver_CMakeLists_txt,v 1.3 2014/08/20 08:54:45 landry Exp $
install sld & xml in share/qgis
--- 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
--- src/mapserver/CMakeLists.txt.orig Fri Jun 27 14:00:08 2014
+++ src/mapserver/CMakeLists.txt Tue Jul 1 08:53:17 2014
@@ -122,6 +122,6 @@ INSTALL(TARGETS
INSTALL(FILES
admin.sld
admin.sld
wms_metadata.xml
- DESTINATION ${QGIS_CGIBIN_DIR}
+ DESTINATION ${QGIS_DATA_DIR}

14
geo/qgis/patches/patch-src_providers_delimitedtext_qgsdelimitedtextfeatureiterator_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_providers_delimitedtext_qgsdelimitedtextfeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
http://osgeo-org.1560.x6.nabble.com/Compiling-QGIS-2-4-with-GCC-4-4-debian-squeeze-td5146777.html
http://hub.qgis.org/issues/10762
--- src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp.orig Tue Jul 1 09:47:48 2014
+++ src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp Tue Jul 1 09:48:05 2014
@@ -26,7 +26,7 @@
#include <QTextStream>
QgsDelimitedTextFeatureIterator::QgsDelimitedTextFeatureIterator( QgsDelimitedTextFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
- : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
+ : QgsAbstractFeatureIteratorFromSource<QgsDelimitedTextFeatureSource>( source, ownSource, request )
{
// Determine mode to use based on request...

14
geo/qgis/patches/patch-src_providers_gpx_qgsgpxfeatureiterator_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_providers_gpx_qgsgpxfeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
http://osgeo-org.1560.x6.nabble.com/Compiling-QGIS-2-4-with-GCC-4-4-debian-squeeze-td5146777.html
http://hub.qgis.org/issues/10762
--- src/providers/gpx/qgsgpxfeatureiterator.cpp.orig Tue Jul 1 09:22:34 2014
+++ src/providers/gpx/qgsgpxfeatureiterator.cpp Tue Jul 1 09:22:53 2014
@@ -26,7 +26,7 @@
QgsGPXFeatureIterator::QgsGPXFeatureIterator( QgsGPXFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
- : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
+ : QgsAbstractFeatureIteratorFromSource<QgsGPXFeatureSource>( source, ownSource, request )
{
rewind();
}

15
geo/qgis/patches/patch-src_providers_grass_qgsgrassfeatureiterator_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_providers_grass_qgsgrassfeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
http://hub.qgis.org/issues/10762
--- src/providers/grass/qgsgrassfeatureiterator.cpp.orig Tue Jul 1 09:50:01 2014
+++ src/providers/grass/qgsgrassfeatureiterator.cpp Tue Jul 1 09:50:23 2014
@@ -67,7 +67,7 @@ QMutex QgsGrassFeatureIterator::sMutex;
QgsGrassFeatureIterator::QgsGrassFeatureIterator( QgsGrassFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
- : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
+ : QgsAbstractFeatureIteratorFromSource<QgsGrassFeatureSource>( source, ownSource, request )
{
sMutex.lock();

14
geo/qgis/patches/patch-src_providers_memory_qgsmemoryfeatureiterator_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_providers_memory_qgsmemoryfeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
http://osgeo-org.1560.x6.nabble.com/Compiling-QGIS-2-4-with-GCC-4-4-debian-squeeze-td5146777.html
http://hub.qgis.org/issues/10762
--- src/providers/memory/qgsmemoryfeatureiterator.cpp.orig Tue Jul 1 09:44:06 2014
+++ src/providers/memory/qgsmemoryfeatureiterator.cpp Tue Jul 1 09:44:19 2014
@@ -23,7 +23,7 @@
QgsMemoryFeatureIterator::QgsMemoryFeatureIterator( QgsMemoryFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
- : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
+ : QgsAbstractFeatureIteratorFromSource<QgsMemoryFeatureSource>( source, ownSource, request )
, mSelectRectGeom( 0 )
{

13
geo/qgis/patches/patch-src_providers_mssql_qgsmssqlfeatureiterator_cpp Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_providers_mssql_qgsmssqlfeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
http://hub.qgis.org/issues/10762
--- src/providers/mssql/qgsmssqlfeatureiterator.cpp.orig Tue Jul 1 09:50:31 2014
+++ src/providers/mssql/qgsmssqlfeatureiterator.cpp Tue Jul 1 09:50:42 2014
@@ -25,7 +25,7 @@
QgsMssqlFeatureIterator::QgsMssqlFeatureIterator( QgsMssqlFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
- : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
+ : QgsAbstractFeatureIteratorFromSource<QgsMssqlFeatureSource>( source, ownSource, request )
{
mClosed = false;
mQuery = NULL;

14
geo/qgis/patches/patch-src_providers_ogr_qgsogrfeatureiterator_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_providers_ogr_qgsogrfeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
http://osgeo-org.1560.x6.nabble.com/Compiling-QGIS-2-4-with-GCC-4-4-debian-squeeze-td5146777.html
http://hub.qgis.org/issues/10762
--- src/providers/ogr/qgsogrfeatureiterator.cpp.orig Tue Jul 1 09:39:55 2014
+++ src/providers/ogr/qgsogrfeatureiterator.cpp Tue Jul 1 09:40:19 2014
@@ -34,7 +34,7 @@
QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
- : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
+ : QgsAbstractFeatureIteratorFromSource<QgsOgrFeatureSource>( source, ownSource, request )
, ogrDataSource( 0 )
, ogrLayer( 0 )
, mSubsetStringSet( false )

13
geo/qgis/patches/patch-src_providers_oracle_qgsoraclefeatureiterator_cpp Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_providers_oracle_qgsoraclefeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
http://hub.qgis.org/issues/10762
--- src/providers/oracle/qgsoraclefeatureiterator.cpp.orig Tue Jul 1 09:50:51 2014
+++ src/providers/oracle/qgsoraclefeatureiterator.cpp Tue Jul 1 09:51:02 2014
@@ -23,7 +23,7 @@
#include <QObject>
QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* source, bool ownSource, const QgsFeatureRequest &request )
- : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
+ : QgsAbstractFeatureIteratorFromSource<QgsOracleFeatureSource>( source, ownSource, request )
, mRewind( false )
{
mConnection = QgsOracleConn::connectDb( mSource->mUri.connectionInfo() );

13
geo/qgis/patches/patch-src_providers_postgres_qgspostgresconnpool_h Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_providers_postgres_qgspostgresconnpool_h,v 1.1 2014/08/20 08:54:45 landry Exp $
http://hub.qgis.org/issues/10762
--- src/providers/postgres/qgspostgresconnpool.h.orig Wed Jul 2 15:26:12 2014
+++ src/providers/postgres/qgspostgresconnpool.h Wed Jul 2 15:29:30 2014
@@ -42,7 +42,7 @@ class QgsPostgresConnPoolGroup : public QObject, publi
Q_OBJECT
public:
- QgsPostgresConnPoolGroup( QString name ) : QgsConnectionPoolGroup( name ) { initTimer( this ); }
+ QgsPostgresConnPoolGroup( QString name ) : QgsConnectionPoolGroup<QgsPostgresConn*>( name ) { initTimer( this ); }
protected slots:
void handleConnectionExpired() { onConnectionExpired(); }

13
geo/qgis/patches/patch-src_providers_postgres_qgspostgresfeatureiterator_cpp Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_providers_postgres_qgspostgresfeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
http://hub.qgis.org/issues/10762
--- src/providers/postgres/qgspostgresfeatureiterator.cpp.orig Tue Jul 1 09:51:09 2014
+++ src/providers/postgres/qgspostgresfeatureiterator.cpp Tue Jul 1 09:51:24 2014
@@ -27,7 +27,7 @@ const int QgsPostgresFeatureIterator::sFeatureQueueSiz
QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
- : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
+ : QgsAbstractFeatureIteratorFromSource<QgsPostgresFeatureSource>( source, ownSource, request )
, mFeatureQueueSize( sFeatureQueueSize )
{
mConn = QgsPostgresConnPool::instance()->acquireConnection( mSource->mConnInfo );

11
geo/qgis/patches/patch-src_providers_postgres_qgspostgresprovider_cpp
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_providers_postgres_qgspostgresprovider_cpp,v 1.1.1.1 2009/06/01 23:14:58 landry Exp $
--- src/providers/postgres/qgspostgresprovider.cpp.orig Sun May 31 14:36:42 2009
+++ src/providers/postgres/qgspostgresprovider.cpp Sun May 31 14:37:24 2009
@@ -21,6 +21,7 @@
#ifdef WIN32
#include <winsock.h>
#else
+#include <sys/types.h>
#include <netinet/in.h>
#endif

13
geo/qgis/patches/patch-src_providers_spatialite_qgsspatialiteconnpool_h Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_providers_spatialite_qgsspatialiteconnpool_h,v 1.1 2014/08/20 08:54:45 landry Exp $
http://hub.qgis.org/issues/10762
--- src/providers/spatialite/qgsspatialiteconnpool.h.orig Wed Jul 2 15:41:30 2014
+++ src/providers/spatialite/qgsspatialiteconnpool.h Wed Jul 2 15:41:42 2014
@@ -41,7 +41,7 @@ class QgsSpatiaLiteConnPoolGroup : public QObject, pub
Q_OBJECT
public:
- QgsSpatiaLiteConnPoolGroup( QString name ) : QgsConnectionPoolGroup( name ) { initTimer( this ); }
+ QgsSpatiaLiteConnPoolGroup( QString name ) : QgsConnectionPoolGroup<QgsSqliteHandle*>( name ) { initTimer( this ); }
protected slots:
void handleConnectionExpired() { onConnectionExpired(); }

13
geo/qgis/patches/patch-src_providers_spatialite_qgsspatialitefeatureiterator_cpp Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_providers_spatialite_qgsspatialitefeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
http://hub.qgis.org/issues/10762
--- src/providers/spatialite/qgsspatialitefeatureiterator.cpp.orig Tue Jul 1 09:51:31 2014
+++ src/providers/spatialite/qgsspatialitefeatureiterator.cpp Tue Jul 1 09:51:43 2014
@@ -24,7 +24,7 @@
QgsSpatiaLiteFeatureIterator::QgsSpatiaLiteFeatureIterator( QgsSpatiaLiteFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
- : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
+ : QgsAbstractFeatureIteratorFromSource<QgsSpatiaLiteFeatureSource>( source, ownSource, request )
, sqliteStatement( NULL )
{

13
geo/qgis/patches/patch-src_providers_wfs_qgswfsfeatureiterator_cpp Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_providers_wfs_qgswfsfeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
http://hub.qgis.org/issues/10762
--- src/providers/wfs/qgswfsfeatureiterator.cpp.orig Tue Jul 1 09:51:49 2014
+++ src/providers/wfs/qgswfsfeatureiterator.cpp Tue Jul 1 09:52:01 2014
@@ -19,7 +19,7 @@
#include "qgsgeometry.h"
QgsWFSFeatureIterator::QgsWFSFeatureIterator( QgsWFSFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
- : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
+ : QgsAbstractFeatureIteratorFromSource<QgsWFSFeatureSource>( source, ownSource, request )
{
switch ( request.filterType() )
{

4803
geo/qgis/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff