koffice, ajout patchs et maj footprint

5 files changed, 132 insertions, 5 deletions

diff --git a/kde/koffice/.footprint b/kde/koffice/.footprint
index 6ceb9f7ca..89e6b2e1d 100644
--- a/kde/koffice/.footprint
+++ b/kde/koffice/.footprint
@@ -475,7 +475,6 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/libkritaoraexport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/libkritaoraimport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/libkritapart.so
--rwxr-xr-x	root/root	usr/lib/kde4/libkritapdfimport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/libkritapngexport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/libkritapngimport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/libkritatiffexport.so
@@ -665,7 +664,6 @@ drwxr-xr-x	root/root	usr/share/applications/kde4/
 -rw-r--r--	root/root	usr/share/applications/kde4/krita_bmp.desktop
 -rw-r--r--	root/root	usr/share/applications/kde4/krita_jpeg.desktop
 -rw-r--r--	root/root	usr/share/applications/kde4/krita_ora.desktop
--rw-r--r--	root/root	usr/share/applications/kde4/krita_pdf.desktop
 -rw-r--r--	root/root	usr/share/applications/kde4/krita_png.desktop
 -rw-r--r--	root/root	usr/share/applications/kde4/krita_raw.desktop
 -rw-r--r--	root/root	usr/share/applications/kde4/krita_tiff.desktop
@@ -704,6 +702,7 @@ drwxr-xr-x	root/root	usr/share/apps/karbon/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/karbon/icons/hicolor/16x16/actions/rotate.png
 -rw-r--r--	root/root	usr/share/apps/karbon/icons/hicolor/16x16/actions/shear.png
 -rw-r--r--	root/root	usr/share/apps/karbon/icons/hicolor/16x16/actions/strokedocker.png
+-rw-r--r--	root/root	usr/share/apps/karbon/icons/hicolor/16x16/actions/tooloptions.png
 -rw-r--r--	root/root	usr/share/apps/karbon/icons/hicolor/16x16/actions/translate.png
 -rw-r--r--	root/root	usr/share/apps/karbon/icons/hicolor/16x16/actions/unlocked.png
 drwxr-xr-x	root/root	usr/share/apps/karbon/icons/hicolor/16x16/apps/
@@ -789,6 +788,7 @@ drwxr-xr-x	root/root	usr/share/apps/kchart/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/16x16/actions/chart_polar.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/16x16/actions/chart_ring.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/16x16/actions/data.png
+-rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/16x16/actions/options.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/16x16/actions/wizard.png
 drwxr-xr-x	root/root	usr/share/apps/kchart/icons/hicolor/22x22/
 drwxr-xr-x	root/root	usr/share/apps/kchart/icons/hicolor/22x22/actions/
@@ -805,6 +805,7 @@ drwxr-xr-x	root/root	usr/share/apps/kchart/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/22x22/actions/chart_polar.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/22x22/actions/chart_ring.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/22x22/actions/data.png
+-rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/22x22/actions/options.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/22x22/actions/wizard.png
 drwxr-xr-x	root/root	usr/share/apps/kchart/icons/hicolor/32x32/
 drwxr-xr-x	root/root	usr/share/apps/kchart/icons/hicolor/32x32/actions/
@@ -821,6 +822,7 @@ drwxr-xr-x	root/root	usr/share/apps/kchart/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/32x32/actions/chart_polar.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/32x32/actions/chart_ring.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/32x32/actions/data.png
+-rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/32x32/actions/options.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/32x32/actions/wizard.png
 drwxr-xr-x	root/root	usr/share/apps/kchart/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/apps/kchart/icons/hicolor/48x48/actions/
@@ -836,6 +838,7 @@ drwxr-xr-x	root/root	usr/share/apps/kchart/icons/hicolor/48x48/actions/
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/48x48/actions/chart_pie_3d.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/48x48/actions/chart_polar.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/48x48/actions/chart_ring.png
+-rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/48x48/actions/options.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/48x48/actions/template_barchart.png
 -rw-r--r--	root/root	usr/share/apps/kchart/icons/hicolor/48x48/actions/template_empty.png
 drwxr-xr-x	root/root	usr/share/apps/kchart/icons/hicolor/scalable/
@@ -1927,6 +1930,7 @@ drwxr-xr-x	root/root	usr/share/apps/kspread/scripts/docker/
 drwxr-xr-x	root/root	usr/share/apps/kspread/scripts/extensions/
 -rw-r--r--	root/root	usr/share/apps/kspread/scripts/extensions/csvexport.py
 -rw-r--r--	root/root	usr/share/apps/kspread/scripts/extensions/csvimport.py
+-rw-r--r--	root/root	usr/share/apps/kspread/scripts/extensions/csvoptions.ui
 -rw-r--r--	root/root	usr/share/apps/kspread/scripts/extensions/htmlexport.py
 -rw-r--r--	root/root	usr/share/apps/kspread/scripts/extensions/htmlexportinfos.ui
 -rw-r--r--	root/root	usr/share/apps/kspread/scripts/extensions/kexidbexport.py
@@ -2123,9 +2127,11 @@ drwxr-xr-x	root/root	usr/share/doc/
 drwxr-xr-x	root/root	usr/share/doc/HTML/
 drwxr-xr-x	root/root	usr/share/doc/HTML/fr/
 drwxr-xr-x	root/root	usr/share/doc/HTML/fr/karbon/
+lrwxrwxrwx	root/root	usr/share/doc/HTML/fr/karbon/common -> /usr/share/doc/HTML/fr//common
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/karbon/index.cache.bz2
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/karbon/index.docbook
 drwxr-xr-x	root/root	usr/share/doc/HTML/fr/kchart/
+lrwxrwxrwx	root/root	usr/share/doc/HTML/fr/kchart/common -> /usr/share/doc/HTML/fr//common
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kchart/file-toolbar.png
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kchart/file-toolbar2.png
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kchart/index.cache.bz2
@@ -2160,6 +2166,7 @@ drwxr-xr-x	root/root	usr/share/doc/HTML/fr/kchart/
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kchart/toolbars.png
 drwxr-xr-x	root/root	usr/share/doc/HTML/fr/kformula/
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kformula/ambiguous-string.png
+lrwxrwxrwx	root/root	usr/share/doc/HTML/fr/kformula/common -> /usr/share/doc/HTML/fr//common
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kformula/file-toolbar.png
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kformula/file-toolbar2.png
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kformula/green1.png
@@ -2180,14 +2187,17 @@ drwxr-xr-x	root/root	usr/share/doc/HTML/fr/kformula/
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kformula/shortcut1.png
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kformula/toolbars.png
 drwxr-xr-x	root/root	usr/share/doc/HTML/fr/koffice/
+lrwxrwxrwx	root/root	usr/share/doc/HTML/fr/koffice/common -> /usr/share/doc/HTML/fr//common
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/koffice/index.cache.bz2
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/koffice/index.docbook
 drwxr-xr-x	root/root	usr/share/doc/HTML/fr/kplato/
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kplato/commands.docbook
+lrwxrwxrwx	root/root	usr/share/doc/HTML/fr/kplato/common -> /usr/share/doc/HTML/fr//common
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kplato/definitions.docbook
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kplato/index.cache.bz2
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kplato/index.docbook
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kplato/mainwindow.docbook
+-rw-r--r--	root/root	usr/share/doc/HTML/fr/kplato/options.docbook
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kplato/wbs.docbook
 drwxr-xr-x	root/root	usr/share/doc/HTML/fr/kspread/
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kspread/advanced.docbook
@@ -2200,6 +2210,7 @@ drwxr-xr-x	root/root	usr/share/doc/HTML/fr/kspread/
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kspread/cellformat5.png
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kspread/chart1.png
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kspread/commands.docbook
+lrwxrwxrwx	root/root	usr/share/doc/HTML/fr/kspread/common -> /usr/share/doc/HTML/fr//common
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kspread/config.docbook
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kspread/configdialog.docbook
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kspread/copy1.png
@@ -2214,6 +2225,7 @@ drwxr-xr-x	root/root	usr/share/doc/HTML/fr/kspread/
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kspread/sort1.png
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/kspread/starting1.png
 drwxr-xr-x	root/root	usr/share/doc/HTML/fr/thesaurus/
+lrwxrwxrwx	root/root	usr/share/doc/HTML/fr/thesaurus/common -> /usr/share/doc/HTML/fr//common
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/thesaurus/index.cache.bz2
 -rw-r--r--	root/root	usr/share/doc/HTML/fr/thesaurus/index.docbook
 drwxr-xr-x	root/root	usr/share/icons/
@@ -2408,7 +2420,6 @@ drwxr-xr-x	root/root	usr/share/kde4/services/ServiceMenus/
 -rw-r--r--	root/root	usr/share/kde4/services/krita_jpeg_import.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/krita_ora_export.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/krita_ora_import.desktop
--rw-r--r--	root/root	usr/share/kde4/services/krita_pdf_import.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/krita_png_export.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/krita_png_import.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/krita_raw_import.desktop
diff --git a/kde/koffice/.md5sum b/kde/koffice/.md5sum
index 1ff911fbd..e9be9ccf3 100644
--- a/kde/koffice/.md5sum
+++ b/kde/koffice/.md5sum
@@ -1,2 +1,4 @@
+e4546d6e8b01e7182ac1887a6571c167  koffice-2.1.2-gcc-4.5.0-1.patch
 8bd87b20e2a134cfd2f7db5f4fee4330  koffice-2.1.2.tar.bz2
 0221e91c3aea51dbdf24ca2e91c73bec  koffice-l10n-fr-2.1.2.tar.bz2
+8f139e0be95f3566cb860bd384c5aa8a  libpng14.patch
diff --git a/kde/koffice/Pkgfile b/kde/koffice/Pkgfile
index e14a821a2..144c19e97 100644
--- a/kde/koffice/Pkgfile
+++ b/kde/koffice/Pkgfile
@@ -8,10 +8,15 @@ name=koffice
 version=2.1.2
 release=1
 source=(ftp://ftp.kde.org/pub/kde/stable/$name-$version/$name-$version.tar.bz2 \
-        ftp://ftp.kde.org/pub/kde/stable/$name-$version/$name-l10n/$name-l10n-fr-$version.tar.bz2)
+        ftp://ftp.kde.org/pub/kde/stable/$name-$version/$name-l10n/$name-l10n-fr-$version.tar.bz2\
+	libpng14.patch koffice-2.1.2-gcc-4.5.0-1.patch)
 
 build() {
-        mkdir build
+	cd $name-$version
+	patch -Np0 -i ../libpng14.patch
+	patch -Np1 -i ../koffice-2.1.2-gcc-4.5.0-1.patch
+        cd ..
+	mkdir build
         cd build
         cmake ../${name}-l10n-fr-$version \
                 -DCMAKE_INSTALL_PREFIX=/usr
diff --git a/kde/koffice/koffice-2.1.2-gcc-4.5.0-1.patch b/kde/koffice/koffice-2.1.2-gcc-4.5.0-1.patch
new file mode 100644
index 000000000..d380aeeb6
--- /dev/null
+++ b/kde/koffice/koffice-2.1.2-gcc-4.5.0-1.patch
@@ -0,0 +1,98 @@
+--- koffice-2.1.2/filters/kword/msword-odf/texthandler.cpp	2010-03-29 15:05:58.000000000 +0200
++++ koffice-2.1.2.new/filters/kword/msword-odf/texthandler.cpp	2010-05-07 19:02:43.000000000 +0200
+@@ -863,7 +863,7 @@
+                 unsigned int code = text[0].unicode();
+                 if ( (code & 0xFF00) == 0xF000 ) // see wv2
+                     code &= 0x00FF;
+-                listStyleWriter.addAttribute( "text:bullet-char", QString::QString( code ).toUtf8() );
++                listStyleWriter.addAttribute( "text:bullet-char", QString( code ).toUtf8() );
+             }
+             else
+                 kWarning(30513) << "Bullet with more than one character, not supported";
+--- koffice-2.1.2/krita/ui/widgets/kis_curve_widget.cpp	2010-03-29 15:07:17.000000000 +0200
++++ koffice-2.1.2.new/krita/ui/widgets/kis_curve_widget.cpp	2010-05-07 20:14:22.000000000 +0200
+@@ -312,11 +312,11 @@
+             curveY = d->m_points.at(i).y();
+ 
+             if (i == d->m_grab_point_index) {
+-                p.setPen(QPen::QPen(Qt::red, 3, Qt::SolidLine));
++                p.setPen(QPen(Qt::red, 3, Qt::SolidLine));
+                 p.drawEllipse(QRectF(curveX * wWidth - 2,
+                                      wHeight - 2 - curveY * wHeight, 4, 4));
+             } else {
+-                p.setPen(QPen::QPen(Qt::red, 1, Qt::SolidLine));
++                p.setPen(QPen(Qt::red, 1, Qt::SolidLine));
+                 p.drawEllipse(QRectF(curveX * wWidth - 3,
+                                      wHeight - 3 - curveY * wHeight, 6, 6));
+             }
+--- koffice-2.1.2/krita/ui/widgets/kis_curve_widget_p.h	2010-03-29 15:07:17.000000000 +0200
++++ koffice-2.1.2.new/krita/ui/widgets/kis_curve_widget_p.h	2010-05-07 20:15:38.000000000 +0200
+@@ -439,7 +439,7 @@
+      * That is not mandatory but desirable
+      */
+ 
+-    p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
++    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
+     p.drawLine(div4_round(wWidth), 0, div4_round(wWidth), wHeight);
+     p.drawLine(div2_round(wWidth), 0, div2_round(wWidth), wHeight);
+     p.drawLine(div4_round(3*wWidth), 0, div4_round(3*wWidth), wHeight);
+--- koffice-2.1.2/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp	2010-03-29 15:06:06.000000000 +0200
++++ koffice-2.1.2.new/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp	2010-05-07 20:20:28.000000000 +0200
+@@ -123,7 +123,7 @@
+ 
+     QPixmap gradientpix(width, height);
+     QPainter p(&gradientpix);
+-    p.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
++    p.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
+     for (; *i < 256; (*i)++, col += inc) {
+         p.setPen(QColor(col, col, col));
+         p.drawPoint(x, y);
+@@ -138,7 +138,7 @@
+     QPixmap pix(256, height);
+     pix.fill();
+     QPainter p(&pix);
+-    p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
++    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
+ 
+     if(m_histogram)
+     {
+--- koffice-2.1.2/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp	2010-03-29 15:06:06.000000000 +0200
++++ koffice-2.1.2.new/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp	2010-05-07 20:45:21.000000000 +0200
+@@ -249,7 +249,7 @@
+     // Create the horizontal gradient label
+     QPixmap hgradientpix(256, 1);
+     QPainter hgp(&hgradientpix);
+-    hgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
++    hgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
+     for (i = 0; i < 256; ++i) {
+         hgp.setPen(QColor(i, i, i));
+         hgp.drawPoint(i, 0);
+@@ -259,7 +259,7 @@
+     // Create the vertical gradient label
+     QPixmap vgradientpix(1, 256);
+     QPainter vgp(&vgradientpix);
+-    vgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
++    vgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
+     for (i = 0; i < 256; ++i) {
+         vgp.setPen(QColor(i, i, i));
+         vgp.drawPoint(0, 255 - i);
+@@ -271,7 +271,7 @@
+     QPixmap pix(256, height);
+     pix.fill();
+     QPainter p(&pix);
+-    p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
++    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
+ 
+     double highest = (double)histogram.calculations().getHighest();
+     qint32 bins = histogram.producer()->numberOfBins();
+--- koffice-2.1.2/krita/plugins/filters/levelfilter/kis_level_filter.cpp	2010-03-29 15:06:23.000000000 +0200
++++ koffice-2.1.2.new/krita/plugins/filters/levelfilter/kis_level_filter.cpp	2010-05-07 20:48:49.000000000 +0200
+@@ -178,7 +178,7 @@
+     pix.fill();
+     QPainter p(&pix);
+ 
+-    p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
++    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
+ 
+     double highest = (double)histogram->calculations().getHighest();
+     qint32 bins = histogram->producer()->numberOfBins();
diff --git a/kde/koffice/libpng14.patch b/kde/koffice/libpng14.patch
new file mode 100644
index 000000000..f4e8da5b1
--- /dev/null
+++ b/kde/koffice/libpng14.patch
@@ -0,0 +1,11 @@
+--- krita/ui/kis_png_converter.cpp.old	2010-01-20 17:48:11.890898029 +0100
++++ krita/ui/kis_png_converter.cpp	2010-01-20 17:50:13.477553307 +0100
+@@ -404,7 +404,7 @@
+ 
+     png_byte signature[8];
+     iod->peek((char*)signature, 8);
+-    if (!png_check_sig(signature, 8)) {
++    if (!png_sig_cmp(signature, 0, 8) == 0) {
+         iod->close();
+         return (KisImageBuilder_RESULT_BAD_FETCH);
+     }