patches/koffice-05-libart.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 839 18da77650f93
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
839
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
     1
--- koffice-1.6.3/karbon/render/art_rgb.h.orig	2008-01-27 11:10:37.443276358 +0530
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
     2
+++ koffice-1.6.3/karbon/render/art_rgb.h	2008-01-27 11:10:58.447631416 +0530
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
     3
@@ -23,7 +23,13 @@
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
     4
 #ifdef LIBART_COMPILATION
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
     5
 #include "art_misc.h"
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
     6
 #else
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
     7
+#ifdef __cplusplus
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
     8
+extern "C" {
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
     9
+#endif
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    10
 #include <libart_lgpl/art_misc.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    11
+#ifdef __cplusplus
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    12
+}
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    13
+#endif
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    14
 #endif
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    15
 
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    16
 #ifdef __cplusplus
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    17
--- koffice-1.6.3/karbon/render/art_rgb_affine_private.c.orig	2008-01-27 11:11:30.908167054 +0530
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    18
+++ koffice-1.6.3/karbon/render/art_rgb_affine_private.c	2008-01-27 11:11:52.705040247 +0530
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    19
@@ -21,7 +21,13 @@
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    20
 #include "art_rgb_affine_private.h"
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    21
 
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    22
 #include <math.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    23
+#ifdef __cplusplus
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    24
+extern "C" {
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    25
+#endif
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    26
 #include <libart_lgpl/art_misc.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    27
+#ifdef __cplusplus
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    28
+}
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    29
+#endif
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    30
 #include <libart_lgpl/art_point.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    31
 #include <libart_lgpl/art_affine.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    32
 
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    33
--- koffice-1.6.3/karbon/render/art_rgba_affine.c.orig	2008-01-27 11:12:42.991186535 +0530
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    34
+++ koffice-1.6.3/karbon/render/art_rgba_affine.c	2008-01-27 11:13:09.331039452 +0530
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    35
@@ -21,7 +21,13 @@
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    36
 #include "art_rgba_affine.h"
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    37
 
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    38
 #include <math.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    39
+#ifdef __cplusplus
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    40
+extern "C" {
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    41
+#endif
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    42
 #include <libart_lgpl/art_misc.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    43
+#ifdef __cplusplus
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    44
+}
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    45
+#endif
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    46
 #include <libart_lgpl/art_point.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    47
 #include <libart_lgpl/art_affine.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    48
 #include <art_rgb_affine_private.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    49
--- koffice-1.6.3/karbon/render/vkopainter.cc.orig	2008-01-27 12:04:26.772582484 +0530
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    50
+++ koffice-1.6.3/karbon/render/vkopainter.cc	2008-01-27 12:05:47.709883405 +0530
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    51
@@ -31,7 +31,14 @@
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    52
 #include <qimage.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    53
 
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    54
 #include "libart_lgpl/art_vpath.h"
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    55
+#ifdef __cplusplus
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    56
+extern "C" {
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    57
+#endif /* __cplusplus */
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    58
 #include <libart_lgpl/art_bpath.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    59
+#ifdef __cplusplus
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    60
+}
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    61
+#endif /* __cplusplus */
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    62
+
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    63
 #include <libart_lgpl/art_vpath_bpath.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    64
 #include <libart_lgpl/art_svp_vpath.h>
18da77650f93 SFEkoffice3.spec:
moinakg
parents:
diff changeset
    65
 #include <libart_lgpl/art_svp_vpath_stroke.h>