Hello community, here is the log from the commit of package calligra for openSUSE:Leap:15.2 checked in at 2020-05-04 08:22:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/calligra (Old) and /work/SRC/openSUSE:Leap:15.2/.calligra.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra" Mon May 4 08:22:50 2020 rev:16 rq:799865 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/calligra/calligra.changes 2020-01-30 06:08:28.914467124 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.calligra.new.2738/calligra.changes 2020-05-04 08:22:52.064391555 +0200 @@ -1,0 +2,185 @@ +Thu Apr 30 10:45:01 UTC 2020 - wba...@tmo.at + +- Update to 3.2.0: + * See https://calligra.org/news/calligra-3-2-0-released/ + * General: + + Don't allow an unrecognized child element to block loading of + a shape plugin + + Fix line percentage height + + [textlayout] Don't enter infinite loop when table is misfit + (kde#381341) + + Fix formatting of scientific numbers + + Fix undo/redo move of anchored shapes + + Check if shape is movable and update cursor and decoration + accordingly + + Check if shape is resizeable and update cursor and decoration + accordingly + + Check if shape is shearable and update cursor and decoration + accordingly + + Check if shape rotation is allowed and update cursor and + decoration accordingly + + Fix freeze in progressbar handling on startup + + Do not allow to set a readonly document to modified + + Fix illustrator image handling + + Improve KoModeBox display in horizontal Mode + + Extend table lifetime (kde#379255) + * Words: + + Do not popup contextmenu twice + + Fix "Distraction free mode" should be called "Full screen + mode" (kde#378527) + + Fixed calligra crashing when opening remote document + (kde#358581) + + Fix crash after loading of template file fails + + Save anchor info also for page-anchored shapes + + Fix interoperability problem with LibreOffice + * Karbon: + + Karbon: Enable multi page capability + + Karbon image filter: Add multipage support + + PDF Import: Add multipage support + + Use Krita toolbar in Karbon + * Sheets: + + Disable build of sheets tableshape, obsoleted by the + implementation of text tables + + Made descriptions for DEC2BIN/OCT2BIN/HEX2DEC/HEX2BIN mention + input number system (kde#399569) + + [Style] Default sheets to white background + * Stage: + + Add automatic slide transition + + Fix animation of sequential and parallel animations + + Add show/hide page margins + * Flow: + + Retire flow, not needed since karbon can do it all + * Gemini: + + Kirigamify the welcome pages + + Pull out DocumentTile as a proper component and add various + fixes + + Fix some issues with similarly named documents in + RecentFileManager + + Remove crash in cloud support by postponing some of the + loading process + + Clarify touch <-> desktop view switch + + Fix loading of templates and files creation + + Migrate away from deprecated interfaces in Gemini DropBox + support + + Handle non-availability of the web view + + Make the touch view accept touch events on recent Qt versions + * QtQuick2 Components: + + Speed up document loading when viewing only by not loading + editor controls + + Correct anchor detection in QML components, removing + potential infinite looping + * Filters: + + CSV: + - CSV characters should not be translated + + RTF: + - Use RTF default color as default Qt format + - Mark \shp and \shpinst as supported control words on rtf + reader + - Display figure brackets in plain text + - Add support for strikeout text in RTF documents + + PPT: + - Relax TextPFRun validation to allow LibreOffice PPT import + + Visio: + - Visio filter: make it work with some file versions + + Excel: + - Read xlsx drawing dimensions from the xdr:ext element if + available + - Don't drop number styling information from xlsx cell + formats which start with a currency symbol + - Don't double format spreadsheet currency values with custom + format strings + - Fix incorrect conditional styling of spreadsheet cells + - Extract images from excel files which omit the FtCF entry + - Assign correct column width when importing XLS file + * Stencils: + + Activate stencils docker in all apps + + StencilBoxDocker: Do not show by default + + StencilsBoxDocker: Load stencils in separate thread, to not + impact app startup time + + ConnectionTool: Fix creation of connections and handle undo + + KoConnectionShape: Do not create a path when all handles point + to the same point + + Stencils: Fix invalid odf in database.odg + * Callouts: + + Callout: Improve ui (resize/rotate) + + Proper fix for LOs inverted rotate/skew angle and wrong + default unit + + Callout: "Fix" rotation of callouts + * Annotation: + + AnnotationShape: Disable all not allowed interactions + + Annotation: Block adding comment to an annotation shape + * Shapes: + + Try to avoid segfaults on shape factory not found + + EnhancedPathShape: Keep correct aspect ratio of shapes in odf + files (kde#334608) + + SvgShapes: Fix loading of shapes created with SvgShapeFactory + + TextShape: Handle stroke (not only border) in root area + provider + + PictureShape: Fix crash when atempting to load unknown binary + data + * Chart: + + Common: + - Only x axes can be attached to multiple diagrams + - Only bar charts can be vertical + - Fix marker symbols + - Remove 'Show Symbol' from ui for charttypes without symbols + - Enable chart tool also when any of the chartshape children + is selected + - Paint decoration when chart tool is active to make it clear + which shape the tool is connected to + - Fix "Layout does not handle axis titles on the same side of + the plotarea" (kde#420328) + - Fix "Axis titles not rotated when plot area rotated" + (kde#420328) + - Fix "Setting dataset chart type is not undoable" + (kde#420290) + - Fix "No axes lines when creating new chart" (kde#240520) + - Fix "Legend does not respect dpi settings" (kde#420151) + - Fix "Legend is not printed properly" (kde#420145) + - Layout title, subtitle, footer shapes center aligned by + default + + Bar: + - Handle gaps as properties of Y-axes only as specified in + odf 1.2 + - Only save gaps in styles used by y-axis + - Set axis positions correct also for vertical charts + - Show Axis Labels ui added + - Enable bar chart orientation + + Stock: + - Implement stock chart sub types + + Scatter: + - Improve label handling + - Fix tooltips + + Pie and Ring: + - Save/load pie/ring attributes + - LO needs ring chart datasets class to be circle + + Radar: + - Add radar chart config widget +- Drop patches merged upstream: + * Fix-build-with-Qt-511.patch + * Fix-build-with-poppler-0.69.patch + * Fix-build-with-poppler-0.64.patch + * Mark-the-functions-as-override.patch + * gBool-to-bool.patch + * Fix-build-with-poppler-0.64-take-2.patch + * Fix-build-with-poppler-0.71.patch + * Fix-GooString-not-having-getCString-anymore.patch + * Fix-build-with-Qt-5_13.patch + * Guchar-to-unsigned-char.patch + * Fix-build-with-poppler-0.82.patch + * Fix-build-with-poppler-0.83.patch +- Add 0001-Revert-Chart-Depend-on-KChart-2.7.0.patch to allow + building the chartshape with kdiagram 2.6.x on Leap 15.1 +- Update/cleanup build requirements +- Move okular*.desktop files from words/stage to + calligra-extras-okular, they need the other files in that package + +------------------------------------------------------------------- +Thu Apr 9 10:47:35 UTC 2020 - wba...@tmo.at + +- Split out "Create New" ODF file templates to a new package + calligra-extra-filemanagertemplates, they are useful without + calligra installed and should not require the full suite + (boo#983878) + +------------------------------------------------------------------- Old: ---- Fix-GooString-not-having-getCString-anymore.patch Fix-build-with-Qt-511.patch Fix-build-with-Qt-5_13.patch Fix-build-with-poppler-0.64-take-2.patch Fix-build-with-poppler-0.64.patch Fix-build-with-poppler-0.69.patch Fix-build-with-poppler-0.71.patch Fix-build-with-poppler-0.82.patch Fix-build-with-poppler-0.83.patch Guchar-to-unsigned-char.patch Mark-the-functions-as-override.patch calligra-3.1.0.tar.xz gBool-to-bool.patch New: ---- 0001-Revert-Chart-Depend-on-KChart-2.7.0.patch calligra-3.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.EtlFaG/_old 2020-05-04 08:22:53.172393929 +0200 +++ /var/tmp/diff_new_pack.EtlFaG/_new 2020-05-04 08:22:53.176393938 +0200 @@ -1,7 +1,7 @@ # # spec file for package calligra # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,115 +16,90 @@ # +%bcond_without lang Name: calligra -Version: 3.1.0 +Version: 3.2.0 Release: 0 Summary: Libraries and Base Files for the KDE Office Suite License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GFDL-1.2-only Group: Productivity/Office/Suite URL: https://www.calligra.org/ Source0: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM Fix-build-with-Qt-511.patch -Patch0: Fix-build-with-Qt-511.patch -# PATCH-FIX-UPSTREAM -Patch1: Fix-build-with-poppler-0.69.patch -Patch2: Fix-build-with-poppler-0.64.patch -Patch3: Mark-the-functions-as-override.patch -Patch4: gBool-to-bool.patch -Patch5: Fix-build-with-poppler-0.64-take-2.patch -Patch6: Fix-build-with-poppler-0.71.patch -Patch7: Fix-GooString-not-having-getCString-anymore.patch -# PATCH-FIX-UPSTREAM -Patch8: Fix-build-with-Qt-5_13.patch -# PATCH-FIX-UPSTREAM -Patch9: Guchar-to-unsigned-char.patch -# PATCH-FIX-UPSTREAM -Patch10: Fix-build-with-poppler-0.82.patch -Patch11: Fix-build-with-poppler-0.83.patch -BuildRequires: Mesa-devel -BuildRequires: OpenColorIO-devel +# PATCH-FIX-OPENSUSE +Patch0: 0001-Revert-Chart-Depend-on-KChart-2.7.0.patch BuildRequires: OpenEXR-devel -BuildRequires: Vc-devel-static -BuildRequires: akonadi-contact-devel -BuildRequires: akonadi-server-devel BuildRequires: extra-cmake-modules BuildRequires: fdupes -BuildRequires: fftw3-devel -BuildRequires: freetds-devel -BuildRequires: glew-devel +BuildRequires: fontconfig-devel +BuildRequires: freetype-devel BuildRequires: gsl-devel -BuildRequires: kactivities5-devel -BuildRequires: karchive-devel -BuildRequires: kcalcore-devel -BuildRequires: kcodecs-devel -BuildRequires: kcompletion-devel -BuildRequires: kconfig-devel -BuildRequires: kconfigwidgets-devel -BuildRequires: kcontacts5-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kdb-devel -BuildRequires: kdeclarative-devel -BuildRequires: kdelibs4support-devel -BuildRequires: kdiagram-devel -BuildRequires: kemoticons-devel BuildRequires: kf5-filesystem -BuildRequires: kglobalaccel-devel -BuildRequires: kguiaddons-devel -BuildRequires: khtml-devel -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kitemmodels-devel -BuildRequires: kitemviews-devel -BuildRequires: knotifyconfig-devel -BuildRequires: kparts-devel -BuildRequires: kproperty-devel -BuildRequires: kreport-devel -BuildRequires: kross-devel -BuildRequires: ktexteditor-devel -BuildRequires: kwallet-devel -BuildRequires: kxmlgui-devel +BuildRequires: libboost_system-devel BuildRequires: libeigen3-devel BuildRequires: libetonyek-devel -BuildRequires: libgsf-devel -BuildRequires: libicu-devel -BuildRequires: libkdcraw-devel BuildRequires: liblcms2-devel BuildRequires: libodfgen-devel BuildRequires: libpoppler-qt5-devel -BuildRequires: libqca-qt5-devel BuildRequires: libspnav-devel BuildRequires: libvisio-devel BuildRequires: libwpd-devel BuildRequires: libwpg-devel BuildRequires: libwps-devel -BuildRequires: marble-devel -BuildRequires: okular-devel -BuildRequires: openjpeg-devel -BuildRequires: phonon4qt5-devel +BuildRequires: perl BuildRequires: pkgconfig BuildRequires: pstoedit -BuildRequires: sonnet-devel -BuildRequires: sqlite-devel -BuildRequires: threadweaver-devel BuildRequires: update-desktop-files +BuildRequires: cmake(KChart) +BuildRequires: cmake(KF5Activities) +BuildRequires: cmake(KF5Akonadi) +BuildRequires: cmake(KF5Archive) +BuildRequires: cmake(KF5CalendarCore) +BuildRequires: cmake(KF5Codecs) +BuildRequires: cmake(KF5Completion) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5Contacts) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5GuiAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5ItemViews) +BuildRequires: cmake(KF5JobWidgets) BuildRequires: cmake(KF5KCMUtils) -BuildRequires: cmake(Qt5Concurrent) +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(KF5KHtml) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Kross) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5NotifyConfig) +BuildRequires: cmake(KF5Parts) +BuildRequires: cmake(KF5TextWidgets) +BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(KF5Sonnet) +BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(Okular5) +BuildRequires: cmake(Phonon4Qt5) +BuildRequires: cmake(Qca-qt5) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5OpenGL) BuildRequires: cmake(Qt5PrintSupport) -BuildRequires: cmake(Qt5Script) +BuildRequires: cmake(Qt5Quick) +BuildRequires: cmake(Qt5QuickWidgets) +BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5UiTools) -BuildRequires: cmake(Qt5WebKit) -BuildRequires: cmake(Qt5WebKitWidgets) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5X11Extras) BuildRequires: cmake(Qt5Xml) -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(zlib) Requires(post): shared-mime-info Requires(postun): shared-mime-info Recommends: %{name}-doc = %{version} @@ -134,11 +109,6 @@ Suggests: calligra-sheets Suggests: calligra-stage Suggests: calligra-words -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_system-devel -%else -BuildRequires: boost-devel -%endif %description The Calligra Suite is a set of applications that allows you to easily complete @@ -177,16 +147,6 @@ %description doc Documentation of the Calligra Office Suite applications. -%package flow -Summary: Flow Chart Drawing Application -License: GPL-2.0-or-later AND LGPL-2.1-or-later -Group: Productivity/Office/Suite -Requires: %{name} = %{version} -Obsoletes: calligra5-flow - -%description flow -Flow is the flow chart drawing application of the Calligra Suite. - %package karbon Summary: Vector Drawing Application License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -272,6 +232,19 @@ action for several formats to the filemanager context menu and calling the related Calligra programs. +%package extras-filemanagertemplates +Summary: "Create New" templates for ODF files +License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later +Group: Productivity/Office/Suite +Supplements: kio +# the files were in extras-dolphin previously +Conflicts: %{name}-extras-dolphin < 3.2.0 + +%description extras-filemanagertemplates +Templates for ODF files that show up in the "Create New" context menu +of KIO-based filemanagers (dolphin, konqueror, krusader, Plasma's folderview) +and the KDE filedialog. + %package lang Summary: Translations for the Calligra Suite Applications License: LGPL-2.1-or-later @@ -340,10 +313,17 @@ This package contains application translations for the Calligra Suite %prep -%autosetup -p1 +%setup -q +%if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150100 +%patch0 -p1 +%endif +%if %pkg_vcmp kdoctools < 5.57.0 +# older kdoctools versions lack the necessary support for indonesian language causing the build to fail +rm -r po/id/docs/ +%endif %build -%cmake_kf5 -d build -- -DAPP_ACTIVE=FALSE +%cmake_kf5 -d build %make_jobs %install @@ -351,16 +331,13 @@ %kf5_makeinstall # Create filelists -%create_subdir_filelist -d filters/flow -f flow -v devel %create_subdir_filelist -d data -f main -v devel %create_subdir_filelist -d devtools -f tools -v devel %create_subdir_filelist -d extras/calligra -f main -v devel %create_subdir_filelist -d extras/converter -f converter -v devel -%create_subdir_filelist -d extras/filemanagertemplates -f dolphin -v devel -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 +%create_subdir_filelist -d extras/filemanagertemplates -f filemanagertemplates -v devel %create_subdir_filelist -d extras/okularodpgenerator -f okular -v devel %create_subdir_filelist -d extras/okularodtgenerator -f okular -v devel -%endif %create_subdir_filelist -d extras/properties -f dolphin -v devel %create_subdir_filelist -d extras/quickprint -f dolphin -v devel %create_subdir_filelist -d extras/thumbnail -f main -v devel @@ -369,6 +346,7 @@ %create_subdir_filelist -d filters/libmsooxml -f main -v devel %create_subdir_filelist -d filters/libodf2 -f main -v devel %create_subdir_filelist -d filters/libodfreader -f main -v devel +%create_subdir_filelist -d filters/odg -f main -v devel %create_subdir_filelist -d filters/sheets -f sheets -v devel %create_subdir_filelist -d filters/stage -f stage -v devel %create_subdir_filelist -d filters/words -f words -v devel @@ -401,6 +379,8 @@ /sbin/ldconfig %mime_database_postun +%post gemini -p /sbin/ldconfig +%postun gemini -p /sbin/ldconfig %post karbon -p /sbin/ldconfig %postun karbon -p /sbin/ldconfig %post sheets -p /sbin/ldconfig @@ -411,27 +391,20 @@ %postun tools -p /sbin/ldconfig %post words -p /sbin/ldconfig %postun words -p /sbin/ldconfig - -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 %post extras-okular -p /sbin/ldconfig %postun extras-okular -p /sbin/ldconfig -%endif %files -f filelists/main %license COPYING COPYING.LIB %doc README +%dir %{_kf5_qmldir}/org/kde %{_kf5_qmldir}/org/kde/calligra/ -%{_kf5_servicesdir}/flow*.desktop %{_datadir}/calligra/ %{_kf5_iconsdir}/hicolor/ %dir %{_kf5_servicesdir}/ServiceMenus %dir %{_kf5_servicesdir}/ServiceMenus/calligra %dir %{_kf5_appstreamdir} -%dir %{_datadir}/templates -%dir %{_datadir}/templates/.source %{_kf5_applicationsdir}/calligra.desktop -%{_kf5_plugindir}/calligra/formatfilters/calligra_filter_vsdx2odg.so -%{_kf5_plugindir}/calligra/formatfilters/calligra_filter_wpg2odg.so %dir %{_kf5_plugindir}/calligra %dir %{_kf5_plugindir}/calligra/devices %dir %{_kf5_plugindir}/calligra/dockers @@ -452,15 +425,17 @@ %files extras-dolphin -f filelists/dolphin -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 +%files extras-filemanagertemplates -f filelists/filemanagertemplates +%dir %{_datadir}/templates +%dir %{_datadir}/templates/.source + %files extras-okular -f filelists/okular +%{_kf5_applicationsdir}/okular*.desktop %{_kf5_plugindir}/okular/ -%endif +%{_kf5_servicesdir}/okular*.desktop %files devel -f filelists/devel -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 %{_libdir}/libkookularGenerator_odt.so -%endif %files doc %license COPYING.DOC @@ -488,7 +463,6 @@ %exclude %{_datadir}/calligra %exclude %{_kf5_iconsdir} %{_kf5_plugindir}/calligrasheets/ -%dir %{_kf5_plugindir}/calligra/deferred %{_kf5_htmldir}/en/calligrasheets/ %{_datadir}/calligrasheets/ %{_kf5_kxmlguidir}/calligrasheets/ @@ -500,7 +474,9 @@ %{_kf5_plugindir}/calligrastage/ %dir %{_kf5_plugindir}/calligra/presentationeventactions %{_kf5_htmldir}/en/calligrastage/ +%exclude %{_kf5_applicationsdir}/okular*.desktop %exclude %{_kf5_plugindir}/okular/ +%exclude %{_kf5_servicesdir}/okular*.desktop %{_datadir}/calligra_shape_music/ %{_datadir}/calligrastage/ %{_kf5_kxmlguidir}/calligrastage/ @@ -514,10 +490,16 @@ %exclude %{_kf5_iconsdir}/hicolor %{_datadir}/calligrawords/ %{_kf5_kxmlguidir}/calligrawords/ +%exclude %{_kf5_applicationsdir}/okular*.desktop %exclude %{_kf5_plugindir}/okular/ +%exclude %{_kf5_servicesdir}/okular*.desktop %dir %{_kf5_plugindir}/calligra/parts +%if %{with lang} %files lang %{_datadir}/locale/ +%{_kf5_htmldir}/ +%exclude %{_kf5_htmldir}/en/ +%endif %changelog ++++++ 0001-Revert-Chart-Depend-on-KChart-2.7.0.patch ++++++ >From 239b0429f5c2e0535416652c8e061377fab76248 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <wba...@tmo.at> Date: Thu, 30 Apr 2020 09:30:08 +0200 Subject: [PATCH] Revert "Chart: Depend on KChart 2.7.0" Allow to build calligra's chartshape with KChart/kdiagram 2.6.x again, which is the version we have in Leap 15.1. Except for one bugfix that needs the newer KChart version (https://bugs.kde.org/420145), this should make no difference. This reverts commit 2269397a6fa5f2ec4c94be8f50dc5c09d02f02ca. --- CMakeLists.txt | 2 +- plugins/chartshape/Axis.cpp | 2 ++ plugins/chartshape/Legend.cpp | 32 ++++++++++++++++++++++++++++++++ plugins/chartshape/PlotArea.cpp | 3 +++ 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d6bed795fa..5cc1dfd2f71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -454,7 +454,7 @@ set_package_properties(KF5Akonadi PROPERTIES ## ## Test for KChart ## -macro_optional_find_package(KChart 2.7.0 QUIET) +macro_optional_find_package(KChart 2.6.0 QUIET) set_package_properties(KChart PROPERTIES DESCRIPTION "Library for creating business charts (part of KDiagram)" URL "https://www.kde.org/"; diff --git a/plugins/chartshape/Axis.cpp b/plugins/chartshape/Axis.cpp index dd98dfb59d4..c4ca7e9e1cc 100644 --- a/plugins/chartshape/Axis.cpp +++ b/plugins/chartshape/Axis.cpp @@ -260,7 +260,9 @@ Axis::Private::Private(Axis *axis, AxisDimension dim) KChart::RulerAttributes attr = kdAxis->rulerAttributes(); attr.setShowRulerLine(true); +#if KCHART_VERSION >= ((2<<16)|(6<<8)|(89)) attr.setRulerLinePen(QPen()); +#endif kdAxis->setRulerAttributes(attr); } diff --git a/plugins/chartshape/Legend.cpp b/plugins/chartshape/Legend.cpp index 092d2808805..a4794248fc8 100644 --- a/plugins/chartshape/Legend.cpp +++ b/plugins/chartshape/Legend.cpp @@ -352,6 +352,7 @@ void Legend::paint(QPainter &painter, const KoViewConverter &converter, KoShapeP background()->paint(painter, converter, paintContext, p); } +#if KCHART_VERSION >= ((2<<16)|(6<<8)|(89)) disconnect (d->kdLegend, SIGNAL(propertiesChanged()), this, SLOT(slotKdLegendChanged())); // KChart thinks in pixels, Calligra in pt @@ -362,6 +363,37 @@ void Legend::paint(QPainter &painter, const KoViewConverter &converter, KoShapeP d->kdLegend->paint(&painter, rect); connect (d->kdLegend, SIGNAL(propertiesChanged()), this, SLOT(slotKdLegendChanged())); +#else + // KChart thinks in pixels, Calligra in pt + // KChart also for non-QWidget painting devices cares for the logicalDpi + // Other than PlotArea we do not control the output size via the paint method, + // so here have to resize the legend temporarily. + // Printing should only result in 1 paint call, so this should not happen too often. + // TODO: something in KChart seems broken in general on printer output, also seen in kchart examples + // so legend in print is still broken :/ + const QSize sizePx = d->kdLegend->size(); + const QSize newSizePx = ScreenConversions::scaleFromPtToPx(size(), painter); + const bool isPainterDifferentDpi = (sizePx != newSizePx); + if (isPainterDifferentDpi) { + // temporarily set a size matching the painterdevice + d->kdLegend->resize(newSizePx); + d->kdLegend->resizeLayout(newSizePx); + } + + ScreenConversions::scaleFromPtToPx(painter); + + d->kdLegend->paint(&painter); + + if (isPainterDifferentDpi) { + // restore screen-dpi size + d->kdLegend->resize(sizePx); + d->kdLegend->resizeLayout(sizePx); + } + + //painter.restore(); + // Paint the cached pixmap + //painter.drawImage(0, 0, d->image); +#endif } diff --git a/plugins/chartshape/PlotArea.cpp b/plugins/chartshape/PlotArea.cpp index 55aca8bb217..dbeccd48d9f 100644 --- a/plugins/chartshape/PlotArea.cpp +++ b/plugins/chartshape/PlotArea.cpp @@ -1313,6 +1313,9 @@ void PlotArea::paint(QPainter& painter, const KoViewConverter& converter, KoShap // is not not cut off. painter.setClipping(false); if (kdchartRect.width() > 10 && kdchartRect.height() > 10) { +#if KCHART_VERSION < 0x020689 + painter.setPen(QPen()); // ruler line needs a pen to be shown +#endif d->kdChart->paint(&painter, kdchartRect); } //painter.restore(); -- 2.16.4 ++++++ calligra-3.1.0.tar.xz -> calligra-3.2.0.tar.xz ++++++ /work/SRC/openSUSE:Leap:15.2/calligra/calligra-3.1.0.tar.xz /work/SRC/openSUSE:Leap:15.2/.calligra.new.2738/calligra-3.2.0.tar.xz differ: char 17, line 1
