From ac3b949ecd1660f82ea31b9090d09689f3774b82 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 15 Nov 2021 00:06:15 +0100 Subject: [PATCH] - fix building with gcc 11 - rediff patches - rebuild with icu from master, rel 6 --- eigen3.patch | 160 ++++++++++++++++++++------------------------- gcc11.patch | 40 ++++++++++++ kde4-calligra.spec | 9 +-- 3 files changed, 117 insertions(+), 92 deletions(-) create mode 100644 gcc11.patch diff --git a/eigen3.patch b/eigen3.patch index feba157..9f83126 100644 --- a/eigen3.patch +++ b/eigen3.patch @@ -23,12 +23,11 @@ beta together. .../convolutionfilters/convolutionfilters.cpp | 26 ++++++++++------------ 15 files changed, 64 insertions(+), 77 deletions(-) -diff --git a/krita/image/kis_convolution_kernel.cc b/krita/image/kis_convolution_kernel.cc -index d6473ba..d2d5d0c 100644 ---- a/krita/image/kis_convolution_kernel.cc -+++ b/krita/image/kis_convolution_kernel.cc -@@ -27,7 +27,7 @@ - struct Q_DECL_HIDDEN KisConvolutionKernel::Private { +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/image/kis_convolution_kernel.cc calligra-2.9.11/krita/image/kis_convolution_kernel.cc +--- calligra-2.9.11.org/krita/image/kis_convolution_kernel.cc 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/image/kis_convolution_kernel.cc 2021-11-14 22:55:05.771518646 +0100 +@@ -26,7 +26,7 @@ + struct KisConvolutionKernel::Private { qreal offset; qreal factor; - Matrix data; @@ -36,7 +35,7 @@ index d6473ba..d2d5d0c 100644 }; KisConvolutionKernel::KisConvolutionKernel(quint32 _width, quint32 _height, qreal _offset, qreal _factor) : d(new Private) -@@ -73,12 +73,12 @@ void KisConvolutionKernel::setFactor(qreal factor) +@@ -72,12 +72,12 @@ void KisConvolutionKernel::setFactor(qre d->factor = factor; } @@ -51,7 +50,7 @@ index d6473ba..d2d5d0c 100644 { return &(d->data); } -@@ -87,7 +87,7 @@ KisConvolutionKernelSP KisConvolutionKernel::fromQImage(const QImage& image) +@@ -86,7 +86,7 @@ KisConvolutionKernelSP KisConvolutionKer { KisConvolutionKernelSP kernel = new KisConvolutionKernel(image.width(), image.height(), 0, 0); @@ -60,7 +59,7 @@ index d6473ba..d2d5d0c 100644 #if QT_VERSION >= 0x040700 const quint8* itImage = image.constBits(); #else -@@ -118,7 +118,7 @@ KisConvolutionKernelSP KisConvolutionKernel::fromMaskGenerator(KisMaskGenerator* +@@ -121,7 +121,7 @@ KisConvolutionKernelSP KisConvolutionKer qreal xc = 0.5 * width - 0.5; qreal yc = 0.5 * height - 0.5; @@ -69,7 +68,7 @@ index d6473ba..d2d5d0c 100644 qreal factor = 0; // dbgImage << ppVar(xc) << ppVar(yc); -@@ -138,9 +138,9 @@ KisConvolutionKernelSP KisConvolutionKernel::fromMaskGenerator(KisMaskGenerator* +@@ -141,9 +141,9 @@ KisConvolutionKernelSP KisConvolutionKer return kernel; } @@ -81,10 +80,9 @@ index d6473ba..d2d5d0c 100644 kernel->data() = matrix; return kernel; -diff --git a/krita/image/kis_convolution_kernel.h b/krita/image/kis_convolution_kernel.h -index 7df71dd..8c58839 100644 ---- a/krita/image/kis_convolution_kernel.h -+++ b/krita/image/kis_convolution_kernel.h +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/image/kis_convolution_kernel.h calligra-2.9.11/krita/image/kis_convolution_kernel.h +--- calligra-2.9.11.org/krita/image/kis_convolution_kernel.h 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/image/kis_convolution_kernel.h 2021-11-14 22:55:05.771518646 +0100 @@ -25,8 +25,6 @@ #include "kritaimage_export.h" #include "kis_types.h" @@ -110,11 +108,10 @@ index 7df71dd..8c58839 100644 private: struct Private; Private* const d; -diff --git a/krita/image/kis_gaussian_kernel.cpp b/krita/image/kis_gaussian_kernel.cpp -index 822e80e..9f859d2 100644 ---- a/krita/image/kis_gaussian_kernel.cpp -+++ b/krita/image/kis_gaussian_kernel.cpp -@@ -34,11 +34,11 @@ int KisGaussianKernel::kernelSizeFromRadius(qreal radius) +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/image/kis_gaussian_kernel.cpp calligra-2.9.11/krita/image/kis_gaussian_kernel.cpp +--- calligra-2.9.11.org/krita/image/kis_gaussian_kernel.cpp 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/image/kis_gaussian_kernel.cpp 2021-11-14 22:55:05.771518646 +0100 +@@ -33,11 +33,11 @@ int KisGaussianKernel::kernelSizeFromRad } @@ -128,7 +125,7 @@ index 822e80e..9f859d2 100644 const qreal sigma = sigmaFromRadius(radius); const qreal multiplicand = 1 / (sqrt(2 * M_PI * sigma * sigma)); -@@ -59,11 +59,11 @@ KisGaussianKernel::createHorizontalMatrix(qreal radius) +@@ -58,11 +58,11 @@ KisGaussianKernel::createHorizontalMatri return matrix; } @@ -142,7 +139,7 @@ index 822e80e..9f859d2 100644 const qreal sigma = sigmaFromRadius(radius); const qreal multiplicand = 1 / (sqrt(2 * M_PI * sigma * sigma)); -@@ -87,14 +87,14 @@ KisGaussianKernel::createVerticalMatrix(qreal radius) +@@ -86,14 +86,14 @@ KisGaussianKernel::createVerticalMatrix( KisConvolutionKernelSP KisGaussianKernel::createHorizontalKernel(qreal radius) { @@ -159,10 +156,9 @@ index 822e80e..9f859d2 100644 return KisConvolutionKernel::fromMatrix(matrix, 0, matrix.sum()); } -diff --git a/krita/image/kis_gaussian_kernel.h b/krita/image/kis_gaussian_kernel.h -index ae59286..ed992ec 100644 ---- a/krita/image/kis_gaussian_kernel.h -+++ b/krita/image/kis_gaussian_kernel.h +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/image/kis_gaussian_kernel.h calligra-2.9.11/krita/image/kis_gaussian_kernel.h +--- calligra-2.9.11.org/krita/image/kis_gaussian_kernel.h 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/image/kis_gaussian_kernel.h 2021-11-14 22:55:05.771518646 +0100 @@ -23,17 +23,16 @@ #include "kis_types.h" @@ -183,11 +179,10 @@ index ae59286..ed992ec 100644 createVerticalMatrix(qreal radius); static KisConvolutionKernelSP -diff --git a/krita/image/kis_selection_filters.cpp b/krita/image/kis_selection_filters.cpp -index b790436..2bcdf54 100644 ---- a/krita/image/kis_selection_filters.cpp -+++ b/krita/image/kis_selection_filters.cpp -@@ -187,7 +187,7 @@ KUndo2MagicString KisDilateSelectionFilter::name() +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/image/kis_selection_filters.cpp calligra-2.9.11/krita/image/kis_selection_filters.cpp +--- calligra-2.9.11.org/krita/image/kis_selection_filters.cpp 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/image/kis_selection_filters.cpp 2021-11-14 22:55:05.771518646 +0100 +@@ -187,7 +187,7 @@ KUndo2MagicString KisDilateSelectionFilt QRect KisDilateSelectionFilter::changeRect(const QRect& rect) { const qint32 radius = 1; @@ -196,7 +191,7 @@ index b790436..2bcdf54 100644 } void KisDilateSelectionFilter::process(KisPixelSelectionSP pixelSelection, const QRect& rect) -@@ -483,7 +483,7 @@ void KisFeatherSelectionFilter::process(KisPixelSelectionSP pixelSelection, cons +@@ -483,7 +483,7 @@ void KisFeatherSelectionFilter::process( { // compute horizontal kernel const uint kernelSize = m_radius * 2 + 1; @@ -205,11 +200,10 @@ index b790436..2bcdf54 100644 const qreal multiplicand = 1 / (2 * M_PI * m_radius * m_radius); const qreal exponentMultiplicand = 1 / (2 * m_radius * m_radius); -diff --git a/krita/image/tests/kis_convolution_painter_test.cpp b/krita/image/tests/kis_convolution_painter_test.cpp -index d8898fd..efcd181 100644 ---- a/krita/image/tests/kis_convolution_painter_test.cpp -+++ b/krita/image/tests/kis_convolution_painter_test.cpp -@@ -56,9 +56,9 @@ KisPaintDeviceSP initAsymTestDevice(QRect &imageRect, int &pixelSize, QByteArray +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/image/tests/kis_convolution_painter_test.cpp calligra-2.9.11/krita/image/tests/kis_convolution_painter_test.cpp +--- calligra-2.9.11.org/krita/image/tests/kis_convolution_painter_test.cpp 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/image/tests/kis_convolution_painter_test.cpp 2021-11-14 22:55:05.771518646 +0100 +@@ -56,9 +56,9 @@ KisPaintDeviceSP initAsymTestDevice(QRec return dev; } @@ -221,7 +215,7 @@ index d8898fd..efcd181 100644 filter(0,0) = 1.0 / 21; filter(0,1) = 3.0 / 21; filter(0,2) = 1.0 / 21; -@@ -77,9 +77,9 @@ Matrix initSymmFilter(qreal &offset, qreal &factor) +@@ -77,9 +77,9 @@ Matrix initSymmFilter(qreal return filter; } @@ -233,7 +227,7 @@ index d8898fd..efcd181 100644 filter(0,0) = 1.0; filter(1,0) = 2.0; filter(2,0) = 1.0; -@@ -144,7 +144,7 @@ void KisConvolutionPainterTest::testSymmConvolution() +@@ -144,7 +144,7 @@ void KisConvolutionPainterTest::testSymm { qreal offset = 0.0; qreal factor = 1.0; @@ -242,7 +236,7 @@ index d8898fd..efcd181 100644 QRect imageRect; int pixelSize = 0; -@@ -172,7 +172,7 @@ void KisConvolutionPainterTest::testAsymmConvolutionImp(QBitArray channelFlags) +@@ -172,7 +172,7 @@ void KisConvolutionPainterTest::testAsym { qreal offset = 0.0; qreal factor = 1.0; @@ -251,7 +245,7 @@ index d8898fd..efcd181 100644 QRect imageRect; int pixelSize = -1; -@@ -317,7 +317,7 @@ void KisConvolutionPainterTest::testGaussianBase(KisPaintDeviceSP dev, bool useF +@@ -317,7 +317,7 @@ void KisConvolutionPainterTest::testGaus qreal horizontalRadius = 5, verticalRadius = 5; @@ -260,10 +254,9 @@ index d8898fd..efcd181 100644 for(int i = 0; i < 3 ; i++, horizontalRadius+=5, verticalRadius+=5) { QTime timer; -diff --git a/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp b/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp -index 94e09bb..4ea4143 100644 ---- a/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp -+++ b/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp calligra-2.9.11/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp +--- calligra-2.9.11.org/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp 2021-11-14 22:55:05.771518646 +0100 @@ -21,7 +21,6 @@ #include @@ -272,7 +265,7 @@ index 94e09bb..4ea4143 100644 #include #include "KoColor.h" -@@ -53,10 +52,10 @@ bool KisColorSelectorRing::containsPointInComponentCoords(int x, int y) const +@@ -53,10 +52,10 @@ bool KisColorSelectorRing::containsPoint int innerRadiusSquared = innerRadius(); outerRadiusSquared*=outerRadiusSquared; innerRadiusSquared*=innerRadiusSquared; @@ -287,7 +280,7 @@ index 94e09bb..4ea4143 100644 if(relativeVector.squaredNorm() < outerRadiusSquared && relativeVector.squaredNorm() > innerRadiusSquared) { return true; -@@ -72,13 +71,13 @@ void KisColorSelectorRing::paint(QPainter* painter) +@@ -72,13 +71,13 @@ void KisColorSelectorRing::paint(QPainte colorCache(); paintCache(); } @@ -303,7 +296,7 @@ index 94e09bb..4ea4143 100644 painter->drawImage(width()/2-m_pixelCache.width()/2, height()/2-m_pixelCache.height()/2, m_pixelCache); -@@ -139,17 +138,17 @@ void KisColorSelectorRing::setColor(const KoColor &color) +@@ -139,17 +138,17 @@ void KisColorSelectorRing::setColor(cons void KisColorSelectorRing::paintCache() { QImage cache(m_cachedSize, m_cachedSize, QImage::Format_ARGB32_Premultiplied); @@ -327,10 +320,9 @@ index 94e09bb..4ea4143 100644 if(currentRadius < outerRadius()+1 && currentRadius > innerRadius()-1) { -diff --git a/krita/plugins/filters/blur/kis_gaussian_blur_filter.h b/krita/plugins/filters/blur/kis_gaussian_blur_filter.h -index ee7bef3..7fd7b11 100644 ---- a/krita/plugins/filters/blur/kis_gaussian_blur_filter.h -+++ b/krita/plugins/filters/blur/kis_gaussian_blur_filter.h +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/plugins/filters/blur/kis_gaussian_blur_filter.h calligra-2.9.11/krita/plugins/filters/blur/kis_gaussian_blur_filter.h +--- calligra-2.9.11.org/krita/plugins/filters/blur/kis_gaussian_blur_filter.h 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/plugins/filters/blur/kis_gaussian_blur_filter.h 2021-11-14 22:55:05.771518646 +0100 @@ -26,8 +26,6 @@ #include @@ -340,11 +332,10 @@ index ee7bef3..7fd7b11 100644 class KisGaussianBlurFilter : public KisFilter { public: -diff --git a/krita/plugins/filters/blur/kis_lens_blur_filter.cpp b/krita/plugins/filters/blur/kis_lens_blur_filter.cpp -index 81d21d3..92a2ffb 100644 ---- a/krita/plugins/filters/blur/kis_lens_blur_filter.cpp -+++ b/krita/plugins/filters/blur/kis_lens_blur_filter.cpp -@@ -165,7 +165,7 @@ void KisLensBlurFilter::processImpl(KisPaintDeviceSP device, +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/plugins/filters/blur/kis_lens_blur_filter.cpp calligra-2.9.11/krita/plugins/filters/blur/kis_lens_blur_filter.cpp +--- calligra-2.9.11.org/krita/plugins/filters/blur/kis_lens_blur_filter.cpp 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/plugins/filters/blur/kis_lens_blur_filter.cpp 2021-11-14 22:55:05.771518646 +0100 +@@ -159,7 +159,7 @@ void KisLensBlurFilter::processImpl(KisP imagePainter.drawPolygon(transformedIris, Qt::WindingFill); // construct kernel from image @@ -353,10 +344,9 @@ index 81d21d3..92a2ffb 100644 for (int j = 0; j < kernelHeight; ++j) { for (int i = 0; i < kernelWidth; ++i) { irisKernel(j, i) = qRed(kernelRepresentation.pixel(i, j)); -diff --git a/krita/plugins/filters/blur/kis_lens_blur_filter.h b/krita/plugins/filters/blur/kis_lens_blur_filter.h -index 73e7704..8f19045 100644 ---- a/krita/plugins/filters/blur/kis_lens_blur_filter.h -+++ b/krita/plugins/filters/blur/kis_lens_blur_filter.h +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/plugins/filters/blur/kis_lens_blur_filter.h calligra-2.9.11/krita/plugins/filters/blur/kis_lens_blur_filter.h +--- calligra-2.9.11.org/krita/plugins/filters/blur/kis_lens_blur_filter.h 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/plugins/filters/blur/kis_lens_blur_filter.h 2021-11-14 22:55:05.771518646 +0100 @@ -1,4 +1,4 @@ -/* +/* @@ -372,11 +362,10 @@ index 73e7704..8f19045 100644 class KisLensBlurFilter : public KisFilter { public: -diff --git a/krita/plugins/filters/blur/kis_motion_blur_filter.cpp b/krita/plugins/filters/blur/kis_motion_blur_filter.cpp -index 1e00a14..2924f76 100644 ---- a/krita/plugins/filters/blur/kis_motion_blur_filter.cpp -+++ b/krita/plugins/filters/blur/kis_motion_blur_filter.cpp -@@ -119,7 +119,7 @@ void KisMotionBlurFilter::processImpl(KisPaintDeviceSP device, +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/plugins/filters/blur/kis_motion_blur_filter.cpp calligra-2.9.11/krita/plugins/filters/blur/kis_motion_blur_filter.cpp +--- calligra-2.9.11.org/krita/plugins/filters/blur/kis_motion_blur_filter.cpp 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/plugins/filters/blur/kis_motion_blur_filter.cpp 2021-11-14 22:55:05.771518646 +0100 +@@ -113,7 +113,7 @@ void KisMotionBlurFilter::processImpl(Ki QPointF(kernelWidth / 2 + halfWidth, kernelHeight / 2 - halfHeight)); // construct kernel from image @@ -385,10 +374,9 @@ index 1e00a14..2924f76 100644 for (int j = 0; j < kernelHeight; ++j) { for (int i = 0; i < kernelWidth; ++i) { motionBlurKernel(j, i) = qRed(kernelRepresentation.pixel(i, j)); -diff --git a/krita/plugins/filters/blur/kis_motion_blur_filter.h b/krita/plugins/filters/blur/kis_motion_blur_filter.h -index 3808a99..9eb31f0 100644 ---- a/krita/plugins/filters/blur/kis_motion_blur_filter.h -+++ b/krita/plugins/filters/blur/kis_motion_blur_filter.h +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/plugins/filters/blur/kis_motion_blur_filter.h calligra-2.9.11/krita/plugins/filters/blur/kis_motion_blur_filter.h +--- calligra-2.9.11.org/krita/plugins/filters/blur/kis_motion_blur_filter.h 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/plugins/filters/blur/kis_motion_blur_filter.h 2021-11-14 22:55:05.771518646 +0100 @@ -27,8 +27,6 @@ #include @@ -398,10 +386,9 @@ index 3808a99..9eb31f0 100644 class KisMotionBlurFilter : public KisFilter { public: -diff --git a/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp b/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp -index 2198e73..d2f4d94 100644 ---- a/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp -+++ b/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp +diff -urNp -x '*.orig' calligra-2.9.11.org/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp calligra-2.9.11/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp +--- calligra-2.9.11.org/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp 2021-11-14 22:55:05.771518646 +0100 @@ -36,8 +36,6 @@ #include @@ -411,7 +398,7 @@ index 2198e73..d2f4d94 100644 K_PLUGIN_FACTORY(KritaConvolutionFiltersFactory, registerPlugin();) K_EXPORT_PLUGIN(KritaConvolutionFiltersFactory("krita")) -@@ -68,7 +66,7 @@ KisSharpenFilter::KisSharpenFilter() +@@ -69,7 +67,7 @@ KisSharpenFilter::KisSharpenFilter() setSupportsPainting(true); setShowConfigurationWidget(false); @@ -420,7 +407,7 @@ index 2198e73..d2f4d94 100644 kernelMatrix << 0, -2, 0, -2, 11, -2, 0, -2, 0; -@@ -82,7 +80,7 @@ KisMeanRemovalFilter::KisMeanRemovalFilter() +@@ -83,7 +81,7 @@ KisMeanRemovalFilter::KisMeanRemovalFilt setSupportsPainting(false); setShowConfigurationWidget(false); @@ -429,7 +416,7 @@ index 2198e73..d2f4d94 100644 kernelMatrix << -1, -1, -1, -1, 9, -1, -1, -1, -1; -@@ -96,7 +94,7 @@ KisEmbossLaplascianFilter::KisEmbossLaplascianFilter() +@@ -97,7 +95,7 @@ KisEmbossLaplascianFilter::KisEmbossLapl setSupportsPainting(false); setShowConfigurationWidget(false); @@ -438,7 +425,7 @@ index 2198e73..d2f4d94 100644 kernelMatrix << -1, 0, -1, 0, 4, 0, -1, 0, -1; -@@ -111,7 +109,7 @@ KisEmbossInAllDirectionsFilter::KisEmbossInAllDirectionsFilter() +@@ -112,7 +110,7 @@ KisEmbossInAllDirectionsFilter::KisEmbos setSupportsPainting(false); setShowConfigurationWidget(false); @@ -447,7 +434,7 @@ index 2198e73..d2f4d94 100644 kernelMatrix << -1, -1, -1, -1, 8, -1, -1, -1, -1; -@@ -126,7 +124,7 @@ KisEmbossHorizontalVerticalFilter::KisEmbossHorizontalVerticalFilter() +@@ -127,7 +125,7 @@ KisEmbossHorizontalVerticalFilter::KisEm setSupportsPainting(false); setShowConfigurationWidget(false); @@ -456,7 +443,7 @@ index 2198e73..d2f4d94 100644 kernelMatrix << 0, -1, 0, -1, 4, -1, 0, -1, 0; -@@ -141,7 +139,7 @@ KisEmbossVerticalFilter::KisEmbossVerticalFilter() +@@ -142,7 +140,7 @@ KisEmbossVerticalFilter::KisEmbossVertic setSupportsPainting(false); setShowConfigurationWidget(false); @@ -465,7 +452,7 @@ index 2198e73..d2f4d94 100644 kernelMatrix << 0, -1, 0, 0, 2, 0, 0, -1, 0; -@@ -156,7 +154,7 @@ KisEmbossHorizontalFilter::KisEmbossHorizontalFilter() : +@@ -157,7 +155,7 @@ KisEmbossHorizontalFilter::KisEmbossHori setSupportsPainting(false); setShowConfigurationWidget(false); @@ -474,7 +461,7 @@ index 2198e73..d2f4d94 100644 kernelMatrix << 0, 0, 0, -1, 2, -1, 0, 0, 0; -@@ -171,7 +169,7 @@ KisEmbossDiagonalFilter::KisEmbossDiagonalFilter() +@@ -172,7 +170,7 @@ KisEmbossDiagonalFilter::KisEmbossDiagon setSupportsPainting(false); setShowConfigurationWidget(false); @@ -483,7 +470,7 @@ index 2198e73..d2f4d94 100644 kernelMatrix << -1, 0, -1, 0, 4, 0, -1, 0, -1; -@@ -187,7 +185,7 @@ KisTopEdgeDetectionFilter::KisTopEdgeDetectionFilter() +@@ -188,7 +186,7 @@ KisTopEdgeDetectionFilter::KisTopEdgeDet setSupportsPainting(false); setShowConfigurationWidget(false); @@ -492,7 +479,7 @@ index 2198e73..d2f4d94 100644 kernelMatrix << 1, 1, 1, 0, 0, 0, -1, -1, -1; -@@ -202,7 +200,7 @@ KisRightEdgeDetectionFilter::KisRightEdgeDetectionFilter() +@@ -203,7 +201,7 @@ KisRightEdgeDetectionFilter::KisRightEdg setSupportsPainting(false); setShowConfigurationWidget(false); @@ -501,7 +488,7 @@ index 2198e73..d2f4d94 100644 kernelMatrix << -1, 0, 1, -1, 0, 1, -1, 0, 1; -@@ -216,7 +214,7 @@ KisBottomEdgeDetectionFilter::KisBottomEdgeDetectionFilter() : KisConvolutionFil +@@ -217,7 +215,7 @@ KisBottomEdgeDetectionFilter::KisBottomE setSupportsPainting(false); setShowConfigurationWidget(false); @@ -510,7 +497,7 @@ index 2198e73..d2f4d94 100644 kernelMatrix << -1, -1, -1, 0, 0, 0, 1, 1, 1; -@@ -230,7 +228,7 @@ KisLeftEdgeDetectionFilter::KisLeftEdgeDetectionFilter() : KisConvolutionFilter( +@@ -231,7 +229,7 @@ KisLeftEdgeDetectionFilter::KisLeftEdgeD setSupportsPainting(false); setShowConfigurationWidget(false); @@ -519,6 +506,3 @@ index 2198e73..d2f4d94 100644 kernelMatrix << 1, 0, -1, 1, 0, -1, 1, 0, -1; --- -cgit v1.1 - diff --git a/gcc11.patch b/gcc11.patch new file mode 100644 index 0000000..670ab8a --- /dev/null +++ b/gcc11.patch @@ -0,0 +1,40 @@ +--- calligra-2.9.11/plan/plugins/schedulers/tj/taskjuggler/FlagList.h~ 2016-02-02 17:57:46.000000000 +0100 ++++ calligra-2.9.11/plan/plugins/schedulers/tj/taskjuggler/FlagList.h 2021-11-14 23:23:02.465114083 +0100 +@@ -37,7 +37,7 @@ + } + bool hasFlag(const QString& flag) const + { +- return contains(flag) > 0; ++ return contains(flag) != 0; + } + } ; + +--- calligra-2.9.11/plan/plugins/schedulers/tj/taskjuggler/Project.h~ 2016-02-02 17:57:46.000000000 +0100 ++++ calligra-2.9.11/plan/plugins/schedulers/tj/taskjuggler/Project.h 2021-11-14 23:33:32.310424545 +0100 +@@ -750,7 +750,7 @@ + } + bool isAllowedFlag(const QString& flag) const + { +- return allowedFlags.contains(flag) > 0; ++ return allowedFlags.contains(flag) != 0; + } + + const QStringList getAllowedFlags() const +--- calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/include/mdbtools.h~ 2016-02-02 20:53:13.000000000 +0100 ++++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/include/mdbtools.h 2021-11-14 23:47:14.547740971 +0100 +@@ -18,6 +18,7 @@ + #ifndef _mdbtools_h_ + #define _mdbtools_h_ + ++#include + #ifdef __cplusplus + extern "C" { + #endif +@@ -30,7 +31,6 @@ + #include + #include + #include +-#include + + #ifdef HAVE_ICONV + #include diff --git a/kde4-calligra.spec b/kde4-calligra.spec index f0f9ea1..9b790a4 100644 --- a/kde4-calligra.spec +++ b/kde4-calligra.spec @@ -28,7 +28,7 @@ Summary: Calligra - powerful office suite for KDE Summary(pl.UTF-8): Calligra - potężny pakiet biurowy dla KDE Name: kde4-calligra Version: 2.9.11 -Release: 5 +Release: 6 License: GPL/LGPL Group: X11/Applications Source0: https://download.kde.org/Attic/%{orgname}-%{version}/%{orgname}-%{version}.tar.xz @@ -38,6 +38,7 @@ Patch1: %{orgname}-exiv2.patch Patch2: %{orgname}-icu.patch Patch3: %{orgname}-boost.patch Patch4: build.patch +Patch5: gcc11.patch URL: http://www.calligra-suite.org/ BuildRequires: GraphicsMagick-devel BuildRequires: OpenColorIO-devel @@ -74,9 +75,7 @@ BuildRequires: kde4-okular-devel >= %{kdever} BuildRequires: lcms2-devel BuildRequires: libetonyek-devel BuildRequires: libexif-devel >= 0.6.12 -#BuildRequires: libicu-devel -# Prevents rebuilding with different library than the one Qt4 is stuck on -BuildRequires: libicu67-devel +BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libodfgen-devel BuildRequires: libpng-devel @@ -384,10 +383,12 @@ the Plasma Active platform. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build install -d build cd build +export CXXFLAGS="%{rpmcxxflags} -std=c++11" %cmake .. \ -DBUILD_active:BOOL=OFF \ -DBUILD_cstester:BOOL=OFF \ -- 2.43.0