[kdelibs] 6:4.14.6-2

Rex Dieter rdieter at fedoraproject.org
Sun Mar 8 13:43:53 UTC 2015


commit 3836b68a04e8585fff6a903f649c0d0a2bdbf13c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Mar 8 08:43:51 2015 -0500

    6:4.14.6-2
    
    - pull in upstream fixes, including minor BIC fix for 4.14.6
    - disable plasma/pacakgekit feature (for f22+

 0001-Add-dollar.patch                              | 1381 ++++++++++++++++++++
 ...date-image-for-web-pages-forgotten-cmake-.patch |   27 +
 0003-Fix-BIC-introduced-in-4.14.6.patch            |   61 +
 ...sing-single-quoted-meta-charset-attribute.patch |   56 +
 kdelibs.spec                                       |   18 +-
 5 files changed, 1541 insertions(+), 2 deletions(-)
---
diff --git a/0001-Add-dollar.patch b/0001-Add-dollar.patch
new file mode 100644
index 0000000..15296ec
--- /dev/null
+++ b/0001-Add-dollar.patch
@@ -0,0 +1,1381 @@
+From 0dc2ca34ba830dda4da87c3d5db9cc0cb2b206e4 Mon Sep 17 00:00:00 2001
+From: Andrea Iacovitti <aiacovitti at libero.it>
+Date: Tue, 3 Mar 2015 15:17:30 +0100
+Subject: [PATCH 1/4] Add &dollar; BUG: 344633
+
+---
+ kdecore/localization/kentities.c     | 1168 +++++++++++++++++-----------------
+ kdecore/localization/kentities.gperf |    3 +-
+ 2 files changed, 599 insertions(+), 572 deletions(-)
+
+diff --git a/kdecore/localization/kentities.c b/kdecore/localization/kentities.c
+index 3f067ab..8c18351 100644
+--- a/kdecore/localization/kentities.c
++++ b/kdecore/localization/kentities.c
+@@ -1,4 +1,4 @@
+-/* ANSI-C code produced by gperf version 3.0.1 */
++/* ANSI-C code produced by gperf version 3.0.3 */
+ /* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -Nkde_findEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf  */
+ 
+ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+@@ -25,7 +25,7 @@
+       && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+       && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+ /* The character set is not based on ISO-646.  */
+-#error "gperf generated tables do not work with this execution character set. Please report a bug to <bug-gnu-gperf at gnu.org>."
++#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf at gnu.org>."
+ #endif
+ 
+ #line 1 "kentities.gperf"
+@@ -53,15 +53,15 @@
+   
+     kentities.gperf: input file to generate a hash table for entities
+     kentities.c: DO NOT EDIT! generated by the command
+-    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c"
++    "gperf -a -L ANSI-C -E -C -c -o -t -k '*' -Nkde_findEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf > kentities.c"
+     from kentities.gperf
+ */  
+-#line 31 "kentities.gperf"
++#line 29 "kentities.gperf"
+ struct entity {
+     const char *name;
+     int code;
+ };
+-/* maximum key range = 924, duplicates = 0 */
++/* maximum key range = 1134, duplicates = 0 */
+ 
+ #ifdef __GNUC__
+ __inline
+@@ -75,32 +75,32 @@ hash_Entity (register const char *str, register unsigned int len)
+ {
+   static const unsigned short asso_values[] =
+     {
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932,   0,
+-      145, 120,   0, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 125, 315,  35,  60, 325,
+-        5,   5,   0, 130, 932,  10,   0,  20, 110, 120,
+-      100,   0,  45,  40,  10, 135,   0, 932,   0,  15,
+-       50, 932, 932, 932, 932, 932, 932,   0,  15,  70,
+-        0,  20, 200, 250, 295,  10, 285,   5, 140,  90,
+-       15,   5,  65, 195,   5, 100,  25,  25, 130,   0,
+-       75, 190,  30,  35, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
+-      932, 932, 932, 932, 932, 932, 932
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,    0,
++        10,    5,    0, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142,   95,  465,  125,   40,  210,
++        20,   30,    0,  295, 1142,    5,    5,    0,   30,   85,
++        35,    0,   65,   50,   10,  140,    0, 1142,    0,   55,
++        45, 1142, 1142, 1142, 1142, 1142, 1142,    0,   15,   70,
++         0,   20,  230,  275,  225,   10,  275,    0,  130,  185,
++        15,    5,   90,   80,    5,  170,   25,   25,   55,   40,
++        75,  180,   35,    0, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
++      1142, 1142, 1142, 1142, 1142, 1142, 1142
+     };
+   register int hval = len;
+ 
+@@ -136,580 +136,585 @@ hash_Entity (register const char *str, register unsigned int len)
+ 
+ #ifdef __GNUC__
+ __inline
++#ifdef __GNUC_STDC_INLINE__
++__attribute__ ((__gnu_inline__))
++#endif
+ #endif
+ const struct entity *
+ kde_findEntity (register const char *str, register unsigned int len)
+ {
+   enum
+     {
+-      TOTAL_KEYWORDS = 280,
++      TOTAL_KEYWORDS = 281,
+       MIN_WORD_LENGTH = 2,
+       MAX_WORD_LENGTH = 8,
+       MIN_HASH_VALUE = 8,
+-      MAX_HASH_VALUE = 931
++      MAX_HASH_VALUE = 1141
+     };
+ 
+   static const struct entity wordlist_Entity[] =
+     {
+-#line 116 "kentities.gperf"
++#line 114 "kentities.gperf"
+       {"and", 0x2227},
+-#line 264 "kentities.gperf"
++#line 263 "kentities.gperf"
+       {"rho", 0x03c1},
+-#line 142 "kentities.gperf"
++#line 140 "kentities.gperf"
+       {"darr", 0x2193},
+-#line 143 "kentities.gperf"
++#line 141 "kentities.gperf"
+       {"dcaron", 0x10f},
+-#line 257 "kentities.gperf"
++#line 256 "kentities.gperf"
+       {"rarr", 0x2192},
+-#line 258 "kentities.gperf"
++#line 257 "kentities.gperf"
+       {"rcaron", 0x0159},
+-#line 95 "kentities.gperf"
++#line 93 "kentities.gperf"
+       {"Tcaron", 0x0164},
+-#line 185 "kentities.gperf"
++#line 184 "kentities.gperf"
+       {"int", 0x222b},
+-#line 214 "kentities.gperf"
++#line 213 "kentities.gperf"
+       {"ncaron", 0x0148},
+-#line 161 "kentities.gperf"
++#line 160 "kentities.gperf"
+       {"eta", 0x03b7},
+-#line 150 "kentities.gperf"
++#line 149 "kentities.gperf"
+       {"ecaron", 0x011b},
+-#line 94 "kentities.gperf"
++#line 92 "kentities.gperf"
+       {"Tau", 0x03a4},
+-#line 299 "kentities.gperf"
++#line 298 "kentities.gperf"
+       {"uarr", 0x2191},
+-#line 288 "kentities.gperf"
++#line 287 "kentities.gperf"
+       {"tcaron", 0x0165},
+-#line 48 "kentities.gperf"
+-      {"Chi", 0x03a7},
+-#line 312 "kentities.gperf"
+-      {"zcaron", 0x017e},
+-#line 90 "kentities.gperf"
+-      {"Rho", 0x03a1},
+-#line 188 "kentities.gperf"
++#line 69 "kentities.gperf"
++      {"Mu", 0x039c},
++#line 82 "kentities.gperf"
++      {"Phi", 0x03a6},
++#line 70 "kentities.gperf"
++      {"Ncaron", 0x0147},
++#line 187 "kentities.gperf"
+       {"isin", 0x2208},
+-#line 293 "kentities.gperf"
++#line 292 "kentities.gperf"
+       {"thorn", 0x00fe},
+-#line 46 "kentities.gperf"
+-      {"Ccaron", 0x010c},
+-#line 287 "kentities.gperf"
++#line 311 "kentities.gperf"
++      {"zcaron", 0x017e},
++#line 286 "kentities.gperf"
+       {"tau", 0x03c4},
+-#line 96 "kentities.gperf"
++#line 94 "kentities.gperf"
+       {"Theta", 0x0398},
+-#line 91 "kentities.gperf"
+-      {"Scaron", 0x0160},
+-#line 110 "kentities.gperf"
++#line 48 "kentities.gperf"
++      {"Dcaron", 0x010e},
++#line 221 "kentities.gperf"
++      {"nu", 0x03bd},
++#line 85 "kentities.gperf"
++      {"Psi", 0x03a8},
++#line 108 "kentities.gperf"
+       {"acute", 0x00b4},
+-#line 89 "kentities.gperf"
+-      {"Rcaron", 0x0158},
+-#line 106 "kentities.gperf"
++#line 104 "kentities.gperf"
+       {"Zcaron", 0x017d},
+-#line 115 "kentities.gperf"
+-      {"amp", 38},
+-#line 220 "kentities.gperf"
++#line 89 "kentities.gperf"
++      {"Scaron", 0x0160},
++#line 88 "kentities.gperf"
++      {"Rho", 0x03a1},
++#line 219 "kentities.gperf"
+       {"nsub", 0x2284},
+-#line 290 "kentities.gperf"
+-      {"theta", 0x03b8},
+ #line 289 "kentities.gperf"
++      {"theta", 0x03b8},
++#line 288 "kentities.gperf"
+       {"there4", 0x2234},
+-#line 243 "kentities.gperf"
+-      {"phi", 0x03c6},
+-#line 238 "kentities.gperf"
+-      {"para", 0x00b6},
+-#line 109 "kentities.gperf"
++#line 72 "kentities.gperf"
++      {"Nu", 0x039d},
++#line 163 "kentities.gperf"
++      {"euro", 0x20ac},
++#line 107 "kentities.gperf"
+       {"acirc", 0x00e2},
+-#line 50 "kentities.gperf"
+-      {"Dcaron", 0x010e},
+-#line 132 "kentities.gperf"
++#line 130 "kentities.gperf"
+       {"chi", 0x03c7},
+-#line 224 "kentities.gperf"
++#line 223 "kentities.gperf"
+       {"ocirc", 0x00f4},
+-#line 180 "kentities.gperf"
++#line 87 "kentities.gperf"
++      {"Rcaron", 0x0158},
++#line 86 "kentities.gperf"
++      {"QUOT", 34},
++#line 179 "kentities.gperf"
+       {"icirc", 0x00ee},
+-#line 128 "kentities.gperf"
++#line 126 "kentities.gperf"
+       {"ccaron", 0x010d},
+-#line 251 "kentities.gperf"
+-      {"psi", 0x03c8},
+-#line 186 "kentities.gperf"
+-      {"iota", 0x03b9},
+-#line 254 "kentities.gperf"
++#line 253 "kentities.gperf"
+       {"radic", 0x221a},
+-#line 231 "kentities.gperf"
+-      {"or", 0x2228},
+-#line 218 "kentities.gperf"
+-      {"not", 0x00ac},
+-#line 152 "kentities.gperf"
++#line 113 "kentities.gperf"
++      {"amp", 38},
++#line 151 "kentities.gperf"
+       {"ecirc", 0x00ea},
+-#line 239 "kentities.gperf"
+-      {"part", 0x2202},
+-#line 300 "kentities.gperf"
++#line 242 "kentities.gperf"
++      {"phi", 0x03c6},
++#line 237 "kentities.gperf"
++      {"para", 0x00b6},
++#line 299 "kentities.gperf"
+       {"ucirc", 0x00fb},
+-#line 84 "kentities.gperf"
+-      {"Phi", 0x03a6},
+-#line 69 "kentities.gperf"
+-      {"Lambda", 0x039b},
+-#line 269 "kentities.gperf"
+-      {"scaron", 0x0161},
+-#line 229 "kentities.gperf"
++#line 159 "kentities.gperf"
++      {"equiv", 0x2261},
++#line 250 "kentities.gperf"
++      {"psi", 0x03c8},
++#line 185 "kentities.gperf"
++      {"iota", 0x03b9},
++#line 228 "kentities.gperf"
+       {"omicron", 0x03bf},
+-#line 88 "kentities.gperf"
+-      {"QUOT", 34},
+-#line 219 "kentities.gperf"
+-      {"notin", 0x2209},
+-#line 70 "kentities.gperf"
+-      {"LT", 60},
+-#line 87 "kentities.gperf"
+-      {"Psi", 0x03a8},
+-#line 72 "kentities.gperf"
+-      {"Ncaron", 0x0147},
+-#line 62 "kentities.gperf"
+-      {"GT", 62},
+-#line 227 "kentities.gperf"
+-      {"oline", 0x203e},
+-#line 222 "kentities.gperf"
+-      {"nu", 0x03bd},
+-#line 296 "kentities.gperf"
+-      {"trade", 0x2122},
+-#line 71 "kentities.gperf"
+-      {"Mu", 0x039c},
+-#line 127 "kentities.gperf"
+-      {"cap", 0x2229},
+-#line 270 "kentities.gperf"
+-      {"sdot", 0x22c5},
+-#line 190 "kentities.gperf"
+-      {"kappa", 0x03ba},
++#line 217 "kentities.gperf"
++      {"not", 0x00ac},
++#line 255 "kentities.gperf"
++      {"raquo", 0x00bb},
++#line 238 "kentities.gperf"
++      {"part", 0x2202},
++#line 259 "kentities.gperf"
++      {"rdquo", 0x201d},
++#line 266 "kentities.gperf"
++      {"rsquo", 0x2019},
++#line 265 "kentities.gperf"
++      {"rsaquo", 0x203a},
+ #line 68 "kentities.gperf"
+-      {"Kappa", 0x039a},
+-#line 108 "kentities.gperf"
+-      {"aacute", 0x00e1},
+-#line 164 "kentities.gperf"
+-      {"euro", 0x20ac},
+-#line 223 "kentities.gperf"
+-      {"oacute", 0x00f3},
+-#line 205 "kentities.gperf"
++      {"LT", 60},
++#line 46 "kentities.gperf"
++      {"Chi", 0x03a7},
++#line 121 "kentities.gperf"
++      {"bdquo", 0x201e},
++#line 44 "kentities.gperf"
++      {"Ccaron", 0x010c},
++#line 204 "kentities.gperf"
+       {"lt", 60},
+-#line 195 "kentities.gperf"
++#line 194 "kentities.gperf"
+       {"larr", 0x2190},
+-#line 179 "kentities.gperf"
+-      {"iacute", 0x00ed},
+-#line 249 "kentities.gperf"
+-      {"prod", 0x220f},
+-#line 247 "kentities.gperf"
+-      {"pound", 0x00a3},
+-#line 104 "kentities.gperf"
+-      {"Yacute", 0x00dd},
+-#line 259 "kentities.gperf"
++#line 218 "kentities.gperf"
++      {"notin", 0x2209},
++#line 106 "kentities.gperf"
++      {"aacute", 0x00e1},
++#line 39 "kentities.gperf"
++      {"AMP", 38},
++#line 222 "kentities.gperf"
++      {"oacute", 0x00f3},
++#line 251 "kentities.gperf"
++      {"quot", 34},
++#line 258 "kentities.gperf"
+       {"rceil", 0x2309},
+-#line 149 "kentities.gperf"
+-      {"eacute", 0x00e9},
+-#line 302 "kentities.gperf"
++#line 178 "kentities.gperf"
++      {"iacute", 0x00ed},
++#line 60 "kentities.gperf"
++      {"GT", 62},
++#line 301 "kentities.gperf"
+       {"uml", 0x00a8},
+-#line 206 "kentities.gperf"
+-      {"macr", 0x00af},
++#line 75 "kentities.gperf"
++      {"Ocirc", 0x00d4},
+ #line 137 "kentities.gperf"
+-      {"crarr", 0x21b5},
+-#line 298 "kentities.gperf"
+-      {"uacute", 0x00fa},
+-#line 265 "kentities.gperf"
+-      {"rlm", 0x200f},
+-#line 212 "kentities.gperf"
++      {"curren", 0x00a4},
++#line 230 "kentities.gperf"
++      {"or", 0x2228},
++#line 125 "kentities.gperf"
++      {"cap", 0x2229},
++#line 211 "kentities.gperf"
+       {"nabla", 0x2207},
+-#line 187 "kentities.gperf"
+-      {"iquest", 0x00bf},
+-#line 158 "kentities.gperf"
+-      {"ensp", 0x2002},
+-#line 160 "kentities.gperf"
+-      {"equiv", 0x2261},
+-#line 233 "kentities.gperf"
+-      {"ordm", 0x00ba},
+-#line 121 "kentities.gperf"
+-      {"atilde", 0x00e3},
+-#line 156 "kentities.gperf"
+-      {"emsp", 0x2003},
+-#line 61 "kentities.gperf"
+-      {"Gamma", 0x0393},
+-#line 235 "kentities.gperf"
+-      {"otilde", 0x00f5},
+ #line 148 "kentities.gperf"
+-      {"dol", 0x0024},
+-#line 77 "kentities.gperf"
+-      {"Ocirc", 0x00d4},
+-#line 47 "kentities.gperf"
+-      {"Ccedil", 0x00c7},
+-#line 38 "kentities.gperf"
++      {"eacute", 0x00e9},
++#line 36 "kentities.gperf"
+       {"Acirc", 0x00c2},
+-#line 221 "kentities.gperf"
+-      {"ntilde", 0x00f1},
+-#line 216 "kentities.gperf"
+-      {"ne", 0x2260},
+-#line 64 "kentities.gperf"
+-      {"Icirc", 0x00ce},
+-#line 211 "kentities.gperf"
+-      {"mu", 0x03bc},
++#line 297 "kentities.gperf"
++      {"uacute", 0x00fa},
++#line 119 "kentities.gperf"
++      {"atilde", 0x00e3},
++#line 234 "kentities.gperf"
++      {"otilde", 0x00f5},
++#line 189 "kentities.gperf"
++      {"kappa", 0x03ba},
++#line 268 "kentities.gperf"
++      {"scaron", 0x0161},
+ #line 66 "kentities.gperf"
+-      {"Iota", 0x0399},
+-#line 98 "kentities.gperf"
++      {"Kappa", 0x039a},
++#line 220 "kentities.gperf"
++      {"ntilde", 0x00f1},
++#line 78 "kentities.gperf"
++      {"Omicron", 0x039f},
++#line 102 "kentities.gperf"
++      {"Yacute", 0x00dd},
++#line 136 "kentities.gperf"
++      {"cup", 0x222a},
++#line 295 "kentities.gperf"
++      {"trade", 0x2122},
++#line 71 "kentities.gperf"
++      {"Ntilde", 0x00d1},
++#line 146 "kentities.gperf"
++      {"dol", 0x0024},
++#line 269 "kentities.gperf"
++      {"sdot", 0x22c5},
++#line 246 "kentities.gperf"
++      {"pound", 0x00a3},
++#line 67 "kentities.gperf"
++      {"Lambda", 0x039b},
++#line 96 "kentities.gperf"
+       {"Ucirc", 0x00db},
+-#line 292 "kentities.gperf"
+-      {"thinsp", 0x2009},
+-#line 201 "kentities.gperf"
+-      {"loz", 0x25ca},
+-#line 250 "kentities.gperf"
+-      {"prop", 0x221d},
++#line 127 "kentities.gperf"
++      {"ccedil", 0x00e7},
++#line 57 "kentities.gperf"
++      {"Eta", 0x0397},
++#line 226 "kentities.gperf"
++      {"oline", 0x203e},
++#line 52 "kentities.gperf"
++      {"Ecaron", 0x011a},
++#line 210 "kentities.gperf"
++      {"mu", 0x03bc},
++#line 276 "kentities.gperf"
++      {"sub", 0x2282},
+ #line 74 "kentities.gperf"
+-      {"Nu", 0x039d},
+-#line 124 "kentities.gperf"
++      {"Oacute", 0x00d3},
++#line 215 "kentities.gperf"
++      {"ne", 0x2260},
++#line 175 "kentities.gperf"
++      {"harr", 0x2194},
++#line 135 "kentities.gperf"
++      {"crarr", 0x21b5},
++#line 35 "kentities.gperf"
++      {"Aacute", 0x00c1},
++#line 200 "kentities.gperf"
++      {"loz", 0x25ca},
++#line 116 "kentities.gperf"
++      {"apos", 0x0027},
++#line 193 "kentities.gperf"
++      {"laquo", 0x00ab},
++#line 186 "kentities.gperf"
++      {"iquest", 0x00bf},
++#line 277 "kentities.gperf"
++      {"sube", 0x2286},
++#line 196 "kentities.gperf"
++      {"ldquo", 0x201c},
++#line 123 "kentities.gperf"
++      {"brvbar", 0x00a6},
++#line 248 "kentities.gperf"
++      {"prod", 0x220f},
++#line 203 "kentities.gperf"
++      {"lsquo", 0x2018},
++#line 202 "kentities.gperf"
++      {"lsaquo", 0x2039},
++#line 161 "kentities.gperf"
++      {"eth", 0x00f0},
++#line 122 "kentities.gperf"
+       {"beta", 0x03b2},
+-#line 184 "kentities.gperf"
++#line 183 "kentities.gperf"
+       {"infin", 0x221e},
+-#line 129 "kentities.gperf"
+-      {"ccedil", 0x00e7},
+ #line 80 "kentities.gperf"
+-      {"Omicron", 0x039f},
+-#line 277 "kentities.gperf"
+-      {"sub", 0x2282},
+-#line 256 "kentities.gperf"
+-      {"raquo", 0x00bb},
+-#line 139 "kentities.gperf"
+-      {"curren", 0x00a4}, //krazy:exclude=spelling
+-#line 213 "kentities.gperf"
+-      {"nbsp", 0x00a0},
+-#line 260 "kentities.gperf"
+-      {"rdquo", 0x201d},
+-#line 236 "kentities.gperf"
+-      {"otimes", 0x2297},
+-#line 117 "kentities.gperf"
++      {"Otilde", 0x00d5},
++#line 101 "kentities.gperf"
++      {"Xi", 0x039e},
++#line 205 "kentities.gperf"
++      {"macr", 0x00af},
++#line 115 "kentities.gperf"
+       {"ang", 0x2220},
+-#line 313 "kentities.gperf"
++#line 41 "kentities.gperf"
++      {"Atilde", 0x00c3},
++#line 157 "kentities.gperf"
++      {"ensp", 0x2002},
++#line 45 "kentities.gperf"
++      {"Ccedil", 0x00c7},
++#line 216 "kentities.gperf"
++      {"ni", 0x220b},
++#line 312 "kentities.gperf"
+       {"zeta", 0x03b6},
+-#line 267 "kentities.gperf"
+-      {"rsquo", 0x2019},
+-#line 266 "kentities.gperf"
+-      {"rsaquo", 0x203a},
+-#line 123 "kentities.gperf"
+-      {"bdquo", 0x201e},
+-#line 192 "kentities.gperf"
+-      {"lambda", 0x03bb},
+-#line 138 "kentities.gperf"
+-      {"cup", 0x222a},
+-#line 278 "kentities.gperf"
+-      {"sube", 0x2286},
+-#line 125 "kentities.gperf"
+-      {"brvbar", 0x00a6},
+-#line 174 "kentities.gperf"
++#line 195 "kentities.gperf"
++      {"lceil", 0x2308},
++#line 155 "kentities.gperf"
++      {"emsp", 0x2003},
++#line 53 "kentities.gperf"
++      {"Ecirc", 0x00ca},
++#line 95 "kentities.gperf"
++      {"Uacute", 0x00da},
++#line 173 "kentities.gperf"
+       {"gt", 62},
+-#line 107 "kentities.gperf"
++#line 105 "kentities.gperf"
+       {"Zeta", 0x0396},
+-#line 76 "kentities.gperf"
+-      {"Oacute", 0x00d3},
+-#line 37 "kentities.gperf"
+-      {"Aacute", 0x00c1},
+-#line 103 "kentities.gperf"
+-      {"Xi", 0x039e},
+-#line 255 "kentities.gperf"
++#line 110 "kentities.gperf"
++      {"agrave", 0x00e0},
++#line 83 "kentities.gperf"
++      {"Pi", 0x03a0},
++#line 254 "kentities.gperf"
+       {"rang", 0x232a},
+-#line 248 "kentities.gperf"
+-      {"prime", 0x2032},
+-#line 63 "kentities.gperf"
+-      {"Iacute", 0x00cd},
+-#line 228 "kentities.gperf"
+-      {"omega", 0x03c9},
+-#line 97 "kentities.gperf"
+-      {"Uacute", 0x00da},
+-#line 284 "kentities.gperf"
++#line 225 "kentities.gperf"
++      {"ograve", 0x00f2},
++#line 283 "kentities.gperf"
+       {"sup", 0x2283},
+-#line 280 "kentities.gperf"
++#line 279 "kentities.gperf"
+       {"sup1", 0x00b9},
+-#line 183 "kentities.gperf"
++#line 227 "kentities.gperf"
++      {"omega", 0x03c9},
++#line 181 "kentities.gperf"
++      {"igrave", 0x00ec},
++#line 282 "kentities.gperf"
++      {"sup3", 0x00b3},
++#line 182 "kentities.gperf"
+       {"image", 0x2111},
+-#line 217 "kentities.gperf"
+-      {"ni", 0x220b},
+-#line 272 "kentities.gperf"
+-      {"shy", 0x00ad},
+-#line 118 "kentities.gperf"
+-      {"apos", 0x0027},
+-#line 134 "kentities.gperf"
+-      {"clubs", 0x2663},
+-#line 307 "kentities.gperf"
+-      {"weierp", 0x2118},
+-#line 232 "kentities.gperf"
+-      {"ordf", 0x00aa},
+-#line 73 "kentities.gperf"
+-      {"Ntilde", 0x00d1},
+-#line 131 "kentities.gperf"
+-      {"cent", 0x00a2},
+-#line 196 "kentities.gperf"
+-      {"lceil", 0x2308},
+-#line 285 "kentities.gperf"
+-      {"supe", 0x2287},
+-#line 155 "kentities.gperf"
++#line 291 "kentities.gperf"
++      {"thinsp", 0x2009},
++#line 281 "kentities.gperf"
++      {"sup2", 0x00b2},
++#line 152 "kentities.gperf"
++      {"egrave", 0x00e8},
++#line 124 "kentities.gperf"
++      {"bull", 0x2022},
++#line 154 "kentities.gperf"
+       {"empty", 0x2205},
+-#line 82 "kentities.gperf"
+-      {"Otilde", 0x00d5},
+-#line 279 "kentities.gperf"
+-      {"sum", 0x2211},
+-#line 176 "kentities.gperf"
+-      {"harr", 0x2194},
+-#line 86 "kentities.gperf"
+-      {"Prime", 0x2033},
+-#line 43 "kentities.gperf"
+-      {"Atilde", 0x00c3},
+-#line 140 "kentities.gperf"
+-      {"dArr", 0x21d3},
+-#line 202 "kentities.gperf"
+-      {"lrm", 0x200e},
+-#line 253 "kentities.gperf"
+-      {"rArr", 0x21d2},
+-#line 151 "kentities.gperf"
++#line 300 "kentities.gperf"
++      {"ugrave", 0x00f9},
++#line 284 "kentities.gperf"
++      {"supe", 0x2287},
++#line 308 "kentities.gperf"
++      {"yacute", 0x00fd},
++#line 129 "kentities.gperf"
++      {"cent", 0x00a2},
++#line 212 "kentities.gperf"
++      {"nbsp", 0x00a0},
++#line 191 "kentities.gperf"
++      {"lambda", 0x03bb},
++#line 307 "kentities.gperf"
++      {"xi", 0x03be},
++#line 50 "kentities.gperf"
++      {"ETH", 0x00d0},
++#line 267 "kentities.gperf"
++      {"sbquo", 0x201a},
++#line 249 "kentities.gperf"
++      {"prop", 0x221d},
++#line 150 "kentities.gperf"
+       {"eague", 0x00e9},
+-#line 200 "kentities.gperf"
+-      {"lowast", 0x2217},
+-#line 41 "kentities.gperf"
+-      {"AMP", 38},
+-#line 242 "kentities.gperf"
+-      {"perp", 0x22a5},
+-#line 198 "kentities.gperf"
++#line 147 "kentities.gperf"
++      {"dollar", 0x0024},
++#line 197 "kentities.gperf"
+       {"le", 0x2264},
+-#line 162 "kentities.gperf"
+-      {"eth", 0x00f0},
+-#line 261 "kentities.gperf"
+-      {"real", 0x211c},
+-#line 165 "kentities.gperf"
+-      {"exist", 0x2203},
+-#line 309 "kentities.gperf"
+-      {"yacute", 0x00fd},
+-#line 244 "kentities.gperf"
++#line 271 "kentities.gperf"
++      {"shy", 0x00ad},
++#line 232 "kentities.gperf"
++      {"ordm", 0x00ba},
++#line 145 "kentities.gperf"
++      {"divide", 0x00f7},
++#line 243 "kentities.gperf"
+       {"pi", 0x03c0},
+-#line 59 "kentities.gperf"
+-      {"Eta", 0x0397},
+-#line 297 "kentities.gperf"
+-      {"uArr", 0x21d1},
+-#line 54 "kentities.gperf"
+-      {"Ecaron", 0x011a},
+-#line 252 "kentities.gperf"
+-      {"quot", 34},
+-#line 308 "kentities.gperf"
+-      {"xi", 0x03be},
+-#line 122 "kentities.gperf"
++#line 260 "kentities.gperf"
++      {"real", 0x211c},
++#line 51 "kentities.gperf"
++      {"Eacute", 0x00c9},
++#line 120 "kentities.gperf"
+       {"auml", 0x00e4},
+-#line 237 "kentities.gperf"
++#line 264 "kentities.gperf"
++      {"rlm", 0x200f},
++#line 236 "kentities.gperf"
+       {"ouml", 0x00f6},
+-#line 145 "kentities.gperf"
+-      {"delta", 0x03b4},
+-#line 189 "kentities.gperf"
++#line 188 "kentities.gperf"
+       {"iuml", 0x00ef},
+-#line 120 "kentities.gperf"
+-      {"asymp", 0x2248},
+-#line 169 "kentities.gperf"
+-      {"frac14", 0x00bc},
+-#line 105 "kentities.gperf"
+-      {"Yuml", 0x0178},
+-#line 119 "kentities.gperf"
+-      {"aring", 0x00e5},
+-#line 163 "kentities.gperf"
++#line 62 "kentities.gperf"
++      {"Icirc", 0x00ce},
++#line 313 "kentities.gperf"
++      {"zwj", 0x200d},
++#line 143 "kentities.gperf"
++      {"delta", 0x03b4},
++#line 162 "kentities.gperf"
+       {"euml", 0x00eb},
+-#line 194 "kentities.gperf"
+-      {"laquo", 0x00ab},
+-#line 240 "kentities.gperf"
+-      {"percnt", 0x0025},
+-#line 85 "kentities.gperf"
+-      {"Pi", 0x03a0},
+-#line 306 "kentities.gperf"
++#line 76 "kentities.gperf"
++      {"Ograve", 0x00d2},
++#line 305 "kentities.gperf"
+       {"uuml", 0x00fc},
+-#line 197 "kentities.gperf"
+-      {"ldquo", 0x201c},
+-#line 246 "kentities.gperf"
+-      {"plusmn", 0x00b1},
++#line 77 "kentities.gperf"
++      {"Omega", 0x03a9},
++#line 306 "kentities.gperf"
++      {"weierp", 0x2118},
+ #line 314 "kentities.gperf"
+-      {"zwj", 0x200d},
+-#line 136 "kentities.gperf"
+-      {"copy", 0x00a9},
+-#line 204 "kentities.gperf"
+-      {"lsquo", 0x2018},
+-#line 203 "kentities.gperf"
+-      {"lsaquo", 0x2039},
+-#line 271 "kentities.gperf"
+-      {"sect", 0x00a7},
+-#line 268 "kentities.gperf"
+-      {"sbquo", 0x201a},
+-#line 135 "kentities.gperf"
+-      {"cong", 0x2245},
+-#line 305 "kentities.gperf"
+-      {"uring", 0x016f},
+-#line 310 "kentities.gperf"
+-      {"yen", 0x00a5},
+-#line 315 "kentities.gperf"
+       {"zwnj", 0x200c},
+-#line 79 "kentities.gperf"
+-      {"Omega", 0x03a9},
+-#line 209 "kentities.gperf"
+-      {"middot", 0x00b7},
+-#line 166 "kentities.gperf"
+-      {"fnof", 0x0192},
+-#line 55 "kentities.gperf"
+-      {"Ecirc", 0x00ca},
+-#line 263 "kentities.gperf"
+-      {"rfloor", 0x230b},
+-#line 283 "kentities.gperf"
+-      {"sup3", 0x00b3},
+-#line 93 "kentities.gperf"
+-      {"THORN", 0x00de},
+-#line 276 "kentities.gperf"
+-      {"spades", 0x2660},
+-#line 193 "kentities.gperf"
+-      {"lang", 0x2329},
+-#line 130 "kentities.gperf"
+-      {"cedil", 0x00b8},
+-#line 157 "kentities.gperf"
+-      {"endash", 0x2013},
+-#line 126 "kentities.gperf"
+-      {"bull", 0x2022},
+-#line 51 "kentities.gperf"
+-      {"Delta", 0x0394},
+-#line 133 "kentities.gperf"
+-      {"circ", 0x02c6},
+-#line 215 "kentities.gperf"
+-      {"ndash", 0x2013},
+-#line 154 "kentities.gperf"
+-      {"emdash", 0x2014},
+-#line 281 "kentities.gperf"
+-      {"supl", 0x00b9},
+-#line 282 "kentities.gperf"
+-      {"sup2", 0x00b2},
+-#line 172 "kentities.gperf"
+-      {"gamma", 0x03b3},
+-#line 147 "kentities.gperf"
+-      {"divide", 0x00f7},
+-#line 173 "kentities.gperf"
+-      {"ge", 0x2265},
+-#line 144 "kentities.gperf"
+-      {"deg", 0x00b0},
+-#line 114 "kentities.gperf"
+-      {"alpha", 0x03b1},
+-#line 112 "kentities.gperf"
+-      {"agrave", 0x00e0},
+-#line 262 "kentities.gperf"
+-      {"reg", 0x00ae},
+-#line 208 "kentities.gperf"
+-      {"micro", 0x00b5},
+-#line 226 "kentities.gperf"
+-      {"ograve", 0x00f2},
+-#line 52 "kentities.gperf"
+-      {"ETH", 0x00d0},
+-#line 182 "kentities.gperf"
+-      {"igrave", 0x00ec},
+-#line 291 "kentities.gperf"
+-      {"thetasym", 0x03d1},
+-#line 191 "kentities.gperf"
+-      {"lArr", 0x21d0},
+-#line 230 "kentities.gperf"
++#line 37 "kentities.gperf"
++      {"Agrave", 0x00c0},
++#line 231 "kentities.gperf"
++      {"ordf", 0x00aa},
++#line 164 "kentities.gperf"
++      {"exist", 0x2203},
++#line 278 "kentities.gperf"
++      {"sum", 0x2211},
++#line 64 "kentities.gperf"
++      {"Iota", 0x0399},
++#line 229 "kentities.gperf"
+       {"oplus", 0x2295},
+-#line 294 "kentities.gperf"
+-      {"tilde", 0x02dc},
++#line 241 "kentities.gperf"
++      {"perp", 0x22a5},
++#line 59 "kentities.gperf"
++      {"Gamma", 0x0393},
++#line 235 "kentities.gperf"
++      {"otimes", 0x2297},
++#line 244 "kentities.gperf"
++      {"piv", 0x03d6},
++#line 131 "kentities.gperf"
++      {"circ", 0x02c6},
++#line 84 "kentities.gperf"
++      {"Prime", 0x2033},
++#line 156 "kentities.gperf"
++      {"endash", 0x2013},
++#line 309 "kentities.gperf"
++      {"yen", 0x00a5},
++#line 103 "kentities.gperf"
++      {"Yuml", 0x0178},
++#line 49 "kentities.gperf"
++      {"Delta", 0x0394},
++#line 262 "kentities.gperf"
++      {"rfloor", 0x230b},
++#line 134 "kentities.gperf"
++      {"copy", 0x00a9},
++#line 214 "kentities.gperf"
++      {"ndash", 0x2013},
+ #line 153 "kentities.gperf"
+-      {"egrave", 0x00e8},
++      {"emdash", 0x2014},
++#line 158 "kentities.gperf"
++      {"epsilon", 0x03b5},
++#line 192 "kentities.gperf"
++      {"lang", 0x2329},
++#line 239 "kentities.gperf"
++      {"percnt", 0x0025},
++#line 303 "kentities.gperf"
++      {"upsilon", 0x03c5},
++#line 128 "kentities.gperf"
++      {"cedil", 0x00b8},
+ #line 275 "kentities.gperf"
+-      {"sim", 0x223c},
+-#line 146 "kentities.gperf"
+-      {"diams", 0x2666},
+-#line 301 "kentities.gperf"
+-      {"ugrave", 0x00f9},
+-#line 245 "kentities.gperf"
+-      {"piv", 0x03d6},
+-#line 83 "kentities.gperf"
++      {"spades", 0x2660},
++#line 280 "kentities.gperf"
++      {"supl", 0x00b9},
++#line 97 "kentities.gperf"
++      {"Ugrave", 0x00d9},
++#line 133 "kentities.gperf"
++      {"cong", 0x2245},
++#line 293 "kentities.gperf"
++      {"tilde", 0x02dc},
++#line 61 "kentities.gperf"
++      {"Iacute", 0x00cd},
++#line 81 "kentities.gperf"
+       {"Ouml", 0x00d6},
+-#line 53 "kentities.gperf"
+-      {"Eacute", 0x00c9},
+-#line 44 "kentities.gperf"
++#line 199 "kentities.gperf"
++      {"lowast", 0x2217},
++#line 42 "kentities.gperf"
+       {"Auml", 0x00c4},
+-#line 159 "kentities.gperf"
+-      {"epsilon", 0x03b5},
+-#line 67 "kentities.gperf"
+-      {"Iuml", 0x00cf},
+-#line 170 "kentities.gperf"
++#line 132 "kentities.gperf"
++      {"clubs", 0x2663},
++#line 165 "kentities.gperf"
++      {"fnof", 0x0192},
++#line 117 "kentities.gperf"
++      {"aring", 0x00e5},
++#line 168 "kentities.gperf"
++      {"frac14", 0x00bc},
++#line 138 "kentities.gperf"
++      {"dArr", 0x21d3},
++#line 247 "kentities.gperf"
++      {"prime", 0x2032},
++#line 169 "kentities.gperf"
+       {"frac34", 0x00be},
++#line 252 "kentities.gperf"
++      {"rArr", 0x21d2},
++#line 118 "kentities.gperf"
++      {"asymp", 0x2248},
++#line 167 "kentities.gperf"
++      {"frac12", 0x00bd},
++#line 201 "kentities.gperf"
++      {"lrm", 0x200e},
++#line 91 "kentities.gperf"
++      {"THORN", 0x00de},
++#line 208 "kentities.gperf"
++      {"middot", 0x00b7},
++#line 270 "kentities.gperf"
++      {"sect", 0x00a7},
+ #line 304 "kentities.gperf"
+-      {"upsilon", 0x03c5},
+-#line 102 "kentities.gperf"
++      {"uring", 0x016f},
++#line 296 "kentities.gperf"
++      {"uArr", 0x21d1},
++#line 112 "kentities.gperf"
++      {"alpha", 0x03b1},
++#line 172 "kentities.gperf"
++      {"ge", 0x2265},
++#line 142 "kentities.gperf"
++      {"deg", 0x00b0},
++#line 261 "kentities.gperf"
++      {"reg", 0x00ae},
++#line 100 "kentities.gperf"
+       {"Uuml", 0x00dc},
+-#line 181 "kentities.gperf"
++#line 302 "kentities.gperf"
++      {"upsih", 0x03d2},
++#line 180 "kentities.gperf"
+       {"iexcl", 0x00a1},
+-#line 42 "kentities.gperf"
+-      {"Aring", 0x00c5},
+-#line 207 "kentities.gperf"
+-      {"mdash", 0x2014},
+-#line 101 "kentities.gperf"
+-      {"Uring", 0x016e},
+-#line 241 "kentities.gperf"
+-      {"permil", 0x2030},
+-#line 210 "kentities.gperf"
+-      {"minus", 0x2212},
+-#line 168 "kentities.gperf"
+-      {"frac12", 0x00bd},
+-#line 295 "kentities.gperf"
+-      {"times", 0x00d7},
+-#line 75 "kentities.gperf"
++#line 54 "kentities.gperf"
++      {"Egrave", 0x00c8},
++#line 73 "kentities.gperf"
+       {"OElig", 0x0152},
+-#line 36 "kentities.gperf"
++#line 34 "kentities.gperf"
+       {"AElig", 0x00c6},
+-#line 286 "kentities.gperf"
+-      {"szlig", 0x00df},
+-#line 45 "kentities.gperf"
+-      {"Beta", 0x0392},
+-#line 171 "kentities.gperf"
+-      {"frasl", 0x2044},
+-#line 141 "kentities.gperf"
+-      {"dagger", 0x2020},
+-#line 199 "kentities.gperf"
+-      {"lfloor", 0x230a},
+-#line 311 "kentities.gperf"
++#line 207 "kentities.gperf"
++      {"micro", 0x00b5},
++#line 55 "kentities.gperf"
++      {"Eague", 0x00c9},
++#line 310 "kentities.gperf"
+       {"yuml", 0x00ff},
+-#line 167 "kentities.gperf"
+-      {"forall", 0x2200},
+-#line 234 "kentities.gperf"
++#line 198 "kentities.gperf"
++      {"lfloor", 0x230a},
++#line 98 "kentities.gperf"
++      {"Upsilon", 0x03a5},
++#line 233 "kentities.gperf"
+       {"oslash", 0x00f8},
+-#line 78 "kentities.gperf"
+-      {"Ograve", 0x00d2},
+ #line 40 "kentities.gperf"
++      {"Aring", 0x00c5},
++#line 58 "kentities.gperf"
++      {"Euml", 0x00cb},
++#line 285 "kentities.gperf"
++      {"szlig", 0x00df},
++#line 166 "kentities.gperf"
++      {"forall", 0x2200},
++#line 139 "kentities.gperf"
++      {"dagger", 0x2020},
++#line 38 "kentities.gperf"
+       {"Alpha", 0x0391},
+-#line 39 "kentities.gperf"
+-      {"Agrave", 0x00c0},
+-#line 65 "kentities.gperf"
++#line 206 "kentities.gperf"
++      {"mdash", 0x2014},
++#line 63 "kentities.gperf"
+       {"Igrave", 0x00cc},
++#line 190 "kentities.gperf"
++      {"lArr", 0x21d0},
+ #line 99 "kentities.gperf"
+-      {"Ugrave", 0x00d9},
+-#line 111 "kentities.gperf"
+-      {"aelig", 0x00e6},
+-#line 49 "kentities.gperf"
++      {"Uring", 0x016e},
++#line 290 "kentities.gperf"
++      {"thetasym", 0x03d1},
++#line 56 "kentities.gperf"
++      {"Epsilon", 0x0395},
++#line 274 "kentities.gperf"
++      {"sim", 0x223c},
++#line 144 "kentities.gperf"
++      {"diams", 0x2666},
++#line 47 "kentities.gperf"
+       {"Dagger", 0x2021},
+-#line 100 "kentities.gperf"
+-      {"Upsilon", 0x03a5},
+-#line 225 "kentities.gperf"
++#line 79 "kentities.gperf"
++      {"Oslash", 0x00d8},
++#line 109 "kentities.gperf"
++      {"aelig", 0x00e6},
++#line 224 "kentities.gperf"
+       {"oelig", 0x0153},
+-#line 175 "kentities.gperf"
+-      {"hArr", 0x21d4},
+-#line 303 "kentities.gperf"
+-      {"upsih", 0x03d2},
+-#line 177 "kentities.gperf"
++#line 240 "kentities.gperf"
++      {"permil", 0x2030},
++#line 176 "kentities.gperf"
+       {"hearts", 0x2665},
+-#line 57 "kentities.gperf"
+-      {"Eague", 0x00c9},
+-#line 92 "kentities.gperf"
++#line 171 "kentities.gperf"
++      {"gamma", 0x03b3},
++#line 65 "kentities.gperf"
++      {"Iuml", 0x00cf},
++#line 209 "kentities.gperf"
++      {"minus", 0x2212},
++#line 245 "kentities.gperf"
++      {"plusmn", 0x00b1},
++#line 294 "kentities.gperf"
++      {"times", 0x00d7},
++#line 174 "kentities.gperf"
++      {"hArr", 0x21d4},
++#line 170 "kentities.gperf"
++      {"frasl", 0x2044},
++#line 43 "kentities.gperf"
++      {"Beta", 0x0392},
++#line 90 "kentities.gperf"
+       {"Sigma", 0x03a3},
+-#line 81 "kentities.gperf"
+-      {"Oslash", 0x00d8},
+-#line 60 "kentities.gperf"
+-      {"Euml", 0x00cb},
+-#line 113 "kentities.gperf"
++#line 177 "kentities.gperf"
++      {"hellip", 0x2026},
++#line 272 "kentities.gperf"
++      {"sigma", 0x03c3},
++#line 111 "kentities.gperf"
+       {"alefsym", 0x2135},
+ #line 273 "kentities.gperf"
+-      {"sigma", 0x03c3},
+-#line 56 "kentities.gperf"
+-      {"Egrave", 0x00c8},
+-#line 58 "kentities.gperf"
+-      {"Epsilon", 0x0395},
+-#line 178 "kentities.gperf"
+-      {"hellip", 0x2026},
+-#line 274 "kentities.gperf"
+       {"sigmaf", 0x03c2}
+     };
+ 
+@@ -720,95 +725,116 @@ kde_findEntity (register const char *str, register unsigned int len)
+        -1,  -1,  -1,   1,  -1,  -1,  -1,  -1,  -1,   2,
+        -1,   3,  -1,  -1,   4,  -1,   5,  -1,  -1,  -1,
+        -1,   6,  -1,   7,  -1,  -1,   8,  -1,   9,  -1,
+-       -1,  10,  -1,  11,  12,  -1,  13,  -1,  14,  -1,
+-       -1,  15,  -1,  16,  17,  18,  19,  -1,  20,  -1,
+-       21,  22,  -1,  -1,  -1,  23,  24,  -1,  -1,  -1,
+-       -1,  25,  -1,  26,  27,  28,  29,  -1,  30,  31,
+-       32,  33,  -1,  34,  -1,  35,  -1,  -1,  -1,  -1,
+-       36,  37,  -1,  38,  39,  40,  -1,  41,  42,  -1,
+-       43,  -1,  -1,  -1,  44,  45,  -1,  -1,  -1,  -1,
+-       -1,  -1,  -1,  46,  -1,  -1,  47,  -1,  -1,  -1,
+-       -1,  48,  49,  -1,  50,  51,  -1,  52,  53,  -1,
+-       -1,  54,  55,  -1,  -1,  56,  -1,  57,  -1,  -1,
+-       58,  -1,  59,  60,  61,  62,  -1,  -1,  -1,  -1,
+-       63,  64,  -1,  -1,  65,  -1,  66,  67,  -1,  68,
+-       -1,  69,  -1,  -1,  70,  71,  72,  -1,  -1,  -1,
+-       73,  74,  -1,  75,  76,  77,  78,  -1,  79,  -1,
+-       80,  81,  -1,  -1,  82,  83,  -1,  -1,  -1,  84,
+-       -1,  85,  -1,  -1,  86,  87,  88,  -1,  89,  -1,
+-       90,  91,  -1,  -1,  -1,  92,  93,  94,  -1,  -1,
+-       95,  -1,  96,  -1,  97,  98,  -1,  -1,  -1,  -1,
+-       -1,  99,  -1,  -1,  -1,  -1,  -1,  -1, 100, 101,
+-       -1,  -1, 102,  -1, 103, 104, 105, 106, 107,  -1,
+-      108, 109,  -1,  -1, 110, 111, 112,  -1, 113, 114,
+-      115, 116,  -1,  -1,  -1, 117, 118,  -1, 119, 120,
+-       -1, 121,  -1,  -1,  -1,  -1,  -1, 122,  -1, 123,
+-       -1, 124,  -1,  -1,  -1,  -1, 125, 126,  -1, 127,
+-      128, 129,  -1,  -1,  -1, 130, 131,  -1, 132, 133,
+-      134,  -1, 135, 136, 137, 138, 139,  -1,  -1, 140,
+-       -1, 141,  -1,  -1, 142, 143,  -1,  -1,  -1, 144,
+-      145, 146,  -1, 147, 148, 149, 150,  -1,  -1, 151,
+-       -1,  -1,  -1, 152, 153, 154, 155,  -1, 156, 157,
+-       -1,  -1, 158, 159,  -1,  -1,  -1,  -1,  -1, 160,
+-      161, 162, 163, 164, 165,  -1, 166,  -1,  -1, 167,
+-       -1,  -1, 168,  -1, 169,  -1,  -1,  -1,  -1, 170,
+-      171,  -1,  -1,  -1, 172, 173, 174,  -1,  -1, 175,
+-      176,  -1,  -1,  -1, 177, 178, 179, 180,  -1, 181,
+-      182, 183,  -1, 184, 185, 186, 187,  -1,  -1, 188,
+-      189,  -1,  -1,  -1, 190, 191,  -1,  -1, 192, 193,
+-      194, 195,  -1,  -1, 196, 197, 198,  -1,  -1, 199,
+-      200, 201,  -1,  -1, 202, 203, 204,  -1,  -1, 205,
+-      206,  -1,  -1,  -1, 207, 208, 209,  -1,  -1, 210,
+-       -1,  -1,  -1,  -1, 211,  -1,  -1,  -1,  -1,  -1,
+-      212, 213, 214, 215,  -1, 216, 217,  -1, 218,  -1,
+-      219, 220,  -1, 221,  -1,  -1, 222,  -1, 223, 224,
+-      225,  -1,  -1,  -1,  -1, 226, 227,  -1, 228,  -1,
+-      229, 230,  -1, 231, 232,  -1, 233,  -1,  -1, 234,
+-       -1,  -1, 235,  -1, 236,  -1, 237, 238,  -1, 239,
+-      240,  -1,  -1,  -1,  -1, 241,  -1,  -1,  -1,  -1,
+-      242,  -1,  -1,  -1,  -1, 243, 244,  -1,  -1,  -1,
+-      245, 246,  -1,  -1,  -1, 247,  -1,  -1,  -1,  -1,
+-      248,  -1,  -1,  -1,  -1, 249,  -1,  -1,  -1,  -1,
+-      250,  -1,  -1,  -1, 251, 252, 253,  -1,  -1,  -1,
+-       -1, 254,  -1,  -1, 255,  -1, 256,  -1,  -1,  -1,
++       -1,  10,  -1,  11,  12,  -1,  13,  14,  15,  -1,
++       -1,  16,  -1,  -1,  17,  18,  19,  -1,  20,  -1,
++       21,  22,  23,  24,  -1,  25,  26,  -1,  -1,  -1,
++       -1,  27,  -1,  28,  29,  30,  31,  32,  -1,  33,
++       34,  -1,  -1,  35,  -1,  36,  37,  -1,  -1,  38,
++       39,  40,  -1,  -1,  -1,  41,  -1,  -1,  42,  -1,
++       43,  -1,  -1,  44,  45,  46,  -1,  -1,  -1,  -1,
++       47,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  48,  49,
++       -1,  -1,  50,  51,  -1,  52,  -1,  -1,  -1,  53,
++       54,  -1,  -1,  -1,  -1,  55,  56,  57,  58,  -1,
++       59,  -1,  -1,  -1,  -1,  -1,  60,  61,  -1,  62,
++       63,  64,  -1,  65,  -1,  -1,  66,  -1,  -1,  67,
++       68,  69,  70,  71,  -1,  72,  73,  74,  75,  -1,
++       76,  77,  -1,  -1,  -1,  78,  79,  -1,  -1,  -1,
++       -1,  80,  -1,  -1,  -1,  -1,  81,  -1,  -1,  -1,
++       82,  83,  -1,  -1,  -1,  84,  85,  -1,  -1,  -1,
++       -1,  -1,  86,  -1,  -1,  -1,  87,  -1,  88,  -1,
++       89,  90,  -1,  91,  92,  93,  94,  -1,  -1,  -1,
++       95,  -1,  -1,  -1,  -1,  -1,  96,  -1,  97,  -1,
++       98,  99, 100, 101,  -1,  -1, 102, 103,  -1,  -1,
++       -1,  -1,  -1,  -1, 104, 105, 106,  -1, 107, 108,
++      109, 110,  -1,  -1, 111, 112, 113,  -1,  -1, 114,
++      115, 116,  -1, 117, 118, 119, 120, 121,  -1, 122,
++       -1,  -1,  -1, 123,  -1,  -1, 124,  -1,  -1, 125,
++       -1, 126, 127,  -1, 128, 129,  -1,  -1,  -1, 130,
++      131, 132, 133,  -1, 134,  -1,  -1,  -1,  -1,  -1,
++       -1, 135, 136,  -1, 137,  -1, 138,  -1, 139, 140,
++      141, 142,  -1,  -1, 143, 144, 145,  -1,  -1, 146,
++       -1, 147,  -1,  -1, 148, 149, 150,  -1,  -1, 151,
++       -1, 152,  -1,  -1, 153,  -1,  -1,  -1,  -1, 154,
++       -1, 155, 156, 157,  -1, 158,  -1,  -1,  -1, 159,
++      160, 161, 162, 163, 164,  -1, 165, 166,  -1, 167,
++       -1, 168,  -1,  -1, 169,  -1,  -1,  -1, 170, 171,
++       -1,  -1,  -1,  -1, 172, 173,  -1,  -1, 174,  -1,
++      175,  -1,  -1,  -1, 176,  -1, 177,  -1,  -1, 178,
++      179, 180,  -1,  -1, 181,  -1, 182,  -1,  -1, 183,
++      184,  -1,  -1, 185, 186, 187,  -1,  -1,  -1, 188,
++      189, 190,  -1, 191, 192, 193, 194,  -1, 195, 196,
++      197, 198,  -1,  -1, 199, 200, 201, 202,  -1, 203,
++       -1, 204, 205,  -1,  -1, 206, 207,  -1,  -1, 208,
++       -1, 209,  -1,  -1, 210, 211, 212,  -1,  -1, 213,
++       -1, 214,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 215,
++      216,  -1,  -1,  -1, 217, 218, 219,  -1,  -1, 220,
++      221, 222,  -1,  -1, 223, 224, 225,  -1, 226,  -1,
++      227,  -1,  -1,  -1,  -1,  -1, 228,  -1,  -1, 229,
++      230,  -1,  -1,  -1, 231, 232,  -1, 233, 234,  -1,
++       -1,  -1,  -1, 235, 236, 237,  -1,  -1,  -1,  -1,
++      238, 239,  -1,  -1,  -1, 240,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1, 241,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1, 242,  -1,  -1,  -1,  -1,
++      243,  -1,  -1,  -1, 244,  -1, 245, 246,  -1,  -1,
++       -1, 247,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++      248,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1, 249,  -1,  -1,  -1,  -1,  -1,
++      250, 251,  -1,  -1,  -1,  -1, 252,  -1,  -1,  -1,
++      253,  -1,  -1,  -1,  -1, 254, 255,  -1,  -1, 256,
++       -1,  -1,  -1,  -1,  -1, 257,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1, 258,  -1,  -1,  -1, 259,  -1,  -1,
++       -1,  -1,  -1, 260,  -1, 261, 262,  -1,  -1,  -1,
++       -1, 263,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++      264,  -1,  -1,  -1,  -1, 265, 266,  -1,  -1,  -1,
++       -1, 267,  -1,  -1,  -1, 268,  -1,  -1,  -1, 269,
++       -1,  -1,  -1,  -1,  -1, 270, 271,  -1,  -1,  -1,
++      272,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1, 273, 274,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1, 275,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+-       -1, 257,  -1,  -1,  -1,  -1, 258,  -1,  -1,  -1,
+-      259, 260,  -1,  -1,  -1,  -1, 261,  -1,  -1,  -1,
+-       -1, 262,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+-       -1,  -1,  -1,  -1,  -1, 263, 264, 265,  -1,  -1,
+-      266,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+-       -1,  -1,  -1,  -1, 267,  -1,  -1,  -1,  -1,  -1,
+-      268, 269,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+-      270,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+-      271,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+-       -1,  -1,  -1,  -1,  -1,  -1, 272,  -1,  -1, 273,
+-       -1,  -1,  -1,  -1,  -1,  -1,  -1, 274,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+-      275,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++      276,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1, 277,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+-       -1, 276,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+-       -1,  -1,  -1,  -1,  -1,  -1,  -1, 277,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+-       -1,  -1,  -1,  -1,  -1,  -1, 278,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++      278,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1, 279,  -1,  -1,
+        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+-       -1, 279
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
++       -1, 280
+     };
+ 
+   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+@@ -830,6 +856,6 @@ kde_findEntity (register const char *str, register unsigned int len)
+     }
+   return 0;
+ }
+-#line 316 "kentities.gperf"
++#line 315 "kentities.gperf"
+ 
+ 
+diff --git a/kdecore/localization/kentities.gperf b/kdecore/localization/kentities.gperf
+index 16d5de4..19522fe 100644
+--- a/kdecore/localization/kentities.gperf
++++ b/kdecore/localization/kentities.gperf
+@@ -22,7 +22,7 @@
+   
+     kentities.gperf: input file to generate a hash table for entities
+     kentities.c: DO NOT EDIT! generated by the command
+-    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c"
++    "gperf -a -L ANSI-C -E -C -c -o -t -k '*' -Nkde_findEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf > kentities.c"
+     from kentities.gperf
+ */  
+ %}
+@@ -144,6 +144,7 @@ delta, 0x03b4
+ diams, 0x2666
+ divide, 0x00f7
+ dol, 0x0024
++dollar, 0x0024
+ eacute, 0x00e9
+ ecaron, 0x011b
+ eague, 0x00e9
+-- 
+2.3.1
+
diff --git a/0002-More-up-to-date-image-for-web-pages-forgotten-cmake-.patch b/0002-More-up-to-date-image-for-web-pages-forgotten-cmake-.patch
new file mode 100644
index 0000000..ce6cbb6
--- /dev/null
+++ b/0002-More-up-to-date-image-for-web-pages-forgotten-cmake-.patch
@@ -0,0 +1,27 @@
+From 45edd7e5c333ea5dd90e3a9814b1f30216dda667 Mon Sep 17 00:00:00 2001
+From: Luigi Toscano <luigi.toscano at tiscali.it>
+Date: Tue, 3 Mar 2015 23:42:03 +0100
+Subject: [PATCH 2/4] More up-to-date image for web pages (forgotten cmake fix)
+
+The new image is now installed; followup of review 122080.
+
+This change is not needed in Frameworks due to the different way
+CMakeLists.txt works there.
+---
+ doc/common/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/doc/common/CMakeLists.txt b/doc/common/CMakeLists.txt
+index 4228625..0380fe9 100644
+--- a/doc/common/CMakeLists.txt
++++ b/doc/common/CMakeLists.txt
+@@ -29,5 +29,6 @@ install(FILES
+     top-middle.png
+     top-right.png
+     top-left.png
++    part_of_the_kde_family_horizontal_190.png
+     1.png 2.png 3.png 4.png 5.png 6.png 7.png 8.png 9.png 10.png
+     DESTINATION ${HTML_INSTALL_DIR}/en/common)
+-- 
+2.3.1
+
diff --git a/0003-Fix-BIC-introduced-in-4.14.6.patch b/0003-Fix-BIC-introduced-in-4.14.6.patch
new file mode 100644
index 0000000..d8ee642
--- /dev/null
+++ b/0003-Fix-BIC-introduced-in-4.14.6.patch
@@ -0,0 +1,61 @@
+From 92d3cb4804bad73f8ebabf9be8f6f2a2c0daa471 Mon Sep 17 00:00:00 2001
+From: Andrea Iacovitti <aiacovitti at libero.it>
+Date: Thu, 5 Mar 2015 15:05:11 +0100
+Subject: [PATCH 3/4] Fix BIC introduced in 4.14.6
+
+REVIEW: 122812
+---
+ khtml/dom/dom_string.cpp |  7 +++++++
+ khtml/dom/dom_string.h   | 15 ++++++++++++++-
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp
+index a3c4abd..4da676b 100644
+--- a/khtml/dom/dom_string.cpp
++++ b/khtml/dom/dom_string.cpp
+@@ -336,6 +336,13 @@ DOMString DOMString::parsedUrl() const
+     return out;
+ }
+ 
++#ifndef KDE_NO_DEPRECATED
++DOMString DOMString::trimSpaces() const
++{
++    return parsedUrl();
++}
++#endif
++
+ // ------------------------------------------------------------------------
+ 
+ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs )
+diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h
+index 087f697..b269213 100644
+--- a/khtml/dom/dom_string.h
++++ b/khtml/dom/dom_string.h
+@@ -124,10 +124,23 @@ public:
+     bool endsWith(const DOMString& str) const;
+     bool startsWith(const DOMString& str) const;
+ 
+-    // http://www.w3.org/TR/html/infrastructure.html#urls
++    /**
++     * Return a parsed url.
++     * Used to parse SRC url attribute,
++     * see http://www.w3.org/TR/html/infrastructure.html#urls
++     *
++     * @since 4.14.6
++     */
+     DOMString parsedUrl() const;
+ 
+     /**
++     * @deprecated, use parsedUrl()
++     */
++#ifndef KDE_NO_DEPRECATED
++    KDE_DEPRECATED DOMString trimSpaces() const;
++#endif
++
++    /**
+      * @internal get a handle to the imlementation of the DOMString
+      * Use at own risk!!!
+      */
+-- 
+2.3.1
+
diff --git a/0004-Fix-parsing-single-quoted-meta-charset-attribute.patch b/0004-Fix-parsing-single-quoted-meta-charset-attribute.patch
new file mode 100644
index 0000000..9ac81e5
--- /dev/null
+++ b/0004-Fix-parsing-single-quoted-meta-charset-attribute.patch
@@ -0,0 +1,56 @@
+From e957417b21f68cceeb8536fe60f880c40bb7a7d5 Mon Sep 17 00:00:00 2001
+From: Andrea Iacovitti <aiacovitti at libero.it>
+Date: Fri, 6 Mar 2015 23:30:14 +0100
+Subject: [PATCH 4/4] Fix parsing single-quoted meta charset attribute. Ignore
+ whitespaces after the quote.
+
+BUG: 322484
+FIXED-IN: 4.14.7
+---
+ kdecore/localization/kencodingdetector.cpp | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/kdecore/localization/kencodingdetector.cpp b/kdecore/localization/kencodingdetector.cpp
+index 1f20bec..13b4909 100644
+--- a/kdecore/localization/kencodingdetector.cpp
++++ b/kdecore/localization/kencodingdetector.cpp
+@@ -1031,6 +1031,7 @@ bool KEncodingDetector::analyze(const char *data, int len)
+                 //if ( *end == '\0' ) break;
+                 QByteArray str( ptr, (end-ptr)+1);
+                 str = str.toLower();
++                const int strLength = str.length();
+                 int pos=0;
+                         //if( (pos = str.find("http-equiv", pos)) == -1) break;
+                         //if( (pos = str.find("content-type", pos)) == -1) break;
+@@ -1045,19 +1046,22 @@ bool KEncodingDetector::analyze(const char *data, int len)
+                 ++pos;
+ 
+                 // skip whitespace before encoding itself
+-                while (pos < (int)str.length() && str[pos] <= ' ')
++                while (pos < strLength && str[pos] <= ' ')
+                     ++pos;
+ 
+-                // there may also be an opening quote, if this is a charset= and not
+-                // a http-equiv.
+-                if (pos < (int)str.length() && str[pos] == '"')
++                // there may also be an opening quote, if this is a charset= and not a http-equiv.
++                if (pos < strLength && (str[pos] == '"' || str[pos] == '\''))
+                     ++pos;
+ 
+-                if ( pos == (int)str.length())
++                // skip whitespace
++                while (pos < strLength && str[pos] <= ' ')
++                    ++pos;
++
++                if ( pos == strLength)
+                     continue;
+ 
+                 int endpos = pos;
+-                while( endpos < str.length() &&
++                while( endpos < strLength &&
+                         (str[endpos] != ' ' && str[endpos] != '"' && str[endpos] != '\''
+                                     && str[endpos] != ';' && str[endpos] != '>') )
+                     ++endpos;
+-- 
+2.3.1
+
diff --git a/kdelibs.spec b/kdelibs.spec
index 2596fc5..4151bde 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -44,7 +44,7 @@ Summary: KDE Libraries
 # shipped with kde applications, version...
 %global apps_version 14.12.3
 Version: 4.14.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -184,6 +184,10 @@ Patch64: kdelibs-4.13.2-invokeTerminal.patch
 
 ## upstream
 # 4.14 branch
+Patch101: 0001-Add-dollar.patch
+Patch102: 0002-More-up-to-date-image-for-web-pages-forgotten-cmake-.patch
+Patch103: 0003-Fix-BIC-introduced-in-4.14.6.patch
+Patch104: 0004-Fix-parsing-single-quoted-meta-charset-attribute.patch
 
 # revert these commits for
 #https://bugs.kde.org/315578
@@ -437,11 +441,17 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch64 -p1 -b .invokeTerminal
 
 # upstream patches
+%patch101 -p1 -b .0001
+%patch102 -p1 -b .0002
+%patch103 -p1 -b .0003
+%patch104 -p1 -b .0004
 
 %patch090 -p1 -R -b .return-not-break.-copy-paste-error
 %patch091 -p1 -R -b .coding-style-fixes.patch
 %patch092 -p1 -R -b .return-application-icons-properly
+%if 0%{?fedora} < 22
 %patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default
+%endif
 
 # security fixes
 
@@ -789,7 +799,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
-* Sat Feb 28 2015 Rex Dieter <rdieter at fedoraproject.org> 4.14.6-1
+* Sun Mar 08 2015 Rex Dieter <rdieter at fedoraproject.org> - 6:4.14.6-2
+- pull in upstream fixes, including minor BIC fix for 4.14.6
+- disable plasma/pacakgekit feature (for f22+
+
+* Sat Feb 28 2015 Rex Dieter <rdieter at fedoraproject.org> 6:4.14.6-1
 - 4.14.6
 
 * Tue Feb 24 2015 Rex Dieter <rdieter at fedoraproject.org> 6:4.14.5-2


More information about the scm-commits mailing list