1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/specs/patches/calligra/calligra-CS.diff	Tue Feb 14 15:44:38 2012 +0100
     1.3 @@ -0,0 +1,31 @@
     1.4 +--- krita/image/kis_warptransform_worker.h.orig	Thu Feb  9 00:37:50 2012
     1.5 ++++ krita/image/kis_warptransform_worker.h	Thu Feb  9 00:38:13 2012
     1.6 +@@ -107,7 +107,7 @@
     1.7 +     static void FreeExtSides(ExtendedSide **S);
     1.8 +     static inline void AddExtSide(ExtendedSide **dest, QPoint P, QPoint S, Side C);
     1.9 +     static inline void setRegion(bool reg[4], int x0, int y0, QRect clipRect);
    1.10 +-    static void Sutherland_Hodgman(ExtendedSide **Dest, ExtendedSide *ExtSide, QRect clipRect, ClipperSide CS, bool &PreviousPointOut);
    1.11 ++    static void Sutherland_Hodgman(ExtendedSide **Dest, ExtendedSide *ExtSide, QRect clipRect, ClipperSide calligra_CS, bool &PreviousPointOut);
    1.12 +     static void ClipPolygone(ExtendedSide **ExtSides, QRect *clipper);
    1.13 +     static inline bool equals(qreal a, qreal b, qreal tolerance);
    1.14 +     static inline bool valInRange(qreal val, qreal range_min, qreal range_max, qreal tolerance);
    1.15 +--- krita/image/kis_warptransform_worker.cc.orig	Thu Feb  9 00:38:40 2012
    1.16 ++++ krita/image/kis_warptransform_worker.cc	Thu Feb  9 00:38:59 2012
    1.17 +@@ -216,7 +216,7 @@
    1.18 +         reg[DOWNSIDE] = true;
    1.19 + }
    1.20 + 
    1.21 +-void KisWarpTransformWorker::Sutherland_Hodgman(ExtendedSide **Dest, ExtendedSide *ExtSide, QRect clipRect, ClipperSide CS, bool &PreviousPointOut)
    1.22 ++void KisWarpTransformWorker::Sutherland_Hodgman(ExtendedSide **Dest, ExtendedSide *ExtSide, QRect clipRect, ClipperSide calligra_CS, bool &PreviousPointOut)
    1.23 + {
    1.24 +     bool reg[2][4];
    1.25 +     int dx, dy, xTmp, tmp, eTmp, sign;
    1.26 +@@ -228,7 +228,7 @@
    1.27 +     dx = ExtSide->Side_->invm.dividend;
    1.28 +     dy = ExtSide->Side_->invm.divisor;
    1.29 +     sign = ExtSide->Side_->invm.sign;
    1.30 +-    switch (CS) {
    1.31 ++    switch (calligra_CS) {
    1.32 +     case LEFTSIDE:
    1.33 +         if ( (!reg[0][LEFTSIDE]) && (!reg[1][LEFTSIDE]) ) {
    1.34 +             if (PreviousPointOut) {

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/specs/patches/calligra/calligra-boost3.diff	Tue Feb 14 15:44:38 2012 +0100
     2.3 @@ -0,0 +1,11 @@
     2.4 +--- plugins/colorengines/lcms2/CMakeLists.txt.orig	Wed Feb  8 23:11:29 2012
     2.5 ++++ plugins/colorengines/lcms2/CMakeLists.txt	Wed Feb  8 23:12:01 2012
     2.6 +@@ -3,7 +3,7 @@
     2.7 + add_subdirectory(tests)
     2.8 + add_subdirectory(colorprofiles)
     2.9 + 
    2.10 +-include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
    2.11 ++include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
    2.12 + 
    2.13 + include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/cmyk_u16
    2.14 +     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/cmyk_u8

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/specs/patches/calligra/calligra-newline.diff	Tue Feb 14 15:44:38 2012 +0100
     3.3 @@ -0,0 +1,10 @@
     3.4 +--- kexi/plugins/forms/widgets/mapbrowser/MapBrowserFactory.cpp.orig	2012-02-08 21:21:22.230503051 +0000
     3.5 ++++ kexi/plugins/forms/widgets/mapbrowser/MapBrowserFactory.cpp	2012-02-08 21:21:28.867292170 +0000
     3.6 +@@ -92,4 +92,5 @@
     3.7 +      
     3.8 + K_EXPORT_KEXI_FORM_WIDGET_FACTORY_PLUGIN(MapBrowserFactory, mapbrowser)
     3.9 + 
    3.10 +-#include "MapBrowserFactory.moc"
    3.11 +\ No newline at end of file
    3.12 ++#include "MapBrowserFactory.moc"
    3.13 ++

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/specs/patches/calligra/calligra-qstring.diff	Tue Feb 14 15:44:38 2012 +0100
     4.3 @@ -0,0 +1,20 @@
     4.4 +--- tables/dialogs/FindDialog.h.orig	Wed Feb  8 22:36:17 2012
     4.5 ++++ tables/dialogs/FindDialog.h	Wed Feb  8 22:37:08 2012
     4.6 +@@ -76,7 +76,7 @@
     4.7 + 
     4.8 + public:
     4.9 +     explicit FindDlg(QWidget *parent = 0,
    4.10 +-                     const QString &name = 0,
    4.11 ++                     const QString &name = QString(),
    4.12 +                      long options = 0,
    4.13 +                      const QStringList &findStrings = QStringList(),
    4.14 +                      bool hasSelection = false);
    4.15 +@@ -106,7 +106,7 @@
    4.16 + 
    4.17 + public:
    4.18 +     explicit SearchDlg(QWidget *parent = 0,
    4.19 +-                       const QString &name = 0,
    4.20 ++                       const QString &name = QString(),
    4.21 +                        long options = 0,
    4.22 +                        const QStringList &findStrings = QStringList(),
    4.23 +                        const QStringList &replaceStrings = QStringList(),