Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=509061f72c7bb167659f00c064ae5f786e0b2844

commit 509061f72c7bb167659f00c064ae5f786e0b2844
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Mon May 31 01:16:25 2010 +0200

koffice-2.1.2-1-i686

- version bump
- add gcc45 patches
- built with libjpeg8

diff --git a/source/kde-extra/koffice/FrugalBuild 
b/source/kde-extra/koffice/FrugalBuild
index 9820f5a..c957e4e 100644
--- a/source/kde-extra/koffice/FrugalBuild
+++ b/source/kde-extra/koffice/FrugalBuild
@@ -3,15 +3,15 @@
# Maintainer: crazy <cr...@frugalware.org>

pkgname=koffice
-pkgver=2.1.1
-pkgrel=3
+pkgver=2.1.2
+pkgrel=1
pkgdesc="An integrated Office suite for KDE"
url="http://www.koffice.org";
_F_kde_subpkgs_custom_path=1
_F_kde_split_docs=1
Finclude kde
depends=( )
-makedepends=("${makedepen...@]}" 'eigen' 'gmm' 'boost' 'libspnav')
+makedepends=("${makedepen...@]}" 'eigen' 'gmm' 'boost' 'libspnav' 
'kdelibs-compiletime' 'ksgmltools2')
groups=('kde-extra')
replaces=('keximdb' 'knoda')
provides=("${replac...@]}")
@@ -19,24 +19,26 @@ conflicts=("${replac...@]}")
archs=('i686' 'x86_64' 'ppc')
url="http://www.koffice.org";
up2date="Flasttar http://ftp.gwdg.de/pub/x11/kde/stable/$pkgname-latest/";
-source=(ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/stable/$pkgname-latest/$pkgname-$pkgver.tar.bz2
 \
-       kformula_install.patch kchart-build_and_install.patch)
-sha1sums=('72a82cfaaca8fbdcd0ba4622f80d4cf27aff74d2' \
+source=(ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/stable/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2
 \
+       kformula_install.patch kchart-build_and_install.patch 
krita-2.1.2-gcc45.patch filters-gcc45.patch)
+sha1sums=('29f5b5e611408ac2a2e68352cb64299b78d83094' \
'1ee9c28bebf19ed8d638fe9a4ea86fb4079cb6b9' \
-          'ebe923ce95a0e3902ccf81455fbaac9bdcf80d90')
+          'ebe923ce95a0e3902ccf81455fbaac9bdcf80d90' \
+          'b70b997572d5ff01e87b244c5f112e402794d72e' \
+          '98d2946c09840e2f0d65da8c593d9fe11dc6df6d')

## move to main -> post-1.2

subpkgs=("${subpk...@]}" "kword")
subdescs=("${subdes...@]}" "KOffice Word Processor")
-subdepends=("${subdepen...@]}" "libqtgui>=$_F_kde_qtver 
libqtxml>=$_F_kde_qtver libgl libxext libwpd wv2 libjpeg")
+subdepends=("${subdepen...@]}" "libqtgui>=$_F_kde_qtver 
libqtxml>=$_F_kde_qtver libgl libxext libwpd wv2 libjpeg>=8b libkhtml")
subrodepends=("${subrodepen...@]}" "$pkgname-libs=$pkgver 
$pkgname-data=$pkgver")
subgroups=("${subgrou...@]}" 'kde-extra')
subarchs=("${subarc...@]}" 'i686 x86_64 ppc')

subpkgs=("${subpk...@]}" "kspread")
subdescs=("${subdes...@]}" "KOffice Spreadsheet Application")
-subdepends=("${subdepen...@]}" "libqtgui>=$_F_kde_qtver 
libqtxml>=$_F_kde_qtver libxext libgl gsl")
+subdepends=("${subdepen...@]}" "libqtgui>=$_F_kde_qtver 
libqtxml>=$_F_kde_qtver libxext libgl gsl libknotify")
subrodepends=("${subrodepen...@]}" "$pkgname-libs=$pkgver 
$pkgname-data=$pkgver")
subgroups=("${subgrou...@]}" 'kde-extra')
subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
@@ -103,7 +105,8 @@ _F_kde_subpkgs=("${subpk...@]}")
subpkgs=("${subpk...@]}" "$pkgname-libs")
subdescs=("${subdes...@]}" "Koffice Libraries")
subdepends=("${subdepen...@]}" "lcms libgcc libice libxrender libglu qca 
util-linux-ng libxi kdepimlibs>=$_F_kde_ver
-       cyrus-sasl libqtscript>=$_F_kde_qtver libqt3support>=$_F_kde_qtver")
+       cyrus-sasl libqtscript>=$_F_kde_qtver libqt3support>=$_F_kde_qtver 
libthreadweaver libkde3support libkfile
+       libkross libknewstuff")
subrodepends=("${subrodepen...@]}" "")
subgroups=("${subgrou...@]}" 'kde-extra')
subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
diff --git a/source/kde-extra/koffice/filters-gcc45.patch 
b/source/kde-extra/koffice/filters-gcc45.patch
new file mode 100644
index 0000000..491d529
--- /dev/null
+++ b/source/kde-extra/koffice/filters-gcc45.patch
@@ -0,0 +1,13 @@
+diff --git a/filters/kword/msword-odf/texthandler.cpp 
b/filters/kword/msword-odf/texthandler.cpp
+index c1f780b..0a05148 100644
+--- a/filters/kword/msword-odf/texthandler.cpp
++++ b/filters/kword/msword-odf/texthandler.cpp
+@@ -863,7 +863,7 @@ bool KWordTextHandler::writeListInfo(KoXmlWriter* writer, 
const wvWare::Word97::
+                 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";
diff --git a/source/kde-extra/koffice/krita-2.1.2-gcc45.patch 
b/source/kde-extra/koffice/krita-2.1.2-gcc45.patch
new file mode 100644
index 0000000..13292e9
--- /dev/null
+++ b/source/kde-extra/koffice/krita-2.1.2-gcc45.patch
@@ -0,0 +1,91 @@
+http://bugs.gentoo.org/314483
+http://websvn.kde.org/?view=revision&revision=1061366
+http://websvn.kde.org/?view=revision&revision=1061381
+
+--- krita/ui/widgets/kis_curve_widget_p.h
++++ krita/ui/widgets/kis_curve_widget_p.h
+@@ -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);
+--- krita/ui/widgets/kis_curve_widget.cpp
++++ krita/ui/widgets/kis_curve_widget.cpp
+@@ -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));
+             }
+--- krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
++++ krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
+@@ -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)
+     {
+--- krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
++++ krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
+@@ -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();
+--- krita/plugins/filters/levelfilter/kis_level_filter.cpp
++++ krita/plugins/filters/levelfilter/kis_level_filter.cpp
+@@ -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();
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to