diff options
author | joerg <joerg@pkgsrc.org> | 2011-12-05 22:52:24 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2011-12-05 22:52:24 +0000 |
commit | 763eb1b11270d1ed9ad3aad97bac2c4fa994fca5 (patch) | |
tree | cdf5267bb5c2e6970becd6a0f8c33c32bd1c792d /misc | |
parent | ad85023e78c2425f04730fa32422e000d4fbaa98 (diff) | |
download | pkgsrc-763eb1b11270d1ed9ad3aad97bac2c4fa994fca5.tar.gz |
Fix low hanging fruits for building with modern GCC.
Diffstat (limited to 'misc')
8 files changed, 168 insertions, 1 deletions
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo index 76e970dfb90..5e79e47a1a0 100644 --- a/misc/koffice/distinfo +++ b/misc/koffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.49 2011/02/06 23:59:36 wiz Exp $ +$NetBSD: distinfo,v 1.50 2011/12/05 22:52:24 joerg Exp $ SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4 @@ -21,3 +21,10 @@ SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53 SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7 SHA1 (patch-filters_krita_png_kis__png__converter.h) = f19ed6af46344b3516580ca91974d0d8382e5201 +SHA1 (patch-krita_core_kis__perspective__math.cpp) = 10aaf4139f8e0ff28eeabbb0ec37476ef3e0af3d +SHA1 (patch-krita_plugins_filters_colorsfilters_kis__brightness__contrast__filter.cc) = 9aad3be4f47d3f51e1c6ba57880111672f62e39a +SHA1 (patch-krita_plugins_filters_colorsfilters_kis__perchannel__filter.cc) = c1cf879ef38b86d0c10d12e7997934bfd17a5d43 +SHA1 (patch-krita_plugins_filters_levelfilter_kgradientslider.cc) = d821bc51bbedd6f8fe3e24995f1d6ac28452cd32 +SHA1 (patch-krita_plugins_filters_levelfilter_kis__level__filter.cc) = ab06f83a1d754d33f2da0618499403909ea3b25f +SHA1 (patch-krita_ui_kcurve.cc) = 35fb18ba3a6861dbb279383e96fa83339cf435aa +SHA1 (patch-kspread_digest.cc) = 378d86e2f406cb520aa1215100585488e64a68b1 diff --git a/misc/koffice/patches/patch-krita_core_kis__perspective__math.cpp b/misc/koffice/patches/patch-krita_core_kis__perspective__math.cpp new file mode 100644 index 00000000000..528fb3b04e8 --- /dev/null +++ b/misc/koffice/patches/patch-krita_core_kis__perspective__math.cpp @@ -0,0 +1,21 @@ +$NetBSD: patch-krita_core_kis__perspective__math.cpp,v 1.1 2011/12/05 22:52:24 joerg Exp $ + +--- krita/core/kis_perspective_math.cpp.orig 2011-12-05 18:29:04.000000000 +0000 ++++ krita/core/kis_perspective_math.cpp +@@ -24,13 +24,15 @@ + + #if 1 + +-#include <iostream.h> ++#include <iostream> + #include <stdlib.h> + #include <math.h> + //#define NDEBUG // uncomment to remove checking of assert() + #include <assert.h> + #define DEFAULT_ALLOC 2 + ++using namespace std; ++ + namespace math { // TODO: use eigen + + template <class ElType> class matrix; diff --git a/misc/koffice/patches/patch-krita_plugins_filters_colorsfilters_kis__brightness__contrast__filter.cc b/misc/koffice/patches/patch-krita_plugins_filters_colorsfilters_kis__brightness__contrast__filter.cc new file mode 100644 index 00000000000..fae49440525 --- /dev/null +++ b/misc/koffice/patches/patch-krita_plugins_filters_colorsfilters_kis__brightness__contrast__filter.cc @@ -0,0 +1,31 @@ +$NetBSD: patch-krita_plugins_filters_colorsfilters_kis__brightness__contrast__filter.cc,v 1.1 2011/12/05 22:52:24 joerg Exp $ + +--- krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc.orig 2011-12-05 18:43:21.000000000 +0000 ++++ krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc +@@ -276,7 +276,7 @@ KisBrightnessContrastConfigWidget::KisBr + // 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)); +@@ -287,7 +287,7 @@ KisBrightnessContrastConfigWidget::KisBr + // 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)); +@@ -300,7 +300,7 @@ KisBrightnessContrastConfigWidget::KisBr + 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(); + Q_INT32 bins = histogram.producer()->numberOfBins(); diff --git a/misc/koffice/patches/patch-krita_plugins_filters_colorsfilters_kis__perchannel__filter.cc b/misc/koffice/patches/patch-krita_plugins_filters_colorsfilters_kis__perchannel__filter.cc new file mode 100644 index 00000000000..9d1f73167f3 --- /dev/null +++ b/misc/koffice/patches/patch-krita_plugins_filters_colorsfilters_kis__perchannel__filter.cc @@ -0,0 +1,31 @@ +$NetBSD: patch-krita_plugins_filters_colorsfilters_kis__perchannel__filter.cc,v 1.1 2011/12/05 22:52:24 joerg Exp $ + +--- krita/plugins/filters/colorsfilters/kis_perchannel_filter.cc.orig 2011-12-05 18:42:12.000000000 +0000 ++++ krita/plugins/filters/colorsfilters/kis_perchannel_filter.cc +@@ -273,7 +273,7 @@ void KisPerChannelConfigWidget::setActiv + 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)); + + m_histogram->setChannel(ch); + +@@ -331,7 +331,7 @@ KisPerChannelConfigWidget::KisPerChannel + // 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)); +@@ -342,7 +342,7 @@ KisPerChannelConfigWidget::KisPerChannel + // 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)); diff --git a/misc/koffice/patches/patch-krita_plugins_filters_levelfilter_kgradientslider.cc b/misc/koffice/patches/patch-krita_plugins_filters_levelfilter_kgradientslider.cc new file mode 100644 index 00000000000..fb76e11c635 --- /dev/null +++ b/misc/koffice/patches/patch-krita_plugins_filters_levelfilter_kgradientslider.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-krita_plugins_filters_levelfilter_kgradientslider.cc,v 1.1 2011/12/05 22:52:24 joerg Exp $ + +--- krita/plugins/filters/levelfilter/kgradientslider.cc.orig 2011-12-05 18:43:40.000000000 +0000 ++++ krita/plugins/filters/levelfilter/kgradientslider.cc +@@ -72,7 +72,7 @@ void KGradientSlider::paintEvent(QPaintE + + // Draw first gradient + y = 0; +- p1.setPen(QPen::QPen(QColor(0,0,0),1, Qt::SolidLine)); ++ p1.setPen(QPen(QColor(0,0,0),1, Qt::SolidLine)); + for( x=0; x<255; ++x ) + { + int gray = (255 * x) / wWidth; diff --git a/misc/koffice/patches/patch-krita_plugins_filters_levelfilter_kis__level__filter.cc b/misc/koffice/patches/patch-krita_plugins_filters_levelfilter_kis__level__filter.cc new file mode 100644 index 00000000000..168f0a64894 --- /dev/null +++ b/misc/koffice/patches/patch-krita_plugins_filters_levelfilter_kis__level__filter.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-krita_plugins_filters_levelfilter_kis__level__filter.cc,v 1.1 2011/12/05 22:52:24 joerg Exp $ + +--- krita/plugins/filters/levelfilter/kis_level_filter.cc.orig 2011-12-05 18:43:45.000000000 +0000 ++++ krita/plugins/filters/levelfilter/kis_level_filter.cc +@@ -277,7 +277,7 @@ void KisLevelConfigWidget::drawHistogram + 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(); + Q_INT32 bins = histogram->producer()->numberOfBins(); diff --git a/misc/koffice/patches/patch-krita_ui_kcurve.cc b/misc/koffice/patches/patch-krita_ui_kcurve.cc new file mode 100644 index 00000000000..063133efe14 --- /dev/null +++ b/misc/koffice/patches/patch-krita_ui_kcurve.cc @@ -0,0 +1,38 @@ +$NetBSD: patch-krita_ui_kcurve.cc,v 1.1 2011/12/05 22:52:24 joerg Exp $ + +--- krita/ui/kcurve.cc.orig 2011-12-05 18:33:50.000000000 +0000 ++++ krita/ui/kcurve.cc +@@ -146,7 +146,7 @@ void KCurve::paintEvent(QPaintEvent *) + pm.fill(); + + // Draw grid separators. +- p1.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); ++ p1.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); + p1.drawLine(wWidth/3, 0, wWidth/3, wHeight); + p1.drawLine(2*wWidth/3, 0, 2*wWidth/3, wHeight); + p1.drawLine(0, wHeight/3, wWidth, wHeight/3); +@@ -154,7 +154,7 @@ void KCurve::paintEvent(QPaintEvent *) + + // Draw curve. + double curvePrevVal = getCurveValue(0.0); +- p1.setPen(QPen::QPen(Qt::black, 1, Qt::SolidLine)); ++ p1.setPen(QPen(Qt::black, 1, Qt::SolidLine)); + for (x = 0 ; x < wWidth ; x++) + { + double curveX; +@@ -184,13 +184,13 @@ void KCurve::paintEvent(QPaintEvent *) + + if(p == m_grab_point) + { +- p1.setPen(QPen::QPen(Qt::red, 3, Qt::SolidLine)); ++ p1.setPen(QPen(Qt::red, 3, Qt::SolidLine)); + p1.drawEllipse( int(curveX * wWidth) - 2, + wHeight - 2 - int(curveY * wHeight), 4, 4 ); + } + else + { +- p1.setPen(QPen::QPen(Qt::red, 1, Qt::SolidLine)); ++ p1.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + + p1.drawEllipse( int(curveX * wWidth) - 3, + wHeight - 3 - int(curveY * wHeight), 6, 6 ); diff --git a/misc/koffice/patches/patch-kspread_digest.cc b/misc/koffice/patches/patch-kspread_digest.cc new file mode 100644 index 00000000000..1ff71a955db --- /dev/null +++ b/misc/koffice/patches/patch-kspread_digest.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-kspread_digest.cc,v 1.1 2011/12/05 22:52:24 joerg Exp $ + +--- kspread/digest.cc.orig 2011-12-05 18:53:47.000000000 +0000 ++++ kspread/digest.cc +@@ -50,7 +50,7 @@ typedef unsigned short sal_uInt16; + + #if SIZEOF_INT == 4 + typedef unsigned int sal_uInt32; +-#elif ++#else + typedef unsigned long sal_uInt32; + #endif + |