Upgrade to QGIS 2.12.

- See https://www.qgis.org/en/site/forusers/visualchangelog212/ for the
changes.
- Regenerate qgisrastercalcparser.{h,c}pp with out-of-ports bison 2.6
- Now uses qca2 & qca-ossl for https handling
- Remove now useless patches
This commit is contained in:
landry 2015-10-31 15:29:44 +00:00
parent 2ad0068f47
commit 4e94e6dc5b
20 changed files with 981 additions and 379 deletions

View File

@ -1,18 +1,19 @@
# $OpenBSD: Makefile,v 1.41 2015/07/21 10:06:14 landry Exp $
# $OpenBSD: Makefile,v 1.42 2015/10/31 15:29:44 landry Exp $
COMMENT = desktop geographical information system
SHARED_ONLY = Yes
DISTNAME = qgis-2.10.1
DISTNAME = qgis-2.12.0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
SHARED_LIBS = qgis_core 9.0 \
qgis_gui 8.0 \
qgis_analysis 4.0 \
qgis_server 1.0 \
qgispython 2.1 \
SHARED_LIBS = qgis_core 10.0 \
qgis_app 0.0 \
qgis_gui 9.0 \
qgis_analysis 5.0 \
qgis_server 2.0 \
qgispython 2.2 \
qgis_networkanalysis 0.0
HOMEPAGE = http://www.qgis.org/
@ -29,6 +30,7 @@ MODULES = devel/cmake \
lang/python
BUILD_DEPENDS = x11/py-qt4>=4.8.4 \
security/qca-ossl \
devel/flex \
editors/py-qscintilla \
geo/gdal,-python
@ -37,6 +39,7 @@ BUILD_DEPENDS = x11/py-qt4>=4.8.4 \
# devel/bison>=2.4
RUN_DEPENDS = x11/py-qt4>=4.8.4 \
security/qca-ossl \
geo/gdal,-python \
databases/py-psycopg2 \
editors/py-qscintilla \
@ -53,13 +56,14 @@ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
geo/spatialite/libspatialite \
geo/spatialindex \
devel/gsl \
security/qca2 \
databases/postgresql
WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat \
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 QtScript QtSvg \
QtWebKit gdal geos_c gsl gslcblas pq qwt fcgi \
QtWebKit gdal geos_c gsl gslcblas pq qwt fcgi qca2 \
QtTest spatialindex spatialite sqlite3 qscintilla2
WANTLIB += ${MODPY_WANTLIB} jpeg tiff
@ -74,6 +78,8 @@ pre-configure:
#bison -o /tmp/qgsexpressionparser.cpp -dvt src/core/qgsexpressionparser.yy
cp ${FILESDIR}/qgsrastercalcparser.{c,h}pp ${WRKSRC}/src/analysis/raster/
cp ${FILESDIR}/qgsexpressionparser.{c,h}pp ${WRKSRC}/src/core/
touch ${WRKSRC}/src/analysis/raster/qgsrastercalcparser.{c,h}pp \
${WRKSRC}/src/core/qgsexpressionparser.{c,h}pp
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{pixmaps,applications}

View File

@ -1,2 +1,2 @@
SHA256 (qgis-2.10.1.tar.bz2) = eRGbVGQu2v/jzaUTUx63uBkT4BOVSknG07IciwAUMwc=
SIZE (qgis-2.10.1.tar.bz2) = 66408603
SHA256 (qgis-2.12.0.tar.bz2) = uOWO+F5mhjSZk6zyy4MGATXyeU8DR196PaeIxFi4Gx0=
SIZE (qgis-2.12.0.tar.bz2) = 69079022

View File

@ -124,7 +124,7 @@ struct expression_parser_context
/* Line 336 of yacc.c */
#line 128 "/tmp/qgsexpressionparser.cpp"
#line 128 "src/core/qgsexpressionparser.cpp"
# ifndef YY_NULL
# if defined __cplusplus && 201103L <= __cplusplus
@ -144,8 +144,8 @@ struct expression_parser_context
/* In a future release of Bison, this section will be replaced
by #include "qgsexpressionparser.hpp". */
#ifndef EXP_TMP_QGSEXPRESSIONPARSER_HPP
# define EXP_TMP_QGSEXPRESSIONPARSER_HPP
#ifndef EXP_SRC_CORE_QGSEXPRESSIONPARSER_HPP
# define EXP_SRC_CORE_QGSEXPRESSIONPARSER_HPP
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
@ -183,19 +183,21 @@ extern int exp_debug;
IN = 278,
NUMBER_FLOAT = 279,
NUMBER_INT = 280,
NULLVALUE = 281,
CASE = 282,
WHEN = 283,
THEN = 284,
ELSE = 285,
END = 286,
STRING = 287,
COLUMN_REF = 288,
FUNCTION = 289,
SPECIAL_COL = 290,
COMMA = 291,
Unknown_CHARACTER = 292,
UMINUS = 293
BOOLEAN = 281,
NULLVALUE = 282,
CASE = 283,
WHEN = 284,
THEN = 285,
ELSE = 286,
END = 287,
STRING = 288,
COLUMN_REF = 289,
FUNCTION = 290,
SPECIAL_COL = 291,
VARIABLE = 292,
COMMA = 293,
Unknown_CHARACTER = 294,
UMINUS = 295
};
#endif
@ -210,6 +212,7 @@ typedef union YYSTYPE
QgsExpression::NodeList* nodelist;
double numberFloat;
int numberInt;
bool boolVal;
QString* text;
QgsExpression::BinaryOperator b_op;
QgsExpression::UnaryOperator u_op;
@ -218,7 +221,7 @@ typedef union YYSTYPE
/* Line 350 of yacc.c */
#line 222 "/tmp/qgsexpressionparser.cpp"
#line 225 "src/core/qgsexpressionparser.cpp"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@ -240,12 +243,12 @@ int exp_parse ();
#endif
#endif /* ! YYPARSE_PARAM */
#endif /* !EXP_TMP_QGSEXPRESSIONPARSER_HPP */
#endif /* !EXP_SRC_CORE_QGSEXPRESSIONPARSER_HPP */
/* Copy the second part of user declarations. */
/* Line 353 of yacc.c */
#line 249 "/tmp/qgsexpressionparser.cpp"
#line 252 "src/core/qgsexpressionparser.cpp"
#ifdef short
# undef short
@ -463,22 +466,22 @@ union yyalloc
#endif /* !YYCOPY_NEEDED */
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 23
#define YYFINAL 25
/* YYLAST -- Last index in YYTABLE. */
#define YYLAST 220
#define YYLAST 248
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 41
#define YYNTOKENS 43
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 6
/* YYNRULES -- Number of rules. */
#define YYNRULES 41
#define YYNRULES 44
/* YYNRULES -- Number of states. */
#define YYNSTATES 85
#define YYNSTATES 88
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
#define YYMAXUTOK 293
#define YYMAXUTOK 295
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@ -490,7 +493,7 @@ static const yytype_uint8 yytranslate[] =
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
39, 40, 2, 2, 2, 2, 2, 2, 2, 2,
41, 42, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@ -515,7 +518,7 @@ static const yytype_uint8 yytranslate[] =
5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38
35, 36, 37, 38, 39, 40
};
#if YYDEBUG
@ -525,39 +528,40 @@ static const yytype_uint8 yyprhs[] =
{
0, 0, 3, 5, 9, 13, 17, 21, 25, 29,
33, 37, 41, 45, 49, 53, 57, 61, 65, 69,
73, 77, 81, 84, 88, 93, 99, 106, 109, 112,
116, 122, 124, 126, 128, 130, 132, 134, 138, 140,
143, 145
73, 77, 81, 84, 88, 93, 97, 103, 110, 113,
116, 120, 126, 128, 130, 132, 134, 136, 138, 140,
142, 146, 148, 151, 153
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
42, 0, -1, 43, -1, 43, 4, 43, -1, 43,
3, 43, -1, 43, 5, 43, -1, 43, 6, 43,
-1, 43, 7, 43, -1, 43, 8, 43, -1, 43,
9, 43, -1, 43, 10, 43, -1, 43, 11, 43,
-1, 43, 12, 43, -1, 43, 13, 43, -1, 43,
14, 43, -1, 43, 15, 43, -1, 43, 16, 43,
-1, 43, 18, 43, -1, 43, 17, 43, -1, 43,
19, 43, -1, 43, 21, 43, -1, 43, 20, 43,
-1, 22, 43, -1, 39, 43, 40, -1, 34, 39,
44, 40, -1, 43, 23, 39, 44, 40, -1, 43,
22, 23, 39, 44, 40, -1, 14, 43, -1, 15,
43, -1, 27, 45, 31, -1, 27, 45, 30, 43,
31, -1, 33, -1, 35, -1, 24, -1, 25, -1,
32, -1, 26, -1, 44, 36, 43, -1, 43, -1,
45, 46, -1, 46, -1, 28, 43, 29, 43, -1
44, 0, -1, 45, -1, 45, 4, 45, -1, 45,
3, 45, -1, 45, 5, 45, -1, 45, 6, 45,
-1, 45, 7, 45, -1, 45, 8, 45, -1, 45,
9, 45, -1, 45, 10, 45, -1, 45, 11, 45,
-1, 45, 12, 45, -1, 45, 13, 45, -1, 45,
14, 45, -1, 45, 15, 45, -1, 45, 16, 45,
-1, 45, 18, 45, -1, 45, 17, 45, -1, 45,
19, 45, -1, 45, 21, 45, -1, 45, 20, 45,
-1, 22, 45, -1, 41, 45, 42, -1, 35, 41,
46, 42, -1, 35, 41, 42, -1, 45, 23, 41,
46, 42, -1, 45, 22, 23, 41, 46, 42, -1,
14, 45, -1, 15, 45, -1, 28, 47, 32, -1,
28, 47, 31, 45, 32, -1, 34, -1, 36, -1,
37, -1, 24, -1, 25, -1, 26, -1, 33, -1,
27, -1, 46, 38, 45, -1, 45, -1, 47, 48,
-1, 48, -1, 29, 45, 30, 45, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint8 yyrline[] =
static const yytype_uint16 yyrline[] =
{
0, 153, 153, 157, 158, 159, 160, 161, 162, 163,
164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
174, 175, 176, 177, 179, 199, 200, 202, 203, 205,
206, 209, 212, 236, 237, 238, 239, 243, 244, 248,
249, 253
0, 157, 157, 161, 162, 163, 164, 165, 166, 167,
168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
178, 179, 180, 181, 183, 205, 224, 225, 227, 228,
230, 231, 234, 237, 262, 273, 274, 275, 276, 277,
281, 282, 286, 287, 291
};
#endif
@ -569,9 +573,9 @@ static const char *const yytname[] =
"$end", "error", "$undefined", "OR", "AND", "EQ", "NE", "LE", "GE",
"LT", "GT", "REGEXP", "LIKE", "IS", "PLUS", "MINUS", "MUL", "DIV",
"INTDIV", "MOD", "CONCAT", "POW", "NOT", "IN", "NUMBER_FLOAT",
"NUMBER_INT", "NULLVALUE", "CASE", "WHEN", "THEN", "ELSE", "END",
"STRING", "COLUMN_REF", "FUNCTION", "SPECIAL_COL", "COMMA",
"Unknown_CHARACTER", "UMINUS", "'('", "')'", "$accept", "root",
"NUMBER_INT", "BOOLEAN", "NULLVALUE", "CASE", "WHEN", "THEN", "ELSE",
"END", "STRING", "COLUMN_REF", "FUNCTION", "SPECIAL_COL", "VARIABLE",
"COMMA", "Unknown_CHARACTER", "UMINUS", "'('", "')'", "$accept", "root",
"expression", "exp_list", "when_then_clauses", "when_then_clause", YY_NULL
};
#endif
@ -584,19 +588,19 @@ static const yytype_uint16 yytoknum[] =
0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
285, 286, 287, 288, 289, 290, 291, 292, 293, 40,
41
285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
295, 40, 41
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
0, 41, 42, 43, 43, 43, 43, 43, 43, 43,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
43, 43, 43, 43, 43, 43, 43, 44, 44, 45,
45, 46
0, 43, 44, 45, 45, 45, 45, 45, 45, 45,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
46, 46, 47, 47, 48
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@ -604,9 +608,9 @@ static const yytype_uint8 yyr2[] =
{
0, 2, 1, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 2, 3, 4, 5, 6, 2, 2, 3,
5, 1, 1, 1, 1, 1, 1, 3, 1, 2,
1, 4
3, 3, 2, 3, 4, 3, 5, 6, 2, 2,
3, 5, 1, 1, 1, 1, 1, 1, 1, 1,
3, 1, 2, 1, 4
};
/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@ -614,43 +618,43 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
0, 0, 0, 0, 33, 34, 36, 0, 35, 31,
0, 32, 0, 0, 2, 27, 28, 22, 0, 0,
40, 0, 0, 1, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 35, 36, 37, 39, 0, 38,
32, 0, 33, 34, 0, 0, 2, 28, 29, 22,
0, 0, 43, 0, 0, 1, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 29, 39, 38,
0, 23, 4, 3, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 18, 17, 19, 21,
20, 0, 0, 0, 0, 0, 24, 0, 0, 41,
30, 37, 0, 25, 26
0, 0, 0, 0, 0, 0, 0, 0, 0, 30,
42, 25, 41, 0, 23, 4, 3, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 18,
17, 19, 21, 20, 0, 0, 0, 0, 0, 24,
0, 0, 44, 31, 40, 0, 26, 27
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int8 yydefgoto[] =
{
-1, 13, 49, 50, 19, 20
-1, 15, 52, 53, 21, 22
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
#define YYPACT_NINF -59
#define YYPACT_NINF -64
static const yytype_int16 yypact[] =
{
121, 121, 121, 121, -59, -59, -59, -13, -59, -59,
-16, -59, 121, 43, 158, -59, -59, 197, 121, 78,
-59, 121, 44, -59, 121, 121, 121, 121, 121, 121,
121, 121, 121, 121, 121, 121, 121, 121, 121, 121,
121, 121, 121, 21, 6, 111, 121, -59, -59, 158,
-23, -59, 178, 197, -10, -10, -10, -10, -10, -10,
-10, -10, -10, 60, 60, 1, 1, 1, 1, -59,
1, 30, 121, 121, 82, 121, -59, 121, -20, 158,
-59, 158, 32, -59, -59
147, 147, 147, 147, -64, -64, -64, -64, -16, -64,
-64, -25, -64, -64, 147, 45, 186, -64, -64, 225,
147, 48, -64, 97, 46, -64, 147, 147, 147, 147,
147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
147, 147, 147, 147, 147, 23, 6, 137, 147, -64,
-64, -64, 186, -23, -64, 206, 225, -10, -10, -10,
-10, -10, -10, -10, -10, -10, 54, 54, 3, 3,
3, 3, -64, 3, 40, 147, 147, 86, 147, -64,
147, -20, 186, -64, 186, -17, -64, -64
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int8 yypgoto[] =
{
-59, -59, 0, -58, -59, 51
-64, -64, 0, -63, -64, 61
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@ -659,33 +663,35 @@ static const yytype_int8 yypgoto[] =
#define YYTABLE_NINF -1
static const yytype_uint8 yytable[] =
{
14, 15, 16, 17, 35, 36, 37, 38, 39, 40,
41, 42, 22, 75, 78, 18, 75, 76, 45, 82,
83, 41, 42, 21, 52, 53, 54, 55, 56, 57,
58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
68, 69, 70, 23, 71, 72, 74, 24, 25, 26,
16, 17, 18, 19, 37, 38, 39, 40, 41, 42,
43, 44, 81, 20, 24, 78, 23, 85, 78, 79,
47, 78, 86, 43, 44, 87, 55, 56, 57, 58,
59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
69, 70, 71, 72, 73, 25, 74, 75, 77, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
37, 38, 39, 40, 41, 42, 43, 44, 75, 77,
48, 0, 84, 79, 0, 81, 37, 38, 39, 40,
41, 42, 0, 0, 51, 24, 25, 26, 27, 28,
29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
39, 40, 41, 42, 43, 44, 18, 0, 46, 47,
0, 0, 0, 80, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 1, 2, 0, 0, 0,
73, 0, 0, 3, 0, 4, 5, 6, 7, 0,
0, 0, 0, 8, 9, 10, 11, 0, 0, 0,
12, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 26, 27, 28, 29, 30, 31, 32, 33,
34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
44
37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
39, 40, 41, 42, 43, 44, 82, 20, 84, 48,
49, 80, 50, 0, 0, 0, 0, 0, 54, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
0, 1, 2, 0, 0, 0, 0, 0, 83, 3,
0, 4, 5, 6, 7, 8, 0, 0, 0, 0,
9, 10, 11, 12, 13, 0, 0, 0, 14, 51,
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
46, 1, 2, 0, 0, 0, 0, 76, 0, 3,
0, 4, 5, 6, 7, 8, 0, 0, 0, 0,
9, 10, 11, 12, 13, 0, 0, 0, 14, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46
};
#define yypact_value_is_default(yystate) \
((yystate) == (-59))
((yystate) == (-64))
#define yytable_value_is_error(yytable_value) \
YYID (0)
@ -693,43 +699,45 @@ static const yytype_uint8 yytable[] =
static const yytype_int8 yycheck[] =
{
0, 1, 2, 3, 14, 15, 16, 17, 18, 19,
20, 21, 12, 36, 72, 28, 36, 40, 18, 77,
40, 20, 21, 39, 24, 25, 26, 27, 28, 29,
20, 21, 75, 29, 14, 38, 41, 80, 38, 42,
20, 38, 42, 20, 21, 42, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 0, 23, 39, 46, 3, 4, 5,
6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 36, 39,
19, -1, 40, 73, -1, 75, 16, 17, 18, 19,
20, 21, -1, -1, 40, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 28, -1, 30, 31,
-1, -1, -1, 31, 3, 4, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 14, 15, -1, -1, -1,
29, -1, -1, 22, -1, 24, 25, 26, 27, -1,
-1, -1, -1, 32, 33, 34, 35, -1, -1, -1,
39, 3, 4, 5, 6, 7, 8, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 4, 5, 6, 7, 8, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 5, 6, 7, 8, 9, 10, 11, 12,
40, 41, 42, 43, 44, 0, 23, 41, 48, 3,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
16, 17, 18, 19, 20, 21, 76, 29, 78, 31,
32, 41, 21, -1, -1, -1, -1, -1, 42, 3,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-1, 14, 15, -1, -1, -1, -1, -1, 32, 22,
-1, 24, 25, 26, 27, 28, -1, -1, -1, -1,
33, 34, 35, 36, 37, -1, -1, -1, 41, 42,
3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23
23, 14, 15, -1, -1, -1, -1, 30, -1, 22,
-1, 24, 25, 26, 27, 28, -1, -1, -1, -1,
33, 34, 35, 36, 37, -1, -1, -1, 41, 3,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
0, 14, 15, 22, 24, 25, 26, 27, 32, 33,
34, 35, 39, 42, 43, 43, 43, 43, 28, 45,
46, 39, 43, 0, 3, 4, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 43, 30, 31, 46, 43,
44, 40, 43, 43, 43, 43, 43, 43, 43, 43,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
43, 23, 39, 29, 43, 36, 40, 39, 44, 43,
31, 43, 44, 40, 40
0, 14, 15, 22, 24, 25, 26, 27, 28, 33,
34, 35, 36, 37, 41, 44, 45, 45, 45, 45,
29, 47, 48, 41, 45, 0, 3, 4, 5, 6,
7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 45, 31, 32,
48, 42, 45, 46, 42, 45, 45, 45, 45, 45,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
45, 45, 45, 45, 23, 41, 30, 45, 38, 42,
41, 46, 45, 32, 45, 46, 42, 42
};
#define yyerrok (yyerrstatus = 0)
@ -1275,47 +1283,68 @@ yydestruct (yymsg, yytype, yyvaluep, parser_ctx)
switch (yytype)
{
case 32: /* STRING */
case 33: /* STRING */
/* Line 1381 of yacc.c */
#line 149 "src/core/qgsexpressionparser.yy"
#line 151 "src/core/qgsexpressionparser.yy"
{ delete ((*yyvaluep).text); };
/* Line 1381 of yacc.c */
#line 1284 "/tmp/qgsexpressionparser.cpp"
#line 1292 "src/core/qgsexpressionparser.cpp"
break;
case 33: /* COLUMN_REF */
case 34: /* COLUMN_REF */
/* Line 1381 of yacc.c */
#line 149 "src/core/qgsexpressionparser.yy"
#line 151 "src/core/qgsexpressionparser.yy"
{ delete ((*yyvaluep).text); };
/* Line 1381 of yacc.c */
#line 1291 "/tmp/qgsexpressionparser.cpp"
#line 1299 "src/core/qgsexpressionparser.cpp"
break;
case 34: /* FUNCTION */
case 35: /* FUNCTION */
/* Line 1381 of yacc.c */
#line 149 "src/core/qgsexpressionparser.yy"
#line 151 "src/core/qgsexpressionparser.yy"
{ delete ((*yyvaluep).text); };
/* Line 1381 of yacc.c */
#line 1298 "/tmp/qgsexpressionparser.cpp"
#line 1306 "src/core/qgsexpressionparser.cpp"
break;
case 35: /* SPECIAL_COL */
case 36: /* SPECIAL_COL */
/* Line 1381 of yacc.c */
#line 149 "src/core/qgsexpressionparser.yy"
#line 151 "src/core/qgsexpressionparser.yy"
{ delete ((*yyvaluep).text); };
/* Line 1381 of yacc.c */
#line 1305 "/tmp/qgsexpressionparser.cpp"
#line 1313 "src/core/qgsexpressionparser.cpp"
break;
case 43: /* expression */
case 37: /* VARIABLE */
/* Line 1381 of yacc.c */
#line 147 "src/core/qgsexpressionparser.yy"
#line 151 "src/core/qgsexpressionparser.yy"
{ delete ((*yyvaluep).text); };
/* Line 1381 of yacc.c */
#line 1320 "src/core/qgsexpressionparser.cpp"
break;
case 45: /* expression */
/* Line 1381 of yacc.c */
#line 149 "src/core/qgsexpressionparser.yy"
{ delete ((*yyvaluep).node); };
/* Line 1381 of yacc.c */
#line 1312 "/tmp/qgsexpressionparser.cpp"
#line 1327 "src/core/qgsexpressionparser.cpp"
break;
case 44: /* exp_list */
case 46: /* exp_list */
/* Line 1381 of yacc.c */
#line 148 "src/core/qgsexpressionparser.yy"
#line 150 "src/core/qgsexpressionparser.yy"
{ delete ((*yyvaluep).nodelist); };
/* Line 1381 of yacc.c */
#line 1319 "/tmp/qgsexpressionparser.cpp"
#line 1334 "src/core/qgsexpressionparser.cpp"
break;
case 47: /* when_then_clauses */
/* Line 1381 of yacc.c */
#line 153 "src/core/qgsexpressionparser.yy"
{ delete ((*yyvaluep).whenthenlist); };
/* Line 1381 of yacc.c */
#line 1341 "src/core/qgsexpressionparser.cpp"
break;
case 48: /* when_then_clause */
/* Line 1381 of yacc.c */
#line 152 "src/core/qgsexpressionparser.yy"
{ delete ((*yyvaluep).whenthen); };
/* Line 1381 of yacc.c */
#line 1348 "src/core/qgsexpressionparser.cpp"
break;
default:
@ -1601,141 +1630,167 @@ yyreduce:
{
case 2:
/* Line 1787 of yacc.c */
#line 153 "src/core/qgsexpressionparser.yy"
#line 157 "src/core/qgsexpressionparser.yy"
{ parser_ctx->rootNode = (yyvsp[(1) - (1)].node); }
break;
case 3:
/* Line 1787 of yacc.c */
#line 157 "src/core/qgsexpressionparser.yy"
#line 161 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 4:
/* Line 1787 of yacc.c */
#line 158 "src/core/qgsexpressionparser.yy"
#line 162 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 5:
/* Line 1787 of yacc.c */
#line 159 "src/core/qgsexpressionparser.yy"
#line 163 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 6:
/* Line 1787 of yacc.c */
#line 160 "src/core/qgsexpressionparser.yy"
#line 164 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 7:
/* Line 1787 of yacc.c */
#line 161 "src/core/qgsexpressionparser.yy"
#line 165 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 8:
/* Line 1787 of yacc.c */
#line 162 "src/core/qgsexpressionparser.yy"
#line 166 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 9:
/* Line 1787 of yacc.c */
#line 163 "src/core/qgsexpressionparser.yy"
#line 167 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 10:
/* Line 1787 of yacc.c */
#line 164 "src/core/qgsexpressionparser.yy"
#line 168 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 11:
/* Line 1787 of yacc.c */
#line 165 "src/core/qgsexpressionparser.yy"
#line 169 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 12:
/* Line 1787 of yacc.c */
#line 166 "src/core/qgsexpressionparser.yy"
#line 170 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 13:
/* Line 1787 of yacc.c */
#line 167 "src/core/qgsexpressionparser.yy"
#line 171 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 14:
/* Line 1787 of yacc.c */
#line 168 "src/core/qgsexpressionparser.yy"
#line 172 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 15:
/* Line 1787 of yacc.c */
#line 169 "src/core/qgsexpressionparser.yy"
#line 173 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 16:
/* Line 1787 of yacc.c */
#line 170 "src/core/qgsexpressionparser.yy"
#line 174 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 17:
/* Line 1787 of yacc.c */
#line 171 "src/core/qgsexpressionparser.yy"
#line 175 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 18:
/* Line 1787 of yacc.c */
#line 172 "src/core/qgsexpressionparser.yy"
#line 176 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 19:
/* Line 1787 of yacc.c */
#line 173 "src/core/qgsexpressionparser.yy"
#line 177 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 20:
/* Line 1787 of yacc.c */
#line 174 "src/core/qgsexpressionparser.yy"
#line 178 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 21:
/* Line 1787 of yacc.c */
#line 175 "src/core/qgsexpressionparser.yy"
#line 179 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
break;
case 22:
/* Line 1787 of yacc.c */
#line 176 "src/core/qgsexpressionparser.yy"
#line 180 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeUnaryOperator((yyvsp[(1) - (2)].u_op), (yyvsp[(2) - (2)].node)); }
break;
case 23:
/* Line 1787 of yacc.c */
#line 177 "src/core/qgsexpressionparser.yy"
#line 181 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = (yyvsp[(2) - (3)].node); }
break;
case 24:
/* Line 1787 of yacc.c */
#line 180 "src/core/qgsexpressionparser.yy"
#line 184 "src/core/qgsexpressionparser.yy"
{
int fnIndex = QgsExpression::functionIndex(*(yyvsp[(1) - (4)].text));
delete (yyvsp[(1) - (4)].text);
if (fnIndex == -1)
{
// this should not actually happen because already in lexer we check whether an identifier is a known function
// (if the name is not known the token is parsed as a column)
exp_error(parser_ctx, "Function is not known");
delete (yyvsp[(3) - (4)].nodelist);
YYERROR;
}
if ( QgsExpression::Functions()[fnIndex]->params() != -1
&& QgsExpression::Functions()[fnIndex]->params() != (yyvsp[(3) - (4)].nodelist)->count() )
{
exp_error(parser_ctx, "Function is called with wrong number of arguments");
delete (yyvsp[(3) - (4)].nodelist);
YYERROR;
}
(yyval.node) = new QgsExpression::NodeFunction(fnIndex, (yyvsp[(3) - (4)].nodelist));
}
break;
case 25:
/* Line 1787 of yacc.c */
#line 206 "src/core/qgsexpressionparser.yy"
{
int fnIndex = QgsExpression::functionIndex(*(yyvsp[(1) - (3)].text));
delete (yyvsp[(1) - (3)].text);
if (fnIndex == -1)
{
// this should not actually happen because already in lexer we check whether an identifier is a known function
@ -1743,142 +1798,160 @@ yyreduce:
exp_error(parser_ctx, "Function is not known");
YYERROR;
}
if ( QgsExpression::Functions()[fnIndex]->params() != -1
&& QgsExpression::Functions()[fnIndex]->params() != (yyvsp[(3) - (4)].nodelist)->count() )
if ( QgsExpression::Functions()[fnIndex]->params() != 0 )
{
exp_error(parser_ctx, "Function is called with wrong number of arguments");
YYERROR;
}
(yyval.node) = new QgsExpression::NodeFunction(fnIndex, (yyvsp[(3) - (4)].nodelist));
delete (yyvsp[(1) - (4)].text);
(yyval.node) = new QgsExpression::NodeFunction(fnIndex, new QgsExpression::NodeList());
}
break;
case 25:
/* Line 1787 of yacc.c */
#line 199 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeInOperator((yyvsp[(1) - (5)].node), (yyvsp[(4) - (5)].nodelist), false); }
break;
case 26:
/* Line 1787 of yacc.c */
#line 200 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeInOperator((yyvsp[(1) - (6)].node), (yyvsp[(5) - (6)].nodelist), true); }
#line 224 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeInOperator((yyvsp[(1) - (5)].node), (yyvsp[(4) - (5)].nodelist), false); }
break;
case 27:
/* Line 1787 of yacc.c */
#line 202 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = (yyvsp[(2) - (2)].node); }
#line 225 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeInOperator((yyvsp[(1) - (6)].node), (yyvsp[(5) - (6)].nodelist), true); }
break;
case 28:
/* Line 1787 of yacc.c */
#line 203 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeUnaryOperator( QgsExpression::uoMinus, (yyvsp[(2) - (2)].node)); }
#line 227 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = (yyvsp[(2) - (2)].node); }
break;
case 29:
/* Line 1787 of yacc.c */
#line 205 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeCondition((yyvsp[(2) - (3)].whenthenlist)); }
#line 228 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeUnaryOperator( QgsExpression::uoMinus, (yyvsp[(2) - (2)].node)); }
break;
case 30:
/* Line 1787 of yacc.c */
#line 206 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeCondition((yyvsp[(2) - (5)].whenthenlist),(yyvsp[(4) - (5)].node)); }
#line 230 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeCondition((yyvsp[(2) - (3)].whenthenlist)); }
break;
case 31:
/* Line 1787 of yacc.c */
#line 209 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeColumnRef( *(yyvsp[(1) - (1)].text) ); delete (yyvsp[(1) - (1)].text); }
#line 231 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeCondition((yyvsp[(2) - (5)].whenthenlist),(yyvsp[(4) - (5)].node)); }
break;
case 32:
/* Line 1787 of yacc.c */
#line 213 "src/core/qgsexpressionparser.yy"
#line 234 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeColumnRef( *(yyvsp[(1) - (1)].text) ); delete (yyvsp[(1) - (1)].text); }
break;
case 33:
/* Line 1787 of yacc.c */
#line 238 "src/core/qgsexpressionparser.yy"
{
int fnIndex = QgsExpression::functionIndex(*(yyvsp[(1) - (1)].text));
if (fnIndex == -1)
{
if ( !QgsExpression::hasSpecialColumn( *(yyvsp[(1) - (1)].text) ) )
{
{
exp_error(parser_ctx, "Special column is not known");
YYERROR;
}
// $var is equivalent to _specialcol_( "$var" )
QgsExpression::NodeList* args = new QgsExpression::NodeList();
QgsExpression::NodeLiteral* literal = new QgsExpression::NodeLiteral( *(yyvsp[(1) - (1)].text) );
args->append( literal );
(yyval.node) = new QgsExpression::NodeFunction( QgsExpression::functionIndex( "_specialcol_" ), args );
delete (yyvsp[(1) - (1)].text);
YYERROR;
}
// $var is equivalent to _specialcol_( "$var" )
QgsExpression::NodeList* args = new QgsExpression::NodeList();
QgsExpression::NodeLiteral* literal = new QgsExpression::NodeLiteral( *(yyvsp[(1) - (1)].text) );
args->append( literal );
(yyval.node) = new QgsExpression::NodeFunction( QgsExpression::functionIndex( "_specialcol_" ), args );
}
else
{
(yyval.node) = new QgsExpression::NodeFunction( fnIndex, NULL );
delete (yyvsp[(1) - (1)].text);
}
else
{
(yyval.node) = new QgsExpression::NodeFunction( fnIndex, NULL );
}
delete (yyvsp[(1) - (1)].text);
}
break;
case 33:
/* Line 1787 of yacc.c */
#line 236 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeLiteral( QVariant((yyvsp[(1) - (1)].numberFloat)) ); }
break;
case 34:
/* Line 1787 of yacc.c */
#line 237 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeLiteral( QVariant((yyvsp[(1) - (1)].numberInt)) ); }
#line 263 "src/core/qgsexpressionparser.yy"
{
// @var is equivalent to var( "var" )
QgsExpression::NodeList* args = new QgsExpression::NodeList();
QgsExpression::NodeLiteral* literal = new QgsExpression::NodeLiteral( QString(*(yyvsp[(1) - (1)].text)).mid(1) );
args->append( literal );
(yyval.node) = new QgsExpression::NodeFunction( QgsExpression::functionIndex( "var" ), args );
delete (yyvsp[(1) - (1)].text);
}
break;
case 35:
/* Line 1787 of yacc.c */
#line 238 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeLiteral( QVariant(*(yyvsp[(1) - (1)].text)) ); delete (yyvsp[(1) - (1)].text); }
#line 273 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeLiteral( QVariant((yyvsp[(1) - (1)].numberFloat)) ); }
break;
case 36:
/* Line 1787 of yacc.c */
#line 239 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeLiteral( QVariant() ); }
#line 274 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeLiteral( QVariant((yyvsp[(1) - (1)].numberInt)) ); }
break;
case 37:
/* Line 1787 of yacc.c */
#line 243 "src/core/qgsexpressionparser.yy"
{ (yyval.nodelist) = (yyvsp[(1) - (3)].nodelist); (yyvsp[(1) - (3)].nodelist)->append((yyvsp[(3) - (3)].node)); }
#line 275 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeLiteral( QVariant((yyvsp[(1) - (1)].boolVal)) ); }
break;
case 38:
/* Line 1787 of yacc.c */
#line 244 "src/core/qgsexpressionparser.yy"
{ (yyval.nodelist) = new QgsExpression::NodeList(); (yyval.nodelist)->append((yyvsp[(1) - (1)].node)); }
#line 276 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeLiteral( QVariant(*(yyvsp[(1) - (1)].text)) ); delete (yyvsp[(1) - (1)].text); }
break;
case 39:
/* Line 1787 of yacc.c */
#line 248 "src/core/qgsexpressionparser.yy"
{ (yyval.whenthenlist) = (yyvsp[(1) - (2)].whenthenlist); (yyvsp[(1) - (2)].whenthenlist)->append((yyvsp[(2) - (2)].whenthen)); }
#line 277 "src/core/qgsexpressionparser.yy"
{ (yyval.node) = new QgsExpression::NodeLiteral( QVariant() ); }
break;
case 40:
/* Line 1787 of yacc.c */
#line 249 "src/core/qgsexpressionparser.yy"
{ (yyval.whenthenlist) = new QgsExpression::WhenThenList(); (yyval.whenthenlist)->append((yyvsp[(1) - (1)].whenthen)); }
#line 281 "src/core/qgsexpressionparser.yy"
{ (yyval.nodelist) = (yyvsp[(1) - (3)].nodelist); (yyvsp[(1) - (3)].nodelist)->append((yyvsp[(3) - (3)].node)); }
break;
case 41:
/* Line 1787 of yacc.c */
#line 253 "src/core/qgsexpressionparser.yy"
#line 282 "src/core/qgsexpressionparser.yy"
{ (yyval.nodelist) = new QgsExpression::NodeList(); (yyval.nodelist)->append((yyvsp[(1) - (1)].node)); }
break;
case 42:
/* Line 1787 of yacc.c */
#line 286 "src/core/qgsexpressionparser.yy"
{ (yyval.whenthenlist) = (yyvsp[(1) - (2)].whenthenlist); (yyvsp[(1) - (2)].whenthenlist)->append((yyvsp[(2) - (2)].whenthen)); }
break;
case 43:
/* Line 1787 of yacc.c */
#line 287 "src/core/qgsexpressionparser.yy"
{ (yyval.whenthenlist) = new QgsExpression::WhenThenList(); (yyval.whenthenlist)->append((yyvsp[(1) - (1)].whenthen)); }
break;
case 44:
/* Line 1787 of yacc.c */
#line 291 "src/core/qgsexpressionparser.yy"
{ (yyval.whenthen) = new QgsExpression::WhenThen((yyvsp[(2) - (4)].node),(yyvsp[(4) - (4)].node)); }
break;
/* Line 1787 of yacc.c */
#line 1882 "/tmp/qgsexpressionparser.cpp"
#line 1955 "src/core/qgsexpressionparser.cpp"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@ -2108,7 +2181,7 @@ yyreturn:
/* Line 2048 of yacc.c */
#line 256 "src/core/qgsexpressionparser.yy"
#line 294 "src/core/qgsexpressionparser.yy"
@ -2131,6 +2204,7 @@ QgsExpression::Node* parseExpression(const QString& str, QString& parserErrorMsg
else // error?
{
parserErrorMsg = ctx.errorMsg;
delete ctx.rootNode;
return NULL;
}
}

View File

@ -30,8 +30,8 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
#ifndef EXP_TMP_QGSEXPRESSIONPARSER_HPP
# define EXP_TMP_QGSEXPRESSIONPARSER_HPP
#ifndef EXP_SRC_CORE_QGSEXPRESSIONPARSER_HPP
# define EXP_SRC_CORE_QGSEXPRESSIONPARSER_HPP
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
@ -69,19 +69,21 @@ extern int exp_debug;
IN = 278,
NUMBER_FLOAT = 279,
NUMBER_INT = 280,
NULLVALUE = 281,
CASE = 282,
WHEN = 283,
THEN = 284,
ELSE = 285,
END = 286,
STRING = 287,
COLUMN_REF = 288,
FUNCTION = 289,
SPECIAL_COL = 290,
COMMA = 291,
Unknown_CHARACTER = 292,
UMINUS = 293
BOOLEAN = 281,
NULLVALUE = 282,
CASE = 283,
WHEN = 284,
THEN = 285,
ELSE = 286,
END = 287,
STRING = 288,
COLUMN_REF = 289,
FUNCTION = 290,
SPECIAL_COL = 291,
VARIABLE = 292,
COMMA = 293,
Unknown_CHARACTER = 294,
UMINUS = 295
};
#endif
@ -96,6 +98,7 @@ typedef union YYSTYPE
QgsExpression::NodeList* nodelist;
double numberFloat;
int numberInt;
bool boolVal;
QString* text;
QgsExpression::BinaryOperator b_op;
QgsExpression::UnaryOperator u_op;
@ -104,7 +107,7 @@ typedef union YYSTYPE
/* Line 2049 of yacc.c */
#line 108 "/tmp/qgsexpressionparser.hpp"
#line 111 "src/core/qgsexpressionparser.hpp"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@ -126,4 +129,4 @@ int exp_parse ();
#endif
#endif /* ! YYPARSE_PARAM */
#endif /* !EXP_TMP_QGSEXPRESSIONPARSER_HPP */
#endif /* !EXP_SRC_CORE_QGSEXPRESSIONPARSER_HPP */

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-CMakeLists_txt,v 1.10 2015/07/21 10:06:14 landry Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.11 2015/10/31 15:29:44 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 26 14:38:57 2015
+++ CMakeLists.txt Mon Jun 29 22:09:08 2015
--- CMakeLists.txt.orig Fri Oct 23 14:10:38 2015
+++ CMakeLists.txt Fri Oct 30 15:44:07 2015
@@ -162,13 +162,13 @@ IF (NOT FLEX_EXECUTABLE)
MESSAGE(FATAL_ERROR "Couldn't find Flex")
ENDIF (NOT FLEX_EXECUTABLE)
@ -23,7 +23,7 @@ lots of undefined refs to syms in libc, we dont link shlibs with -lc
#############################################################
# search for dependencies
@@ -596,12 +596,6 @@ ELSE (WIN32)
@@ -609,12 +609,6 @@ ELSE (WIN32)
ELSE()
SET(DLLEXPORT "")
ENDIF()

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.6 2015/03/16 20:06:33 landry Exp $
--- cmake/FindGDAL.cmake.orig Thu Feb 26 10:12:00 2015
+++ cmake/FindGDAL.cmake Tue Mar 3 10:15:34 2015
$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.7 2015/10/31 15:29:44 landry Exp $
--- cmake/FindGDAL.cmake.orig Fri Oct 23 14:10:38 2015
+++ cmake/FindGDAL.cmake Fri Oct 30 16:42:16 2015
@@ -160,7 +160,7 @@ ELSE(WIN32)
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
ENDIF (NOT GDAL_LIBRARY)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.7 2015/03/16 20:06:33 landry Exp $
--- cmake/FindGEOS.cmake.orig Thu Feb 26 10:12:00 2015
+++ cmake/FindGEOS.cmake Tue Mar 3 10:15:34 2015
$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.8 2015/10/31 15:29:44 landry Exp $
--- cmake/FindGEOS.cmake.orig Fri Oct 23 14:10:38 2015
+++ cmake/FindGEOS.cmake Fri Oct 30 16:42:16 2015
@@ -148,7 +148,7 @@ ELSE(WIN32)
SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
ENDIF (NOT GEOS_LIBRARY)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.5 2014/11/10 16:05:17 landry Exp $
--- cmake/FindPostgres.cmake.orig Fri Oct 31 15:17:19 2014
+++ cmake/FindPostgres.cmake Fri Nov 7 14:44:07 2014
$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.6 2015/10/31 15:29:44 landry Exp $
--- cmake/FindPostgres.cmake.orig Fri Oct 23 14:10:38 2015
+++ cmake/FindPostgres.cmake Fri Oct 30 16:42:16 2015
@@ -96,7 +96,7 @@ ELSE(WIN32)
ENDFOREACH(_LIBNAME ${_LIBS})

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_analysis_CMakeLists_txt,v 1.3 2015/03/16 20:06:33 landry Exp $
$OpenBSD: patch-src_analysis_CMakeLists_txt,v 1.4 2015/10/31 15:29:44 landry Exp $
dont call bison to generate the parser, and build the pregenerated file instead
--- src/analysis/CMakeLists.txt.orig Thu Feb 26 10:12:00 2015
+++ src/analysis/CMakeLists.txt Tue Mar 3 10:15:34 2015
@@ -33,6 +33,7 @@ SET(QGIS_ANALYSIS_SRCS
--- src/analysis/CMakeLists.txt.orig Fri Oct 23 14:10:38 2015
+++ src/analysis/CMakeLists.txt Fri Oct 30 15:44:07 2015
@@ -35,6 +35,7 @@ SET(QGIS_ANALYSIS_SRCS
raster/qgsrelief.cpp
raster/qgsrastercalcnode.cpp
raster/qgsrastercalculator.cpp
@ -10,7 +10,7 @@ dont call bison to generate the parser, and build the pregenerated file instead
raster/qgsrastermatrix.cpp
vector/mersenne-twister.cpp
vector/qgsgeometryanalyzer.cpp
@@ -58,7 +59,7 @@ INCLUDE_DIRECTORIES(BEFORE raster)
@@ -60,7 +61,7 @@ INCLUDE_DIRECTORIES(BEFORE raster)
ADD_FLEX_FILES_PREFIX(QGIS_ANALYSIS_SRCS raster raster/qgsrastercalclexer.ll)

View File

@ -1,10 +0,0 @@
$OpenBSD: patch-src_analysis_vector_qgszonalstatistics_cpp,v 1.2 2015/07/21 11:39:52 landry Exp $
https://github.com/qgis/QGIS/pull/2215
--- src/analysis/vector/qgszonalstatistics.cpp.orig Mon Jun 29 23:07:26 2015
+++ src/analysis/vector/qgszonalstatistics.cpp Mon Jun 29 23:07:35 2015
@@ -1,4 +1,4 @@
-/***************************************************************************
+/***************************************************************************
qgszonalstatistics.cpp - description
----------------------------
begin : August 29th, 2009

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.7 2015/07/21 10:06:14 landry Exp $
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.8 2015/10/31 15:29:44 landry Exp $
Fix paths to docs
--- src/app/qgisapp.cpp.orig Fri Jun 26 14:38:57 2015
+++ src/app/qgisapp.cpp Mon Jun 29 22:08:17 2015
@@ -1339,7 +1339,7 @@ void QgisApp::createActions()
--- src/app/qgisapp.cpp.orig Fri Oct 23 14:10:38 2015
+++ src/app/qgisapp.cpp Fri Oct 30 15:44:07 2015
@@ -1481,7 +1481,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() ) );
@@ -7989,7 +7989,7 @@ void QgisApp::helpContents()
@@ -8218,7 +8218,7 @@ void QgisApp::helpContents()
void QgisApp::apiDocumentation()
{
@ -20,7 +20,7 @@ Fix paths to docs
{
openURL( "api/index.html" );
}
@@ -8014,7 +8014,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
@@ -8243,7 +8243,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
// open help in user browser
if ( useQgisDocDirectory )
{

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_app_qgsabout_cpp,v 1.6 2015/07/21 10:06:14 landry Exp $
--- src/app/qgsabout.cpp.orig Fri Jun 26 14:38:57 2015
+++ src/app/qgsabout.cpp Mon Jun 29 22:10:38 2015
@@ -231,7 +231,7 @@ void QgsAbout::setWhatsNew()
$OpenBSD: patch-src_app_qgsabout_cpp,v 1.7 2015/10/31 15:29:44 landry Exp $
--- src/app/qgsabout.cpp.orig Fri Oct 23 14:10:38 2015
+++ src/app/qgsabout.cpp Fri Oct 30 15:44:07 2015
@@ -237,7 +237,7 @@ void QgsAbout::setWhatsNew()
{
txtWhatsNew->clear();
txtWhatsNew->document()->setDefaultStyleSheet( QgsApplication::reportStyleSheet() );

View File

@ -1,16 +1,26 @@
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.9 2015/07/21 10:06:14 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 26 14:38:57 2015
+++ src/core/CMakeLists.txt Mon Jun 29 22:08:17 2015
@@ -93,6 +93,7 @@ SET(QGIS_CORE_SRCS
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.10 2015/10/31 15:29:44 landry Exp $
chunk 1/3: dont call bison to generate the parser, and build the pregenerated file instead
chunk 2: workaround $area expansion issue with gmake expanding to $$$$area
--- src/core/CMakeLists.txt.orig Fri Oct 23 14:10:38 2015
+++ src/core/CMakeLists.txt Fri Oct 30 16:47:52 2015
@@ -100,6 +100,7 @@ SET(QGIS_CORE_SRCS
qgsdistancearea.cpp
qgserror.cpp
qgsexpression.cpp
+ qgsexpressionparser.cpp
qgsexpressioncontext.cpp
qgsexpression_texts.cpp
qgsexpressionfieldbuffer.cpp
qgsfeature.cpp
@@ -368,7 +369,7 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FO
@@ -327,7 +328,7 @@ SET(QGIS_CORE_SRCS
geometry/qgswkbtypes.cpp
)
-FILE(GLOB JSON_HELP_FILES "${CMAKE_SOURCE_DIR}/resources/function_help/json/*")
+FILE(GLOB JSON_HELP_FILES "${CMAKE_SOURCE_DIR}/resources/function_help/json/a*")
STRING(REPLACE "$" "$$" JSON_HELP_FILES "${JSON_HELP_FILES}")
STRING(REPLACE "\(" "\\(" JSON_HELP_FILES "${JSON_HELP_FILES}")
STRING(REPLACE "\)" "\\)" JSON_HELP_FILES "${JSON_HELP_FILES}")
@@ -392,7 +393,7 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FO
ADD_FLEX_FILES(QGIS_CORE_SRCS qgsexpressionlexer.ll)
@ -19,7 +29,7 @@ chunk 1/2: dont call bison to generate the parser, and build the pregenerated fi
SET(QGIS_CORE_MOC_HDRS
@@ -812,9 +813,9 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
@@ -864,9 +865,9 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
TARGET_LINK_LIBRARIES(qgis_core
${QT_QTMAIN_LIBRARY}
${QT_QTXML_LIBRARY}
@ -31,4 +41,4 @@ chunk 1/2: dont call bison to generate the parser, and build the pregenerated fi
+ ${QT_QTNETWORK_LIBRARY} ${QT_QTNETWORK_LIB_DEPENDENCIES}
${QT_QTSVG_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
${QT_QTSQL_LIBRARY}

View File

@ -1,58 +1,59 @@
$OpenBSD: patch-src_core_qgsapplication_cpp,v 1.5 2015/07/21 10:06:14 landry Exp $
$OpenBSD: patch-src_core_qgsapplication_cpp,v 1.6 2015/10/31 15:29:44 landry Exp $
Fix paths to various doc files, installed in share/doc/qgis
per doc/CMakeLists.txt patch
--- src/core/qgsapplication.cpp.orig Fri Jun 26 14:38:57 2015
+++ src/core/qgsapplication.cpp Mon Jun 29 22:08:17 2015
@@ -434,25 +434,25 @@ const QString QgsApplication::themeName()
--- src/core/qgsapplication.cpp.orig Fri Oct 23 14:10:38 2015
+++ src/core/qgsapplication.cpp Fri Oct 30 15:48:30 2015
@@ -528,18 +528,18 @@ QHash<QString, QString> QgsApplication::uiThemes()
*/
const QString QgsApplication::authorsFilePath()
QString QgsApplication::authorsFilePath()
{
- return ABISYM( mPkgDataPath ) + QString( "/doc/AUTHORS" );
+ return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/AUTHORS" );
- return ABISYM( mPkgDataPath ) + QLatin1String( "/doc/AUTHORS" );
+ return ABISYM( mPkgDataPath ) + QLatin1String( "../doc/qgis/AUTHORS" );
}
/*!
Returns the path to the contributors file.
*/
const QString QgsApplication::contributorsFilePath()
QString QgsApplication::contributorsFilePath()
{
- return ABISYM( mPkgDataPath ) + QString( "/doc/CONTRIBUTORS" );
+ return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/CONTRIBUTORS" );
- return ABISYM( mPkgDataPath ) + QLatin1String( "/doc/CONTRIBUTORS" );
+ return ABISYM( mPkgDataPath ) + QLatin1String( "../doc/qgis/CONTRIBUTORS" );
}
const QString QgsApplication::developersMapFilePath()
QString QgsApplication::developersMapFilePath()
{
- return ABISYM( mPkgDataPath ) + QString( "/doc/developersmap.html" );
+ return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/developersmap.html" );
}
/*!
Returns the path to the sponsors file.
*/
const QString QgsApplication::sponsorsFilePath()
{
- return ABISYM( mPkgDataPath ) + QString( "/doc/SPONSORS" );
+ return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/SPONSORS" );
- return ABISYM( mPkgDataPath ) + QLatin1String( "/doc/developersmap.html" );
+ return ABISYM( mPkgDataPath ) + QLatin1String( "../doc/qgis/developersmap.html" );
}
/*!
@@ -460,19 +460,19 @@ const QString QgsApplication::sponsorsFilePath()
@@ -547,7 +547,7 @@ QString QgsApplication::developersMapFilePath()
*/
const QString QgsApplication::donorsFilePath()
QString QgsApplication::sponsorsFilePath()
{
- return ABISYM( mPkgDataPath ) + QString( "/doc/DONORS" );
+ return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/DONORS" );
- return ABISYM( mPkgDataPath ) + QLatin1String( "/doc/SPONSORS" );
+ return ABISYM( mPkgDataPath ) + QLatin1String( "../doc/qgis/SPONSORS" );
}
/*!
@@ -555,19 +555,19 @@ QString QgsApplication::sponsorsFilePath()
*/
QString QgsApplication::donorsFilePath()
{
- return ABISYM( mPkgDataPath ) + QLatin1String( "/doc/DONORS" );
+ return ABISYM( mPkgDataPath ) + QLatin1String( "../doc/qgis/DONORS" );
}
/** Returns the path to the sponsors file. */
const QString QgsApplication::translatorsFilePath()
QString QgsApplication::translatorsFilePath()
{
- return ABISYM( mPkgDataPath ) + QString( "/doc/TRANSLATORS" );
+ return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/TRANSLATORS" );
- return ABISYM( mPkgDataPath ) + QLatin1String( "/doc/TRANSLATORS" );
+ return ABISYM( mPkgDataPath ) + QLatin1String( "../doc/qgis/TRANSLATORS" );
}
/** Returns the path to the licence file. */
const QString QgsApplication::licenceFilePath()
QString QgsApplication::licenceFilePath()
{
- return ABISYM( mPkgDataPath ) + QString( "/doc/LICENSE" );
+ return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/LICENSE" );
- return ABISYM( mPkgDataPath ) + QLatin1String( "/doc/LICENSE" );
+ return ABISYM( mPkgDataPath ) + QLatin1String( "../doc/qgis/LICENSE" );
}
/*!

View File

@ -1,10 +0,0 @@
$OpenBSD: patch-src_core_qgshistogram_cpp,v 1.2 2015/07/21 11:39:52 landry Exp $
https://github.com/qgis/QGIS/pull/2215
--- src/core/qgshistogram.cpp.orig Mon Jun 29 22:31:50 2015
+++ src/core/qgshistogram.cpp Mon Jun 29 22:37:27 2015
@@ -1,4 +1,4 @@
-/***************************************************************************
+/***************************************************************************
qgshistogram.cpp
----------------
begin : May 2015

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_helpviewer_CMakeLists_txt,v 1.3 2015/03/16 20:06:33 landry Exp $
--- src/helpviewer/CMakeLists.txt.orig Thu Feb 26 10:12:00 2015
+++ src/helpviewer/CMakeLists.txt Tue Mar 3 10:16:43 2015
@@ -60,9 +60,9 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
$OpenBSD: patch-src_helpviewer_CMakeLists_txt,v 1.4 2015/10/31 15:29:44 landry Exp $
--- src/helpviewer/CMakeLists.txt.orig Fri Oct 23 14:10:38 2015
+++ src/helpviewer/CMakeLists.txt Fri Oct 30 15:44:07 2015
@@ -63,9 +63,9 @@ INCLUDE_DIRECTORIES(SYSTEM
TARGET_LINK_LIBRARIES(qgis_help
qgis_core

View File

@ -1,10 +0,0 @@
$OpenBSD: patch-src_plugins_zonal_statistics_qgszonalstatisticsdialog_h,v 1.2 2015/07/21 11:39:52 landry Exp $
https://github.com/qgis/QGIS/pull/2215
--- src/plugins/zonal_statistics/qgszonalstatisticsdialog.h.orig Mon Jun 29 23:46:33 2015
+++ src/plugins/zonal_statistics/qgszonalstatisticsdialog.h Mon Jun 29 23:46:38 2015
@@ -1,4 +1,4 @@
-/***************************************************************************
+/***************************************************************************
qgszonalstatisticsdialog.h - description
-----------------------
begin : September 1st, 2009

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_providers_delimitedtext_CMakeLists_txt,v 1.2 2015/07/21 10:06:14 landry Exp $
$OpenBSD: patch-src_providers_delimitedtext_CMakeLists_txt,v 1.3 2015/10/31 15:29:44 landry Exp $
Fix dependency
--- src/providers/delimitedtext/CMakeLists.txt.orig Fri Jun 26 14:38:57 2015
+++ src/providers/delimitedtext/CMakeLists.txt Mon Jun 29 22:08:17 2015
@@ -32,6 +32,7 @@ ADD_LIBRARY(delimitedtextprovider MODULE ${DTEXT_SRCS}
--- src/providers/delimitedtext/CMakeLists.txt.orig Fri Oct 23 14:10:38 2015
+++ src/providers/delimitedtext/CMakeLists.txt Fri Oct 30 15:44:07 2015
@@ -36,6 +36,7 @@ ADD_LIBRARY(delimitedtextprovider MODULE ${DTEXT_SRCS}
TARGET_LINK_LIBRARIES(delimitedtextprovider
qgis_core

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_server_CMakeLists_txt,v 1.2 2015/07/21 10:06:14 landry Exp $
$OpenBSD: patch-src_server_CMakeLists_txt,v 1.3 2015/10/31 15:29:44 landry Exp $
install sld & xml in share/qgis
--- src/server/CMakeLists.txt.orig Fri Jun 26 14:38:57 2015
+++ src/server/CMakeLists.txt Mon Jun 29 22:08:17 2015
@@ -195,6 +195,6 @@ INSTALL(FILES
--- src/server/CMakeLists.txt.orig Fri Oct 23 14:10:38 2015
+++ src/server/CMakeLists.txt Fri Oct 30 15:44:07 2015
@@ -216,6 +216,6 @@ INSTALL(FILES
admin.sld
wms_metadata.xml
schemaExtension.xsd

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2015/07/21 10:06:14 landry Exp $
@comment $OpenBSD: PLIST,v 1.17 2015/10/31 15:29:44 landry Exp $
@bin bin/qbrowser
@bin bin/qgis
@bin bin/qgis_bench
@ -29,6 +29,8 @@ include/qgis/qgsabstractgeometryv2.h
include/qgis/qgsactionmenu.h
include/qgis/qgsaddremoveitemcommand.h
include/qgis/qgsaddremovemultiframecommand.h
include/qgis/qgsadvanceddigitizingdockwidget.h
include/qgis/qgsalignraster.h
include/qgis/qgsannotationitem.h
include/qgis/qgsapplication.h
include/qgis/qgsarcproperter.h
@ -46,6 +48,33 @@ include/qgis/qgsattributetablefiltermodel.h
include/qgis/qgsattributetablemodel.h
include/qgis/qgsattributetableview.h
include/qgis/qgsattributetypeloaddialog.h
include/qgis/qgsauthauthoritieseditor.h
include/qgis/qgsauthcertificateinfo.h
include/qgis/qgsauthcertificatemanager.h
include/qgis/qgsauthcerttrustpolicycombobox.h
include/qgis/qgsauthcertutils.h
include/qgis/qgsauthconfig.h
include/qgis/qgsauthconfigedit.h
include/qgis/qgsauthconfigeditor.h
include/qgis/qgsauthconfigidedit.h
include/qgis/qgsauthconfigselect.h
include/qgis/qgsauthcrypto.h
include/qgis/qgsautheditorwidgets.h
include/qgis/qgsauthguiutils.h
include/qgis/qgsauthidentitieseditor.h
include/qgis/qgsauthimportcertdialog.h
include/qgis/qgsauthimportidentitydialog.h
include/qgis/qgsauthmanager.h
include/qgis/qgsauthmasterpassresetdialog.h
include/qgis/qgsauthmethod.h
include/qgis/qgsauthmethodedit.h
include/qgis/qgsauthmethodmetadata.h
include/qgis/qgsauthmethodregistry.h
include/qgis/qgsauthserverseditor.h
include/qgis/qgsauthsslconfigwidget.h
include/qgis/qgsauthsslerrorsdialog.h
include/qgis/qgsauthsslimportdialog.h
include/qgis/qgsauthtrustedcasdialog.h
include/qgis/qgsbilinearrasterresampler.h
include/qgis/qgsblendmodecombobox.h
include/qgis/qgsblureffect.h
@ -121,6 +150,7 @@ include/qgis/qgscomposertablev2.h
include/qgis/qgscomposertexttable.h
include/qgis/qgscomposerview.h
include/qgis/qgscomposition.h
include/qgis/qgsconditionalstyle.h
include/qgis/qgsconfig.h
include/qgis/qgsconnectionpool.h
include/qgis/qgscontexthelp.h
@ -189,6 +219,7 @@ include/qgis/qgsexception.h
include/qgis/qgsexpression.h
include/qgis/qgsexpressionbuilderdialog.h
include/qgis/qgsexpressionbuilderwidget.h
include/qgis/qgsexpressioncontext.h
include/qgis/qgsexpressionfieldbuffer.h
include/qgis/qgsexpressionhighlighter.h
include/qgis/qgsexpressionselectiondialog.h
@ -207,6 +238,7 @@ include/qgis/qgsfeaturestore.h
include/qgis/qgsfield.h
include/qgis/qgsfield_p.h
include/qgis/qgsfieldcombobox.h
include/qgis/qgsfieldconditionalformatwidget.h
include/qgis/qgsfieldexpressionwidget.h
include/qgis/qgsfieldmodel.h
include/qgis/qgsfieldproxymodel.h
@ -260,6 +292,7 @@ include/qgis/qgsinvertedpolygonrenderer.h
include/qgis/qgsinvertedpolygonrendererwidget.h
include/qgis/qgslabel.h
include/qgis/qgslabelattributes.h
include/qgis/qgslabelingenginev2.h
include/qgis/qgslabelsearchtree.h
include/qgis/qgslayerdefinition.h
include/qgis/qgslayerpropertieswidget.h
@ -304,6 +337,7 @@ include/qgis/qgsmaplayerproxymodel.h
include/qgis/qgsmaplayerregistry.h
include/qgis/qgsmaplayerrenderer.h
include/qgis/qgsmaplayerstylemanager.h
include/qgis/qgsmapmouseevent.h
include/qgis/qgsmapoverviewcanvas.h
include/qgis/qgsmaprenderer.h
include/qgis/qgsmaprenderercache.h
@ -314,6 +348,9 @@ include/qgis/qgsmaprenderersequentialjob.h
include/qgis/qgsmapsettings.h
include/qgis/qgsmaptip.h
include/qgis/qgsmaptool.h
include/qgis/qgsmaptooladvanceddigitizing.h
include/qgis/qgsmaptoolcapture.h
include/qgis/qgsmaptooledit.h
include/qgis/qgsmaptoolemitpoint.h
include/qgis/qgsmaptoolidentify.h
include/qgis/qgsmaptoolidentifyfeature.h
@ -370,6 +407,7 @@ include/qgis/qgsphotoconfigdlg.h
include/qgis/qgsphotowidgetfactory.h
include/qgis/qgsphotowidgetwrapper.h
include/qgis/qgspiediagram.h
include/qgis/qgspixmaplabel.h
include/qgis/qgspluginlayer.h
include/qgis/qgspluginlayerregistry.h
include/qgis/qgspluginmanagerinterface.h
@ -377,6 +415,7 @@ include/qgis/qgspoint.h
include/qgis/qgspointdisplacementrenderer.h
include/qgis/qgspointdisplacementrendererwidget.h
include/qgis/qgspointlocator.h
include/qgis/qgspointv2.h
include/qgis/qgsprevieweffect.h
include/qgis/qgsproject.h
include/qgis/qgsprojectbadlayerguihandler.h
@ -460,6 +499,7 @@ include/qgis/qgsscaleutils.h
include/qgis/qgsscalevisibilitydialog.h
include/qgis/qgsscalewidget.h
include/qgis/qgssearchquerybuilder.h
include/qgis/qgssearchwidgetwrapper.h
include/qgis/qgsshadoweffect.h
include/qgis/qgssimplifymethod.h
include/qgis/qgssinglebandcolordatarenderer.h
@ -479,6 +519,7 @@ include/qgis/qgssnappingutils.h
include/qgis/qgsspatialindex.h
include/qgis/qgsspinbox.h
include/qgis/qgsstatisticalsummary.h
include/qgis/qgsstringutils.h
include/qgis/qgsstylev2.h
include/qgis/qgsstylev2exportimportdialog.h
include/qgis/qgsstylev2managerdialog.h
@ -514,11 +555,14 @@ include/qgis/qgsuserinputdockwidget.h
include/qgis/qgsuuidwidgetfactory.h
include/qgis/qgsuuidwidgetwrapper.h
include/qgis/qgsvaluemapconfigdlg.h
include/qgis/qgsvaluemapsearchwidgetwrapper.h
include/qgis/qgsvaluemapwidgetfactory.h
include/qgis/qgsvaluemapwidgetwrapper.h
include/qgis/qgsvaluerelationconfigdlg.h
include/qgis/qgsvaluerelationsearchwidgetwrapper.h
include/qgis/qgsvaluerelationwidgetfactory.h
include/qgis/qgsvaluerelationwidgetwrapper.h
include/qgis/qgsvariableeditorwidget.h
include/qgis/qgsvectorcolorbrewercolorrampv2dialog.h
include/qgis/qgsvectorcolorrampv2.h
include/qgis/qgsvectordataprovider.h
@ -528,12 +572,14 @@ include/qgis/qgsvectorfilewriter.h
include/qgis/qgsvectorgradientcolorrampv2dialog.h
include/qgis/qgsvectorlayer.h
include/qgis/qgsvectorlayercache.h
include/qgis/qgsvectorlayerdiagramprovider.h
include/qgis/qgsvectorlayereditbuffer.h
include/qgis/qgsvectorlayereditpassthrough.h
include/qgis/qgsvectorlayereditutils.h
include/qgis/qgsvectorlayerfeatureiterator.h
include/qgis/qgsvectorlayerimport.h
include/qgis/qgsvectorlayerjoinbuffer.h
include/qgis/qgsvectorlayerlabelprovider.h
include/qgis/qgsvectorlayerrenderer.h
include/qgis/qgsvectorlayerselectionmanager.h
include/qgis/qgsvectorlayertools.h
@ -541,6 +587,7 @@ include/qgis/qgsvectorlayerundocommand.h
include/qgis/qgsvectorrandomcolorrampv2dialog.h
include/qgis/qgsvectorsimplifymethod.h
include/qgis/qgsvertexmarker.h
include/qgis/qgsvisibilitypresetcollection.h
include/qgis/qgswebframe.h
include/qgis/qgswebpage.h
include/qgis/qgswebview.h
@ -564,6 +611,7 @@ include/qgis/ui_qgsprojectionselectorbase.h
include/qgis/ui_qgsquerybuilderbase.h
include/qgis/ui_qgssublayersdialogbase.h
@lib lib/libqgis_analysis.so.${LIBqgis_analysis_VERSION}
@lib lib/libqgis_app.so.${LIBqgis_app_VERSION}
@lib lib/libqgis_core.so.${LIBqgis_core_VERSION}
@lib lib/libqgis_gui.so.${LIBqgis_gui_VERSION}
@lib lib/libqgis_networkanalysis.so.${LIBqgis_networkanalysis_VERSION}
@ -572,15 +620,19 @@ include/qgis/ui_qgssublayersdialogbase.h
lib/qgis/
@bin lib/qgis/crssync
lib/qgis/plugins/
lib/qgis/plugins/libbasicauthmethod.so
lib/qgis/plugins/libcoordinatecaptureplugin.so
lib/qgis/plugins/libdelimitedtextprovider.so
lib/qgis/plugins/libdxf2shpconverterplugin.so
lib/qgis/plugins/libevis.so
lib/qgis/plugins/libgdalprovider.so
lib/qgis/plugins/libgeometrycheckerplugin.so
lib/qgis/plugins/libgeometrysnapperplugin.so
lib/qgis/plugins/libgeorefplugin.so
lib/qgis/plugins/libgpsimporterplugin.so
lib/qgis/plugins/libgpxprovider.so
lib/qgis/plugins/libheatmapplugin.so
lib/qgis/plugins/libidentcertauthmethod.so
lib/qgis/plugins/libinterpolationplugin.so
lib/qgis/plugins/libmemoryprovider.so
lib/qgis/plugins/libmssqlprovider.so
@ -588,6 +640,8 @@ lib/qgis/plugins/libofflineeditingplugin.so
lib/qgis/plugins/libogrprovider.so
lib/qgis/plugins/liboracleplugin.so
lib/qgis/plugins/libowsprovider.so
lib/qgis/plugins/libpkcs12authmethod.so
lib/qgis/plugins/libpkipathsauthmethod.so
lib/qgis/plugins/libpostgresprovider.so
lib/qgis/plugins/librasterterrainplugin.so
lib/qgis/plugins/libroadgraphplugin.so
@ -636,7 +690,6 @@ share/qgis/i18n/qgis_el.qm
share/qgis/i18n/qgis_es.qm
share/qgis/i18n/qgis_et.qm
share/qgis/i18n/qgis_eu.qm
share/qgis/i18n/qgis_fa.qm
share/qgis/i18n/qgis_fi.qm
share/qgis/i18n/qgis_fr.qm
share/qgis/i18n/qgis_gl.qm
@ -644,7 +697,6 @@ share/qgis/i18n/qgis_hi.qm
share/qgis/i18n/qgis_hr.qm
share/qgis/i18n/qgis_hu.qm
share/qgis/i18n/qgis_id.qm
share/qgis/i18n/qgis_is.qm
share/qgis/i18n/qgis_it.qm
share/qgis/i18n/qgis_ja.qm
share/qgis/i18n/qgis_km.qm
@ -663,7 +715,6 @@ share/qgis/i18n/qgis_sl.qm
share/qgis/i18n/qgis_sr.qm
share/qgis/i18n/qgis_sr@latin.qm
share/qgis/i18n/qgis_sv.qm
share/qgis/i18n/qgis_th.qm
share/qgis/i18n/qgis_tr.qm
share/qgis/i18n/qgis_vi.qm
share/qgis/i18n/qgis_zh-Hans.qm
@ -1001,6 +1052,7 @@ share/qgis/python/plugins/db_manager/dlg_table_properties.py
share/qgis/python/plugins/db_manager/icons/
share/qgis/python/plugins/db_manager/icons/about.png
share/qgis/python/plugins/db_manager/icons/action_del_table.png
share/qgis/python/plugins/db_manager/icons/action_delete.png
share/qgis/python/plugins/db_manager/icons/action_edit_table.png
share/qgis/python/plugins/db_manager/icons/action_export.png
share/qgis/python/plugins/db_manager/icons/action_import.png
@ -1923,6 +1975,7 @@ share/qgis/python/plugins/processing/algs/qgis/MeanCoords.py
share/qgis/python/plugins/processing/algs/qgis/Merge.py
share/qgis/python/plugins/processing/algs/qgis/MultipartToSingleparts.py
share/qgis/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py
share/qgis/python/plugins/processing/algs/qgis/OrientedMinimumBoundingBox.py
share/qgis/python/plugins/processing/algs/qgis/PointDistance.py
share/qgis/python/plugins/processing/algs/qgis/PointsDisplacement.py
share/qgis/python/plugins/processing/algs/qgis/PointsFromLines.py
@ -2133,7 +2186,7 @@ share/qgis/python/plugins/processing/algs/saga/description/2.1.2/MassBalanceInde
share/qgis/python/plugins/processing/algs/saga/description/2.1.2/MergeLayers.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.2/MetricConversions.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.2/MinimumDistanceAnalysis.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.2/ModifedQuadraticShepard.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.2/ModifiedQuadraticShepard.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.2/MorphologicalFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.2/MorphometricProtectionIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.2/Mosaicking.txt
@ -2368,7 +2421,7 @@ share/qgis/python/plugins/processing/algs/saga/description/2.1.3/MassBalanceInde
share/qgis/python/plugins/processing/algs/saga/description/2.1.3/MergeLayers.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.3/MetricConversions.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.3/MinimumDistanceAnalysis.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.3/ModifedQuadraticShepard.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.3/ModifiedQuadraticShepard.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.3/MorphologicalFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.3/MorphometricProtectionIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.3/Mosaicking.txt
@ -2477,6 +2530,476 @@ share/qgis/python/plugins/processing/algs/saga/description/2.1.3/WatershedBasins
share/qgis/python/plugins/processing/algs/saga/description/2.1.3/WatershedSegmentation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.3/WindEffect(WindwardLeewardIndex).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.3/ZonalGridStatistics.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/AccumulatedCost(Anisotropic).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/AccumulatedCost(Isotropic).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/AddCoordinatestopoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/AddGridValuestoPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/AddGridValuestoShapes.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/AddPolygonAttributestoPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Aggregate.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/AggregatePointObservations.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/AggregationIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/AnalyticalHierarchyProcess.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/AnalyticalHillshading.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/B-SplineApproximation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/BurnStreamNetworkintoDEM.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CatchmentArea(FlowTracing).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CatchmentArea(Parallel).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CatchmentArea(Recursive).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CellBalance.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ChangeDateFormat.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ChangeDetection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ChangeGridValues.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ChangeTimeFormat.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ChannelNetwork.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ChannelNetworkandDrainageBasins.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ClipGridwithPolygon.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ClipPointswithPolygons.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CloseGaps.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CloseGapswithSpline.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CloseOneCellGaps.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ClusterAnalysisforGrids.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ContourLinesfromGrid.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ConvergenceIndex(SearchRadius).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ConvergenceIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ConvertDataStorageType.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ConvertLinestoPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ConvertLinestoPolygons.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ConvertMultipointstoPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ConvertPointstoLine(s).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ConvertPolygonLineVerticestoPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ConvertPolygonstoLines.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ConvexHull.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CreateGraticule.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CropToData.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Cross-ClassificationandTabulation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CrossProfiles.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CubicSplineApproximation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CurvatureClassification.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/CutShapesLayer.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/DTMFilter(slope-based).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/DirectionalStatisticsforSingleGrid.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/DistanceMatrix.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/DiurnalAnisotropicHeating.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/DownslopeDistanceGradient.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/EdgeContamination.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/EffectiveAirFlowHeights.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FastRegionGrowingAlgorithm.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FastRepresentativeness.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FillGapsinRecords.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FillSinks(PlanchonDarboux,2001).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FillSinks(WangLiu).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FillSinksXXL(WangLiu).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FilterClumps.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FireRiskAnalysis.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FitNPointstoshape.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FlatDetection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FlowPathLength.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FlowWidthandSpecificCatchmentArea.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Fragmentation(Alternative).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Fragmentation(Standard).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FragmentationClassesfromDensityandConnectivity.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Function.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Fuzzify.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FuzzyIntersection(AND).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/FuzzyUnion(OR).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GaussianFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GeographicallyWeightedMultipleRegression(Points).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GeographicallyWeightedMultipleRegression(PointsGrids).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GeographicallyWeightedMultipleRegression.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GeographicallyWeightedRegression(PointsGrid).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GeographicallyWeightedRegression.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GeometricFigures.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GetShapesExtents.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GlobalMoransIforGrids.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GradientVectorfromCartesiantoPolarCoordinates.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GradientVectorfromPolartoCartesianCoordinates.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GradientVectorsfromDirectionalComponents.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GradientVectorsfromDirectionandLength.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GradientVectorsfromSurface.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridBuffer.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridCalculator.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridCellIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridDifference.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridDivision.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridMasking.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridNormalisation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridOrientation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridProximityBuffer.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridSkeletonization.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridStandardisation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridStatisticsforPolygons.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridValuestoPoints(randomly).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridValuestoPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridVolume.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridsProduct.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/GridsSum.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/HistogramSurface.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Hypsometry.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/InverseDistanceWeighted.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/InvertDataNo-Data.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/KernelDensityEstimation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/LSFactor.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/LakeFlood.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/LandSurfaceTemperature.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/LaplacianFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Layerofextremevalue.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/LeastCostPaths.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Line-PolygonIntersection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/LineDissolve.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/LineProperties.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/LineSimplification.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/LocalMinimaandMaxima.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MajorityFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MassBalanceIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MergeLayers.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MetricConversions.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MinimumDistanceAnalysis.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ModifiedQuadraticShepard.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MorphologicalFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MorphometricProtectionIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Mosaicking.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Multi-BandVariation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MultiDirectionLeeFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MultilevelB-SplineInterpolation(fromGrid).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MultilevelB-SplineInterpolation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MultipleRegressionAnalysis(GridGrids).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MultipleRegressionAnalysis(PointsGrids).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/MultiresolutionIndexofValleyBottomFlatness(MRVBF).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/NaturalNeighbour.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/NearestNeighbour.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/OrderedWeightedAveraging(OWA).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/OrdinaryKriging(Global).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/OrdinaryKriging.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/OverlandFlow-KinematicWaveD8.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/OverlandFlowDistancetoChannelNetwork.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Patching.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PatternAnalysis.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PointStatisticsforPolygons.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PointsFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PointsThinning.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolartoCartesianCoordinates.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Polygon-LineIntersection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonCentroids.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonDifference.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonDissolve.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonDissolveAllPolygs.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonIdentity.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonIntersect.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonPartstoSeparatePolygons.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonProperties.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonShapeIndices.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonSymmetricalDifference.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonUnion.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonUpdate.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolygonstoEdgesandNodes.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PolynomialRegression.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/PrincipleComponentsAnalysis.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Profilefrompoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ProfilesfromLines.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ProximityGrid.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/QuadTreeStructuretoShapes.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/RGBComposite.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/RadiusofVariance(Grid).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/RandomField.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/RandomTerrainGeneration.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/RankFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/RealSurfaceArea.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ReclassifyGridValues.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/RegressionAnalysis(PointsGrid).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/RelativeHeightsandSlopePositions.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/RemoveDuplicatePoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Representativeness(Grid).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Resampling.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ResidualAnalysis(Grid).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/RunningAverage.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SAGAWetnessIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SeedGeneration.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Separatepointsbydirection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ShapesBuffer.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ShapesBufferFixed.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ShapestoGrid.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ShrinkAndExpand.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SimpleFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SimpleRegionGrowing.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Simulation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SinkDrainageRouteDetection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SinkRemoval.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SkyViewFactor.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Slope,Aspect,Curvature.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SlopeLength.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SoilTextureClassification.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SpatialPointPatternAnalysis.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SplitShapesLayerRandomly.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/StatisticsforGrids.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/StrahlerOrder.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/StreamPowerIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SupervisedClassification.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/SurfaceSpecificPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/TPIBasedLandformClassification.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/TerrainRuggednessIndex(TRI).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ThinPlateSpline(Global).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ThinPlateSpline(Local).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ThinPlateSpline(TIN).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ThresholdBuffer.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/TopographicCorrection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/TopographicPositionIndex(TPI).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/TopographicWetnessIndex(TWI).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Transectthroughpolygonshapefile.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/TransformShapes.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/TransposeGrids.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/Triangulation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/UniversalKriging(Global).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/UniversalKriging.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/UpslopeArea.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/UserDefinedFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/VariogramCloud.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/VariogramSurface.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/VectorRuggednessMeasure(VRM).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/VectorisingGridClasses.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/VegetationIndex(SlopeBased).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/VerticalDistancetoChannelNetwork.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/WaterRetentionCapacity.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/WatershedBasins.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/WatershedSegmentation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/WindEffect(WindwardLeewardIndex).txt
share/qgis/python/plugins/processing/algs/saga/description/2.1.4/ZonalGridStatistics.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/AccumulatedCost(Anisotropic).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/AccumulatedCost(Isotropic).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/AddCoordinatestopoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/AddGridValuestoPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/AddGridValuestoShapes.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/AddPolygonAttributestoPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Aggregate.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/AggregatePointObservations.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/AggregationIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/AnalyticalHierarchyProcess.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/AnalyticalHillshading.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/B-SplineApproximation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/BurnStreamNetworkintoDEM.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/CellBalance.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ChangeDateFormat.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ChangeDetection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ChangeGridValues.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ChangeTimeFormat.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ChannelNetwork.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ChannelNetworkandDrainageBasins.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ClipGridwithPolygon.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ClipPointswithPolygons.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/CloseGaps.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/CloseGapswithSpline.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/CloseOneCellGaps.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ClusterAnalysisforGrids.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ContourLinesfromGrid.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ConvergenceIndex(SearchRadius).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ConvergenceIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ConvertDataStorageType.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ConvertLinestoPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ConvertLinestoPolygons.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ConvertMultipointstoPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ConvertPointstoLine(s).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ConvertPolygonLineVerticestoPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ConvertPolygonstoLines.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ConvexHull.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/CreateGraticule.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/CropToData.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Cross-ClassificationandTabulation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/CrossProfiles.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/CubicSplineApproximation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/CurvatureClassification.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/CutShapesLayer.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/DTMFilter(slope-based).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/DirectionalStatisticsforSingleGrid.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/DistanceMatrix.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/DiurnalAnisotropicHeating.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/DownslopeDistanceGradient.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/EdgeContamination.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/EffectiveAirFlowHeights.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FastRegionGrowingAlgorithm.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FastRepresentativeness.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FillGapsinRecords.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FillSinks(PlanchonDarboux,2001).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FillSinks(WangLiu).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FillSinksXXL(WangLiu).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FilterClumps.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FireRiskAnalysis.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FitNPointstoshape.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FlatDetection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FlowAccumulation(FlowTracing).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FlowAccumulation(Recursive).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FlowAccumulation(Top-Down).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FlowPathLength.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FlowWidthandSpecificCatchmentArea.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Fragmentation(Alternative).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Fragmentation(Standard).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FragmentationClassesfromDensityandConnectivity.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Function.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Fuzzify.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FuzzyIntersection(AND).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/FuzzyUnion(OR).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GaussianFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GeographicallyWeightedMultipleRegression(Points).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GeographicallyWeightedMultipleRegression(PointsGrids).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GeographicallyWeightedMultipleRegression.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GeographicallyWeightedRegression(PointsGrid).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GeographicallyWeightedRegression.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GeometricFigures.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GetShapesExtents.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GlobalMoransIforGrids.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GradientVectorfromCartesiantoPolarCoordinates.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GradientVectorfromPolartoCartesianCoordinates.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GradientVectorsfromDirectionalComponents.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GradientVectorsfromDirectionandLength.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GradientVectorsfromSurface.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridBuffer.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridCalculator.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridCellIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridDifference.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridDivision.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridMasking.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridNormalisation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridOrientation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridProximityBuffer.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridSkeletonization.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridStandardisation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridStatisticsforPolygons.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridValuestoPoints(randomly).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridValuestoPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridVolume.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridsProduct.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/GridsSum.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/HistogramSurface.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Hypsometry.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/InverseDistanceWeighted.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/InvertDataNo-Data.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/KernelDensityEstimation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/LSFactor.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/LakeFlood.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/LandSurfaceTemperature.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/LaplacianFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Layerofextremevalue.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/LeastCostPaths.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Line-PolygonIntersection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/LineDissolve.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/LineProperties.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/LineSimplification.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/LocalMinimaandMaxima.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MajorityFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MassBalanceIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MergeLayers.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MetricConversions.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MinimumDistanceAnalysis.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ModifiedQuadraticShepard.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MorphologicalFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MorphometricProtectionIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Mosaicking.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Multi-BandVariation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MultiDirectionLeeFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MultilevelB-SplineInterpolation(fromGrid).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MultilevelB-SplineInterpolation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MultipleRegressionAnalysis(GridGrids).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MultipleRegressionAnalysis(PointsGrids).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/MultiresolutionIndexofValleyBottomFlatness(MRVBF).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/NaturalNeighbour.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/NearestNeighbour.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/OrderedWeightedAveraging(OWA).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/OrdinaryKriging(Global).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/OrdinaryKriging.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/OverlandFlow-KinematicWaveD8.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/OverlandFlowDistancetoChannelNetwork.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Patching.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PatternAnalysis.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PointStatisticsforPolygons.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PointsFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PointsThinning.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolartoCartesianCoordinates.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Polygon-LineIntersection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonCentroids.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonDifference.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonDissolve.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonDissolveAllPolygs.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonIdentity.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonIntersect.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonPartstoSeparatePolygons.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonProperties.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonShapeIndices.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonSymmetricalDifference.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonUnion.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonUpdate.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolygonstoEdgesandNodes.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PolynomialRegression.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/PrincipleComponentsAnalysis.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Profilefrompoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ProfilesfromLines.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ProximityGrid.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/QuadTreeStructuretoShapes.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/RGBComposite.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/RadiusofVariance(Grid).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/RandomField.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/RandomTerrainGeneration.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/RankFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/RealSurfaceArea.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ReclassifyGridValues.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/RegressionAnalysis(PointsGrid).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/RelativeHeightsandSlopePositions.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/RemoveDuplicatePoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Representativeness(Grid).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Resampling.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ResidualAnalysis(Grid).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/RunningAverage.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SAGAWetnessIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SeedGeneration.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Separatepointsbydirection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ShapesBuffer.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ShapesBufferFixed.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ShapestoGrid.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ShrinkAndExpand.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SimpleFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SimpleRegionGrowing.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Simulation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SinkDrainageRouteDetection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SinkRemoval.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SkyViewFactor.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Slope,Aspect,Curvature.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SlopeLength.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SoilTextureClassification.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SpatialPointPatternAnalysis.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SplitShapesLayerRandomly.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/StatisticsforGrids.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/StrahlerOrder.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/StreamPowerIndex.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SupervisedClassification.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/SurfaceSpecificPoints.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/TPIBasedLandformClassification.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/TerrainRuggednessIndex(TRI).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ThinPlateSpline(Global).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ThinPlateSpline(Local).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ThinPlateSpline(TIN).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ThresholdBuffer.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/TopographicCorrection.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/TopographicPositionIndex(TPI).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/TopographicWetnessIndex(TWI).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Transectthroughpolygonshapefile.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/TransformShapes.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/TransposeGrids.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/Triangulation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/UniversalKriging(Global).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/UniversalKriging.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/UpslopeArea.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/UserDefinedFilter.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/VariogramCloud.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/VariogramSurface.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/VectorRuggednessMeasure(VRM).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/VectorisingGridClasses.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/VegetationIndex(SlopeBased).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/VerticalDistancetoChannelNetwork.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/WaterRetentionCapacity.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/WatershedBasins.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/WatershedSegmentation.txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/WindEffect(WindwardLeewardIndex).txt
share/qgis/python/plugins/processing/algs/saga/description/2.2.0/ZonalGridStatistics.txt
share/qgis/python/plugins/processing/algs/saga/ext/
share/qgis/python/plugins/processing/algs/saga/ext/__init__.py
share/qgis/python/plugins/processing/algs/saga/ext/supervisedclassification.py
@ -2615,6 +3138,7 @@ share/qgis/python/plugins/processing/gui/ToolboxAction.py
share/qgis/python/plugins/processing/gui/__init__.py
share/qgis/python/plugins/processing/gui/algclasssification.txt
share/qgis/python/plugins/processing/gui/algnames.txt
share/qgis/python/plugins/processing/gui/utils.py
share/qgis/python/plugins/processing/images/
share/qgis/python/plugins/processing/images/alg.png
share/qgis/python/plugins/processing/images/commander.png
@ -2730,6 +3254,7 @@ share/qgis/python/plugins/processing/tools/general.py
share/qgis/python/plugins/processing/tools/help.py
share/qgis/python/plugins/processing/tools/raster.py
share/qgis/python/plugins/processing/tools/system.py
share/qgis/python/plugins/processing/tools/translation.py
share/qgis/python/plugins/processing/tools/vector.py
share/qgis/python/plugins/processing/ui/
share/qgis/python/plugins/processing/ui/DlgAlgorithmBase.ui
@ -4786,6 +5311,19 @@ share/qgis/resources/qgis.db
share/qgis/resources/spatialite.db
share/qgis/resources/srs.db
share/qgis/resources/symbology-ng-style.db
share/qgis/resources/themes/
share/qgis/resources/themes/Night Mapping/
share/qgis/resources/themes/Night Mapping/icons/
share/qgis/resources/themes/Night Mapping/icons/caret-down_ffffff_14.png
share/qgis/resources/themes/Night Mapping/icons/caret-right_ffffff_14.png
share/qgis/resources/themes/Night Mapping/icons/check.png
share/qgis/resources/themes/Night Mapping/icons/cross.svg
share/qgis/resources/themes/Night Mapping/icons/down_arrow.png
share/qgis/resources/themes/Night Mapping/icons/eye-blocked.svg
share/qgis/resources/themes/Night Mapping/icons/eye.svg
share/qgis/resources/themes/Night Mapping/icons/up_arrow.png
share/qgis/resources/themes/Night Mapping/style.qss
share/qgis/resources/themes/Night Mapping/variables.qss
share/qgis/schemaExtension.xsd
share/qgis/svg/
share/qgis/svg/accommodation/