From eeed8cb17ee92cfa3c37e1c89f783167f05b7346 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Thu, 30 Jul 2020 00:54:41 +0000 Subject: user/calligra: Update to 3.2.1 --- user/calligra/APKBUILD | 51 ++----- user/calligra/braindump.patch | 11 ++ user/calligra/c99-math.patch | 18 --- user/calligra/kcalcore.patch | 74 --------- user/calligra/kf5.patch | 38 ----- user/calligra/plan.patch | 48 ------ user/calligra/poppler-73.patch | 45 ------ user/calligra/poppler-81.patch | 70 --------- user/calligra/poppler-83.patch | 102 ------------- user/calligra/poppler.patch | 84 ----------- user/calligra/poppler2.patch | 114 -------------- user/calligra/poppler3.patch | 92 ----------- user/calligra/poppler4.patch | 76 ---------- user/calligra/qt5.patch | 293 ------------------------------------ user/calligra/ridiculous-typo.patch | 11 ++ 15 files changed, 33 insertions(+), 1094 deletions(-) create mode 100644 user/calligra/braindump.patch delete mode 100644 user/calligra/c99-math.patch delete mode 100644 user/calligra/kcalcore.patch delete mode 100644 user/calligra/kf5.patch delete mode 100644 user/calligra/plan.patch delete mode 100644 user/calligra/poppler-73.patch delete mode 100644 user/calligra/poppler-81.patch delete mode 100644 user/calligra/poppler-83.patch delete mode 100644 user/calligra/poppler.patch delete mode 100644 user/calligra/poppler2.patch delete mode 100644 user/calligra/poppler3.patch delete mode 100644 user/calligra/poppler4.patch delete mode 100644 user/calligra/qt5.patch create mode 100644 user/calligra/ridiculous-typo.patch (limited to 'user/calligra') diff --git a/user/calligra/APKBUILD b/user/calligra/APKBUILD index 60d8a0e8e..7fa944d3a 100644 --- a/user/calligra/APKBUILD +++ b/user/calligra/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=calligra -pkgver=3.1.0 -pkgrel=4 +pkgver=3.2.1 +pkgrel=0 pkgdesc="KDE Office suite" url="https://www.calligra.org/" arch="all" @@ -23,35 +23,15 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev boost-dev eigen-dev fontconfig-dev freetype-dev gsl-dev lcms2-dev libetonyek-dev libgit2-dev libodfgen-dev librevenge-dev libvisio-dev libwpd-dev libwpg-dev libwps-dev marble-dev poppler-dev poppler-qt5-dev - qca-dev + qca-dev okular kcalendarcore-dev kcontacts-dev kdiagram-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/calligra/$pkgver/calligra-$pkgver.tar.xz - https://download.kde.org/stable/calligra/$pkgver/calligraplan-$pkgver.tar.xz - c99-math.patch - kcalcore.patch - kf5.patch - plan.patch - poppler.patch - poppler2.patch - poppler3.patch - poppler4.patch - poppler-73.patch - poppler-81.patch - poppler-83.patch - qt5.patch + braindump.patch + ridiculous-typo.patch " -prepare() { - # Run this *before* default_prepare so patches can work on plan! - mv ../calligraplan-$pkgver plan - default_prepare - sed -e "/add_subdirectory(plan)/s/#//" \ - -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \ - -i CMakeLists.txt -} - build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" @@ -64,7 +44,9 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ - -DPRODUCTSET="KARBON PLAN SHEETS STAGE WORDS" \ + -DPRODUCTSET=desktop \ + -DQt5WebKitWidgets_FOUND=True \ + -DAPP_BRAINDUMP=True \ -DBUILD_UNMAINTAINED=True \ ${CMAKE_CROSSOPTS} \ -Bbuild @@ -79,17 +61,6 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b calligra-3.1.0.tar.xz -a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 calligraplan-3.1.0.tar.xz -b03d2f33a0233638be06b4219328404eac4a77c508619c4037b3b53556b257fc4888cd690bb3755562040a198cbd51a323d13553fed3f2082398556a49482c6e c99-math.patch -7c7c0dbf0603e1ff1dba640364c58922e1f59f0c60ef4a1afbd330e454259a2ef767d94d54e8c0ef5c228c6972e91cbdc32cb6242a27e5374ddf0c5d4ea983d6 kcalcore.patch -0edb2b9ef6c9aad374d3e25bbc637f9a3447a6e70d153fbec4ab87dc213e96076a6c8df5a65fb020d7f232269ee8cf4561f5d13724df827247379c321c15401d kf5.patch -7d4654810d0aa1bcbd3609e0d9067e357284a9cd97d50aa3782ef8e341478c3c16acba85428595ddb1d5b22397703f2383304d2c39c48d3fd5e2cfa2768bc6bc plan.patch -960614eb2d367443810cc356d004d43867a4fa4085b054ffd1522b94ef09e9338e723117c91148383d33d54104729750a199ab1b75569aaa7164a908afd3cd4c poppler.patch -53296af0b1ad39c523bc93a0040f1316dfb52e2077d277a83841a741c5cb48d81efb1f6328b2af2c8f1dc92db12c4d771a9a65028498d7802b2c30dd702b9455 poppler2.patch -a22b78d9664284ee5de7a4299907ec37a7835cb6ae3af8e7c1ee0202cea8c1e544fbad7395e56115fb5fe13ec06aeff22e381431e20c6c151c93003cf8a45446 poppler3.patch -df0e592f8c314581b1811776f8aa1c3dd32f05f966f23ef4dd023c41dad759aea8b674b32e2bd7bee36efe4ba0ce0bdd08f3fc30d10115330605d09d46883a28 poppler4.patch -8440f1c36aba9cb54efa36fae73d605f57e78d055225c776791b14554d6be6f081f8cdc3fa65fb9c0b600a3b030d7776b45f631b9bc00d495ab16bfc35bd66f4 poppler-73.patch -354d1ceab55dfd036c94aa0f9cd6792e58714011b2ef23f104f45fc46cd6d005a242ba18f47337dc1ead79fbeb1e3075062fc9d63d50a4058ca845ac9ec7810c poppler-81.patch -b65384ddc4be747907d17b1eb944130dd27155034156faa4d3e3b704507fff03331535e875cb9dec929d5cba2f0a317ba1a7e7978336e3b57f28807f5ad5b383 poppler-83.patch -440a5297ad0e1542c2892e6c84a6acf5cd61da3160dcf56163791ef4ade35d90f71c3bb3df28988deea60e9f68c292ce8ffa23150ddaa08d262b256dd91481f1 qt5.patch" +sha512sums="e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f calligra-3.2.1.tar.xz +786f02e5e21535c08343bee10ddf5d331dd34e778a117228edc010ca20dc497c285d3938a3166892f2faa20167133f3b64ab66f0a8b623ae5318601a7218359d braindump.patch +3fa0700f471202eb8b76ded3928b884f43aa1c52e3fa6fc33b7fb62d5b1dcff1df2823723963a40f383e466eb7bebb1a66db14f2bd076a41f25b74f1a5f7f8d5 ridiculous-typo.patch" diff --git a/user/calligra/braindump.patch b/user/calligra/braindump.patch new file mode 100644 index 000000000..741221700 --- /dev/null +++ b/user/calligra/braindump.patch @@ -0,0 +1,11 @@ +--- calligra-3.2.1/CMakeLists.txt.old 2020-05-14 06:53:49.000000000 +0000 ++++ calligra-3.2.1/CMakeLists.txt 2020-07-29 23:07:48.255879433 +0000 +@@ -1068,7 +1068,7 @@ + # e.g.: + # calligra_disable_product(APP_FOO "isn't buildable at the moment") + +-calligra_disable_product(APP_BRAINDUMP "Disabled, will (probably) be removed from Calligra") ++#calligra_disable_product(APP_BRAINDUMP "Disabled, will (probably) be removed from Calligra") + + ############################################# + #### Calculate buildable products #### diff --git a/user/calligra/c99-math.patch b/user/calligra/c99-math.patch deleted file mode 100644 index 4326dd7fa..000000000 --- a/user/calligra/c99-math.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- calligra-3.1.0/filters/words/msword-odf/wv2/CMakeLists.txt.old 2018-01-26 09:24:44.000000000 +0000 -+++ calligra-3.1.0/filters/words/msword-odf/wv2/CMakeLists.txt 2018-10-24 23:22:43.440000000 +0000 -@@ -64,12 +64,12 @@ - set( CMAKE_REQUIRED_INCLUDES math.h ) - endif() - --check_function_exists( isinf HAVE_FUNC_ISINF ) --check_function_exists( isnan HAVE_FUNC_ISNAN ) -+check_symbol_exists( isinf math.h HAVE_FUNC_ISINF ) -+check_symbol_exists( isnan math.h HAVE_FUNC_ISNAN ) - if(MINGW) - add_definitions( -DHAVE_FUNC_ISFINITE ) - endif() --check_function_exists( finite HAVE_FUNC_FINITE ) -+check_symbol_exists( finite math.h HAVE_FUNC_FINITE ) - check_function_exists( _finite HAVE_FUNC__FINITE ) - - # diff --git a/user/calligra/kcalcore.patch b/user/calligra/kcalcore.patch deleted file mode 100644 index 8124192db..000000000 --- a/user/calligra/kcalcore.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 2d484fda1b31a72659088a4bfce5c3708e923cb0 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 23 Jul 2019 12:20:29 +0200 -Subject: Fix compilation after recent KCalCore API changes - ---- - .../filters/icalendar/export/icalendarexport.cpp | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp -index 757d693..daf1c2d 100644 ---- a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp -+++ b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -140,9 +141,15 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, - todo->setOrganizer(node->projectNode()->leader()); - } - if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ KCalCore::Person p = KCalCore::Person::fromFullName(node->leader()); -+ KCalCore::Attendee a(p.name(), p.email()); -+ a.setRole(KCalCore::Attendee::NonParticipant); -+#else - KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader()); - KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email())); - a->setRole(KCalCore::Attendee::NonParticipant); -+#endif - todo->addAttendee(a); - } - DateTime st = node->startTime(id); -@@ -161,13 +168,21 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, - const QList lst = task->requestedResources(); - foreach(const Resource *r, lst) { - if (r->type() == Resource::Type_Work) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ todo->addAttendee(KCalCore::Attendee(r->name(), r->email())); -+#else - todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email()))); -+#endif - } - } - } else { - foreach(const Resource *r, s->resources()) { - if (r->type() == Resource::Type_Work) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ todo->addAttendee(KCalCore::Attendee(r->name(), r->email())); -+#else - todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email()))); -+#endif - } - } - -@@ -178,7 +193,11 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, - todo->setPercentComplete(task->completion().percentFinished()); - } - foreach(const Document *doc, node->documents().documents()) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ todo->addAttachment(KCalCore::Attachment(doc->url().url())); -+#else - todo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment(doc->url().url()))); -+#endif - } - if (! parent.isNull()) { - todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent); --- -cgit v1.1 - diff --git a/user/calligra/kf5.patch b/user/calligra/kf5.patch deleted file mode 100644 index 1a424ef98..000000000 --- a/user/calligra/kf5.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9611a8b3e09f7ae4b53640c11a2196274f39d60f Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Sun, 10 Nov 2019 14:28:36 +0100 -Subject: port away from deprecated methods in KWindowSystem >= 5.62 - -(this is in order to make KWindowSystem independent from QtWidgets) ---- - plan/src/workpackage/commandlineparser.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/plan/src/workpackage/commandlineparser.cpp b/plan/src/workpackage/commandlineparser.cpp -index 432f99a..f9be208 100644 ---- a/plan/src/workpackage/commandlineparser.cpp -+++ b/plan/src/workpackage/commandlineparser.cpp -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -65,7 +66,12 @@ void CommandLineParser::handleActivateRequest(const QStringList &arguments, cons - handleCommandLine(QDir(workingDirectory)); - - // terminate startup notification and activate the mainwindow -+#if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5,62,0) -+ m_mainwindow->setAttribute(Qt::WA_NativeWindow, true); -+ KStartupInfo::setNewStartupId(m_mainwindow->windowHandle(), KStartupInfo::startupId()); -+#else - KStartupInfo::setNewStartupId(m_mainwindow, KStartupInfo::startupId()); -+#endif - KWindowSystem::forceActiveWindow(m_mainwindow->winId()); - - } --- -cgit v1.1 - diff --git a/user/calligra/plan.patch b/user/calligra/plan.patch deleted file mode 100644 index c8f8c91fb..000000000 --- a/user/calligra/plan.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 36ec68024620211edbcdb31a5ef6021545fe9451 Mon Sep 17 00:00:00 2001 -From: Dag Andersen -Date: Fri, 9 Feb 2018 08:40:34 +0100 -Subject: Plan: Fix crash in tj scheduler if a resource does not have a - calendar - -This can happen when there is no default calendar and no calendar has been set for a resource. ---- - plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp b/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp -index 4f4e825..548969e 100644 ---- a/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp -+++ b/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp -@@ -259,6 +259,9 @@ bool PlanTJScheduler::kplatoToTJ() - addRequests(); - addStartEndJob(); - -+ if (result != -1) { -+ return false; -+ } - return check(); - } - -@@ -596,6 +599,7 @@ TJ::Resource *PlanTJScheduler::addResource( KPlato::Resource *r) - res->setEfficiency( (double)(r->units()) / 100. ); - } - Calendar *cal = r->calendar(); -+ Q_ASSERT(cal); - DateTime start = qMax( r->availableFrom(), m_project->constraintStartTime() ); - DateTime end = m_project->constraintEndTime(); - if ( r->availableUntil().isValid() && end > r->availableUntil() ) { -@@ -887,6 +891,11 @@ void PlanTJScheduler::addRequest( TJ::Task *job, Task *task ) - return; - } - foreach ( ResourceRequest *rr, task->requests().resourceRequests( true /*resolveTeam*/ ) ) { -+ if (!rr->resource()->calendar()) { -+ result = 1; // stops scheduling -+ logError(task, 0, i18n("No working hours defined for resource: %1",rr->resource()->name())); -+ continue; // may happen if no calendar is set, and no default calendar -+ } - TJ::Resource *tjr = addResource( rr->resource() ); - TJ::Allocation *a = new TJ::Allocation(); - a->setSelectionMode( TJ::Allocation::order ); --- -cgit v1.1 - diff --git a/user/calligra/poppler-73.patch b/user/calligra/poppler-73.patch deleted file mode 100644 index aa71e20b4..000000000 --- a/user/calligra/poppler-73.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp.old 2019-01-14 18:40:55.580000000 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2019-01-14 18:53:05.000000000 +0000 -@@ -402,7 +402,7 @@ - - QString str; - -- const char * p = s->getCString(); -+ const char * p = s->c_str(); - int len = s->getLength(); - CharCode code; - Unicode *u = nullptr; -@@ -451,11 +451,11 @@ - *d->body << " y=\"" << y << "px\""; - - if (font && font->getFamily()) { -- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\""; -- //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() ); -+ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\""; -+ //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() ); - } else if (font && font->getName()) { -- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\""; -- //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() ); -+ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\""; -+ //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() ); - } - *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\""; - -@@ -488,7 +488,7 @@ - if (maskColors) { - for (int y = 0; y < height; y++) { - dest = (unsigned int *)(buffer + y * 4 * width); -- Guchar * pix = imgStr->getLine(); -+ unsigned char * pix = imgStr->getLine(); - colorMap->getRGBLine(pix, dest, width); - - for (int x = 0; x < width; x++) { -@@ -507,7 +507,7 @@ - } else { - for (int y = 0; y < height; y++) { - dest = (unsigned int *)(buffer + y * 4 * width); -- Guchar * pix = imgStr->getLine(); -+ unsigned char * pix = imgStr->getLine(); - colorMap->getRGBLine(pix, dest, width); - } - diff --git a/user/calligra/poppler-81.patch b/user/calligra/poppler-81.patch deleted file mode 100644 index 3211b7b8e..000000000 --- a/user/calligra/poppler-81.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt -index 8f462b7b597..945eebbe676 100644 ---- a/filters/karbon/pdf/CMakeLists.txt -+++ b/filters/karbon/pdf/CMakeLists.txt -@@ -1,4 +1,8 @@ - -+if(Poppler_VERSION VERSION_LESS "0.82.0") -+ add_definitions("-DHAVE_POPPLER_PRE_0_82") -+endif() -+ - set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) - - add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 18c6fbb4a44..3ebb2281bf3 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -405,7 +405,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - const char * p = s->c_str(); - int len = s->getLength(); - CharCode code; -+#ifdef HAVE_POPPLER_PRE_0_82 - Unicode *u = nullptr; -+#else -+ const Unicode *u = nullptr; -+#endif - int uLen; - double dx, dy, originX, originY; - while (len > 0) { -@@ -474,9 +478,15 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - *d->body << "" << endl; - } - --void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, -+#ifdef HAVE_POPPLER_PRE_0_82 -+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, -+ int width, int height, GfxImageColorMap *colorMap, -+ bool /*interpolate*/, int *maskColors, bool /*inlineImg*/) -+#else -+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- bool /*interpolate*/, int *maskColors, bool inlineImg) -+ bool /*interpolate*/, const int *maskColors, bool inlineImg) -+#endif - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - imgStr->reset(); -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 2c161ce50af..2b0ea41e30c 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -61,9 +61,17 @@ public: - void drawString(GfxState * state, const GooString * s) override; - -+#ifdef HAVE_POPPLER_PRE_0_82 -+ // images -+ void drawImage(GfxState *state, Object *ref, Stream *str, -+ int width, int height, GfxImageColorMap *colorMap, -+ bool interpolate, int *maskColors, bool inlineImg) override; -+#else - // images - void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- bool interpolate, int *maskColors, bool inlineImg) override; -+ bool interpolate, const int *maskColors, bool inlineImg) override; -+#endif -+ - - // styles - void updateAll(GfxState *state) override; diff --git a/user/calligra/poppler-83.patch b/user/calligra/poppler-83.patch deleted file mode 100644 index e158ac4ff..000000000 --- a/user/calligra/poppler-83.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- calligra-3.1.0/filters/karbon/pdf/CMakeLists.txt.old 2020-01-13 11:57:23.529485941 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/CMakeLists.txt 2020-01-13 12:08:05.610601265 +0000 -@@ -3,6 +3,10 @@ - add_definitions("-DHAVE_POPPLER_PRE_0_82") - endif() - -+if(Poppler_VERSION VERSION_LESS "0.83.0") -+ add_definitions("-DHAVE_POPPLER_PRE_0_83") -+endif() -+ - set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) - - add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) ---- calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp.old 2020-01-13 10:34:30.622852616 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp 2020-01-13 12:26:57.029441237 +0000 -@@ -60,19 +60,31 @@ - } - - // read config file -+#ifdef HAVE_POPPLER_PRE_0_83 - globalParams = new GlobalParams(); -+#else -+ globalParams = std::unique_ptr(new GlobalParams()); -+#endif - if (! globalParams) - return KoFilter::NotImplemented; - - GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); - PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); - if (! pdfDoc) { -+#ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; -+#else -+ globalParams.reset(); -+#endif - return KoFilter::StupidError; - } - - if (! pdfDoc->isOk()) { -+#ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; -+#else -+ globalParams.reset(); -+#endif - delete pdfDoc; - return KoFilter::StupidError; - } -@@ -99,8 +111,12 @@ - - delete dev; - delete pdfDoc; -+#ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; - globalParams = 0; -+#else -+ globalParams.reset(); -+#endif - - return KoFilter::OK; - } ---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp.old 2020-01-13 11:57:43.537339118 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2020-01-13 12:18:49.211663293 +0000 -@@ -172,7 +172,11 @@ - *d->body << "/>" << endl; - } - -+#ifdef HAVE_POPPLER_PRE_0_83 - QString SvgOutputDev::convertPath(GfxPath *path) -+#else -+QString SvgOutputDev::convertPath(const GfxPath *path) -+#endif - { - if (! path) - return QString(); -@@ -180,7 +184,12 @@ - QString output; - - for (int i = 0; i < path->getNumSubpaths(); ++i) { -- GfxSubpath * subpath = path->getSubpath(i); -+#ifdef HAVE_POPPLER_PRE_0_83 -+ GfxSubpath * subpath; -+#else -+ const GfxSubpath * subpath; -+#endif -+ subpath = path->getSubpath(i); - if (subpath->getNumPoints() > 0) { - output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); - int j = 1; ---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h.old 2020-01-13 11:57:23.529485941 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h 2020-01-13 12:11:30.918610131 +0000 -@@ -87,7 +87,11 @@ - /// Dumps content to svg file - void dumpContent(); - private: -+#ifdef HAVE_POPPLER_PRE_0_83 - QString convertPath(GfxPath *path); -+#else -+ QString convertPath(const GfxPath *path); -+#endif - QString convertMatrix(const QMatrix &matrix); - QString convertMatrix(const double * matrix); - QString printFill(); diff --git a/user/calligra/poppler.patch b/user/calligra/poppler.patch deleted file mode 100644 index 458a31514..000000000 --- a/user/calligra/poppler.patch +++ /dev/null @@ -1,84 +0,0 @@ -From a615718222f8ad3bba4b88fad640382e517f7dd9 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Wed, 24 Oct 2018 08:28:00 +0200 -Subject: Fix build with poppler>=0.69 - -Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's - -Differential Revision: https://phabricator.kde.org/D16388 ---- - filters/karbon/pdf/PdfImport.cpp | 3 --- - filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++---- - filters/karbon/pdf/SvgOutputDev.h | 2 +- - 3 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index c3e96b0..48b08df 100644 ---- a/filters/karbon/pdf/PdfImport.cpp -+++ b/filters/karbon/pdf/PdfImport.cpp -@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - delete globalParams; - globalParams = 0; - -- // check for memory leaks -- Object::memCheck(stderr); -- - return KoFilter::OK; - } - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 931917a..7901317 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix) - .arg(matrix.dx()) .arg(matrix.dy()); - } - --QString SvgOutputDev::convertMatrix(double * matrix) -+QString SvgOutputDev::convertMatrix(const double * matrix) - { - return QString("matrix(%1 %2 %3 %4 %5 %6)") - .arg(matrix[0]).arg(matrix[1]) -@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - - QString str; - -- char * p = s->getCString(); -+ const char * p = s->getCString(); - int len = s->getLength(); - CharCode code; - Unicode *u = nullptr; -@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - double x = state->getCurX(); - double y = state->getCurY(); - -- double * ctm = state->getCTM(); -+ const double * ctm = state->getCTM(); - QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - - QMatrix mirror; -@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - return; - } - -- double * ctm = state->getCTM(); -+ const double * ctm = state->getCTM(); - QMatrix m; - m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]); - -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 85fe55d..2a44908 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -84,7 +84,7 @@ public: - private: - QString convertPath(GfxPath *path); - QString convertMatrix(const QMatrix &matrix); -- QString convertMatrix(double * matrix); -+ QString convertMatrix(const double * matrix); - QString printFill(); - QString printStroke(); - --- -cgit v0.11.2 - diff --git a/user/calligra/poppler2.patch b/user/calligra/poppler2.patch deleted file mode 100644 index 6f18c070f..000000000 --- a/user/calligra/poppler2.patch +++ /dev/null @@ -1,114 +0,0 @@ -From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Thu, 25 Oct 2018 23:04:39 +0200 -Subject: Mark the functions as override - -So when poppler API breaks (as it often does) it stops compiling and -someone has to fix it ---- - filters/karbon/pdf/SvgOutputDev.cpp | 13 +++-------- - filters/karbon/pdf/SvgOutputDev.h | 43 +++++++++++++++++-------------------- - 2 files changed, 23 insertions(+), 33 deletions(-) - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 5692824..1d07f16 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -387,7 +387,7 @@ QString SvgOutputDev::printStroke() - return stroke; - } - --void SvgOutputDev::drawString(GfxState * state, GooString * s) -+void SvgOutputDev::drawString(GfxState * state, const GooString * s) - { - int render = state->getRender(); - // check for invisible text -- this is used by Acrobat Capture -@@ -478,9 +478,9 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - *d->body << "" << endl; - } - --void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, -+void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- int *maskColors, GBool /*inlineImg*/) -+ GBool /*interpolate*/, int *maskColors, GBool inlineImg) - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - imgStr->reset(); -@@ -547,10 +547,3 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - delete imgStr; - } - --void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, -- int width, int height, GfxImageColorMap *colorMap, -- GBool /*interpolate*/, int *maskColors, GBool inlineImg) --{ -- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); --} -- -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 2a44908..422027c 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -46,38 +46,35 @@ public: - - GBool isOk(); - -- virtual GBool upsideDown(); -- virtual GBool useDrawChar(); -- virtual GBool interpretType3Chars(); -- virtual void startPage(int pageNum, GfxState *state, XRef *xref); -- virtual void endPage(); -+ GBool upsideDown() override; -+ GBool useDrawChar() override; -+ GBool interpretType3Chars() override; -+ void startPage(int pageNum, GfxState *state, XRef *xref) override; -+ void endPage() override; - - // path painting -- virtual void stroke(GfxState * state); -- virtual void fill(GfxState * state); -- virtual void eoFill(GfxState *state); -+ void stroke(GfxState * state) override; -+ void fill(GfxState * state) override; -+ void eoFill(GfxState *state) override; - - // text -- virtual void drawString(GfxState * state, GooString * s); -+ void drawString(GfxState * state, const GooString * s) override; - - // images -- virtual void drawImage(GfxState *state, Object *ref, Stream *str, -+ void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- int *maskColors, GBool inlineImg); -- virtual void drawImage(GfxState *state, Object *ref, Stream *str, -- int width, int height, GfxImageColorMap *colorMap, -- GBool interpolate, int *maskColors, GBool inlineImg); -+ GBool interpolate, int *maskColors, GBool inlineImg) override; - - // styles -- virtual void updateAll(GfxState *state); -- virtual void updateFillColor(GfxState *state); -- virtual void updateStrokeColor(GfxState *state); -- virtual void updateFillOpacity(GfxState *state); -- virtual void updateStrokeOpacity(GfxState *state); -- virtual void updateLineJoin(GfxState *state); -- virtual void updateLineCap(GfxState *state); -- virtual void updateMiterLimit(GfxState *state); -- virtual void updateLineWidth(GfxState *state); -+ void updateAll(GfxState *state) override; -+ void updateFillColor(GfxState *state) override; -+ void updateStrokeColor(GfxState *state) override; -+ void updateFillOpacity(GfxState *state) override; -+ void updateStrokeOpacity(GfxState *state) override; -+ void updateLineJoin(GfxState *state) override; -+ void updateLineCap(GfxState *state) override; -+ void updateMiterLimit(GfxState *state) override; -+ void updateLineWidth(GfxState *state) override; - - /// Dumps content to svg file - void dumpContent(); --- -cgit v1.1 - diff --git a/user/calligra/poppler3.patch b/user/calligra/poppler3.patch deleted file mode 100644 index 54702b515..000000000 --- a/user/calligra/poppler3.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Thu, 25 Oct 2018 23:06:34 +0200 -Subject: GBool -> bool - -It was just a typedef in poppler and it'll die in next versions ---- - filters/karbon/pdf/SvgOutputDev.cpp | 12 ++++++------ - filters/karbon/pdf/SvgOutputDev.h | 10 +++++----- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 1d07f16..870a940 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -52,7 +52,7 @@ public: - QString defsData; - QTextStream * defs; - QTextStream * body; -- GBool state; -+ bool state; - QSizeF pageSize; - QPen pen; - QBrush brush; -@@ -75,22 +75,22 @@ SvgOutputDev::~SvgOutputDev() - delete d; - } - --GBool SvgOutputDev::isOk() -+bool SvgOutputDev::isOk() - { - return d->state; - } - --GBool SvgOutputDev::upsideDown() -+bool SvgOutputDev::upsideDown() - { - return gTrue; - } - --GBool SvgOutputDev::useDrawChar() -+bool SvgOutputDev::useDrawChar() - { - return gFalse; - } - --GBool SvgOutputDev::interpretType3Chars() -+bool SvgOutputDev::interpretType3Chars() - { - return gFalse; - } -@@ -480,7 +480,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - - void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- GBool /*interpolate*/, int *maskColors, GBool inlineImg) -+ bool /*interpolate*/, int *maskColors, bool inlineImg) - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - imgStr->reset(); -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 422027c..df2805c 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -44,11 +44,11 @@ public: - explicit SvgOutputDev(const QString &fileName); - virtual ~SvgOutputDev(); - -- GBool isOk(); -+ bool isOk(); - -- GBool upsideDown() override; -- GBool useDrawChar() override; -- GBool interpretType3Chars() override; -+ bool upsideDown() override; -+ bool useDrawChar() override; -+ bool interpretType3Chars() override; - void startPage(int pageNum, GfxState *state, XRef *xref) override; - void endPage() override; - -@@ -63,7 +63,7 @@ public: - // images - void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- GBool interpolate, int *maskColors, GBool inlineImg) override; -+ bool interpolate, int *maskColors, bool inlineImg) override; - - // styles - void updateAll(GfxState *state) override; --- -cgit v1.1 - diff --git a/user/calligra/poppler4.patch b/user/calligra/poppler4.patch deleted file mode 100644 index 9a13bcdec..000000000 --- a/user/calligra/poppler4.patch +++ /dev/null @@ -1,76 +0,0 @@ -From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Fri, 2 Nov 2018 21:23:13 +0100 -Subject: Fix build with poppler 0.71 - -Port away from removed API - -Differential Revision: https://phabricator.kde.org/D16607 ---- - filters/karbon/pdf/PdfImport.cpp | 6 +++--- - filters/karbon/pdf/SvgOutputDev.cpp | 10 +++++----- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index 48b08df..e910dae 100644 ---- a/filters/karbon/pdf/PdfImport.cpp -+++ b/filters/karbon/pdf/PdfImport.cpp -@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile()); - if (dev->isOk()) { - int rotate = 0; -- GBool useMediaBox = gTrue; -- GBool crop = gFalse; -- GBool printing = gFalse; -+ bool useMediaBox = true; -+ bool crop = false; -+ bool printing = false; - pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing); - dev->dumpContent(); - } -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 9063e69..80f01a5 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -39,7 +39,7 @@ class SvgOutputDev::Private - { - public: - Private(const QString &fname) -- : svgFile(fname), defs(0), body(0), state(gTrue) -+ : svgFile(fname), defs(0), body(0), state(true) - , brush(Qt::SolidPattern) {} - - ~Private() { -@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName) - : d(new Private(fileName)) - { - if (! d->svgFile.open(QIODevice::WriteOnly)) { -- d->state = gFalse; -+ d->state = false; - return; - } - -@@ -82,17 +82,17 @@ bool SvgOutputDev::isOk() - - bool SvgOutputDev::upsideDown() - { -- return gTrue; -+ return true; - } - - bool SvgOutputDev::useDrawChar() - { -- return gFalse; -+ return false; - } - - bool SvgOutputDev::interpretType3Chars() - { -- return gFalse; -+ return false; - } - - void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/) --- -cgit v1.1 - diff --git a/user/calligra/qt5.patch b/user/calligra/qt5.patch deleted file mode 100644 index a40d92127..000000000 --- a/user/calligra/qt5.patch +++ /dev/null @@ -1,293 +0,0 @@ -From a7ebecb9fbee2190e649c44ed53f1299013baa30 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 18 Mar 2018 11:56:57 +0100 -Subject: Fix build with Qt 5.11 (missing headers) - -Reviewers: #calligra:_3.0, anthonyfieroni, danders - -Reviewed By: #calligra:_3.0, anthonyfieroni, danders - -Subscribers: anthonyfieroni, danders - -Tags: #calligra:_3.0 - -Differential Revision: https://phabricator.kde.org/D11454 ---- - libs/widgets/KoCsvImportDialog.cpp | 1 + - libs/widgets/KoPageLayoutWidget.cpp | 2 ++ - plan/src/kptview.h | 1 + - plan/src/kptviewlist.cpp | 1 + - plan/src/libs/ui/kptaccountseditor.cpp | 1 + - plan/src/libs/ui/kptdocumentspanel.h | 1 + - plan/src/libs/ui/kptitemviewsettup.cpp | 2 +- - plan/src/libs/ui/kpttaskeditor.cpp | 1 + - plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 + - plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++ - plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 + - plugins/formulashape/FormulaToolWidget.cpp | 1 + - sheets/dialogs/LayoutDialog.cpp | 1 + - words/part/dialogs/KWAnchoringProperties.cpp | 1 + - words/part/dialogs/KWRunAroundProperties.cpp | 2 ++ - 15 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp -index 0ffdcf6..cdca006 100644 ---- a/libs/widgets/KoCsvImportDialog.cpp -+++ b/libs/widgets/KoCsvImportDialog.cpp -@@ -21,6 +21,7 @@ - #include "KoCsvImportDialog.h" - - // Qt -+#include - #include - #include - -diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp -index f91555c..a3816f9 100644 ---- a/libs/widgets/KoPageLayoutWidget.cpp -+++ b/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include - -+#include -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: -diff --git a/plan/src/kptview.h b/plan/src/kptview.h -index 44d1193..a98e553 100644 ---- a/plan/src/kptview.h -+++ b/plan/src/kptview.h -@@ -28,6 +28,7 @@ - #include "kptcontext.h" - #include "kptviewbase.h" - -+#include - #include - #include - -diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp -index f34e702..0e6db7b 100644 ---- a/plan/src/kptviewlist.cpp -+++ b/plan/src/kptviewlist.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - - #include -diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp -index 7991faf..54e3a87 100644 ---- a/plan/src/libs/ui/kptaccountseditor.cpp -+++ b/plan/src/libs/ui/kptaccountseditor.cpp -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h -index 00ea3af..491cb1e 100644 ---- a/plan/src/libs/ui/kptdocumentspanel.h -+++ b/plan/src/libs/ui/kptdocumentspanel.h -@@ -26,6 +26,7 @@ - - #include "kptdocuments.h" - -+#include - #include - #include - -diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp -index d1c3b1f..7c97a07 100644 ---- a/plan/src/libs/ui/kptitemviewsettup.cpp -+++ b/plan/src/libs/ui/kptitemviewsettup.cpp -@@ -25,9 +25,9 @@ - - #include "KoPageLayoutWidget.h" - -+#include - #include - -- - namespace KPlato - { - -diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp -index 2154611..91db5ac 100644 ---- a/plan/src/libs/ui/kpttaskeditor.cpp -+++ b/plan/src/libs/ui/kpttaskeditor.cpp -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - #include - - #include -diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -index 344ebc2..9146f06 100644 ---- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -+++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -@@ -31,6 +31,7 @@ - #include - - #include -+#include - #include - #include - #include -diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp -index c9e17b7..b67e984 100644 ---- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp -+++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include - -+#include -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: -diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp -index c0d5136..d2a772e 100644 ---- a/plugins/chartshape/dialogs/TableEditorDialog.cpp -+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp -@@ -24,6 +24,7 @@ - - // Qt - #include -+#include - - // Calligra - #include -diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp -index ed10919..8f52177 100644 ---- a/plugins/formulashape/FormulaToolWidget.cpp -+++ b/plugins/formulashape/FormulaToolWidget.cpp -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) -diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp -index a0a9832..7d7db53 100644 ---- a/sheets/dialogs/LayoutDialog.cpp -+++ b/sheets/dialogs/LayoutDialog.cpp -@@ -36,6 +36,7 @@ - #include - - #include -+#include - #include - #include - #include -diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp -index d64208c..bfddb3a 100644 ---- a/words/part/dialogs/KWAnchoringProperties.cpp -+++ b/words/part/dialogs/KWAnchoringProperties.cpp -@@ -35,6 +35,7 @@ - - #include - -+#include - #include - - const int KWAnchoringProperties::vertRels[4][20] = { -diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp -index e38599a..7e8b2d5 100644 ---- a/words/part/dialogs/KWRunAroundProperties.cpp -+++ b/words/part/dialogs/KWRunAroundProperties.cpp -@@ -28,6 +28,8 @@ - - #include - -+#include -+ - KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) - : m_state(state) - { --- -cgit v1.1 - -From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 3 Apr 2018 00:31:19 +0200 -Subject: Fix compilation with Qt 5.11 (missing include) - ---- - stage/part/KPrPresentationTool.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp -index ae743da..3007f91 100644 ---- a/stage/part/KPrPresentationTool.cpp -+++ b/stage/part/KPrPresentationTool.cpp -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include --- -cgit v1.1 - -From acd0ef39e3c945d066d2902de0e19fa2d020c7f8 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 23 Jul 2019 12:20:03 +0200 -Subject: Fix compilation with Qt 5.13 (missing include) - ---- - plan/src/workpackage/view.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plan/src/workpackage/view.h b/plan/src/workpackage/view.h -index b10547e..c5231e59 100644 ---- a/plan/src/workpackage/view.h -+++ b/plan/src/workpackage/view.h -@@ -24,6 +24,7 @@ - #include - - #include -+#include - - class QPrinter; - class QPrintDialog; --- -cgit v1.1 - -From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 23 Jul 2019 13:02:34 +0200 -Subject: Fix compilation with Qt 5.13 (missing include) - ---- - sheets/plugins/calendar/CalendarToolWidget.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp -index b10b230..0c5eeb6 100644 ---- a/sheets/plugins/calendar/CalendarToolWidget.cpp -+++ b/sheets/plugins/calendar/CalendarToolWidget.cpp -@@ -30,6 +30,7 @@ - #include - - #include -+#include - - namespace Calligra - { --- -cgit v1.1 - diff --git a/user/calligra/ridiculous-typo.patch b/user/calligra/ridiculous-typo.patch new file mode 100644 index 000000000..9d81e899e --- /dev/null +++ b/user/calligra/ridiculous-typo.patch @@ -0,0 +1,11 @@ +--- calligra-3.2.1/braindump/src/layouts/ColumnLayout.cpp.old 2020-05-14 06:51:30.000000000 +0000 ++++ calligra-3.2.1/braindump/src/layouts/ColumnLayout.cpp 2020-07-30 00:37:08.634435315 +0000 +@@ -94,7 +94,7 @@ + qDebug() << _shape << _shape->absolutePosition(KoFlake::TopLeftCorner).y() << " " << _shape->position().y(); + } + qDebug() << ""; +- std:sort(m_shapes.begin(), m_shapes.end(), shapeIsLessThan); ++ std::sort(m_shapes.begin(), m_shapes.end(), shapeIsLessThan); + // Update position + qreal y = 0; + qDebug() << ""; -- cgit v1.2.3-60-g2f50