The package rpms/calligra.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/calligra.git/commit/?id=cbc200acc3fd....
Change: +%ifarch %{qt6_qtwebengine_arches}
Thanks.
Full change: ============
commit cf4a789d5484abdbe9ea6aa8246b32377c85d237 Merge: 878f60b 09e91f4 Author: Steve Cossette farchord@gmail.com Date: Sat Dec 21 07:59:41 2024 -0500
Merge branch 'rawhide' into f40
commit 09e91f4b970429d5ab832edc1c23250670051800 Author: Marc Deop i Argemí marcdeop@fedoraproject.org Date: Sat Dec 7 18:52:41 2024 +0100
24.12.0
diff --git a/.gitignore b/.gitignore index c97316f..b7620b1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /calligra-4.0.1.tar.xz /calligra-24.11.80.tar.xz /calligra-24.11.90.tar.xz +/calligra-24.12.0.tar.xz diff --git a/calligra.spec b/calligra.spec index 83302db..75f106a 100644 --- a/calligra.spec +++ b/calligra.spec @@ -8,7 +8,7 @@ #global external_lilypond_fonts 1
Name: calligra -Version: 24.11.90 +Version: 24.12.0 Release: 1%{?dist} Summary: An integrated office suite
@@ -512,6 +512,9 @@ done
%changelog +* Sat Dec 07 2024 Marc Deop i Argemí marcdeop@fedoraproject.org - 24.12.0-1 +- 24.12.0 + * Fri Nov 29 2024 Marc Deop i Argemí marcdeop@fedoraproject.org - 24.11.90-1 - 24.11.90
diff --git a/sources b/sources index f199150..a28c7c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calligra-24.11.90.tar.xz) = 58144fddb5b1e983364c293ba5bcfbdb6106dc16674a7ecda70dbf5695c2739053abf7d11b45691f4ac213033605db0bd44657f1d6bc62bc36695e281160164e +SHA512 (calligra-24.12.0.tar.xz) = ad6a68474a16a7279180ce408292c269a937980a3a151d91656189172fc05aa1c28c2787b0bfd5f14245c97c654d8748f351d7095106b10a0766a5434795724c
commit ed241c2719c3949d5c7968a741bececb34799b5f Author: Marc Deop i Argemí marcdeop@fedoraproject.org Date: Fri Nov 29 21:08:13 2024 +0100
24.11.90
diff --git a/.gitignore b/.gitignore index b3ee47c..c97316f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /calligra-3.2.1.tar.xz /calligra-4.0.1.tar.xz /calligra-24.11.80.tar.xz +/calligra-24.11.90.tar.xz diff --git a/calligra.spec b/calligra.spec index 5efa14a..83302db 100644 --- a/calligra.spec +++ b/calligra.spec @@ -8,7 +8,7 @@ #global external_lilypond_fonts 1
Name: calligra -Version: 24.11.80 +Version: 24.11.90 Release: 1%{?dist} Summary: An integrated office suite
@@ -512,6 +512,9 @@ done
%changelog +* Fri Nov 29 2024 Marc Deop i Argemí marcdeop@fedoraproject.org - 24.11.90-1 +- 24.11.90 + * Fri Nov 15 2024 Marc Deop i Argemí marcdeop@fedoraproject.org - 24.11.80-1 - 24.11.80
diff --git a/sources b/sources index 9a248a1..f199150 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calligra-24.11.80.tar.xz) = 9d2fb5a8af1b6662b2ee1ed1fa8fdc9012567aaeb8d4ee65b268a07e3d2b7304fe225d2dc7404a102aef2d89219c39ecd7594fe8ebfe43ce280105b639e10d21 +SHA512 (calligra-24.11.90.tar.xz) = 58144fddb5b1e983364c293ba5bcfbdb6106dc16674a7ecda70dbf5695c2739053abf7d11b45691f4ac213033605db0bd44657f1d6bc62bc36695e281160164e
commit 472b9b3805a824f542567dc7deff845324b41cac Author: Marc Deop i Argemí marcdeop@fedoraproject.org Date: Wed Nov 20 22:13:42 2024 +0100
24.11.80
diff --git a/.gitignore b/.gitignore index c00c532..b3ee47c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /calligra-3.2.0.tar.xz /calligra-3.2.1.tar.xz /calligra-4.0.1.tar.xz +/calligra-24.11.80.tar.xz diff --git a/0002-Remove-extra-arguments-from-okular-generator-desktop.patch b/0002-Remove-extra-arguments-from-okular-generator-desktop.patch deleted file mode 100644 index bf2df5a..0000000 --- a/0002-Remove-extra-arguments-from-okular-generator-desktop.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 2809fc286dafb0f0f89a497ccd9b2504e2c7b854 Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz yselkowi@redhat.com -Date: Tue, 3 Sep 2024 15:35:04 -0400 -Subject: [PATCH 2/2] Remove extra arguments from okular generator desktop - files - -These arguments were removed from okular's own desktop files years ago: - -https://invent.kde.org/graphics/okular/-/commit/83299b95328d9f3021666c879399... -https://invent.kde.org/graphics/okular/-/commit/f7d1dd9312135e3f1820d98d38db... ---- - .../okularodpgenerator/okularApplication_odp_calligra.desktop | 2 +- - .../okularodtgenerator/okularApplication_odt_calligra.desktop | 2 +- - .../powerpoint/okularApplication_powerpoint_calligra.desktop | 2 +- - filters/stage/pptx/okularApplication_pptx_calligra.desktop | 2 +- - .../words/docx/import/okularApplication_docx_calligra.desktop | 2 +- - filters/words/msword-odf/okularApplication_doc_calligra.desktop | 2 +- - filters/words/rtf/import/okularApplication_rtf_calligra.desktop | 2 +- - .../wordperfect/import/okularApplication_wpd_calligra.desktop | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/extras/okularodpgenerator/okularApplication_odp_calligra.desktop b/extras/okularodpgenerator/okularApplication_odp_calligra.desktop -index 806807f7f58..ed88b296e0c 100644 ---- a/extras/okularodpgenerator/okularApplication_odp_calligra.desktop -+++ b/extras/okularodpgenerator/okularApplication_odp_calligra.desktop -@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints - GenericName[x-test]=xxDocument Viewerxx - GenericName[zh_CN]=文档查看器 - GenericName[zh_TW]=文件檢視器 --Exec=okular %U %i -qwindowtitle %c -+Exec=okular %U - Icon=okular - Type=Application - InitialPreference=3 -diff --git a/extras/okularodtgenerator/okularApplication_odt_calligra.desktop b/extras/okularodtgenerator/okularApplication_odt_calligra.desktop -index dd378cbd64b..655c7b62af9 100644 ---- a/extras/okularodtgenerator/okularApplication_odt_calligra.desktop -+++ b/extras/okularodtgenerator/okularApplication_odt_calligra.desktop -@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints - GenericName[x-test]=xxDocument Viewerxx - GenericName[zh_CN]=文档查看器 - GenericName[zh_TW]=文件檢視器 --Exec=okular %U %i -qwindowtitle %c -+Exec=okular %U - Icon=okular - Type=Application - InitialPreference=3 -diff --git a/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop b/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop -index 61aac3ce772..39be532ba10 100644 ---- a/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop -+++ b/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop -@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints - GenericName[x-test]=xxDocument Viewerxx - GenericName[zh_CN]=文档查看器 - GenericName[zh_TW]=文件檢視器 --Exec=okular %U %i -qwindowtitle %c -+Exec=okular %U - Icon=okular - Type=Application - InitialPreference=3 -diff --git a/filters/stage/pptx/okularApplication_pptx_calligra.desktop b/filters/stage/pptx/okularApplication_pptx_calligra.desktop -index 90961d84274..f0c1b39a741 100644 ---- a/filters/stage/pptx/okularApplication_pptx_calligra.desktop -+++ b/filters/stage/pptx/okularApplication_pptx_calligra.desktop -@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints - GenericName[x-test]=xxDocument Viewerxx - GenericName[zh_CN]=文档查看器 - GenericName[zh_TW]=文件檢視器 --Exec=okular %U %i -qwindowtitle %c -+Exec=okular %U - Icon=okular - Type=Application - InitialPreference=3 -diff --git a/filters/words/docx/import/okularApplication_docx_calligra.desktop b/filters/words/docx/import/okularApplication_docx_calligra.desktop -index 7f017973899..5f5fcbb7cb8 100644 ---- a/filters/words/docx/import/okularApplication_docx_calligra.desktop -+++ b/filters/words/docx/import/okularApplication_docx_calligra.desktop -@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints - GenericName[x-test]=xxDocument Viewerxx - GenericName[zh_CN]=文档查看器 - GenericName[zh_TW]=文件檢視器 --Exec=okular %U %i -qwindowtitle %c -+Exec=okular %U - Icon=okular - Type=Application - InitialPreference=3 -diff --git a/filters/words/msword-odf/okularApplication_doc_calligra.desktop b/filters/words/msword-odf/okularApplication_doc_calligra.desktop -index 37bcac8d484..0db41df433e 100644 ---- a/filters/words/msword-odf/okularApplication_doc_calligra.desktop -+++ b/filters/words/msword-odf/okularApplication_doc_calligra.desktop -@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints - GenericName[x-test]=xxDocument Viewerxx - GenericName[zh_CN]=文档查看器 - GenericName[zh_TW]=文件檢視器 --Exec=okular %U %i -qwindowtitle %c -+Exec=okular %U - Icon=okular - Type=Application - InitialPreference=3 -diff --git a/filters/words/rtf/import/okularApplication_rtf_calligra.desktop b/filters/words/rtf/import/okularApplication_rtf_calligra.desktop -index 65104411bb6..7afe29fdf97 100644 ---- a/filters/words/rtf/import/okularApplication_rtf_calligra.desktop -+++ b/filters/words/rtf/import/okularApplication_rtf_calligra.desktop -@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints - GenericName[x-test]=xxDocument Viewerxx - GenericName[zh_CN]=文档查看器 - GenericName[zh_TW]=文件檢視器 --Exec=okular %U %i -qwindowtitle %c -+Exec=okular %U - Icon=okular - Type=Application - InitialPreference=3 -diff --git a/filters/words/wordperfect/import/okularApplication_wpd_calligra.desktop b/filters/words/wordperfect/import/okularApplication_wpd_calligra.desktop -index e0e6ca266a9..688450848b5 100644 ---- a/filters/words/wordperfect/import/okularApplication_wpd_calligra.desktop -+++ b/filters/words/wordperfect/import/okularApplication_wpd_calligra.desktop -@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints - GenericName[x-test]=xxDocument Viewerxx - GenericName[zh_CN]=文档查看器 - GenericName[zh_TW]=文件檢視器 --Exec=okular %U %i -qwindowtitle %c -+Exec=okular %U - Icon=okular - Type=Application - InitialPreference=3 --- -2.46.0 - diff --git a/calligra.spec b/calligra.spec index 27e46e8..5efa14a 100644 --- a/calligra.spec +++ b/calligra.spec @@ -8,8 +8,8 @@ #global external_lilypond_fonts 1
Name: calligra -Version: 4.0.1 -Release: 2%{?dist} +Version: 24.11.80 +Release: 1%{?dist} Summary: An integrated office suite
License: GPL-2.0-or-later AND GPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.0-only AND LGPL-2.1-only AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause AND BSD-2-Clause @@ -23,7 +23,6 @@ URL: https://calligra.org/ Source0: https://download.kde.org/%%7Bstable%7D/calligra/calligra-%%7Bversion%7D.tar....
## upstream patches -Patch2: 0002-Remove-extra-arguments-from-okular-generator-desktop.patch
## upstreamable patches
@@ -513,6 +512,9 @@ done
%changelog +* Fri Nov 15 2024 Marc Deop i Argemí marcdeop@fedoraproject.org - 24.11.80-1 +- 24.11.80 + * Tue Sep 03 2024 Yaakov Selkowitz yselkowi@redhat.com - 4.0.1-2 - Fix okular generator desktop files
diff --git a/sources b/sources index 182fb48..9a248a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calligra-4.0.1.tar.xz) = 79569a1e75d5c70c8b2c3e5c7cf88d26d9b7a81be52c131c932521c65d1712a531829bcd29f7233f1ee7601fa363ca9ce2c4783a76dfdc5abe3c8b04b5741b78 +SHA512 (calligra-24.11.80.tar.xz) = 9d2fb5a8af1b6662b2ee1ed1fa8fdc9012567aaeb8d4ee65b268a07e3d2b7304fe225d2dc7404a102aef2d89219c39ecd7594fe8ebfe43ce280105b639e10d21
commit 7b3b4cc4a9e31972387cc1646dd5148d28057246 Author: Yaakov Selkowitz yselkowi@redhat.com Date: Tue Sep 3 16:44:16 2024 -0400
Fix okular generator desktop files
diff --git a/0002-Remove-extra-arguments-from-okular-generator-desktop.patch b/0002-Remove-extra-arguments-from-okular-generator-desktop.patch new file mode 100644 index 0000000..bf2df5a --- /dev/null +++ b/0002-Remove-extra-arguments-from-okular-generator-desktop.patch @@ -0,0 +1,128 @@ +From 2809fc286dafb0f0f89a497ccd9b2504e2c7b854 Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz yselkowi@redhat.com +Date: Tue, 3 Sep 2024 15:35:04 -0400 +Subject: [PATCH 2/2] Remove extra arguments from okular generator desktop + files + +These arguments were removed from okular's own desktop files years ago: + +https://invent.kde.org/graphics/okular/-/commit/83299b95328d9f3021666c879399... +https://invent.kde.org/graphics/okular/-/commit/f7d1dd9312135e3f1820d98d38db... +--- + .../okularodpgenerator/okularApplication_odp_calligra.desktop | 2 +- + .../okularodtgenerator/okularApplication_odt_calligra.desktop | 2 +- + .../powerpoint/okularApplication_powerpoint_calligra.desktop | 2 +- + filters/stage/pptx/okularApplication_pptx_calligra.desktop | 2 +- + .../words/docx/import/okularApplication_docx_calligra.desktop | 2 +- + filters/words/msword-odf/okularApplication_doc_calligra.desktop | 2 +- + filters/words/rtf/import/okularApplication_rtf_calligra.desktop | 2 +- + .../wordperfect/import/okularApplication_wpd_calligra.desktop | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/extras/okularodpgenerator/okularApplication_odp_calligra.desktop b/extras/okularodpgenerator/okularApplication_odp_calligra.desktop +index 806807f7f58..ed88b296e0c 100644 +--- a/extras/okularodpgenerator/okularApplication_odp_calligra.desktop ++++ b/extras/okularodpgenerator/okularApplication_odp_calligra.desktop +@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints + GenericName[x-test]=xxDocument Viewerxx + GenericName[zh_CN]=文档查看器 + GenericName[zh_TW]=文件檢視器 +-Exec=okular %U %i -qwindowtitle %c ++Exec=okular %U + Icon=okular + Type=Application + InitialPreference=3 +diff --git a/extras/okularodtgenerator/okularApplication_odt_calligra.desktop b/extras/okularodtgenerator/okularApplication_odt_calligra.desktop +index dd378cbd64b..655c7b62af9 100644 +--- a/extras/okularodtgenerator/okularApplication_odt_calligra.desktop ++++ b/extras/okularodtgenerator/okularApplication_odt_calligra.desktop +@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints + GenericName[x-test]=xxDocument Viewerxx + GenericName[zh_CN]=文档查看器 + GenericName[zh_TW]=文件檢視器 +-Exec=okular %U %i -qwindowtitle %c ++Exec=okular %U + Icon=okular + Type=Application + InitialPreference=3 +diff --git a/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop b/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop +index 61aac3ce772..39be532ba10 100644 +--- a/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop ++++ b/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop +@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints + GenericName[x-test]=xxDocument Viewerxx + GenericName[zh_CN]=文档查看器 + GenericName[zh_TW]=文件檢視器 +-Exec=okular %U %i -qwindowtitle %c ++Exec=okular %U + Icon=okular + Type=Application + InitialPreference=3 +diff --git a/filters/stage/pptx/okularApplication_pptx_calligra.desktop b/filters/stage/pptx/okularApplication_pptx_calligra.desktop +index 90961d84274..f0c1b39a741 100644 +--- a/filters/stage/pptx/okularApplication_pptx_calligra.desktop ++++ b/filters/stage/pptx/okularApplication_pptx_calligra.desktop +@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints + GenericName[x-test]=xxDocument Viewerxx + GenericName[zh_CN]=文档查看器 + GenericName[zh_TW]=文件檢視器 +-Exec=okular %U %i -qwindowtitle %c ++Exec=okular %U + Icon=okular + Type=Application + InitialPreference=3 +diff --git a/filters/words/docx/import/okularApplication_docx_calligra.desktop b/filters/words/docx/import/okularApplication_docx_calligra.desktop +index 7f017973899..5f5fcbb7cb8 100644 +--- a/filters/words/docx/import/okularApplication_docx_calligra.desktop ++++ b/filters/words/docx/import/okularApplication_docx_calligra.desktop +@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints + GenericName[x-test]=xxDocument Viewerxx + GenericName[zh_CN]=文档查看器 + GenericName[zh_TW]=文件檢視器 +-Exec=okular %U %i -qwindowtitle %c ++Exec=okular %U + Icon=okular + Type=Application + InitialPreference=3 +diff --git a/filters/words/msword-odf/okularApplication_doc_calligra.desktop b/filters/words/msword-odf/okularApplication_doc_calligra.desktop +index 37bcac8d484..0db41df433e 100644 +--- a/filters/words/msword-odf/okularApplication_doc_calligra.desktop ++++ b/filters/words/msword-odf/okularApplication_doc_calligra.desktop +@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints + GenericName[x-test]=xxDocument Viewerxx + GenericName[zh_CN]=文档查看器 + GenericName[zh_TW]=文件檢視器 +-Exec=okular %U %i -qwindowtitle %c ++Exec=okular %U + Icon=okular + Type=Application + InitialPreference=3 +diff --git a/filters/words/rtf/import/okularApplication_rtf_calligra.desktop b/filters/words/rtf/import/okularApplication_rtf_calligra.desktop +index 65104411bb6..7afe29fdf97 100644 +--- a/filters/words/rtf/import/okularApplication_rtf_calligra.desktop ++++ b/filters/words/rtf/import/okularApplication_rtf_calligra.desktop +@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints + GenericName[x-test]=xxDocument Viewerxx + GenericName[zh_CN]=文档查看器 + GenericName[zh_TW]=文件檢視器 +-Exec=okular %U %i -qwindowtitle %c ++Exec=okular %U + Icon=okular + Type=Application + InitialPreference=3 +diff --git a/filters/words/wordperfect/import/okularApplication_wpd_calligra.desktop b/filters/words/wordperfect/import/okularApplication_wpd_calligra.desktop +index e0e6ca266a9..688450848b5 100644 +--- a/filters/words/wordperfect/import/okularApplication_wpd_calligra.desktop ++++ b/filters/words/wordperfect/import/okularApplication_wpd_calligra.desktop +@@ -95,7 +95,7 @@ GenericName[wa]=Håyneu di documints + GenericName[x-test]=xxDocument Viewerxx + GenericName[zh_CN]=文档查看器 + GenericName[zh_TW]=文件檢視器 +-Exec=okular %U %i -qwindowtitle %c ++Exec=okular %U + Icon=okular + Type=Application + InitialPreference=3 +-- +2.46.0 + diff --git a/calligra.spec b/calligra.spec index 2d7ef24..27e46e8 100644 --- a/calligra.spec +++ b/calligra.spec @@ -9,7 +9,7 @@
Name: calligra Version: 4.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An integrated office suite
License: GPL-2.0-or-later AND GPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.0-only AND LGPL-2.1-only AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause AND BSD-2-Clause @@ -23,6 +23,7 @@ URL: https://calligra.org/ Source0: https://download.kde.org/%%7Bstable%7D/calligra/calligra-%%7Bversion%7D.tar....
## upstream patches +Patch2: 0002-Remove-extra-arguments-from-okular-generator-desktop.patch
## upstreamable patches
@@ -512,6 +513,9 @@ done
%changelog +* Tue Sep 03 2024 Yaakov Selkowitz yselkowi@redhat.com - 4.0.1-2 +- Fix okular generator desktop files + * Mon Sep 02 2024 Yaakov Selkowitz yselkowi@redhat.com - 4.0.1-1 - 4.0.1
commit cbc200acc3fd3806683780f7183b7756cc13d525 Author: Yaakov Selkowitz yselkowi@redhat.com Date: Tue Aug 27 23:09:30 2024 -0400
4.0.1
diff --git a/.gitignore b/.gitignore index 6b86d2a..c00c532 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /calligra-3.1.90.tar.xz /calligra-3.2.0.tar.xz /calligra-3.2.1.tar.xz +/calligra-4.0.1.tar.xz diff --git a/0001-Fix-some-more-warnings.patch b/0001-Fix-some-more-warnings.patch deleted file mode 100644 index 648967c..0000000 --- a/0001-Fix-some-more-warnings.patch +++ /dev/null @@ -1,443 +0,0 @@ -From 068cd9aec11052733e393976142516d2190e4564 Mon Sep 17 00:00:00 2001 -From: Pierre Ducroquet pinaraf@pinaraf.info -Date: Sun, 28 Feb 2021 23:23:02 +0100 -Subject: [PATCH] Fix some more warnings - ---- - filters/libmsooxml/MsooXmlDiagramReader_p.cpp | 1 + - filters/sheets/csv/csvimport.cc | 2 +- - filters/sheets/excel/sidewinder/excel.cpp | 1 + - filters/sheets/excel/sidewinder/formulas.cpp | 2 +- - filters/sheets/gnumeric/gnumericexport.cc | 5 ++--- - filters/sheets/html/htmlexport.cc | 2 -- - filters/sheets/latex/export/latexexport.cc | 1 - - filters/sheets/latex/export/table.cc | 1 + - filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp | 1 - - filters/stage/pptx/PptxXmlDocumentReader.cpp | 2 +- - filters/words/msword-odf/texthandler.cpp | 2 ++ - filters/words/msword-odf/wv2/src/parser9x.cpp | 4 +++- - filters/words/msword-odf/wv2/src/styles.cpp | 4 +--- - filters/words/msword-odf/wv2/src/styles.h | 11 ++++++++--- - gemini/lib/GeminiMainWindow.cpp | 2 ++ - libs/pageapp/KoPAOdfPageSaveHelper.cpp | 2 +- - plugins/spacenavigator/SpaceNavigatorDevice.h | 6 ++---- - plugins/spacenavigator/SpaceNavigatorEvent.h | 2 +- - plugins/spacenavigator/SpaceNavigatorPollingThread.h | 3 +-- - plugins/vectorshape/VectorShape.cpp | 1 + - sheets/functions/datetime.cpp | 1 + - sheets/part/Digest.cpp | 8 ++++---- - sheets/shape/TableToolFactory.h | 2 +- - sheets/tests/TestSort.cpp | 4 ++-- - 24 files changed, 38 insertions(+), 32 deletions(-) - -diff --git a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp -index 14b08531262..14fc6ab9a71 100644 ---- a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp -+++ b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp -@@ -872,6 +872,7 @@ void LayoutNodeAtom::finishBuild(Context* context) { - case AlgorithmAtom::UnknownAlg: - warnMsooXml << "Layout with name=" << m_name << "defines an unknown algorithm."; - // fall through and use the composite-algorithm -+ // fall through - case AlgorithmAtom::CompositeAlg: m_algorithmImpl = new CompositeAlgorithm; break; - case AlgorithmAtom::ConnectorAlg: m_algorithmImpl = new ConnectorAlgorithm; break; - case AlgorithmAtom::CycleAlg: m_algorithmImpl = new CycleAlgorithm; break; -diff --git a/filters/sheets/csv/csvimport.cc b/filters/sheets/csv/csvimport.cc -index 89fb7162e00..1008d186f18 100644 ---- a/filters/sheets/csv/csvimport.cc -+++ b/filters/sheets/csv/csvimport.cc -@@ -97,8 +97,8 @@ KoFilter::ConversionStatus CSVFilter::convert(const QByteArray& from, const QByt - return KoFilter::FileNotFound; - } - -- QString csv_delimiter; - // ###### FIXME: disabled for now -+ //QString csv_delimiter; - //if (!config.isNull()) - // csv_delimiter = config[0]; - -diff --git a/filters/sheets/excel/sidewinder/excel.cpp b/filters/sheets/excel/sidewinder/excel.cpp -index ab592225ca6..7fa5633d433 100644 ---- a/filters/sheets/excel/sidewinder/excel.cpp -+++ b/filters/sheets/excel/sidewinder/excel.cpp -@@ -2449,6 +2449,7 @@ bool ExcelReader::load(Workbook* workbook, const char* filename) - } else { - bytes_read = combObjStream->read( buffer, markerOrLength ); - QString ansiString = readByteString(buffer, markerOrLength); -+ Q_UNUSED(ansiString); - //TODO... - //printf( "markerOrLength=%i ansiString=%s\n",markerOrLength,ansiString.ascii() ); - } -diff --git a/filters/sheets/excel/sidewinder/formulas.cpp b/filters/sheets/excel/sidewinder/formulas.cpp -index 62747469a49..0132d39e024 100644 ---- a/filters/sheets/excel/sidewinder/formulas.cpp -+++ b/filters/sheets/excel/sidewinder/formulas.cpp -@@ -1513,7 +1513,7 @@ static void mergeTokens(UStringStack* stack, unsigned count, const QString &merg - if (!stack) return; - if (stack->size() < count) return; - -- QString s1, s2; -+ QString s1; - - while (count) { - count--; -diff --git a/filters/sheets/gnumeric/gnumericexport.cc b/filters/sheets/gnumeric/gnumericexport.cc -index 1256c68bc74..2468548edb3 100644 ---- a/filters/sheets/gnumeric/gnumericexport.cc -+++ b/filters/sheets/gnumeric/gnumericexport.cc -@@ -1293,15 +1293,13 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const - i = 0; - } - -- QString line; - for (int currentcolumn = 1; currentcolumn <= iMaxColumn; currentcolumn++) { - QDomElement cell_contents; - Cell cell(table, currentcolumn, currentrow); - -- QString text, style; -+ QString text; - QDomDocument domLink; - QDomElement domRoot; -- QDomNode domNode; - QDomNodeList childNodes; - - if (!cell.isDefault() && !cell.isEmpty()) { -@@ -1342,6 +1340,7 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const - text = domNode.toElement().text(); - - while (!domNode.isNull()) { -+ QString style; - style = domNode.toElement().tagName(); - - if (style == "b") -diff --git a/filters/sheets/html/htmlexport.cc b/filters/sheets/html/htmlexport.cc -index 2d116e0608c..bf41a6f743e 100644 ---- a/filters/sheets/html/htmlexport.cc -+++ b/filters/sheets/html/htmlexport.cc -@@ -242,7 +242,6 @@ void HTMLExport::convertSheet(Sheet *sheet, QString &str, int iMaxUsedRow, int i - i = 0; - } - -- QString separators; - QString line; - unsigned int nonempty_cells = 0; - -@@ -435,7 +434,6 @@ void HTMLExport::detectFilledCells(Sheet *sheet, int &rows, int &columns) - int iUsedColumn = 0; - for (int currentcolumn = 1 ; currentcolumn <= iMaxColumn ; currentcolumn++) { - cell = Cell(sheet, currentcolumn, currentrow); -- QString text; - if (!cell.isDefault() && !cell.isEmpty()) { - iUsedColumn = currentcolumn; - } -diff --git a/filters/sheets/latex/export/latexexport.cc b/filters/sheets/latex/export/latexexport.cc -index 8d0698a3420..4f8caf235d9 100644 ---- a/filters/sheets/latex/export/latexexport.cc -+++ b/filters/sheets/latex/export/latexexport.cc -@@ -38,7 +38,6 @@ LATEXExport::LATEXExport(QObject* parent, const QVariantList&) : - - KoFilter::ConversionStatus LATEXExport::convert(const QByteArray& from, const QByteArray& to) - { -- QString config; - - if (to != "text/x-tex" || from != "application/x-kspread") - return KoFilter::NotImplemented; -diff --git a/filters/sheets/latex/export/table.cc b/filters/sheets/latex/export/table.cc -index 8d8b6701a39..e58827dfbc7 100644 ---- a/filters/sheets/latex/export/table.cc -+++ b/filters/sheets/latex/export/table.cc -@@ -118,6 +118,7 @@ void Table::analyzePaper(const QDomNode node) - - /* borders */ - QDomNode border = getChild(node, "borders"); -+ Q_UNUSED(border); - setBorderRight(getAttr(node, "right").toLong()); - setBorderLeft(getAttr(node, "left").toLong()); - setBorderBottom(getAttr(node, "bottom").toLong()); -diff --git a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp -index 782a5914729..eda8ffc6b47 100644 ---- a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp -+++ b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp -@@ -872,7 +872,6 @@ KoFilter::ConversionStatus XlsxXmlWorksheetReader::read_conditionalFormatting() - while (index < m_conditionalIndices.size()) { - QString conditionalArea; - Condition examinedCondition = m_conditionalIndices.at(index); -- QString sqrefOriginal = sqref; - int areaIndex = 0; - Condition previousCond; - -diff --git a/filters/stage/pptx/PptxXmlDocumentReader.cpp b/filters/stage/pptx/PptxXmlDocumentReader.cpp -index 4cf86aea8c8..11b5ad266b9 100644 ---- a/filters/stage/pptx/PptxXmlDocumentReader.cpp -+++ b/filters/stage/pptx/PptxXmlDocumentReader.cpp -@@ -316,7 +316,7 @@ KoFilter::ConversionStatus PptxXmlDocumentReader::read_sldId() - - QString slideMasterPath, slideMasterFile; - MSOOXML::Utils::splitPathAndFile(m_context->relationships->targetForType(slidePath, slideFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideLayout"), &slideMasterPath, &slideMasterFile); -- const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster"); -+ // const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster"); - - // Delay the reading of a tableStyle until we find a table as we need the - // clrMap from the master slide -diff --git a/filters/words/msword-odf/texthandler.cpp b/filters/words/msword-odf/texthandler.cpp -index e167d86e028..89ef678961a 100644 ---- a/filters/words/msword-odf/texthandler.cpp -+++ b/filters/words/msword-odf/texthandler.cpp -@@ -408,6 +408,7 @@ void WordsTextHandler::footnoteFound(wvWare::FootnoteData data, - } - case msonfcUCLetter: - letter = 'A'; -+ // fall through - case msonfcLCLetter: - { - while (noteNumber / 25 > 0) { -@@ -1064,6 +1065,7 @@ void WordsTextHandler::fieldStart(const wvWare::FLD* fld, wvWare::SharedPtr<cons - break; - case UNSUPPORTED: - warnMsDoc << "Warning: Fld data missing, ignoring!"; -+ // fall through - default: - warnMsDoc << "Warning: unrecognized field type, ignoring!"; - m_fld->m_type = UNSUPPORTED; -diff --git a/filters/words/msword-odf/wv2/src/parser9x.cpp b/filters/words/msword-odf/wv2/src/parser9x.cpp -index 9a6d1606ce9..e5d7d14691c 100644 ---- a/filters/words/msword-odf/wv2/src/parser9x.cpp -+++ b/filters/words/msword-odf/wv2/src/parser9x.cpp -@@ -581,7 +581,8 @@ void Parser9x::processPiece( String* string, U32 fc, U32 limit, const Position& - // same ASCII code as TTP_MARK (0x0007), NOTE: table depth == 1 - case CELL_MARK: - m_cellMarkFound = true; -- // Fall-through intended. A row/cell end is also a paragraph end. -+ // A row/cell end is also a paragraph end. -+ // fall through - case PARAGRAPH_MARK: - { - // No "index - start + 1" here, as we don't want to copy the -@@ -1064,6 +1065,7 @@ void Parser9x::emitSpecialCharacter( UChar character, U32 globalCP, SharedPtr<co - if (m_subDocument == Main) { - emitAnnotation( UString(character), globalCP, chp ); - } -+ break; - } - case TextHandler::FieldEscapeChar: - wvlog << "Found an escape character ++++++++++++++++++++?" << endl; -diff --git a/filters/words/msword-odf/wv2/src/styles.cpp b/filters/words/msword-odf/wv2/src/styles.cpp -index f47c3dd8d51..d2c96e3d92b 100644 ---- a/filters/words/msword-odf/wv2/src/styles.cpp -+++ b/filters/words/msword-odf/wv2/src/styles.cpp -@@ -42,7 +42,6 @@ STD::STD() - } - - STD::STD( U16 baseSize, U16 totalSize, OLEStreamReader* stream, bool preservePos ) --throw(InvalidFormatException) - { - clearInternal(); - if (!read( baseSize, totalSize, stream, preservePos )) { -@@ -112,7 +111,6 @@ STD& STD::operator=( const STD& rhs ) - } - - bool STD::read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos ) --throw(InvalidFormatException) - { - U16 shifterU16; - S32 startOffset=stream->tell(); // address where the STD starts -@@ -938,7 +936,7 @@ void Style::mergeUpechpx( const Style* parentStyle, WordVersion version ) - } - - --StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException) -+StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) - : m_udsNum(0) - { - WordVersion version = Word8; -diff --git a/filters/words/msword-odf/wv2/src/styles.h b/filters/words/msword-odf/wv2/src/styles.h -index ba02def6845..41c8278dd21 100644 ---- a/filters/words/msword-odf/wv2/src/styles.h -+++ b/filters/words/msword-odf/wv2/src/styles.h -@@ -58,8 +58,9 @@ struct STD - STD(); - /** - * Simply calls read(...) -+ * @throw InvalidFormatException - */ -- STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException); -+ STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ); - /** - * Attention: This struct allocates memory on the heap - */ -@@ -74,8 +75,9 @@ struct STD - * false the state of stream will be changed! - * - * @return true - success, false - failed -+ * @throw InvalidFormatException - */ -- bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException); -+ bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ); - - /** - * Same as reading :) -@@ -365,7 +367,10 @@ private: - class WV2_EXPORT StyleSheet - { - public: -- StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException); -+ /** -+ * @throw InvalidFormatException -+ */ -+ StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ); - ~StyleSheet(); - - /** -diff --git a/gemini/lib/GeminiMainWindow.cpp b/gemini/lib/GeminiMainWindow.cpp -index 3d05f6461e0..eb5f120c0f7 100644 ---- a/gemini/lib/GeminiMainWindow.cpp -+++ b/gemini/lib/GeminiMainWindow.cpp -@@ -136,8 +136,10 @@ void GeminiMainWindow::setFullScreen(bool newState) - } - - -+ - void GeminiMainWindow::changeState(GeminiMainWindow::GeminiState newState, bool lockNewState) - { -+ Q_UNUSED(lockNewState); - d->syncObject = new GeminiModeSynchronisationObject; - - if(centralWidget()) { -diff --git a/libs/pageapp/KoPAOdfPageSaveHelper.cpp b/libs/pageapp/KoPAOdfPageSaveHelper.cpp -index 92c6dfd4cb4..068501c8af1 100644 ---- a/libs/pageapp/KoPAOdfPageSaveHelper.cpp -+++ b/libs/pageapp/KoPAOdfPageSaveHelper.cpp -@@ -49,7 +49,7 @@ KoPAOdfPageSaveHelper::KoPAOdfPageSaveHelper( KoPADocument * doc, QList<KoPAPage - KoPAPage * p = static_cast<KoPAPage *>( page ); - masterPages.insert( p->masterPage() ); - } -- m_masterPages = masterPages.toList(); -+ m_masterPages = masterPages.values(); - } - } - -diff --git a/plugins/spacenavigator/SpaceNavigatorDevice.h b/plugins/spacenavigator/SpaceNavigatorDevice.h -index b9056ac98c1..ecd696e415f 100644 ---- a/plugins/spacenavigator/SpaceNavigatorDevice.h -+++ b/plugins/spacenavigator/SpaceNavigatorDevice.h -@@ -31,10 +31,8 @@ public: - explicit SpaceNavigatorDevice(QObject *parent); - virtual ~SpaceNavigatorDevice(); - -- /// reimplemented from KoInputDeviceHandler -- virtual bool start(); -- /// reimplemented from KoInputDeviceHandler -- virtual bool stop(); -+ virtual bool start() override; -+ virtual bool stop() override; - private Q_SLOTS: - void slotMoveEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons ); - void slotButtonEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons, Qt::MouseButton, int type ); -diff --git a/plugins/spacenavigator/SpaceNavigatorEvent.h b/plugins/spacenavigator/SpaceNavigatorEvent.h -index 73751ec88ff..76ee8e2f880 100644 ---- a/plugins/spacenavigator/SpaceNavigatorEvent.h -+++ b/plugins/spacenavigator/SpaceNavigatorEvent.h -@@ -33,7 +33,7 @@ public: - void setPosition( int x, int y, int z ); - void setRotation( int rx, int ry, int rz ); - -- virtual KoPointerEvent * pointerEvent(); -+ virtual KoPointerEvent * pointerEvent() override; - - private: - int m_x, m_y, m_z; -diff --git a/plugins/spacenavigator/SpaceNavigatorPollingThread.h b/plugins/spacenavigator/SpaceNavigatorPollingThread.h -index 62c4de8ab73..67d59177021 100644 ---- a/plugins/spacenavigator/SpaceNavigatorPollingThread.h -+++ b/plugins/spacenavigator/SpaceNavigatorPollingThread.h -@@ -39,8 +39,7 @@ Q_SIGNALS: - - protected: - -- /// reimplemented from QThread -- virtual void run(); -+ virtual void run() override; - - private: - bool m_stopped; -diff --git a/plugins/vectorshape/VectorShape.cpp b/plugins/vectorshape/VectorShape.cpp -index a25ab3fc561..9acbd251c94 100644 ---- a/plugins/vectorshape/VectorShape.cpp -+++ b/plugins/vectorshape/VectorShape.cpp -@@ -294,6 +294,7 @@ void VectorShape::saveOdf(KoShapeSavingContext & context) const - break; - case VectorTypeSvg: - mimeType = "image/svg+xml"; -+ break; - default: - // FIXME: What here? - mimeType = "application/x-what"; -diff --git a/sheets/functions/datetime.cpp b/sheets/functions/datetime.cpp -index 9f59fe2cf75..6157b0996c1 100644 ---- a/sheets/functions/datetime.cpp -+++ b/sheets/functions/datetime.cpp -@@ -597,6 +597,7 @@ Value func_currentDate(valVector, ValueCalc * calc, FuncExtra *) - // Function: CURRENTTIME - Value func_currentTime(valVector, ValueCalc * calc, FuncExtra *) - { -+ Q_UNUSED(calc); - return Value(QTime::currentTime()); - } - -diff --git a/sheets/part/Digest.cpp b/sheets/part/Digest.cpp -index 8cd972db989..e9246ce6e7d 100644 ---- a/sheets/part/Digest.cpp -+++ b/sheets/part/Digest.cpp -@@ -596,10 +596,10 @@ static void __rtl_digest_endSHA(DigestContextSHA *ctx) - } - - switch (ctx->m_nDatLen & 0x03) { -- case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; -- case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; -- case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L; -- case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L; -+ case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; /* fall through */ -+ case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; /* fall through */ -+ case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L; /* fall through */ -+ case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L; /* fall through */ - } - - __rtl_digest_swapLong(X, i + 1); -diff --git a/sheets/shape/TableToolFactory.h b/sheets/shape/TableToolFactory.h -index 679bfe14b8e..9412d8ffdc5 100644 ---- a/sheets/shape/TableToolFactory.h -+++ b/sheets/shape/TableToolFactory.h -@@ -34,7 +34,7 @@ public: - TableToolFactory(); - ~TableToolFactory(); - -- KoToolBase* createTool(KoCanvasBase* canvas); -+ KoToolBase* createTool(KoCanvasBase* canvas) override; - }; - - } // namespace Sheets -diff --git a/sheets/tests/TestSort.cpp b/sheets/tests/TestSort.cpp -index b3f1e35169d..6354d79abc5 100644 ---- a/sheets/tests/TestSort.cpp -+++ b/sheets/tests/TestSort.cpp -@@ -68,7 +68,7 @@ void TestSort::AscendingOrder() - command->setSheet(sheet); - - // Parameters. -- command->setSortRows(Qt::Vertical); -+ command->setSortRows(true); - command->setSkipFirst(false); - command->setCopyFormat(false); - -@@ -121,7 +121,7 @@ void TestSort::DescendingOrder() - command->setSheet(sheet); - - // Parameters. -- command->setSortRows(Qt::Vertical); -+ command->setSortRows(true); - command->setSkipFirst(false); - command->setCopyFormat(false); - --- -2.34.1 - diff --git a/0002-Make-show-hidden-row-s-work.patch b/0002-Make-show-hidden-row-s-work.patch deleted file mode 100644 index 6895c3d..0000000 --- a/0002-Make-show-hidden-row-s-work.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 28920c50e6300d643477f256aba91c8c51836682 Mon Sep 17 00:00:00 2001 -From: Dag Andersen danders@get2net.dk -Date: Thu, 11 Jun 2020 10:43:38 +0200 -Subject: [PATCH 02/54] Make show hidden row(s) work - -Check for hidden rows was inverted to check for shown rows, -hence hidden rows would never be unhidden. - -BUG:338816 -BUG:354236 -FIXED-IN:3.2.2 ---- - sheets/commands/RowColumnManipulators.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sheets/commands/RowColumnManipulators.cpp b/sheets/commands/RowColumnManipulators.cpp -index 95282d6e31b..25e8c454e27 100644 ---- a/sheets/commands/RowColumnManipulators.cpp -+++ b/sheets/commands/RowColumnManipulators.cpp -@@ -192,7 +192,7 @@ bool HideShowManipulator::preProcessing() - } - } - for (int row = range.top(); row <= range.bottom(); ++row) { -- if (!m_sheet->rowFormats()->isHidden(row)) { -+ if (m_sheet->rowFormats()->isHidden(row)) { - region.add(QRect(1, row, KS_colMax, 1)); - } - } --- -2.31.1 - diff --git a/0003-Fix-Bug-423038-Annotation-shape-crashes-on-paste.patch b/0003-Fix-Bug-423038-Annotation-shape-crashes-on-paste.patch deleted file mode 100644 index ed11c7a..0000000 --- a/0003-Fix-Bug-423038-Annotation-shape-crashes-on-paste.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2dea3f29791a2c157876824ce3e59291eeb0b200 Mon Sep 17 00:00:00 2001 -From: Dag Andersen danders@get2net.dk -Date: Tue, 16 Jun 2020 10:06:01 +0200 -Subject: [PATCH 03/54] Fix Bug 423038 - Annotation shape crashes on paste - -BUG: 423038 - -Reviewers: -CCMAIL: cbo@boemann.dk ---- - plugins/textshape/AnnotationTextShapeFactory.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/textshape/AnnotationTextShapeFactory.cpp b/plugins/textshape/AnnotationTextShapeFactory.cpp -index 6467222ce32..c28ed1eeb23 100644 ---- a/plugins/textshape/AnnotationTextShapeFactory.cpp -+++ b/plugins/textshape/AnnotationTextShapeFactory.cpp -@@ -103,6 +103,8 @@ KoShape *AnnotationTextShapeFactory::createDefaultShape(KoDocumentResourceManage - document.setChangeTracker(changeTracker); - } - -+ document.setShapeController(documentResources->shapeController()); -+ - //update the resources of the document - annotation->updateDocumentData(); - annotation->setImageCollection(documentResources->imageCollection()); --- -2.31.1 - diff --git a/0008-Fix-comparison-between-QString-and-0.patch b/0008-Fix-comparison-between-QString-and-0.patch deleted file mode 100644 index 0adf4dd..0000000 --- a/0008-Fix-comparison-between-QString-and-0.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 622e3ae6cca729e11e83e56a91db87e3a4ecbf6f Mon Sep 17 00:00:00 2001 -From: David Faure faure@kde.org -Date: Thu, 18 Jun 2020 22:55:10 +0200 -Subject: [PATCH 08/54] Fix comparison between QString and 0. - -Detected with local hack to qstring.h ---- - filters/stage/powerpoint/PptToOdp.cpp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/filters/stage/powerpoint/PptToOdp.cpp b/filters/stage/powerpoint/PptToOdp.cpp -index f5646f7b089..245b314e7fe 100644 ---- a/filters/stage/powerpoint/PptToOdp.cpp -+++ b/filters/stage/powerpoint/PptToOdp.cpp -@@ -3485,7 +3485,7 @@ void PptToOdp::processDeclaration(KoXmlWriter* xmlWriter) - #if 0 - QString headerText = QString::fromLatin1(headerAtom->header, headerAtom->header.size()); - QString hdrName = findDeclaration(Header, headerText); -- if (hdrName == 0 ) { -+ if (hdrName.isEmpty() ) { - hdrName = QString("hdr%1").arg(declaration.values(Header).count() + 1); - insertDeclaration(Header, hdrName, headerText); - } -@@ -3495,7 +3495,7 @@ void PptToOdp::processDeclaration(KoXmlWriter* xmlWriter) - if (headerFooterAtom && headerFooterAtom->fHasFooter && footerAtom) { - QString footerText = QString::fromUtf16(footerAtom->footer.data(), footerAtom->footer.size()); - QString ftrName = findDeclaration(Footer, footerText); -- if ( ftrName == 0) { -+ if ( ftrName.isEmpty() ) { - ftrName = QString("ftr%1").arg((declaration.values(Footer).count() + 1)); - insertDeclaration(Footer, ftrName, footerText); - } -@@ -3505,7 +3505,7 @@ void PptToOdp::processDeclaration(KoXmlWriter* xmlWriter) - if(headerFooterAtom->fHasUserDate && userDateAtom) { - QString userDate = QString::fromUtf16(userDateAtom->userDate.data(), userDateAtom->userDate.size()); - QString dtdName = findDeclaration(DateTime, userDate); -- if ( dtdName == 0) { -+ if ( dtdName.isEmpty() ) { - dtdName = QString("dtd%1").arg((declaration.values(DateTime).count() + 1)); - insertDeclaration(DateTime, dtdName, userDate); - } -@@ -3513,7 +3513,7 @@ void PptToOdp::processDeclaration(KoXmlWriter* xmlWriter) - } - if(headerFooterAtom->fHasTodayDate) { - QString dtdName = findDeclaration(DateTime, ""); -- if ( dtdName == 0) { -+ if ( dtdName.isEmpty() ) { - dtdName = QString("dtd%1").arg((declaration.values(DateTime).count() + 1)); - insertDeclaration(DateTime, dtdName, ""); - } -@@ -3568,7 +3568,7 @@ QString PptToOdp::findDeclaration(DeclarationType type, const QString &text) con - return item.first; - } - } -- return 0; -+ return QString(); - } - - QString PptToOdp::findNotesDeclaration(DeclarationType type, const QString &text) const -@@ -3581,7 +3581,7 @@ QString PptToOdp::findNotesDeclaration(DeclarationType type, const QString &text - return item.first; - } - } -- return 0; -+ return QString(); - } - - void PptToOdp::insertDeclaration(DeclarationType type, const QString &name, const QString &text) --- -2.31.1 - diff --git a/0009-Sheets-Fix-Bug-423474-Selections-not-retained-when-s.patch b/0009-Sheets-Fix-Bug-423474-Selections-not-retained-when-s.patch deleted file mode 100644 index d44db70..0000000 --- a/0009-Sheets-Fix-Bug-423474-Selections-not-retained-when-s.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4788317516dd7d63235819b2f8ee5503221d0abf Mon Sep 17 00:00:00 2001 -From: Dag Andersen dag.andersen@kdemail.net -Date: Thu, 25 Jun 2020 10:09:29 +0200 -Subject: [PATCH 09/54] Sheets: Fix Bug 423474 - Selections not retained when - switching between sheets - -BUG: 423474 ---- - sheets/part/View.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sheets/part/View.cpp b/sheets/part/View.cpp -index 02e43b81b48..8c3d76af78a 100644 ---- a/sheets/part/View.cpp -+++ b/sheets/part/View.cpp -@@ -1266,7 +1266,8 @@ void View::setActiveSheet(Sheet* sheet, bool updateSheet) - d->selection->clear(); - d->selection->setActiveSheet(d->activeSheet); - d->selection->setOriginSheet(d->activeSheet); -- d->selection->initialize(QRect(newMarker, newAnchor)); -+ d->selection->initialize(newAnchor); -+ d->selection->update(newMarker); - - d->actions->showPageOutline->blockSignals(true); - d->actions->showPageOutline->setChecked(d->activeSheet->isShowPageOutline()); --- -2.31.1 - diff --git a/0010-ChartTool-KoFormulaTool-Guard-against-crash-if-activ.patch b/0010-ChartTool-KoFormulaTool-Guard-against-crash-if-activ.patch deleted file mode 100644 index af857ac..0000000 --- a/0010-ChartTool-KoFormulaTool-Guard-against-crash-if-activ.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 3bedba886436fb6cee2d92f446d4674ae431cab0 Mon Sep 17 00:00:00 2001 -From: Dag Andersen dag.andersen@kdemail.net -Date: Tue, 30 Jun 2020 09:08:42 +0200 -Subject: [PATCH 10/54] ChartTool, KoFormulaTool: Guard against crash if - activated without shape - ---- - plugins/chartshape/ChartTool.cpp | 5 ++++- - plugins/formulashape/KoFormulaTool.cpp | 4 ++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/plugins/chartshape/ChartTool.cpp b/plugins/chartshape/ChartTool.cpp -index 33d9bb6d876..3fbf8c49f11 100644 ---- a/plugins/chartshape/ChartTool.cpp -+++ b/plugins/chartshape/ChartTool.cpp -@@ -267,7 +267,10 @@ void ChartTool::activate(ToolActivation, const QSet<KoShape*> &shapes) - void ChartTool::deactivate() - { - debugChartTool<<d->shape; -- -+ if (!d->shape) { -+ // activated without shape -+ return; -+ } - foreach (QWidget *w, optionWidgets()) { - ConfigWidgetBase *configWidget = dynamic_cast<ConfigWidgetBase*>(w); - if (configWidget) -diff --git a/plugins/formulashape/KoFormulaTool.cpp b/plugins/formulashape/KoFormulaTool.cpp -index 6db24cad001..070633348ce 100644 ---- a/plugins/formulashape/KoFormulaTool.cpp -+++ b/plugins/formulashape/KoFormulaTool.cpp -@@ -128,6 +128,10 @@ void KoFormulaTool::deactivate() - for (const TemplateAction &templateAction : koAsConst(m_templateActions)) { - disconnect(templateAction.action, &QAction::triggered, this, nullptr); - } -+ if (!m_formulaShape) { -+ // activated without shape -+ return; -+ } - disconnect(m_formulaShape->formulaData(),0,this,0); - if (canvas()) { - m_cursorList.append(m_formulaEditor); --- -2.31.1 - diff --git a/0018-Fix-assert-with-invalid-.local-share-autocorrect-cus.patch b/0018-Fix-assert-with-invalid-.local-share-autocorrect-cus.patch deleted file mode 100644 index 8b0432c..0000000 --- a/0018-Fix-assert-with-invalid-.local-share-autocorrect-cus.patch +++ /dev/null @@ -1,47 +0,0 @@ -From dcea315173ffc1d5d42aa2734636fe97cd0180d9 Mon Sep 17 00:00:00 2001 -From: David Faure faure@kde.org -Date: Sun, 9 Aug 2020 10:55:41 +0200 -Subject: [PATCH 18/54] Fix assert with invalid - ~/.local/share/autocorrect/custom-en-US.xml - ---- - .../textediting/autocorrection/Autocorrect.cpp | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/plugins/textediting/autocorrection/Autocorrect.cpp b/plugins/textediting/autocorrection/Autocorrect.cpp -index 4d17c0d79c2..61674276e9f 100644 ---- a/plugins/textediting/autocorrection/Autocorrect.cpp -+++ b/plugins/textediting/autocorrection/Autocorrect.cpp -@@ -845,8 +845,12 @@ void Autocorrect::readAutocorrectXmlEntry(const QString &fname, bool onlyCustomi - QDomNodeList nl = doubleQuote.childNodes(); - if(nl.count()==1) { - QDomElement element = nl.item(0).toElement(); -- m_typographicDoubleQuotes.begin = element.attribute(QLatin1String("begin")).at(0); -- m_typographicDoubleQuotes.end = element.attribute(QLatin1String("end")).at(0); -+ const QString beginStr = element.attribute(QLatin1String("begin")); -+ const QString endStr = element.attribute(QLatin1String("end")); -+ if (!beginStr.isEmpty() && !endStr.isEmpty()) { -+ m_typographicDoubleQuotes.begin = beginStr.at(0); -+ m_typographicDoubleQuotes.end = endStr.at(0); -+ } - } - } - -@@ -855,8 +859,12 @@ void Autocorrect::readAutocorrectXmlEntry(const QString &fname, bool onlyCustomi - QDomNodeList nl = singleQuote.childNodes(); - if(nl.count()==1) { - QDomElement element = nl.item(0).toElement(); -- m_typographicSingleQuotes.begin = element.attribute(QLatin1String("begin")).at(0); -- m_typographicSingleQuotes.end = element.attribute(QLatin1String("end")).at(0); -+ const QString beginStr = element.attribute(QLatin1String("begin")); -+ const QString endStr = element.attribute(QLatin1String("end")); -+ if (!beginStr.isEmpty() && !endStr.isEmpty()) { -+ m_typographicSingleQuotes.begin = beginStr.at(0); -+ m_typographicSingleQuotes.end = endStr.at(0); -+ } - } - } - --- -2.31.1 - diff --git a/0019-Repair-KFileWidget-integration.patch b/0019-Repair-KFileWidget-integration.patch deleted file mode 100644 index e40480e..0000000 --- a/0019-Repair-KFileWidget-integration.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4e9bc810ae78efb52dc2e7807032e32b6134a42e Mon Sep 17 00:00:00 2001 -From: David Faure faure@kde.org -Date: Sun, 9 Aug 2020 13:04:00 +0200 -Subject: [PATCH 19/54] Repair KFileWidget integration - -We need to do like KDEPlatformFileDialog and call slotOk, to let it -process the selected files (or the location-lineedit text). ---- - plugins/pictureshape/PictureShapeConfigWidget.cpp | 14 ++++++++++++-- - plugins/pictureshape/PictureShapeConfigWidget.h | 3 +++ - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/plugins/pictureshape/PictureShapeConfigWidget.cpp b/plugins/pictureshape/PictureShapeConfigWidget.cpp -index ac26c7ba8d6..9a7f289f838 100644 ---- a/plugins/pictureshape/PictureShapeConfigWidget.cpp -+++ b/plugins/pictureshape/PictureShapeConfigWidget.cpp -@@ -98,20 +98,30 @@ void PictureShapeConfigWidget::open(KoShape *shape) - m_fileWidget->setMimeFilter(imageFilters); - layout->addWidget(m_fileWidget); - setLayout(layout); -- connect(m_fileWidget, SIGNAL(accepted()), this, SIGNAL(accept())); -+ connect(m_fileWidget, &KFileWidget::accepted, this, &PictureShapeConfigWidget::slotAccept); - } - -+// The page dialog's own accept() is called by the OK button -+// This makes exec() return, then we get here. -+// For KFileWidget, nothing happened yet. It still needs to process things in slotOk. - void PictureShapeConfigWidget::save() - { - if (!m_shape) - return; -+ m_fileWidget->slotOk(); // emits accepted, possibly async -+} -+ -+// Called by slotOk, possibly async -+void PictureShapeConfigWidget::slotAccept() -+{ - m_fileWidget->accept(); -- QUrl url = m_fileWidget->selectedUrl(); -+ const QUrl url = m_fileWidget->selectedUrl(); - if (!url.isEmpty()) { - KIO::StoredTransferJob *job = KIO::storedGet(url, KIO::NoReload, 0); - PictureShapeLoadWaiter *waiter = new PictureShapeLoadWaiter(m_shape); - connect(job, SIGNAL(result(KJob*)), waiter, SLOT(setImageData(KJob*))); - } -+ Q_EMIT accept(); - } - - bool PictureShapeConfigWidget::showOnShapeCreate() -diff --git a/plugins/pictureshape/PictureShapeConfigWidget.h b/plugins/pictureshape/PictureShapeConfigWidget.h -index 83ca0d042b0..ed051915d9b 100644 ---- a/plugins/pictureshape/PictureShapeConfigWidget.h -+++ b/plugins/pictureshape/PictureShapeConfigWidget.h -@@ -43,6 +43,9 @@ public: - /// reimplemented from KoShapeConfigWidgetBase - bool showOnShapeSelect() override; - -+private: -+ void slotAccept(); -+ - private: - PictureShape *m_shape; - KFileWidget *m_fileWidget; --- -2.31.1 - diff --git a/0020-Fix-inserting-a-large-JPEG-image-into-a-presentation.patch b/0020-Fix-inserting-a-large-JPEG-image-into-a-presentation.patch deleted file mode 100644 index 00ccb28..0000000 --- a/0020-Fix-inserting-a-large-JPEG-image-into-a-presentation.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b561c83b5076154f0e22ef57709fcb25c263931 Mon Sep 17 00:00:00 2001 -From: David Faure faure@kde.org -Date: Sun, 9 Aug 2020 14:27:32 +0200 -Subject: [PATCH 20/54] Fix inserting a (large) JPEG image into a presentation - -The format was hardcoded to "png" but the JPEG data was written "as is" -into the temp file (because > 90kB), so loading as PNG failed. ---- - libs/flake/KoImageData.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libs/flake/KoImageData.cpp b/libs/flake/KoImageData.cpp -index 5882360d8cd..c2238b4f42d 100644 ---- a/libs/flake/KoImageData.cpp -+++ b/libs/flake/KoImageData.cpp -@@ -148,6 +148,7 @@ QImage KoImageData::image() const - d->errorCode = OpenFailed; - } - else if (d->errorCode == Success && !d->image.load(d->temporaryFile->fileName(), d->suffix.toLatin1())) { -+ qWarning() << "Failed to open image" << d->temporaryFile->fileName() << "with format" << d->suffix; - d->errorCode = OpenFailed; - } - d->temporaryFile->close(); -@@ -316,6 +317,7 @@ void KoImageData::setImage(const QByteArray &imageData, KoImageCollection *colle - buffer.setData(imageData); - buffer.open(QIODevice::ReadOnly); - d->copyToTemporary(buffer); -+ d->suffix.clear(); // let QImage find out what the data contains - } - - QCryptographicHash md5(QCryptographicHash::Md5); --- -2.31.1 - diff --git a/0032-Remove-duplicated-actions-provided-by-parent-view.patch b/0032-Remove-duplicated-actions-provided-by-parent-view.patch deleted file mode 100644 index 07f582a..0000000 --- a/0032-Remove-duplicated-actions-provided-by-parent-view.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 106fe0496bc197d4b60d8b5a46a5e9d6b16cf6d4 Mon Sep 17 00:00:00 2001 -From: Anthony Fieroni bvbfan@abv.bg -Date: Sun, 17 Jan 2021 21:06:47 +0200 -Subject: [PATCH 32/54] Remove duplicated actions provided by parent view - -BUG: 426801 - -Signed-off-by: Anthony Fieroni bvbfan@abv.bg ---- - karbon/ui/KarbonView.cpp | 73 ++++------------------------------------ - karbon/ui/KarbonView.h | 4 --- - 2 files changed, 6 insertions(+), 71 deletions(-) - -diff --git a/karbon/ui/KarbonView.cpp b/karbon/ui/KarbonView.cpp -index c6946734755..8f30933ba53 100644 ---- a/karbon/ui/KarbonView.cpp -+++ b/karbon/ui/KarbonView.cpp -@@ -152,12 +152,12 @@ public: - Private(KarbonPart *part, KarbonDocument * doc) - : karbonPart(part), part(doc) - , colorBar(0), closePath(0), combinePath(0) -- , separatePath(0), reversePath(0), intersectPath(0), subtractPath(0) -- , unitePath(0), excludePath(0), pathSnapToGrid(0), configureAction(0) -- , deleteSelectionAction(0), clipObjects(0), unclipObjects(0) -- , flipVertical(0), flipHorizontal(0), viewAction(0) -- , snapGridAction(0), showPageMargins(0), showGuidesAction(0) -- , showPaletteAction(0) -+ , separatePath(0), reversePath(0), intersectPath(0) -+ , subtractPath(0), unitePath(0), excludePath(0) -+ , pathSnapToGrid(0), configureAction(0), clipObjects(0) -+ , unclipObjects(0), flipVertical(0), flipHorizontal(0) -+ , viewAction(0), snapGridAction(0), showPageMargins(0) -+ , showGuidesAction(0), showPaletteAction(0) - , status(0), cursorCoords(0), smallPreview(0) - {} - -@@ -176,7 +176,6 @@ public: - QAction * excludePath; - QAction * pathSnapToGrid; - QAction * configureAction; -- QAction * deleteSelectionAction; - QAction * clipObjects; - QAction * unclipObjects; - QAction * flipVertical; -@@ -472,41 +471,6 @@ void KarbonView::selectionDuplicate() - kopaCanvas()->toolProxy()->paste(); - } - --void KarbonView::editSelectAll() --{ -- KoSelection* selection = shapeManager()->selection(); -- if (! selection) { -- return; -- } -- QList<KoShape*> shapes; -- for (int i = 0; i < kopaDocument()->pages().count(); ++i) { -- KoShapeLayer *l = dynamic_cast<KoShapeLayer*>(kopaDocument()->pages().at(i)); -- shapes += l->shapes(); -- } -- debugKarbonUi << "shapes.size() =" << shapes.size(); -- -- foreach(KoShape* shape, shapes) { -- selection->select(shape); -- shape->update(); -- } -- -- selectionChanged(); --} -- --void KarbonView::editDeselectAll() --{ -- KoSelection* selection = shapeManager()->selection(); -- if (selection) -- selection->deselectAll(); -- -- selectionChanged(); --} -- --void KarbonView::editDeleteSelection() --{ -- kopaCanvas()->toolProxy()->deleteSelection(); --} -- - void KarbonView::selectionDistributeHorizontalCenter() - { - selectionDistribute(KoShapeDistributeCommand::HorizontalCenterDistribution); -@@ -906,26 +870,10 @@ void KarbonView::initActions() - if (!mainWindow()) - return; - -- // edit -----> -- QAction *action = actionCollection()->addAction(KStandardAction::Cut, "edit_cut", 0, 0); -- new KoCutController(kopaCanvas(), action); -- action = actionCollection()->addAction(KStandardAction::Copy, "edit_copy", 0, 0); -- new KoCopyController(kopaCanvas(), action); -- action = actionCollection()->addAction(KStandardAction::Paste, "edit_paste", 0, 0); -- new KoPasteController(kopaCanvas(), action); -- actionCollection()->addAction(KStandardAction::SelectAll, "edit_select_all", this, SLOT(editSelectAll())); -- actionCollection()->addAction(KStandardAction::Deselect, "edit_deselect_all", this, SLOT(editDeselectAll())); -- - QAction *actionImportGraphic = new QAction(i18n("&Import Graphic..."), this); - actionCollection()->addAction("file_import", actionImportGraphic); - connect(actionImportGraphic, SIGNAL(triggered()), this, SLOT(fileImportGraphic())); - -- d->deleteSelectionAction = new QAction(koIcon("edit-delete"), i18n("D&elete"), this); -- actionCollection()->addAction("edit_delete", d->deleteSelectionAction); -- d->deleteSelectionAction->setShortcut(QKeySequence("Del")); -- connect(d->deleteSelectionAction, SIGNAL(triggered()), this, SLOT(editDeleteSelection())); -- connect(kopaCanvas()->toolProxy(), SIGNAL(selectionChanged(bool)), d->deleteSelectionAction, SLOT(setEnabled(bool))); -- - QAction *actionEditGuides = new QAction(koIcon("edit-guides"), i18n("Edit Guides"), this); - actionCollection()->addAction("edit_guides", actionEditGuides); - connect(actionEditGuides, SIGNAL(triggered()), this, SLOT(editGuides())); -@@ -975,15 +923,6 @@ void KarbonView::initActions() - d->showPaletteAction->setChecked(true); - connect(d->showPaletteAction, SIGNAL(triggered()), this, SLOT(showPalette())); - -- action = actionCollection()->action("object_group"); -- if (action) { -- action->setShortcut(QKeySequence("Ctrl+G")); -- } -- action = actionCollection()->action("object_ungroup"); -- if (action) { -- action->setShortcut(QKeySequence("Ctrl+Shift+G")); -- } -- - d->clipObjects = new QAction(i18n("&Clip Object"), this); - actionCollection()->addAction("object_clip", d->clipObjects ); - connect(d->clipObjects, SIGNAL(triggered()), this, SLOT(clipObjects())); -diff --git a/karbon/ui/KarbonView.h b/karbon/ui/KarbonView.h -index ffe4c2bbebd..017f59379f8 100644 ---- a/karbon/ui/KarbonView.h -+++ b/karbon/ui/KarbonView.h -@@ -84,10 +84,6 @@ public: - KarbonPaletteBarWidget *colorBar() const; - - public Q_SLOTS: -- // editing: -- void editSelectAll(); -- void editDeselectAll(); -- void editDeleteSelection(); - - void selectionDuplicate(); - void selectionDistributeHorizontalCenter(); --- -2.31.1 - diff --git a/0037-kundo2_aware_xgettext.sh-fix-a-gawk-warning.patch b/0037-kundo2_aware_xgettext.sh-fix-a-gawk-warning.patch deleted file mode 100644 index c26a9d8..0000000 --- a/0037-kundo2_aware_xgettext.sh-fix-a-gawk-warning.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 54ac021920c8975d3fa6fc6ad145627a85f87a9b Mon Sep 17 00:00:00 2001 -From: Luigi Toscano luigi.toscano@tiscali.it -Date: Sun, 21 Mar 2021 23:44:08 +0100 -Subject: [PATCH 37/54] kundo2_aware_xgettext.sh: fix a gawk warning - -The following warning is reported by gawk >= 5 but it really affects -also the previous versions: - -warning: regexp escape sequence `"' is not a known regexp operator -(cherry picked from commit 15b70303e2b433e6fbb10e90924d7dbd801cf960) ---- - kundo2_aware_xgettext.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kundo2_aware_xgettext.sh b/kundo2_aware_xgettext.sh -index b5921d93e2c..0249b68b03d 100644 ---- a/kundo2_aware_xgettext.sh -+++ b/kundo2_aware_xgettext.sh -@@ -38,7 +38,7 @@ function add_ctxt_qtundo() { - mv "${POT_PART_QUNDOFORMAT}" "${POT_PART_QUNDOFORMAT2}" - cat "${POT_PART_QUNDOFORMAT2}" | awk ' - /^msgid "/ { -- if (lastLine !~ /^"/ && lastLine !~ /^msgctxt/ && lastLine != "#, fuzzy") { -+ if (lastLine !~ /^"/ && lastLine !~ /^msgctxt/ && lastLine != "#, fuzzy") { - print "msgctxt "(qtundo-format)"" - } - } --- -2.31.1 - diff --git a/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch b/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch deleted file mode 100644 index 46f6dd0..0000000 --- a/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch +++ /dev/null @@ -1,86 +0,0 @@ -From c7636fb343c848000300a9429410b74d17a4d54d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= omerusta@gmail.com -Date: Tue, 8 Jun 2021 05:13:23 +0000 -Subject: [PATCH 53/54] Partial update of Commit 62f51070 to make it - compileable again - -Cmake to 3.16 -Fix Fontconfig's FOUND variable -Fix Fontconfig's include_dirs variable -Use Correct Target to link FontConfig and Freetype ---- - CMakeLists.txt | 14 +++++--------- - libs/text/CMakeLists.txt | 4 ++-- - 2 files changed, 7 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ce210ebe01..71272ffef2d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8.12) -+cmake_minimum_required(VERSION 3.16) - - project(calligra) - -@@ -168,6 +168,8 @@ calligra_set_productset(${PRODUCTSET}) - ## Look for ECM, Qt, KF5 ## - ########################### - ########################## -+set(REQUIRED_KF5_VERSION "5.7.0") -+set(REQUIRED_QT_VERSION "5.3.0") - - find_package(ECM 5.19 REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -@@ -199,9 +201,6 @@ include(MacroOptionalFindPackage) - include(MacroEnsureVersion) - include(MacroDesktopToJson) - -- --set(REQUIRED_KF5_VERSION "5.7.0") -- - find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED - COMPONENTS - Archive -@@ -251,9 +250,6 @@ if(${KF5_VERSION} VERSION_LESS "5.16.0") - set(CALLIGRA_OLD_PLUGIN_METADATA TRUE) - endif() - -- --set(REQUIRED_QT_VERSION "5.3.0") -- - find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED - COMPONENTS - Core -@@ -641,8 +637,8 @@ if(NOT WIN32 AND NOT APPLE) - ) - endif() - --if(NOT FONTCONFIG_FOUND OR NOT FREETYPE_FOUND) -- set(FONTCONFIG_INCLUDE_DIR "") -+if(NOT Fontconfig_FOUND OR NOT FREETYPE_FOUND) -+ set(Fontconfig_INCLUDE_DIRS "") - set(FREETYPE_INCLUDE_DIRS "") - else() - add_definitions( -DSHOULD_BUILD_FONT_CONVERSION ) -diff --git a/libs/text/CMakeLists.txt b/libs/text/CMakeLists.txt -index 16d7e066fa2..429afe79704 100644 ---- a/libs/text/CMakeLists.txt -+++ b/libs/text/CMakeLists.txt -@@ -152,11 +152,11 @@ if( SHOULD_BUILD_FEATURE_RDF ) - endif() - - if( FONTCONFIG_FOUND ) -- target_link_libraries(kotext PRIVATE ${FONTCONFIG_LIBRARIES}) -+ target_link_libraries(kotext PRIVATE Fontconfig::Fontconfig) - endif() - - if( FREETYPE_FOUND ) -- target_link_libraries(kotext PRIVATE ${FREETYPE_LIBRARIES}) -+ target_link_libraries(kotext PRIVATE Freetype::Freetype) - endif() - - --- -2.31.1 - diff --git a/calligra-c++17.patch b/calligra-c++17.patch deleted file mode 100644 index 610958e..0000000 --- a/calligra-c++17.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- calligra-3.2.1/CMakeLists.txt -+++ calligra-3.2.1/CMakeLists.txt -@@ -108,7 +108,7 @@ message(STATUS "Release build: ${RELEASE - if (CMAKE_VERSION VERSION_LESS "3.1") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - else () -- set (CMAKE_CXX_STANDARD 11) -+ set (CMAKE_CXX_STANDARD 17) - endif () - - ############ diff --git a/calligra-c++20.patch b/calligra-c++20.patch deleted file mode 100644 index 4f2a255..0000000 --- a/calligra-c++20.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 7ef44c6864cc77abb529e11f83e01ae7dc7d5061 Mon Sep 17 00:00:00 2001 -From: Heiko Becker heiko.becker@kde.org -Date: Thu, 23 May 2024 22:11:28 +0200 -Subject: Require C++20 to fix the build with poppler>=24.05 - -poppler >= 24.05.0 started to use std::string's starts_with and -ends_with [1] in a public header, but these are only available with -C++20. - -[1] https://gitlab.freedesktop.org/poppler/poppler/-/commit/fbb64544e5ea25ac9b1b... - ---- calligra-3.2.1/CMakeLists.txt -+++ calligra-3.2.1/CMakeLists.txt -@@ -108,7 +108,7 @@ message(STATUS "Release build: ${RELEASE - if (CMAKE_VERSION VERSION_LESS "3.1") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - else () -- set (CMAKE_CXX_STANDARD 17) -+ set (CMAKE_CXX_STANDARD 20) - endif () - - ############ ---- calligra-3.2.1/libs/pigment/lut.h -+++ calligra-3.2.1/libs/pigment/lut.h -@@ -143,7 +143,7 @@ typedef uint32_t lut_uint32; - template<> \ - class LutKey<_INT_TYPE_> { \ - public: \ -- LutKey<_INT_TYPE_>(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) \ -+ LutKey(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) \ - { \ - } \ - public: \ -@@ -183,7 +183,7 @@ PARTIAL_LUT_INT_SPECIALIZATION(lut_uint3 - template<> \ - class FullLutKey<_INT_TYPE_> { \ - public: \ -- FullLutKey<_INT_TYPE_>() \ -+ FullLutKey() \ - { \ - } \ - public: \ -@@ -233,7 +233,7 @@ class LutKey<float> { - float f; - }; - public: -- LutKey<float>(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision) -+ LutKey(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision) - { - // Those values where computed using the test_linear and setting the shift and then using - // the standard deviation. diff --git a/calligra-c99.patch b/calligra-c99.patch deleted file mode 100644 index c6f2979..0000000 --- a/calligra-c99.patch +++ /dev/null @@ -1,17 +0,0 @@ -Avoid implicit declaration of atoi in CMake check. Future compilers -will not support implicit function declarations by default, so include -<stdlib.h> for a declaration of atoi. - -Submitted upstream: - - https://invent.kde.org/office/calligra/-/merge_requests/81 - -diff --git a/cmake/TestModernZlib.c b/cmake/TestModernZlib.c -index f7c6a0429f16b548..c9a790caaf903cbc 100644 ---- a/cmake/TestModernZlib.c -+++ b/cmake/TestModernZlib.c -@@ -1,3 +1,4 @@ -+#include <stdlib.h> - #include <string.h> - #include <zlib.h> - diff --git a/calligra-disable_products.patch b/calligra-disable_products.patch index bd8a57d..2e449d2 100644 --- a/calligra-disable_products.patch +++ b/calligra-disable_products.patch @@ -1,14 +1,15 @@ -diff -up calligra-3.2.0/CMakeLists.txt.disable_products calligra-3.2.0/CMakeLists.txt ---- calligra-3.2.0/CMakeLists.txt.disable_products 2020-04-24 10:58:02.572031256 -0500 -+++ calligra-3.2.0/CMakeLists.txt 2020-04-24 10:58:33.687367280 -0500 -@@ -1069,6 +1069,10 @@ calligra_drop_products_on_old_flag(words +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fbeb00ca429..4e645f19025 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -933,6 +933,10 @@ calligra_drop_products_on_old_flag(words PART_WORDS APP_WORDS) + # by calling calligra_disable_product with the product id and the reason, + # 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") +calligra_disable_product(APP_CSTESTER "not wanted in fedora packaging") +calligra_disable_product(APP_DEVTOOLS "not wanted in fedora packaging") -+calligra_disable_product(APP_GEMINI "not wanted in fedora packaging") -+calligra_disable_product(PART_COMPONENTS "not wanted in fedora packaging") ++calligra_disable_product(PART_COMPONENTS "not used since Gemini is disabled")
############################################# #### Calculate buildable products #### diff --git a/calligra-gcc11.patch b/calligra-gcc11.patch deleted file mode 100644 index c478958..0000000 --- a/calligra-gcc11.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/filters/sheets/excel/sidewinder/chartsubstreamhandler.cpp b/filters/sheets/excel/sidewinder/chartsubstreamhandler.cpp -index feac1c6..5739328 100644 ---- a/filters/sheets/excel/sidewinder/chartsubstreamhandler.cpp -+++ b/filters/sheets/excel/sidewinder/chartsubstreamhandler.cpp -@@ -19,6 +19,7 @@ - Boston, MA 02110-1301, USA - */ - -+#include <limits> - #include "chartsubstreamhandler.h" - #include "globalssubstreamhandler.h" - #include "worksheetsubstreamhandler.h" -diff --git a/filters/sheets/excel/sidewinder/objects.cpp b/filters/sheets/excel/sidewinder/objects.cpp -index 7531dd7..6cbca37 100644 ---- a/filters/sheets/excel/sidewinder/objects.cpp -+++ b/filters/sheets/excel/sidewinder/objects.cpp -@@ -17,6 +17,7 @@ - Boston, MA 02110-1301, USA - */ - -+#include <limits> - #include "objects.h" - - #include "generated/simpleParser.h" -diff --git a/filters/sheets/excel/sidewinder/utils.h b/filters/sheets/excel/sidewinder/utils.h -index 6e012b2..61d7624 100644 ---- a/filters/sheets/excel/sidewinder/utils.h -+++ b/filters/sheets/excel/sidewinder/utils.h -@@ -23,6 +23,7 @@ - - #include "value.h" - #include <map> -+#include <limits> - - #include <QString> - #include <QUuid> -diff --git a/filters/sheets/excel/sidewinder/value.cpp b/filters/sheets/excel/sidewinder/value.cpp -index bfa3351..3007058 100644 ---- a/filters/sheets/excel/sidewinder/value.cpp -+++ b/filters/sheets/excel/sidewinder/value.cpp -@@ -17,6 +17,7 @@ - * Boston, MA 02110-1301, USA - */ - -+#include <limits> - #include "value.h" - #include "utils.h" - diff --git a/calligra-poppler-22.08.0-1.patch b/calligra-poppler-22.08.0-1.patch deleted file mode 100644 index ff5539d..0000000 --- a/calligra-poppler-22.08.0-1.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 236bacbe13739414e919de868283b0caf2df5d8a Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid aacid@kde.org -Date: Wed, 13 Apr 2022 01:25:44 +0200 -Subject: PdfImport: Fix compile with newer poppler - -Brings a dependency on poppler-qt5 to be able to include the version -header, honestly it's not strictly needed, one could do a -check_cxx_source_compiles, but I don't care about Calligra enough to -spend more time making it compile while it's using poppler the wrong -way. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 51f1d65b8e6..06bbad5c24c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -952,6 +952,7 @@ calligra_drop_product_on_bad_condition( FILTER_WPG_TO_ODG - calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG - NOT_WIN "not supported on Windows" - PopplerXPDFHeaders_FOUND "poppler xpdf headers not found" -+ Poppler_FOUND "poppler qt5 headers not found" - ) - - calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS -diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt -index 8fddf1ad757..b71c92cbf04 100644 ---- a/filters/karbon/pdf/CMakeLists.txt -+++ b/filters/karbon/pdf/CMakeLists.txt -@@ -3,7 +3,7 @@ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) - add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) - calligra_filter_desktop_to_json(calligra_filter_pdf2svg calligra_filter_pdf2svg.desktop) - --target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core) -+target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core Poppler::Qt5) - - install(TARGETS calligra_filter_pdf2svg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters) - -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index abbe681b4e8..e97974fc133 100644 ---- a/filters/karbon/pdf/PdfImport.cpp -+++ b/filters/karbon/pdf/PdfImport.cpp -@@ -17,6 +17,10 @@ - - #include <kpluginfactory.h> - -+#include <poppler-version.h> -+ -+#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) -+ - // Don't show this warning: it's an issue in poppler - #ifdef __GNUC__ - #pragma GCC diagnostic ignored "-Wunused-parameter" -@@ -54,8 +58,13 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - if (! globalParams) - return KoFilter::NotImplemented; - -+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) - GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); - PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); -+#else -+ std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data()); -+ PDFDoc * pdfDoc = new PDFDoc(std::move(fname)); -+#endif - if (! pdfDoc) { - #ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; diff --git a/calligra-poppler-22.08.0-2.patch b/calligra-poppler-22.08.0-2.patch deleted file mode 100644 index d6f5b20..0000000 --- a/calligra-poppler-22.08.0-2.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 6b75bec784c9835c78993349845d8c2ef22ec3de Mon Sep 17 00:00:00 2001 -From: Dag Andersen dag.andersen@kdemail.net -Date: Wed, 13 Apr 2022 14:45:33 +0200 -Subject: PdfImport: Fix compile with newer poppler - -Also fixes odg2pdf filter. - -Same solution as commit 236bacbe13739414e919de868283b0caf2df5d8a -by accid@kde.org. - -diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt -index b71c92cbf04..4ce138ccdd6 100644 ---- a/filters/karbon/pdf/CMakeLists.txt -+++ b/filters/karbon/pdf/CMakeLists.txt -@@ -13,6 +13,6 @@ set(pdf2odg_PART_SRCS PdfImportDebug.cpp Pdf2OdgImport.cpp SvgOutputDev.cpp) - add_library(calligra_filter_pdf2odg MODULE ${pdf2odg_PART_SRCS}) - calligra_filter_desktop_to_json(calligra_filter_pdf2odg calligra_filter_pdf2odg.desktop) - --target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core) -+target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core Poppler::Qt5) - - install(TARGETS calligra_filter_pdf2odg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters) -diff --git a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp -index 934e31dd5aa..a21eac97a77 100644 ---- a/filters/karbon/pdf/Pdf2OdgImport.cpp -+++ b/filters/karbon/pdf/Pdf2OdgImport.cpp -@@ -27,6 +27,8 @@ - - #include <kpluginfactory.h> - -+#include <poppler-version.h> -+ - // Don't show this warning: it's an issue in poppler - #ifdef __GNUC__ - #pragma GCC diagnostic ignored "-Wunused-parameter" -@@ -36,6 +38,8 @@ - #include <PDFDoc.h> - #include <GlobalParams.h> - -+#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) -+ - K_PLUGIN_FACTORY_WITH_JSON(Pdf2OdgImportFactory, "calligra_filter_pdf2odg.json", - registerPlugin<Pdf2OdgImport>();) - -@@ -69,8 +73,13 @@ KoFilter::ConversionStatus Pdf2OdgImport::convert(const QByteArray& from, const - if (! globalParams) - return KoFilter::NotImplemented; - -+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) - GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); - PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); -+#else -+ std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data()); -+ PDFDoc * pdfDoc = new PDFDoc(std::move(fname)); -+#endif - if (! pdfDoc) { - #ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 0e6e5a934ca..7caec15175a 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -22,6 +22,10 @@ - #include <QPen> - #include <QImage> - -+#include <poppler-version.h> -+ -+#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) -+ - class SvgOutputDev::Private - { - public: -@@ -386,7 +390,12 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - if (s->getLength() == 0) - return; - -+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) - GfxFont * font = state->getFont(); -+#else -+ std::shared_ptr<GfxFont> font = state->getFont(); -+#endif -+ - - QString str; - diff --git a/calligra.spec b/calligra.spec index 4cdd3e5..2d7ef24 100644 --- a/calligra.spec +++ b/calligra.spec @@ -1,339 +1,172 @@ - -# koffice version to Obsolete -%global koffice_ver 3:2.3.70 - -%global pstoedit 1 -%global marble 1 -%global visio 1 -%global wpd 1 -%if 0%{?fedora} > 25 -# Switch this back to 1 once the build issue is resolved -%global okular 0 -%endif +%bcond pstoedit 1 +# used only in RDF; Soprano has not been updated since Qt4 +%bcond marble 0 +%bcond visio 1 +%bcond wpd 1 +%bcond okular 1
#global external_lilypond_fonts 1
-# trim changelog included in binary rpms -%global _changelog_trimtime %(date +%s -d "1 year ago") - Name: calligra -Version: 3.2.1 -Release: 34%{?dist} +Version: 4.0.1 +Release: 1%{?dist} Summary: An integrated office suite
-# Automatically converted from old format: GPLv2+ and LGPLv2+ - review is highly recommended. -License: GPL-2.0-or-later AND LicenseRef-Callaway-LGPLv2+ -URL: http://www.calligra-suite.org/ +License: GPL-2.0-or-later AND GPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.0-only AND LGPL-2.1-only AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause AND BSD-2-Clause +URL: https://calligra.org/ %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable %else %global stable stable %endif -Source0: http://download.kde.org/%%7Bstable%7D/calligra/%%7Bversion%7D/calligra-%%7Bv... +Source0: https://download.kde.org/%%7Bstable%7D/calligra/calligra-%%7Bversion%7D.tar....
## upstream patches -Patch2: 0002-Make-show-hidden-row-s-work.patch -Patch3: 0003-Fix-Bug-423038-Annotation-shape-crashes-on-paste.patch -Patch8: 0008-Fix-comparison-between-QString-and-0.patch -Patch9: 0009-Sheets-Fix-Bug-423474-Selections-not-retained-when-s.patch -Patch10: 0010-ChartTool-KoFormulaTool-Guard-against-crash-if-activ.patch -Patch18: 0018-Fix-assert-with-invalid-.local-share-autocorrect-cus.patch -Patch19: 0019-Repair-KFileWidget-integration.patch -Patch20: 0020-Fix-inserting-a-large-JPEG-image-into-a-presentation.patch -Patch32: 0032-Remove-duplicated-actions-provided-by-parent-view.patch -Patch37: 0037-kundo2_aware_xgettext.sh-fix-a-gawk-warning.patch -Patch53: 0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch -# Needed for compiling with C++17 -Patch54: 0001-Fix-some-more-warnings.patch -Patch55: calligra-poppler-22.08.0-1.patch -Patch56: calligra-poppler-22.08.0-2.patch
## upstreamable patches
## downstream patches -# FIXME/TODO: (re)enable gemini for propper packaging Patch200: calligra-disable_products.patch
-# Fix missing #includes for gcc-11 -Patch201: calligra-gcc11.patch - -# Switch to C++17 because poppler needs it -Patch202: calligra-c++17.patch -Patch203: calligra-c99.patch -# Switch to C++20 because poppler needs it -Patch204: calligra-c++20.patch - # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86}
-BuildRequires: boost-devel -BuildRequires: bzip2-devel bzip2 BuildRequires: desktop-file-utils BuildRequires: doxygen +BuildRequires: gcc-c++ BuildRequires: libappstream-glib -BuildRequires: pkgconfig(eigen3) -BuildRequires: pkgconfig(exiv2) -BuildRequires: pkgconfig(fftw3) -BuildRequires: pkgconfig(fontconfig) -BuildRequires: freeglut-devel -BuildRequires: gettext-devel -BuildRequires: giflib-devel -BuildRequires: pkgconfig(glew) -BuildRequires: pkgconfig(GraphicsMagick) -BuildRequires: pkgconfig(gsl)
-BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(gl) pkgconfig(glu) -%if 0%{?marble} -BuildRequires: marble-widget-qt5-devel +# kf6 deps +BuildRequires: extra-cmake-modules +BuildRequires: kf6-rpm-macros +BuildRequires: cmake(KF6Archive) +BuildRequires: cmake(KF6Completion) +BuildRequires: cmake(KF6Config) +BuildRequires: cmake(KF6ConfigWidgets) +BuildRequires: cmake(KF6CoreAddons) +BuildRequires: cmake(KF6Crash) +BuildRequires: cmake(KF6DocTools) +BuildRequires: cmake(KF6GuiAddons) +BuildRequires: cmake(KF6I18n) +BuildRequires: cmake(KF6IconThemes) +BuildRequires: cmake(KF6ItemViews) +BuildRequires: cmake(KF6JobWidgets) +BuildRequires: cmake(KF6KCMUtils) +BuildRequires: cmake(KF6KIO) +BuildRequires: cmake(KF6Notifications) +BuildRequires: cmake(KF6NotifyConfig) +BuildRequires: cmake(KF6Sonnet) +BuildRequires: cmake(KF6TextWidgets) +BuildRequires: cmake(KF6WidgetsAddons) +BuildRequires: cmake(KF6WindowSystem) +BuildRequires: cmake(KF6XmlGui) +BuildRequires: cmake(KF6DBusAddons) + +# qt6 deps +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6Network) +BuildRequires: cmake(Qt6PrintSupport) +BuildRequires: cmake(Qt6Svg) +BuildRequires: cmake(Qt6Test) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Xml) +BuildRequires: cmake(Qt6Quick) +BuildRequires: cmake(Qt6QuickControls2) +BuildRequires: cmake(Qt6OpenGL) +BuildRequires: cmake(Qt6Sql) +%ifarch %{qt6_qtwebengine_arches} +BuildRequires: cmake(Qt6WebEngineWidgets) %endif -%if 0%{?wpd} -%if 0%{?visio} -BuildRequires: pkgconfig(libvisio-0.1) +BuildRequires: cmake(Qt6DBus) + +# other required deps +BuildRequires: perl-interpreter +BuildRequires: zlib-devel +BuildRequires: cmake(Qt6Keychain) +BuildRequires: boost-devel + +# optional deps +BuildRequires: cmake(Imath) +BuildRequires: pkgconfig(gsl) +BuildRequires: cmake(Phonon4Qt6) +#BuildRequires: cmake(KF6CalendarCore) +#BuildRequires: cmake(KF6Contacts) +#BuildRequires: cmake(KPim6Akonadi) +BuildRequires: cmake(KChart6) +BuildRequires: pkgconfig(eigen3) +BuildRequires: cmake(Qca-qt6) +%if %{with marble} +BuildRequires: cmake(Marble) %endif -BuildRequires: pkgconfig(libetonyek-0.1) -BuildRequires: pkgconfig(libodfgen-0.1) +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(shared-mime-info) +%if %{with wpd} BuildRequires: pkgconfig(librevenge-0.0) +BuildRequires: pkgconfig(librevenge-stream-0.0) +BuildRequires: pkgconfig(libodfgen-0.1) BuildRequires: pkgconfig(libwpd-0.10) BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.4) +%if %{with visio} +BuildRequires: pkgconfig(libvisio-0.1) %endif -BuildRequires: cmake(OpenColorIO) -BuildRequires: pkgconfig(libpng) -BuildRequires: libicu-devel -BuildRequires: libspnav-devel -BuildRequires: libtiff-devel -BuildRequires: pkgconfig(libxslt) -BuildRequires: pkgconfig(glib-2.0) -# As of OpenEXR 3 upstream has significantly reorganized the libraries -# including splitting out imath as a standalone library (which this project may -# or may not need). Please see -# https://github.com/AcademySoftwareFoundation/Imath/blob/master/docs/PortingG... -# for porting details and encourage upstream to support it. For now a 2.x -# compat package is provided. -%if 0%{?fedora} > 33 -BuildRequires: cmake(OpenEXR) < 3 -%else -BuildRequires: pkgconfig(OpenEXR) < 3 -%endif -BuildRequires: perl-interpreter -BuildRequires: pkgconfig(poppler-qt5) -BuildRequires: cmake(Qca-qt5) -BuildRequires: readline-devel -BuildRequires: pkgconfig(sqlite3) - -# kf5 -BuildRequires: extra-cmake-modules -BuildRequires: kf5-rpm-macros -BuildRequires: cmake(KF5Activities) -BuildRequires: cmake(KF5Archive) -BuildRequires: cmake(KF5Codecs) -BuildRequires: cmake(KF5Completion) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5KHtml) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5ItemViews) -BuildRequires: cmake(KF5JobWidgets) -BuildRequires: cmake(KF5KCMUtils) -BuildRequires: cmake(KF5KDELibs4Support) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5Kross) -BuildRequires: cmake(KF5Notifications) -BuildRequires: cmake(KF5NotifyConfig) -BuildRequires: cmake(KF5Parts) -BuildRequires: cmake(KF5Sonnet) -BuildRequires: cmake(KF5TextWidgets) -BuildRequires: cmake(KF5ThreadWeaver) -BuildRequires: cmake(KF5Wallet) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(KF5XmlGui) - -# qt5 -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Network) -BuildRequires: cmake(Qt5PrintSupport) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5Widgets) -BuildRequires: cmake(Qt5Xml) -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5OpenGL) -BuildRequires: cmake(Qt5Quick) -BuildRequires: cmake(Qt5Sql) -BuildRequires: cmake(Qt5WebKit) -BuildRequires: cmake(Qt5WebKitWidgets) -BuildRequires: cmake(Qt5X11Extras) -## optional qtquick1 components, retired in fedora, so let's omit this -#BuildRequires: cmake(Qt5Declarative) - -BuildRequires: cmake(Phonon4Qt5) - -BuildRequires: cmake(KF5Contacts) -# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches -%ifarch %{qt5_qtwebengine_arches} -BuildRequires: cmake(KF5Akonadi) +BuildRequires: pkgconfig(libetonyek-0.1) %endif +BuildRequires: pkgconfig(poppler-qt6) +BuildRequires: pkgconfig(poppler) +BuildRequires: pkgconfig(libgit2)
-BuildRequires: cmake(Qca-qt5) - -BuildRequires: git-core -BuildRequires: libgit2-devel - -BuildRequires: cmake(KChart) >= 2.7 -BuildRequires: cmake(KGantt) >= 2.7 - -## not used anymore, but may be re-added when their API stabilizes -#BuildRequires: cmake(KReport) -#BuildRequires: cmake(KPropertyWidgets) - - -# * Git -# * Qca-qt5 (required version >= 2.1.0), Qt Cryptographic Architecture, http:/download.kde.org/stable/qca-qt5 -# Required for encrypted OpenDocument files and encrypted xls files support (available as a module in kdesupport) -# * Vc (required version >= 1.1.0), Portable, zero-overhead SIMD library for C++, https://github.com/VcDevel/Vc -# Required by the pigment for vectorization -# * Libgit2 -# * Libqgit2 +# -- The following OPTIONAL packages have not been found: +# * Qt6QmlCompilerPlusPrivate # * Cauchy, Cauchy's M2MML, a Matlab/Octave to MathML compiler, https://bitbucket.org/cyrille/cauchy # Required for the matlab/octave formula tool # * OOoSDK
-Obsoletes: koffice < %{koffice_ver} -Obsoletes: koffice-suite < %{koffice_ver} - -Requires: %{name}-words = %{version}-%{release} -Requires: %{name}-sheets = %{version}-%{release} -Requires: %{name}-stage = %{version}-%{release} -Requires: %{name}-karbon = %{version}-%{release} -%if 0%{?okular} -Requires: %{name}-okular-odpgenerator = %{version}-%{release} -Requires: %{name}-okular-odtgenerator = %{version}-%{release} -%endif +Requires: %{name}-words%{?_isa} = %{version}-%{release} +Requires: %{name}-sheets%{?_isa} = %{version}-%{release} +Requires: %{name}-stage%{?_isa} = %{version}-%{release} +Requires: %{name}-karbon%{?_isa} = %{version}-%{release}
%description %{summary}.
-%package core -Summary: Core support files for %{name} -Obsoletes: koffice-core < %{koffice_ver} -Obsoletes: koffice-filters < %{koffice_ver} -Obsoletes: calligra-filters < 2.3.86-3 -Provides: calligra-filters = %{version}-%{release} -Obsoletes: %{name}-kformula < 2.4.0 -Obsoletes: %{name}-kformula-libs < 2.4.0 -Obsoletes: %{name}-author < 3.0 -Obsoletes: %{name}-flow < 3.0.1-6 -Obsoletes: %{name}-flow-libs < 3.0.1-6 -Obsoletes: %{name}-map-shape < 3.0 -Obsoletes: %{name}-qtquick < 3.0 -Obsoletes: %{name}-semanticitems < 3.0 -%if ! 0%{?okular} -Obsoletes: %{name}-okular-odpgenerator < %{version}-%{release} -Obsoletes: %{name}-okular-odtgenerator < %{version}-%{release} +%package data +Summary: Runtime support files for %{name} +%if %{undefined flatpak} +Requires: color-filesystem %endif -Obsoletes: %{name}-reports-map-element < 3.0 -Obsoletes: %{name}-kexi-map-form-widget < 3.0 -Obsoletes: %{name}-braindump < 3.0.0 -Obsoletes: %{name}-braindump-libs < 3.0.0 %if 0%{?external_lilypond_fonts} Requires: lilypond-emmentaler-fonts %endif -Requires: color-filesystem -# formulashape fonts -Requires: lyx-fonts -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%description core +Obsoletes: %{name}-core < 4 +%if %{without okular} +Obsoletes: %{name}-okular-odpgenerator < %{version}-%{release} +Obsoletes: %{name}-okular-odtgenerator < %{version}-%{release} +%endif +BuildArch: noarch +%description data %{summary}.
%package libs -Summary: Runtime libraries for %{name} -Obsoletes: koffice-libs < %{koffice_ver} -Obsoletes: calligra-devel < 3.0 -Obsoletes: calligra-kdchart < 3.0 -Obsoletes: calligra-kdchart-devel < 3.0 -Obsoletes: koffice-devel < 3:2.3.70 +Summary: Runtime libraries for %{name} +Requires: %{name}-data = %{version}-%{release} %description libs %{summary}.
%package l10n Summary: Language files for calligra -Obsoletes: calligra-l10n-bs < 3.0 -Obsoletes: calligra-l10n-ca < 3.0 -Obsoletes: calligra-l10n-cs < 3.0 -Obsoletes: calligra-l10n-da < 3.0 -Obsoletes: calligra-l10n-de < 3.0 -Obsoletes: calligra-l10n-el < 3.0 -Obsoletes: calligra-l10n-en_GB < 3.0 -Obsoletes: calligra-l10n-es < 3.0 -Obsoletes: calligra-l10n-et < 3.0 -Obsoletes: calligra-l10n-fi < 3.0 -Obsoletes: calligra-l10n-fr < 3.0 -Obsoletes: calligra-l10n-gl < 3.0 -Obsoletes: calligra-l10n-hu < 3.0 -Obsoletes: calligra-l10n-it < 3.0 -Obsoletes: calligra-l10n-ja < 3.0 -Obsoletes: calligra-l10n-kk < 3.0 -Obsoletes: calligra-l10n-nb < 3.0 -Obsoletes: calligra-l10n-nl < 3.0 -Obsoletes: calligra-l10n-pl < 3.0 -Obsoletes: calligra-l10n-pt < 3.0 -Obsoletes: calligra-l10n-pt_BR < 3.0 -Obsoletes: calligra-l10n-ru < 3.0 -Obsoletes: calligra-l10n-sk < 3.0 -Obsoletes: calligra-l10n-sv < 3.0 -Obsoletes: calligra-l10n-tr < 3.0 -Obsoletes: calligra-l10n-uk < 3.0 -Obsoletes: calligra-l10n-zh_CN < 3.0 -Obsoletes: calligra-l10n-zh_TW < 3.0 -Provides: calligra-l10n-bs = %{version}-%{release} -Provides: calligra-l10n-ca = %{version}-%{release} -Provides: calligra-l10n-cs = %{version}-%{release} -Provides: calligra-l10n-da = %{version}-%{release} -Provides: calligra-l10n-de = %{version}-%{release} -Provides: calligra-l10n-el = %{version}-%{release} -Provides: calligra-l10n-en_GB = %{version}-%{release} -Provides: calligra-l10n-es = %{version}-%{release} -Provides: calligra-l10n-et = %{version}-%{release} -Provides: calligra-l10n-fi = %{version}-%{release} -Provides: calligra-l10n-fr = %{version}-%{release} -Provides: calligra-l10n-gl = %{version}-%{release} -Provides: calligra-l10n-hu = %{version}-%{release} -Provides: calligra-l10n-it = %{version}-%{release} -Provides: calligra-l10n-ja = %{version}-%{release} -Provides: calligra-l10n-kk = %{version}-%{release} -Provides: calligra-l10n-nb = %{version}-%{release} -Provides: calligra-l10n-nl = %{version}-%{release} -Provides: calligra-l10n-pl = %{version}-%{release} -Provides: calligra-l10n-pt = %{version}-%{release} -Provides: calligra-l10n-pt_BR = %{version}-%{release} -Provides: calligra-l10n-ru = %{version}-%{release} -Provides: calligra-l10n-sk = %{version}-%{release} -Provides: calligra-l10n-sv = %{version}-%{release} -Provides: calligra-l10n-tr = %{version}-%{release} -Provides: calligra-l10n-uk = %{version}-%{release} -Provides: calligra-l10n-zh_CN = %{version}-%{release} -Provides: calligra-l10n-zh_TW = %{version}-%{release} -# not *strictly* required, but helps ensure -l10n,-core, and other pkg versions match -Requires: %{name}-core = %{version}-%{release} +# not *strictly* required, but helps ensure -l10n,-data, and other pkg versions match +Requires: %{name}-data = %{version}-%{release} BuildArch: noarch %description l10n %{summary}.
%package words Summary: An intuitive word processor application with desktop publishing features -Obsoletes: koffice-kword < %{koffice_ver} -Obsoletes: koffice-kword-libs < %{koffice_ver} -Requires: %{name}-core = %{version}-%{release} Requires: %{name}-words-libs%{?_isa} = %{version}-%{release} -%{?kf5_kinit_requires} %description words KWord is an intuitive word processor and desktop publisher application. With it, you can create informative and attractive documents with @@ -341,19 +174,13 @@ pleasure and ease.
%package words-libs Summary: Runtime libraries for %{name}-words -Requires: %{name}-words = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description words-libs %{summary}.
%package sheets Summary: A fully-featured spreadsheet application -Obsoletes: koffice-kspread < %{koffice_ver} -Obsoletes: koffice-kspread-libs < %{koffice_ver} -Obsoletes: calligra-tables < 2.3.92 -Provides: calligra-tables = %{version}-%{release} -Requires: %{name}-core = %{version}-%{release} Requires: %{name}-sheets-libs%{?_isa} = %{version}-%{release} -%{?kf5_kinit_requires} %description sheets Tables is a fully-featured calculation and spreadsheet tool. Use it to quickly create and calculate various business-related spreadsheets, such @@ -361,18 +188,13 @@ as income and expenditure, employee working hours…
%package sheets-libs Summary: Runtime libraries for %{name}-sheets -Obsoletes: calligra-tables-libs < 2.3.92 -Requires: %{name}-sheets = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description sheets-libs %{summary}.
%package stage Summary: A full-featured presentation program -Obsoletes: koffice-kpresenter < %{koffice_ver} -Obsoletes: koffice-kpresenter-libs < %{koffice_ver} -Requires: %{name}-core = %{version}-%{release} Requires: %{name}-stage-libs%{?_isa} = %{version}-%{release} -# when -libs was introduced %description stage Stage is a powerful and easy to use presentation application. You can dazzle your audience with stunning slides containing images, videos, @@ -380,22 +202,18 @@ animation and more.
%package stage-libs Summary: Runtime libraries for %{name}-stage -Requires: %{name}-stage = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description stage-libs %{summary}.
%package karbon Summary: A vector drawing application -Obsoletes: koffice-karbon < %{koffice_ver} -Obsoletes: koffice-karbon-libs < %{koffice_ver} -Requires: %{name}-core = %{version}-%{release} Requires: %{name}-karbon-libs%{?_isa} = %{version}-%{release} -%if 0%{?pstoedit} +%if %{with pstoedit} # for karbon eps import filter BuildRequires: pstoedit Requires: pstoedit %endif -%{?kf5_kinit_requires} %description karbon Karbon is a vector drawing application with an user interface that is easy to use, highly customizable and extensible. That makes Karbon a @@ -408,47 +226,26 @@ vector images – look no further, Karbon is the tool for you!
%package karbon-libs Summary: Runtime libraries for %{name}-karbon -Requires: %{name}-karbon = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description karbon-libs %{summary}.
-%package plan -Summary: A project planner -Obsoletes: koffice-kplato < %{koffice_ver} -Obsoletes: koffice-kplato-libs < %{koffice_ver} -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-plan-libs%{?_isa} = %{version}-%{release} -%if 0%{?mpxj} -BuildRequires: java-devel -Requires: apache-poi -#Requires: apache-mpxj -%endif -%description plan -Plan is a project management application. It is intended for managing -moderately large projects with multiple resources. - -%package plan-libs -Summary: Runtime libraries for %{name}-plan -Requires: %{name}-plan = %{version}-%{release} -%description plan-libs -%{summary}. - -%if 0%{?okular} +%if %{with okular} %package okular-odpgenerator Summary: OpenDocument presenter support for okular -Obsoletes: koffice-okular-odpgenerator < %{koffice_ver} -BuildRequires: okular5-devel -# README.PACKAGER claims this, but I don't think it's true anymore -Requires: %{name}-stage = %{version}-%{release} -Requires: okular5-part +BuildRequires: cmake(Okular6) +Requires: %{name}-stage-libs%{?_isa} = %{version}-%{release} +Requires: okular-part +Supplements: (%{name}-stage and okular) %description okular-odpgenerator %{summary}.
%package okular-odtgenerator Summary: OpenDocument text support for okular -BuildRequires: okular5-devel -Requires: %{name}-words = %{version}-%{release} -Requires: okular5-part +BuildRequires: cmake(Okular6) +Requires: %{name}-words-libs%{?_isa} = %{version}-%{release} +Requires: okular-part +Supplements: (%{name}-words and okular) %description okular-odtgenerator %{summary}. %endif @@ -459,7 +256,7 @@ Requires: okular5-part
%build -%cmake_kf5 \ +%cmake_kf6 \ -Wno-dev
%cmake_build @@ -469,17 +266,16 @@ Requires: okular5-part %cmake_install
## unpackaged files -rm -fv %{buildroot}%{_datadir}/mime/packages/{krita_ora,x-iwork-keynote-sffkey}.xml %if 0%{?external_lilypond_fonts} -rm -fv %{buildroot}%{_kf5_datadir}/calligra_shape_music/fonts/Emmentaler-14.ttf +rm -fv %{buildroot}%{_kf6_datadir}/calligra_shape_music/fonts/Emmentaler-14.ttf %endif -rm -frv %{buildroot}%{_kf5_datadir}/locale/x-test/ +rm -frv %{buildroot}%{_kf6_datadir}/locale/x-test/
%find_lang %{name} --all-name --with-html
%check -for appdata_file in %{buildroot}%{_kf5_metainfodir}/*.appdata.xml ; do +for appdata_file in %{buildroot}%{_kf6_metainfodir}/*.metainfo.xml ; do appstream-util validate-relax --nonet ${appdata_file} ||: done for desktop_file in %{buildroot}%{_datadir}/applications/*.desktop ; do @@ -487,312 +283,238 @@ desktop-file-validate ${desktop_file} ||: done
-%files -## devtools fun -#{_kf5_bindir}/cstester -#{_kf5_bindir}/cstrunner -#{_kf5_bindir}/visualimagecompare +%files +%{_kf6_bindir}/calligraconverter +%{_kf6_bindir}/calligralauncher +%{_kf6_datadir}/applications/org.kde.calligra.desktop +%{_kf6_metainfodir}/org.kde.calligra.metainfo.xml
-%files core -%doc AUTHORS README +%files data +%doc AUTHORS README.md %license COPYING* -%{_kf5_bindir}/calligra -%{_kf5_bindir}/calligraconverter +%{_kf6_sysconfdir}/xdg/calligrasheetsrc +%{_kf6_sysconfdir}/xdg/calligrastagerc +%{_kf6_sysconfdir}/xdg/calligrawordsrc +%{_kf6_sysconfdir}/xdg/karbonrc %{_datadir}/color/icc/calligra/ -%{_kf5_datadir}/calligra/ -#{_datadir}/mime/packages/msooxml-all.xml -%{_datadir}/mime/packages/calligra_svm.xml -%if 0%{?krita} -%{_datadir}/mime/packages/krita*.xml -%endif -%{_datadir}/mime/packages/wiki-format.xml -%{_kf5_datadir}/icons/hicolor/*/*/* +%{_kf6_datadir}/calligra/ %if ! 0%{?external_lilypond_fonts} -%{_kf5_datadir}/calligra_shape_music/fonts/Emmentaler-14.ttf +%{_kf6_datadir}/calligra_shape_music/fonts/Emmentaler-14.ttf %endif -%{_kf5_sysconfdir}/xdg/calligra_stencils.knsrc -%{_kf5_datadir}/kservices5/calligra_odg_thumbnail.desktop -%{_kf5_datadir}/kservices5/calligradocinfopropspage.desktop -%{_kf5_datadir}/kservices5/flow_vsdx_thumbnail.desktop -%{_kf5_datadir}/kservices5/flow_wpg_thumbnail.desktop -# PART_COMPONENTS, used by gemini -# links all of calligrasheetscommon,calligrastageprivate,wordsprivate -#{_kf5_libdir}/qt5/qml/org/kde/calligra/ - -%ldconfig_scriptlets libs +%{_kf6_datadir}/calligrasheets/ +%{_kf6_datadir}/calligrastage/ +%{_kf6_datadir}/calligrawords/ +%{_kf6_datadir}/karbon/ +%{_kf6_datadir}/config.kcfg/calligrasheets.kcfg +%{_kf6_datadir}/icons/hicolor/*/*/* +%{_kf6_datadir}/kxmlgui5/calligrasheets/ +%{_kf6_datadir}/kxmlgui5/calligrastage/ +%{_kf6_datadir}/kxmlgui5/calligrawords/ +%{_kf6_datadir}/kxmlgui5/karbon/ +%{_kf6_datadir}/mime/packages/calligra_svm.xml +%{_kf6_datadir}/mime/packages/wiki-format.xml
%files libs -%{_kf5_libdir}/libbasicflakes.so* -%{_kf5_libdir}/libflake.so* -%{_kf5_libdir}/libkoformula.so* -%{_kf5_libdir}/libkomain.so* -%{_kf5_libdir}/libkoodf.so* -%{_kf5_libdir}/libkoodf2.so* -%{_kf5_libdir}/libkoodfreader.so* -%{_kf5_libdir}/libkopageapp.so* -%{_kf5_libdir}/libkoplugin.so* -%{_kf5_libdir}/libkostore.so* -%{_kf5_libdir}/libkotext.so* -%{_kf5_libdir}/libkowidgets.so* -%{_kf5_libdir}/libkowidgetutils.so* -%{_kf5_libdir}/libkowv2.so* -%{_kf5_libdir}/libkundo2.so* -%{_kf5_libdir}/libkomsooxml.so* -%{_kf5_libdir}/libpigmentcms.so* -%{_kf5_libdir}/libRtfReader.so* -%{_kf5_libdir}/libkotextlayout.so* -%{_kf5_libdir}/libkovectorimage.so* -%{_kf5_libdir}/libkoversion.so* -# core-libs ? -%{_kf5_qtplugindir}/calligra/colorspaces/kolcmsengine.so -%{_kf5_qtplugindir}/calligra/devices/calligra_device_spacenavigator.so -%{_kf5_qtplugindir}/calligra/dockers/calligra_docker_defaults.so -%{_kf5_qtplugindir}/calligra/dockers/calligra_docker_stencils.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_eps2svgai.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_key2odp.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_kpr2odp.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_pdf2odg.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_pdf2svg.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_vsdx2odg.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_wmf2svg.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_xfig2odg.so -%{_kf5_qtplugindir}/calligra/pageapptools/kopabackgroundtool.so -%{_kf5_qtplugindir}/calligra/shapefiltereffects/calligra_filtereffects.so -%{_kf5_qtplugindir}/calligra/shapes/calligra_shape_artistictext.so -%{_kf5_qtplugindir}/calligra/shapes/calligra_shape_chart.so -%{_kf5_qtplugindir}/calligra/shapes/calligra_shape_formula.so -%{_kf5_qtplugindir}/calligra/shapes/calligra_shape_music.so -%{_kf5_qtplugindir}/calligra/shapes/calligra_shape_paths.so -%{_kf5_qtplugindir}/calligra/shapes/calligra_shape_picture.so -%{_kf5_qtplugindir}/calligra/shapes/calligra_shape_plugin.so -%{_kf5_qtplugindir}/calligra/shapes/calligra_shape_text.so -%{_kf5_qtplugindir}/calligra/shapes/calligra_shape_vector.so -%{_kf5_qtplugindir}/calligra/shapes/calligra_shape_video.so -%{_kf5_qtplugindir}/calligra/textediting/calligra_textediting_autocorrect.so -%{_kf5_qtplugindir}/calligra/textediting/calligra_textediting_changecase.so -%{_kf5_qtplugindir}/calligra/textediting/calligra_textediting_spellcheck.so -%{_kf5_qtplugindir}/calligra/textediting/calligra_textediting_thesaurus.so -%{_kf5_qtplugindir}/calligra/textinlineobjects/calligra_textinlineobject_variables.so -%{_kf5_qtplugindir}/calligra/tools/calligra_tool_basicflakes.so -%{_kf5_qtplugindir}/calligra/tools/calligra_tool_defaults.so -%{_kf5_qtplugindir}/calligradocinfopropspage.so -%{_kf5_qtplugindir}/calligraimagethumbnail.so -%{_kf5_qtplugindir}/calligrathumbnail.so -#{_kf5_qtplugindir}/kreport/planreport_textplugin.so +%{_kf6_libdir}/libautocorrection.so* +%{_kf6_libdir}/libbasicflakes.so* +%{_kf6_libdir}/libflake.so* +%{_kf6_libdir}/libkoformula.so* +%{_kf6_libdir}/libkomain.so* +%{_kf6_libdir}/libkomsooxml.so* +%{_kf6_libdir}/libkoodf.so* +%{_kf6_libdir}/libkoodf2.so* +%{_kf6_libdir}/libkoodfreader.so* +%{_kf6_libdir}/libkopageapp.so* +%{_kf6_libdir}/libkoplugin.so* +%{_kf6_libdir}/libkostore.so* +%{_kf6_libdir}/libkotext.so* +%{_kf6_libdir}/libkotextlayout.so* +%{_kf6_libdir}/libkovectorimage.so* +%{_kf6_libdir}/libkowidgets.so* +%{_kf6_libdir}/libkowidgetutils.so* +%{_kf6_libdir}/libkowv2.so* +%{_kf6_libdir}/libkundo2.so* +%{_kf6_libdir}/libpigmentcms.so* +%{_kf6_libdir}/libRtfReader.so* +%dir %{_kf6_qtplugindir}/calligra/ +%dir %{_kf6_qtplugindir}/calligra/colorspaces/ +%{_kf6_qtplugindir}/calligra/colorspaces/kolcmsengine.so +%dir %{_kf6_qtplugindir}/calligra/dockers/ +%{_kf6_qtplugindir}/calligra/dockers/calligra_docker_defaults.so +%{_kf6_qtplugindir}/calligra/dockers/calligra_docker_stencils.so +%dir %{_kf6_qtplugindir}/calligra/formatfilters/ +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_eps2svgai.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_key2odp.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_kpr2odp.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_pdf2svg.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_vsdx2odg.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_wmf2svg.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_xfig2odg.so +%dir %{_kf6_qtplugindir}/calligra/pageapptools/ +%{_kf6_qtplugindir}/calligra/pageapptools/kopabackgroundtool.so +%dir %{_kf6_qtplugindir}/calligra/parts/ +%dir %{_kf6_qtplugindir}/calligra/shapefiltereffects/ +%{_kf6_qtplugindir}/calligra/shapefiltereffects/calligra_filtereffects.so +%dir %{_kf6_qtplugindir}/calligra/shapes/ +%ifarch %{qt6_qtwebengine_arches} +%{_kf6_qtplugindir}/calligra/shapes/braindump_shape_web.so +%endif +%{_kf6_qtplugindir}/calligra/shapes/calligra_shape_artistictext.so +%{_kf6_qtplugindir}/calligra/shapes/calligra_shape_chart.so +%{_kf6_qtplugindir}/calligra/shapes/calligra_shape_formula.so +%{_kf6_qtplugindir}/calligra/shapes/calligra_shape_music.so +%{_kf6_qtplugindir}/calligra/shapes/calligra_shape_paths.so +%{_kf6_qtplugindir}/calligra/shapes/calligra_shape_picture.so +%{_kf6_qtplugindir}/calligra/shapes/calligra_shape_plugin.so +%{_kf6_qtplugindir}/calligra/shapes/calligra_shape_text.so +%{_kf6_qtplugindir}/calligra/shapes/calligra_shape_threed.so +%{_kf6_qtplugindir}/calligra/shapes/calligra_shape_vector.so +%{_kf6_qtplugindir}/calligra/shapes/calligra_shape_video.so +%dir %{_kf6_qtplugindir}/calligra/textediting/ +%{_kf6_qtplugindir}/calligra/textediting/calligra_textediting_autocorrect.so +%{_kf6_qtplugindir}/calligra/textediting/calligra_textediting_changecase.so +%{_kf6_qtplugindir}/calligra/textediting/calligra_textediting_spellcheck.so +%{_kf6_qtplugindir}/calligra/textediting/calligra_textediting_thesaurus.so +%dir %{_kf6_qtplugindir}/calligra/textinlineobjects/ +%{_kf6_qtplugindir}/calligra/textinlineobjects/calligra_textinlineobject_variables.so +%dir %{_kf6_qtplugindir}/calligra/tools/ +%{_kf6_qtplugindir}/calligra/tools/calligra_tool_basicflakes.so +%{_kf6_qtplugindir}/calligra/tools/calligra_tool_defaults.so +%{_kf6_plugindir}/propertiesdialog/calligradocinfopropspage.so +%{_kf6_plugindir}/thumbcreator/calligraimagethumbnail.so +%{_kf6_plugindir}/thumbcreator/calligrathumbnail.so
%files l10n -f %{name}.lang # includes en/ docs, rename to -doc instead? -- rdieter -%{_kf5_datadir}/applications/calligra.desktop +%{_kf6_datadir}/applications/calligra.desktop
%files sheets -%{_kf5_bindir}/calligrasheets -%{_kf5_libdir}/libkdeinit5_calligrasheets.so -%{_kf5_datadir}/calligrasheets/ -%{_kf5_sysconfdir}/xdg/calligrasheetsrc -%{_kf5_datadir}/applications/org.kde.calligrasheets.desktop -%{_kf5_metainfodir}/org.kde.calligrasheets.appdata.xml -%{_kf5_datadir}/kxmlgui5/calligrasheets -%{_kf5_datadir}/config.kcfg/calligrasheets.kcfg -%{_kf5_datadir}/kservices5/ServiceMenus/calligra/sheets_print.desktop -%{_kf5_datadir}/kservices5/sheets_excel_thumbnail.desktop -%{_kf5_datadir}/kservices5/sheets_ods_thumbnail.desktop -%{_kf5_datadir}/kservices5/sheets_xlsx_thumbnail.desktop -%{_kf5_datadir}/templates/SpreadSheet.desktop -%{_kf5_datadir}/templates/.source/SpreadSheet.ods - -%ldconfig_scriptlets sheets-libs +%{_kf6_bindir}/calligrasheets +%{_kf6_datadir}/applications/org.kde.calligra.sheets.desktop +%{_kf6_datadir}/kio/servicemenus/sheets_print.desktop +%{_kf6_datadir}/templates/.source/SpreadSheet.ods +%{_kf6_datadir}/templates/SpreadSheet.desktop +%{_kf6_metainfodir}/org.kde.calligra.sheets.metainfo.xml
%files sheets-libs -%{_libdir}/libcalligrasheetscommon.so* -%{_libdir}/libcalligrasheetsodf.so* -%{_kf5_qtplugindir}/calligrasheets/ -%{_kf5_qtplugindir}/calligra/parts/calligrasheetspart.so -# -#{_kf5_qtplugindir}/calligra/shapes/calligra_shape_spreadsheet.so -#{_kf5_qtplugindir}/calligra/deferred/calligra_shape_spreadsheet-deferred.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_applixspread2kspread.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_dbase2kspread.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_csv2sheets.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_gnumeric2sheets.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_kspread2tex.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_opencalc2sheets.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_qpro2sheets.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_sheets2csv.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_sheets2gnumeric.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_sheets2html.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_sheets2opencalc.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_xls2ods.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_xlsx2ods.so +%{_libdir}/libcalligrasheetscore.so* +%{_libdir}/libcalligrasheetsengine.so* +%{_libdir}/libcalligrasheetspartlib.so* +%{_libdir}/libcalligrasheetsui.so* +%{_kf6_qtplugindir}/calligrasheets/ +%{_kf6_qtplugindir}/calligra/parts/calligrasheetspart.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_applixspread2kspread.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_dbase2kspread.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_csv2sheets.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_gnumeric2sheets.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_kspread2tex.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_opencalc2sheets.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_qpro2sheets.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_sheets2csv.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_sheets2gnumeric.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_sheets2html.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_sheets2opencalc.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_xls2ods.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_xlsx2ods.so
%files stage #doc stage/AUTHORS stage/CHANGES %{_bindir}/calligrastage -%{_libdir}/libkdeinit5_calligrastage.so -%{_kf5_datadir}/applications/org.kde.calligrastage.desktop -%{_kf5_metainfodir}/org.kde.calligrastage.appdata.xml -%{_kf5_datadir}/kservices5/ServiceMenus/calligra/stage_print.desktop -%{_kf5_datadir}/calligrastage -%{_kf5_sysconfdir}/xdg/calligrastagerc -%{_kf5_datadir}/kxmlgui5/calligrastage -%{_kf5_datadir}/kservices5/stage_key_thumbnail.desktop -%{_kf5_datadir}/kservices5/stage_kpr_thumbnail.desktop -%{_kf5_datadir}/kservices5/stage_odp_thumbnail.desktop -%{_kf5_datadir}/kservices5/stage_powerpoint_thumbnail.desktop -%{_kf5_datadir}/kservices5/stage_pptx_thumbnail.desktop -%{_kf5_datadir}/templates/.source/Presentation.odp -%{_kf5_datadir}/templates/Presentation.desktop - -%ldconfig_scriptlets stage-libs +%{_kf6_datadir}/applications/org.kde.calligra.stage.desktop +%{_kf6_datadir}/kio/servicemenus/stage_print.desktop +%{_kf6_datadir}/templates/.source/Presentation.odp +%{_kf6_datadir}/templates/Presentation.desktop +%{_kf6_metainfodir}/org.kde.calligra.stage.metainfo.xml
%files stage-libs -%{_kf5_libdir}/libcalligrastageprivate.so* -%{_kf5_qtplugindir}/calligra/parts/calligrastagepart.so -# -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_ppt2odp.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_pptx2odp.so -%{_kf5_qtplugindir}/calligra/presentationeventactions/calligrastageeventactions.so -%{_kf5_qtplugindir}/calligra/textinlineobjects/kprvariables.so -%{_kf5_qtplugindir}/calligrastage/pageeffects/kpr_pageeffect_barwipe.so -%{_kf5_qtplugindir}/calligrastage/pageeffects/kpr_pageeffect_clockwipe.so -%{_kf5_qtplugindir}/calligrastage/pageeffects/kpr_pageeffect_edgewipe.so -%{_kf5_qtplugindir}/calligrastage/pageeffects/kpr_pageeffect_fade.so -%{_kf5_qtplugindir}/calligrastage/pageeffects/kpr_pageeffect_iriswipe.so -%{_kf5_qtplugindir}/calligrastage/pageeffects/kpr_pageeffect_matrixwipe.so -%{_kf5_qtplugindir}/calligrastage/pageeffects/kpr_pageeffect_slidewipe.so -%{_kf5_qtplugindir}/calligrastage/pageeffects/kpr_pageeffect_spacerotation.so -%{_kf5_qtplugindir}/calligrastage/pageeffects/kpr_pageeffect_swapeffect.so -%{_kf5_qtplugindir}/calligrastage/shapeanimations/kpr_shapeanimation_example.so -%{_kf5_qtplugindir}/calligrastage/tools/calligrastagetoolanimation.so - -%posttrans karbon -update-desktop-database -q &> /dev/null ||: - -%postun karbon -if [ $1 -eq 0 ] ; then -update-desktop-database -q &> /dev/null ||: -fi +%{_kf6_libdir}/libcalligrastageprivate.so* +%{_kf6_qtplugindir}/calligra/parts/calligrastagepart.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_ppt2odp.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_pptx2odp.so +%{_kf6_qtplugindir}/calligra/presentationeventactions/calligrastageeventactions.so +%{_kf6_qtplugindir}/calligra/textinlineobjects/kprvariables.so +%{_kf6_qtplugindir}/calligrastage/
%files karbon -%{_kf5_sysconfdir}/xdg/karbonrc -%{_kf5_datadir}/applications/org.kde.karbon.desktop -%{_kf5_metainfodir}/org.kde.karbon.appdata.xml -%{_kf5_bindir}/karbon -%{_kf5_libdir}/libkdeinit5_karbon.so -%{_kf5_datadir}/karbon/ -%{_kf5_datadir}/kservices5/ServiceMenus/calligra/karbon_print.desktop -%{_kf5_datadir}/kservices5/karbon_karbon1x_thumbnail.desktop -%{_kf5_datadir}/kservices5/karbon_wmf_thumbnail.desktop -%{_kf5_datadir}/kservices5/karbon_wpg_thumbnail.desktop -%{_kf5_datadir}/kservices5/karbon_xfig_thumbnail.desktop -%{_kf5_datadir}/kxmlgui5/karbon/ -%{_kf5_datadir}/templates/.source/Illustration.odg -%{_kf5_datadir}/templates/Illustration.desktop - -%ldconfig_scriptlets karbon-libs +%{_kf6_bindir}/karbon +%{_kf6_datadir}/applications/org.kde.calligra.karbon.desktop +%{_kf6_datadir}/kio/servicemenus/karbon_print.desktop +%{_kf6_datadir}/templates/.source/Illustration.odg +%{_kf6_datadir}/templates/Illustration.desktop +%{_kf6_metainfodir}/org.kde.calligra.karbon.metainfo.xml
%files karbon-libs -%{_kf5_libdir}/libkarboncommon.so* -%{_kf5_libdir}/libkarbonui.so* -%{_kf5_qtplugindir}/calligra/parts/karbonpart.so -# -%{_kf5_qtplugindir}/calligra/tools/karbon_tools.so -%{_kf5_qtplugindir}/karbon/extensions/karbon_flattenpath.so -%{_kf5_qtplugindir}/karbon/extensions/karbon_refinepath.so -%{_kf5_qtplugindir}/karbon/extensions/karbon_roundcorners.so -%{_kf5_qtplugindir}/karbon/extensions/karbon_whirlpinch.so -# -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_karbon1x2karbon.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_karbon2image.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_karbon2svg.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_karbon2wmf.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_svg2karbon.so - -%posttrans words -update-desktop-database -q &> /dev/null ||: - -%postun words -if [ $1 -eq 0 ] ; then -update-desktop-database -q &> /dev/null ||: -fi +%{_kf6_libdir}/libkarboncommon.so* +%{_kf6_libdir}/libkarbonui.so* +%{_kf6_qtplugindir}/calligra/parts/karbonpart.so +%{_kf6_qtplugindir}/calligra/tools/karbon_tools.so +%{_kf6_qtplugindir}/karbon/ +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_karbon1x2karbon.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_karbon2image.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_karbon2svg.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_karbon2wmf.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_pdf2odg.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_svg2karbon.so
%files words -%{_kf5_bindir}/calligrawords -%{_kf5_libdir}/libkdeinit5_calligrawords.so -%{_kf5_sysconfdir}/xdg/calligrawordsrc -%{_kf5_datadir}/applications/org.kde.calligrawords.desktop -%{_kf5_datadir}/applications/org.kde.calligrawords_ascii.desktop -%{_kf5_metainfodir}/org.kde.calligrawords.appdata.xml -%{_kf5_datadir}/calligrawords/ -%{_kf5_datadir}/templates/TextDocument.desktop -%{_kf5_datadir}/templates/.source/TextDocument.odt -%{_kf5_datadir}/kxmlgui5/calligrawords/ -#{_kf5_datadir}/applications/calligra_filter_odt2docx.desktop -%{_kf5_datadir}/kservices5/ServiceMenus/calligra/words_print.desktop -%{_kf5_datadir}/kservices5/words_docx_thumbnail.desktop -%{_kf5_datadir}/kservices5/words_msword_thumbnail.desktop -%{_kf5_datadir}/kservices5/words_odt_thumbnail.desktop -%{_kf5_datadir}/kservices5/words_rtf_thumbnail.desktop -%{_kf5_datadir}/kservices5/words_wpd_thumbnail.desktop -%{_kf5_datadir}/kservices5/words_wps_thumbnail.desktop - -%ldconfig_scriptlets words-libs +%{_kf6_bindir}/calligrawords +%{_kf6_datadir}/applications/org.kde.calligra.words.desktop +%{_kf6_datadir}/applications/org.kde.calligrawords_ascii.desktop +%{_kf6_datadir}/kio/servicemenus/words_print.desktop +%{_kf6_datadir}/templates/.source/TextDocument.odt +%{_kf6_datadir}/templates/TextDocument.desktop +%{_kf6_metainfodir}/org.kde.calligra.words.metainfo.xml
%files words-libs -%{_kf5_libdir}/libwordsprivate.so* -%{_kf5_qtplugindir}/calligra/parts/calligrawordspart.so -# -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_applixword2odt.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_ascii2words.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_doc2odt.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_docx2odt.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_html2ods.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_odt2ascii.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_odt2docx.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_odt2epub2.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_odt2html.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_odt2mobi.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_odt2wiki.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_rtf2odt.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_wpd2odt.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_wpg2odg.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_wpg2svg.so -%{_kf5_qtplugindir}/calligra/formatfilters/calligra_filter_wps2odt.so - -%if 0%{?okular} +%{_kf6_libdir}/libwordsprivate.so* +%{_kf6_qtplugindir}/calligra/parts/calligrawordspart.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_applixword2odt.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_ascii2words.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_doc2odt.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_docx2odt.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_html2ods.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_odt2ascii.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_odt2docx.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_odt2epub2.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_odt2html.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_odt2mobi.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_odt2wiki.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_rtf2odt.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_wpd2odt.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_wpg2odg.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_wpg2svg.so +%{_kf6_qtplugindir}/calligra/formatfilters/calligra_filter_wps2odt.so + +%if %{with okular} %files okular-odpgenerator -%{_kf5_libdir}/libkookularGenerator_odp.so* -%{_kf5_qtplugindir}/okular/generators/okularGenerator_odp_calligra.so -%{_kf5_qtplugindir}/okular/generators/okularGenerator_powerpoint_calligra.so -%{_kf5_qtplugindir}/okular/generators/okularGenerator_pptx_calligra.so -%{_kf5_datadir}/applications/okularApplication_odp_calligra.desktop -%{_kf5_datadir}/applications/okularApplication_powerpoint_calligra.desktop -%{_kf5_datadir}/applications/okularApplication_pptx_calligra.desktop -%{_kf5_datadir}/kservices5/okularOdp_calligra.desktop -%{_kf5_datadir}/kservices5/okularPowerpoint_calligra.desktop -%{_kf5_datadir}/kservices5/okularPptx_calligra.desktop +%{_kf6_libdir}/libkookularGenerator_odp.so* +%{_kf6_qtplugindir}/okular_generators/okularGenerator_odp_calligra.so +%{_kf6_qtplugindir}/okular_generators/okularGenerator_powerpoint_calligra.so +%{_kf6_qtplugindir}/okular_generators/okularGenerator_pptx_calligra.so +%{_kf6_datadir}/applications/okularApplication_odp_calligra.desktop +%{_kf6_datadir}/applications/okularApplication_powerpoint_calligra.desktop +%{_kf6_datadir}/applications/okularApplication_pptx_calligra.desktop
%files okular-odtgenerator -%{_kf5_libdir}/libkookularGenerator_odt.so* -%{_kf5_qtplugindir}/okular/generators/okularGenerator_doc_calligra.so -%{_kf5_qtplugindir}/okular/generators/okularGenerator_docx_calligra.so -%{_kf5_qtplugindir}/okular/generators/okularGenerator_odt_calligra.so -%{_kf5_qtplugindir}/okular/generators/okularGenerator_powerpoint_calligra.so -%{_kf5_qtplugindir}/okular/generators/okularGenerator_rtf_calligra.so -%{_kf5_qtplugindir}/okular/generators/okularGenerator_wpd_calligra.so -%{_kf5_datadir}/applications/okularApplication_doc_calligra.desktop -%{_kf5_datadir}/applications/okularApplication_docx_calligra.desktop -%{_kf5_datadir}/applications/okularApplication_odt_calligra.desktop -%{_kf5_datadir}/applications/okularApplication_rtf_calligra.desktop -%{_kf5_datadir}/applications/okularApplication_wpd_calligra.desktop -%{_kf5_datadir}/kservices5/okularDoc_calligra.desktop -%{_kf5_datadir}/kservices5/okularDocx_calligra.desktop -%{_kf5_datadir}/kservices5/okularOdt_calligra.desktop -%{_kf5_datadir}/kservices5/okularRtf_calligra.desktop -%{_kf5_datadir}/kservices5/okularWpd_calligra.desktop +%{_kf6_libdir}/libkookularGenerator_odt.so* +%{_kf6_qtplugindir}/okular_generators/okularGenerator_doc_calligra.so +%{_kf6_qtplugindir}/okular_generators/okularGenerator_docx_calligra.so +%{_kf6_qtplugindir}/okular_generators/okularGenerator_odt_calligra.so +%{_kf6_qtplugindir}/okular_generators/okularGenerator_powerpoint_calligra.so +%{_kf6_qtplugindir}/okular_generators/okularGenerator_rtf_calligra.so +%{_kf6_qtplugindir}/okular_generators/okularGenerator_wpd_calligra.so +%{_kf6_datadir}/applications/okularApplication_doc_calligra.desktop +%{_kf6_datadir}/applications/okularApplication_docx_calligra.desktop +%{_kf6_datadir}/applications/okularApplication_odt_calligra.desktop +%{_kf6_datadir}/applications/okularApplication_rtf_calligra.desktop +%{_kf6_datadir}/applications/okularApplication_wpd_calligra.desktop %endif
%changelog +* Mon Sep 02 2024 Yaakov Selkowitz yselkowi@redhat.com - 4.0.1-1 +- 4.0.1 + * Wed Aug 28 2024 Miroslav Suchý msuchy@redhat.com - 3.2.1-34 - convert license to SPDX
diff --git a/sources b/sources index 3bac89d..182fb48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calligra-3.2.1.tar.xz) = e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f +SHA512 (calligra-4.0.1.tar.xz) = 79569a1e75d5c70c8b2c3e5c7cf88d26d9b7a81be52c131c932521c65d1712a531829bcd29f7233f1ee7601fa363ca9ce2c4783a76dfdc5abe3c8b04b5741b78
commit b338ab52c24f483aa07721572b59076e9081edc1 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Aug 28 08:23:07 2024 +0200
convert license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
diff --git a/calligra.spec b/calligra.spec index 632c629..4cdd3e5 100644 --- a/calligra.spec +++ b/calligra.spec @@ -18,10 +18,11 @@
Name: calligra Version: 3.2.1 -Release: 33%{?dist} +Release: 34%{?dist} Summary: An integrated office suite
-License: GPLv2+ and LGPLv2+ +# Automatically converted from old format: GPLv2+ and LGPLv2+ - review is highly recommended. +License: GPL-2.0-or-later AND LicenseRef-Callaway-LGPLv2+ URL: http://www.calligra-suite.org/ %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -792,6 +793,9 @@ fi
%changelog +* Wed Aug 28 2024 Miroslav Suchý msuchy@redhat.com - 3.2.1-34 +- convert license to SPDX + * Thu Aug 22 2024 Marek Kasik mkasik@redhat.com - 3.2.1-33 - Rebuild for poppler 24.08.0
commit 26c9462a90e111eb10e6cf56b78bee52a18830dd Author: Marek Kasik mkasik@redhat.com Date: Thu Aug 22 14:28:48 2024 +0200
Rebuild for poppler 24.08.0
diff --git a/calligra-c++20.patch b/calligra-c++20.patch new file mode 100644 index 0000000..4f2a255 --- /dev/null +++ b/calligra-c++20.patch @@ -0,0 +1,51 @@ +From 7ef44c6864cc77abb529e11f83e01ae7dc7d5061 Mon Sep 17 00:00:00 2001 +From: Heiko Becker heiko.becker@kde.org +Date: Thu, 23 May 2024 22:11:28 +0200 +Subject: Require C++20 to fix the build with poppler>=24.05 + +poppler >= 24.05.0 started to use std::string's starts_with and +ends_with [1] in a public header, but these are only available with +C++20. + +[1] https://gitlab.freedesktop.org/poppler/poppler/-/commit/fbb64544e5ea25ac9b1b... + +--- calligra-3.2.1/CMakeLists.txt ++++ calligra-3.2.1/CMakeLists.txt +@@ -108,7 +108,7 @@ message(STATUS "Release build: ${RELEASE + if (CMAKE_VERSION VERSION_LESS "3.1") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + else () +- set (CMAKE_CXX_STANDARD 17) ++ set (CMAKE_CXX_STANDARD 20) + endif () + + ############ +--- calligra-3.2.1/libs/pigment/lut.h ++++ calligra-3.2.1/libs/pigment/lut.h +@@ -143,7 +143,7 @@ typedef uint32_t lut_uint32; + template<> \ + class LutKey<_INT_TYPE_> { \ + public: \ +- LutKey<_INT_TYPE_>(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) \ ++ LutKey(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) \ + { \ + } \ + public: \ +@@ -183,7 +183,7 @@ PARTIAL_LUT_INT_SPECIALIZATION(lut_uint3 + template<> \ + class FullLutKey<_INT_TYPE_> { \ + public: \ +- FullLutKey<_INT_TYPE_>() \ ++ FullLutKey() \ + { \ + } \ + public: \ +@@ -233,7 +233,7 @@ class LutKey<float> { + float f; + }; + public: +- LutKey<float>(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision) ++ LutKey(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision) + { + // Those values where computed using the test_linear and setting the shift and then using + // the standard deviation. diff --git a/calligra.spec b/calligra.spec index 6e6732c..632c629 100644 --- a/calligra.spec +++ b/calligra.spec @@ -18,7 +18,7 @@
Name: calligra Version: 3.2.1 -Release: 32%{?dist} +Release: 33%{?dist} Summary: An integrated office suite
License: GPLv2+ and LGPLv2+ @@ -60,6 +60,8 @@ Patch201: calligra-gcc11.patch # Switch to C++17 because poppler needs it Patch202: calligra-c++17.patch Patch203: calligra-c99.patch +# Switch to C++20 because poppler needs it +Patch204: calligra-c++20.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -790,6 +792,9 @@ fi
%changelog +* Thu Aug 22 2024 Marek Kasik mkasik@redhat.com - 3.2.1-33 +- Rebuild for poppler 24.08.0 + * Wed Jul 17 2024 Fedora Release Engineering releng@fedoraproject.org - 3.2.1-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
arch-excludes@lists.fedoraproject.org