[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 2b37981a42b6f9259a31f4b1269dadcf6a36bb95 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 27 22:36:56 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 28 01:19:37 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b37981a app-office/calligra: 3.1.0 version bump Package-Manager: Portage-2.3.20, Repoman-2.3.6 app-office/calligra/Manifest | 2 + app-office/calligra/calligra-3.1.0.ebuild | 241 + .../files/calligra-3.1.0-no-arch-detection.patch | 17 ++ app-office/calligra/metadata.xml | 1 + 4 files changed, 261 insertions(+) diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 776ebb77289..8cf6fbe018a 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1 +1,3 @@ DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B e264f1eb5928d2f11fba9c9b71a77d2685230b9128105264d109d3aca51f32a814795dd04f5f8fb980dce4fa4d4365c4073b35c2abb8933c906238bc0b25aef2 SHA512 ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0 +DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b +DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 diff --git a/app-office/calligra/calligra-3.1.0.ebuild b/app-office/calligra/calligra-3.1.0.ebuild new file mode 100644 index 000..b053f117b3a --- /dev/null +++ b/app-office/calligra/calligra-3.1.0.ebuild @@ -0,0 +1,241 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +CHECKREQS_DISK_BUILD="4G" +KDE_APPS_MINIMAL="17.12.0" +KDE_HANDBOOK="forceoptional" +KDE_PO_DIRS="po plan/po" +KDE_TEST="forceoptional" +inherit check-reqs kde5 versionator + +DESCRIPTION="KDE Office Suite" +HOMEPAGE="https://www.calligra.org/"; +[[ ${KDE_BUILD_TYPE} == release ]] && \ + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz + calligra_features_plan? ( mirror://kde/stable/${PN}/${PV}/${PN}plan-${PV}.tar.xz )" + +LICENSE="GPL-2" + +[[ ${KDE_BUILD_TYPE} == release ]] && \ +KEYWORDS="~amd64 ~x86" + +CAL_FTS=( karbon plan sheets words ) + +IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf + phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) + calligra_experimental_features_stage" + +# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) +# Required for the matlab/octave formula tool +# FIXME: Disabled by upstream for good reason +# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940) +# $(add_kdeapps_dep akonadi) +# $(add_kdeapps_dep akonadi-contacts) +# Currently upstream-disabled in plan +# =dev-libs/kproperty-3.0*:5 +# =dev-libs/kreport-3.0*:5 +COMMON_DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kemoticons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemmodels) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kross) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep sonnet) + $(add_qt_dep designer) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtscript) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-lang/perl + sys-libs/zlib + virtual/libiconv + activities? ( $(add_frameworks_dep kactivities) ) + crypt? ( app-crypt/qca:2[qt5] ) + fontconfig? ( me
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 5f8fcc52db2a134f1189d4cde2a9bdd1aabc51b2 Author: Johannes Huber gentoo org> AuthorDate: Tue Mar 22 19:09:35 2016 + Commit: Johannes Huber gentoo org> CommitDate: Tue Mar 22 19:11:27 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f8fcc52 app-office/calligra: Remove old Package-Manager: portage-2.2.28 app-office/calligra/Manifest | 4 - app-office/calligra/calligra-2.8.7.ebuild | 231 - app-office/calligra/calligra-2.9.10.ebuild | 223 app-office/calligra/calligra-2.9.6.ebuild | 230 app-office/calligra/calligra-2.9.7.ebuild | 227 .../files/calligra-2.9.6-ghns-linking.patch| 11 - .../calligra/files/calligra-2.9.6-version.patch| 24 --- 7 files changed, 950 deletions(-) diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 6080d09..0287b87 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,6 +1,2 @@ DIST calligra-2.8.5.tar.xz 138928992 SHA256 92b8828ec64b46124b29a03bae13c143e3ed771adf3186fa938c765e5eac2fbd SHA512 09e32b7ce2415daae2ac3c1871fc1bc270210cbf5bc774f622922f8adb20e639db3dfb16c2974404b4395b30f8367a7ddd0016363a8b3e46fa24ff3fde1e4c14 WHIRLPOOL b4cc14353b7f9a457510a745b711283481f969e10ffee2847253b123ba2ea03f61d8abfdda2bcdb463c6bba8f2d8634e1536259f5be3d44778104bc8f28f79fe -DIST calligra-2.8.7.tar.xz 138966248 SHA256 af6b8b74ea077e5bbfa398e3ae96866b9a3ccfbc10224e9f341e59643be80eb5 SHA512 e09fcbb6708d73db3b31027c4393a138fbf5c47d1b777dd4a3b94f6e668d67ac963cfadb320350c63f1b2d1173edc67dc2100704899176c196865fb4d2ce7442 WHIRLPOOL ce082f04cfb7947219e317ba9a4a6ce436a3aa0784f1cad6206f3febd072f17796ccbb89227d3c8dede1eafc647409b26f1f4fb304b1d482db0fe8c758b9 -DIST calligra-2.9.10.tar.xz 194841508 SHA256 a9d16f0523e03141a3d2cd2e28e484a8aa0f0fead2352ac2c385688066a1d1ef SHA512 50b14b938ecbc70aed36d83e475225cbed8ecb72e0f407e4a1089472a43122c9278d768dad258d1b65534a0e42322295bab5c493d580d69730daf63e936a6df6 WHIRLPOOL 3679b2ec00f00844b640d38dafce6925abf8ef2c851c72d7ad0a4046d85a432367b20436bc6dbbd28527102d0e58df61e5683042508f15a134dc34c002162c29 DIST calligra-2.9.11.tar.xz 196039892 SHA256 b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8 WHIRLPOOL 973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74 -DIST calligra-2.9.6.tar.xz 194239580 SHA256 78564137133e2f45065085df66ce2ab31478517c10163a06ba690a2d3a98a184 SHA512 d51b20c3d53a09ced3347b117de6827c5c29e31b198eff8bc136f0d6f604991371c6c4705d0ff3c6bcc64c017f0a14139d4b0529b02973909d80a25223e59f07 WHIRLPOOL 848884f830e0b8b2c6b8ed73d11222598295ca56ed4db826f4a9c3d3be42d5a65f5e50879a4fed68d6ae004962b799e23d6978a0943ff6b8900728b62dec43c0 -DIST calligra-2.9.7.tar.xz 194348264 SHA256 7a641a1669739ff55809fd6f2c22d673843ac41f64e82f5ca6cb3e60c7c82781 SHA512 89b6b43113dfd7304c9d88c79fe8ecce9d1cf5e6a82a401df6d0c5bad28c450af6e4012e859ccb1595f638513f79bb00f15cbc9f8cad03801c5aa1440b1b8a1f WHIRLPOOL d15fcf5458b25ae30e98031c541c85cac1658a435c8fa432fc7d3de44ebda7fa56ffab61b642c196d639d1bc9737f386e76dc75d7d51baa2efc0ed79d51dd9fc diff --git a/app-office/calligra/calligra-2.8.7.ebuild b/app-office/calligra/calligra-2.8.7.ebuild deleted file mode 100644 index 3615a0d..000 --- a/app-office/calligra/calligra-2.8.7.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# note: files that need to be checked for dependencies etc: -# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt -# krita/CMakeLists.txt - -EAPI=5 - -CHECKREQS_DISK_BUILD="4G" -KDE_HANDBOOK="optional" -KDE_LINGUAS_LIVE_OVERRIDE="true" -KDE_MINIMAL="4.13.1" -OPENGL_REQUIRED="optional" -inherit check-reqs kde4-base versionator - -DESCRIPTION="KDE Office Suite" -HOMEPAGE="http://www.calligra.org/"; - -case ${PV} in - 2.[456789].[789]?) - # beta or rc releases - SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;; - 2.[456789].?) - # stable releases - SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;; - 2.[456789].) - # stable branch live ebuild - SRC_URI="" ;; - ) - # master branch live ebuild - SRC_URI="" ;; -esac - -LICENSE="GPL-2" -SLOT="4" - -if [[ ${KDE_BUILD_TYPE} == release ]] ; then - KEYWORDS="~amd64 ~arm ~x86" -fi - -IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +glib +gsf gsl -import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql +okular -openexr +pdf postgres spacenav sybase test tiff +threads +truetype vc xbase -+x
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 3fb992b4a31755f1c289dbf1f1f25dfbd8557303 Author: Guilherme Amadio gentoo org> AuthorDate: Wed Dec 7 18:52:21 2016 + Commit: Johannes Huber gentoo org> CommitDate: Thu Dec 8 14:10:22 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb992b4 app-office/calligra: Fix bug 584118 Prevent calligra from adding CPU flags automatically. Reported-by: Alec Ari Gentoo-bug: 584118 Closes: https://github.com/gentoo/gentoo/pull/3050 Package-Manager: portage-2.3.3 Signed-off-by: Guilherme Amadio gentoo.org> Signed-off-by: Johannes Huber gentoo.org> app-office/calligra/calligra-2.9.11-r1.ebuild | 234 + .../files/calligra-2.9.1-no-arch-detection.patch | 14 ++ 2 files changed, 248 insertions(+) diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild b/app-office/calligra/calligra-2.9.11-r1.ebuild new file mode 100644 index ..795c6aa --- /dev/null +++ b/app-office/calligra/calligra-2.9.11-r1.ebuild @@ -0,0 +1,234 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# note: files that need to be checked for dependencies etc: +# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt +# krita/CMakeLists.txt + +EAPI=5 + +CHECKREQS_DISK_BUILD="4G" +KDE_HANDBOOK="optional" +KDE_LINGUAS_LIVE_OVERRIDE="true" +OPENGL_REQUIRED="optional" +WEBKIT_REQUIRED="optional" +inherit check-reqs kde4-base versionator + +DESCRIPTION="KDE Office Suite" +HOMEPAGE="http://www.calligra.org/"; + +case ${PV} in + 2.[456789].[789]?) + # beta or rc releases + SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;; + 2.[456789].?|2.[456789].??) + # stable releases + SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;; + 2.[456789].) + # stable branch live ebuild + SRC_URI="" ;; + ) + # master branch live ebuild + SRC_URI="" ;; +esac + +LICENSE="GPL-2" +SLOT="4" + +if [[ ${KDE_BUILD_TYPE} == release ]] ; then + KEYWORDS="~amd64 ~arm ~x86" +fi + +IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds ++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql ++okular openexr +pdf +pim postgres spacenav sybase test tiff +threads ++truetype vc xbase +xml" + +# Don't use Active, it's broken on desktops. +CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words" +for cal_ft in ${CAL_FTS}; do + IUSE+=" calligra_features_${cal_ft}" +done +unset cal_ft + +REQUIRED_USE=" + calligra_features_author? ( calligra_features_words ) + calligra_features_gemini? ( opengl ) + calligra_features_krita? ( eigen exif lcms opengl ) + calligra_features_plan? ( pim ) + calligra_features_sheets? ( eigen ) + calligra_features_stage? ( webkit ) + vc? ( calligra_features_krita ) + test? ( calligra_features_karbon ) +" + +RDEPEND=" + dev-lang/perl + dev-libs/boost + dev-qt/qtcore:4[exceptions] + media-libs/libpng:0 + sys-libs/zlib + virtual/libiconv + attica? ( dev-libs/libattica ) + color-management? ( media-libs/opencolorio ) + crypt? ( app-crypt/qca:2[qt4(+)] ) + eigen? ( dev-cpp/eigen:3 ) + exif? ( media-gfx/exiv2:= ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + freetds? ( dev-db/freetds ) + glib? ( dev-libs/glib:2 ) + gsf? ( gnome-extra/libgsf ) + gsl? ( sci-libs/gsl ) + import-filter? ( + app-text/libetonyek + app-text/libodfgen + app-text/libwpd:* + app-text/libwpg:* + app-text/libwps + dev-libs/librevenge + media-libs/libvisio + ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( media-libs/openjpeg:0 ) + kdcraw? ( $(add_kdeapps_dep libkdcraw) ) + lcms? ( + media-libs/lcms:2 + x11-libs/libX11 + ) + marble? ( $(add_kdeapps_dep marble) ) + mysql? ( virtual/mysql ) + okular? ( >=kde-apps/okular-4.4:4=[aqua=] ) + opengl? ( + media-libs/glew:0 + virtual/glu + ) + openexr? ( media-libs/openexr ) + pdf? ( + app-text/poppler:= + media-gfx/pstoedit + ) + pim? ( $(add_kdeapps_dep kdepimlibs) ) + postgres? ( + dev-db/postgresql:* + dev-libs/libpqxx + ) + spacenav? ( dev-libs/libspnav ) + sybase? ( dev-db/freetds ) + tiff? ( media-libs/tiff:0 ) + truetype? ( media-libs/freetype:2 ) + vc? ( =dev-db/sqlite-3.8.7:3[extensions(+)] + dev-libs/icu:= + ) + calligra_features_krita? ( + dev-qt/qtdeclarative:4 + net-misc/curl + x11-libs/li
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 371eb8a1679d3e33e57a6d7860d2cbe734875bf2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 21 14:19:48 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 21 20:52:05 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371eb8a1 app-office/calligra: Fix >=libwps-0.4 detection Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-office/calligra/calligra-2.9.11-r1.ebuild | 1 + .../files/calligra-2.9.11-libwps-0.4.patch | 46 ++ 2 files changed, 47 insertions(+) diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild b/app-office/calligra/calligra-2.9.11-r1.ebuild index a28e2a28e24..a67a0fe9ec1 100644 --- a/app-office/calligra/calligra-2.9.11-r1.ebuild +++ b/app-office/calligra/calligra-2.9.11-r1.ebuild @@ -141,6 +141,7 @@ RESTRICT=test PATCHES=( "${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch "${FILESDIR}"/${P}-postgresql-9.6.patch + "${FILESDIR}"/${P}-libwps-0.4.patch ) pkg_pretend() { diff --git a/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch b/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch new file mode 100644 index 000..79595d9f883 --- /dev/null +++ b/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch @@ -0,0 +1,46 @@ +Last-Update: 2015-06-17 +Forwarded: no +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788969 +Origin: http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?id=124c28df44584e08b00d4dbb859362af73c41070 +From: David Tardon +Description: adapt to libwps 0.4 + +--- a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake +@@ -9,18 +9,18 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + + include(LibFindMacros) + libfind_package(LIBWPS LibWpd) +-libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3) ++libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.4) + + find_path(LIBWPS_INCLUDE_DIR + NAMES libwps/libwps.h + HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR} +-PATH_SUFFIXES libwps-0.3 ++PATH_SUFFIXES libwps-0.4 + ) + + find_library(LIBWPS_LIBRARY +-NAMES wps wps-0.3 ++NAMES wps wps-0.4 + HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR} + ) + + set(LIBWPS_PROCESS_LIBS LIBWPS_LIBRARY LIBWPD_LIBRARIES) +--- a/filters/words/works/import/WPSImport.cpp b/filters/words/works/import/WPSImport.cpp +@@ -90,9 +90,11 @@ + } + bool isSupportedFormat(librevenge::RVNGInputStream &input) + { + WPSKind kind = WPS_TEXT; +-WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind); ++WPSCreator creator = WPS_MSWORKS; ++bool needsEncoding = false; ++WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind, creator, needsEncoding); + if (confidence == WPS_CONFIDENCE_NONE || kind != WPS_TEXT) + return false; + return true; + }
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: bc67da033112ad06b72a1eb5019f20e0fe987b89 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 4 14:27:54 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 6 22:30:34 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc67da03 app-office/calligra: Drop old Package-Manager: portage-2.3.0 app-office/calligra/calligra-3.0.0.1.ebuild| 235 - .../files/calligra-3.0.0-optionaldeps.patch| 20 -- 2 files changed, 255 deletions(-) diff --git a/app-office/calligra/calligra-3.0.0.1.ebuild b/app-office/calligra/calligra-3.0.0.1.ebuild deleted file mode 100644 index 15bb5b9.. --- a/app-office/calligra/calligra-3.0.0.1.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -CHECKREQS_DISK_BUILD="4G" -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -inherit check-reqs kde5 versionator - -DESCRIPTION="KDE Office Suite" -HOMEPAGE="http://www.calligra.org/"; -[[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" - -[[ ${KDE_BUILD_TYPE} == release ]] && \ -KEYWORDS="~amd64 ~x86" - -CAL_FTS=( karbon plan sheets words ) -CAL_EXP_FTS=( braindump stage ) - -IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble okular - openexr +pdf spacenav +truetype vc +xml X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) - $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})" - -REQUIRED_USE="calligra_features_sheets? ( eigen )" - -# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) -# Required for the matlab/octave formula tool -# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0 -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kross) - $(add_frameworks_dep ktexteditor) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep sonnet) - $(add_frameworks_dep threadweaver) - $(add_qt_dep designer) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtscript) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-lang/perl - dev-libs/boost - media-libs/libpng:0 - sys-libs/zlib - virtual/libiconv - activities? ( $(add_frameworks_dep kactivities) ) - crypt? ( app-crypt/qca:2[qt5] ) - eigen? ( dev-cpp/eigen:3 ) - fontconfig? ( media-libs/fontconfig ) - gsl? ( sci-libs/gsl ) - import-filter? ( - $(add_frameworks_dep khtml) - app-text/libetonyek - app-text/libodfgen - app-text/libwpd:* - app-text/libwpg:* - >=app-text/libwps-0.4 - dev-libs/librevenge - media-libs/libvisio - ) - lcms? ( media-libs/lcms:2 ) - marble? ( $(add_kdeapps_dep marble) ) - openexr? ( media-libs/openexr ) - pdf? ( app-text/poppler:=[qt5] ) - spacenav? ( dev-libs/libspnav ) - truetype? ( media-libs/freetype:2 ) - X? ( - $(add_qt_dep qtx11extras) - x11-libs/libX11 - ) - calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) ) - calligra_experimental_features_stage? ( - $(add_qt_dep qtwebkit) - okular? ( $(add_kdeapps_dep okular) ) - ) - calligra_features_plan? ( - $(add_frameworks_dep khtml) - $(add_qt_dep qtcore '' '' '5=') - dev-libs/kdiagram:5 - dev-libs/kproperty:5 - dev-libs/kreport:5 - pim? ( - $(add_kdeapps_dep akonadi) - $(add_kdeapps_dep akonadi-contacts) - $(add_kdeapps_dep kcalcor
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 9699b1c310d94b9a4c76336a5f0a4aebe2589e91 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 16 16:20:59 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 16 16:20:59 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9699b1c3 app-office/calligra: Fix build with poppler-0.73 Closes: https://bugs.gentoo.org/675454 Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-3.1.0-r3.ebuild | 1 + .../files/calligra-3.1.0-poppler-0.73.patch| 35 ++ 2 files changed, 36 insertions(+) diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild index 329a851fea6..24ca06bcb3a 100644 --- a/app-office/calligra/calligra-3.1.0-r3.ebuild +++ b/app-office/calligra/calligra-3.1.0-r3.ebuild @@ -121,6 +121,7 @@ PATCHES=( "${FILESDIR}"/${P}-poppler-0.69.patch "${FILESDIR}"/${P}-poppler-0.71.patch "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable + "${FILESDIR}"/${P}-poppler-0.73.patch "${FILESDIR}"/${P}-no-webkit.patch ) diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch new file mode 100644 index 000..727f6edf3f1 --- /dev/null +++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch @@ -0,0 +1,35 @@ +From a1ddd91e6c354e8f0dda40f8a522053c3fa19c39 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Tue, 15 Jan 2019 22:24:08 +0100 +Subject: Guchar -> unsigned char + +It was just a typdef and it's now gone +--- + filters/karbon/pdf/SvgOutputDev.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 80f01a5..1a5aa30b 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -496,7 +496,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + if (maskColors) { + for (int y = 0; y < height; y++) { + dest = (unsigned int *)(buffer + y * 4 * width); +-Guchar * pix = imgStr->getLine(); ++unsigned char * pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + + for (int x = 0; x < width; x++) { +@@ -515,7 +515,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + } else { + for (int y = 0; y < height; y++) { + dest = (unsigned int *)(buffer + y * 4 * width); +-Guchar * pix = imgStr->getLine(); ++unsigned char * pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + } + +-- +cgit v1.1 +
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: ed29e62fa20e94e2601da05749127fab941b2050 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 5 23:23:28 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 5 23:24:57 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed29e62f app-office/calligra: Drop 3.0.1 Package-Manager: Portage-2.3.28, Repoman-2.3.9 app-office/calligra/Manifest | 1 - app-office/calligra/calligra-3.0.1.ebuild | 241 - .../files/calligra-3.0.0-no-arch-detection.patch | 17 -- 3 files changed, 259 deletions(-) diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 8cf6fbe018a..f4101fe56ac 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,3 +1,2 @@ -DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B e264f1eb5928d2f11fba9c9b71a77d2685230b9128105264d109d3aca51f32a814795dd04f5f8fb980dce4fa4d4365c4073b35c2abb8933c906238bc0b25aef2 SHA512 ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 diff --git a/app-office/calligra/calligra-3.0.1.ebuild b/app-office/calligra/calligra-3.0.1.ebuild deleted file mode 100644 index 7a2d180f4ec..000 --- a/app-office/calligra/calligra-3.0.1.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CHECKREQS_DISK_BUILD="4G" -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional-recursive" -inherit check-reqs kde5 versionator - -DESCRIPTION="KDE Office Suite" -HOMEPAGE="https://www.calligra.org/"; -[[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" - -[[ ${KDE_BUILD_TYPE} == release ]] && \ -KEYWORDS="amd64 x86" - -CAL_FTS=( karbon plan sheets words ) -CAL_EXP_FTS=( braindump stage ) - -IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular openexr +pdf - phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) - $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})" - -# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) -# Required for the matlab/octave formula tool -# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0 -# FIXME: Disabled by upstream for good reason -# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940) -# $(add_kdeapps_dep akonadi) -# $(add_kdeapps_dep akonadi-contacts) -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kross) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep sonnet) - $(add_qt_dep designer) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtscript) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-lang/perl - sys-libs/zlib - virtual/libiconv - activities? ( $(add_frameworks_dep kactivities) ) - crypt? ( app-crypt/qca:2[qt5] ) - fontconfig? ( media-libs/fontconfig ) - gsl? ( sci-libs/gsl ) - import-filter? ( - $(add_frameworks_dep khtml) - app-text/libetonyek - app-text/libodfgen -
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: e785021cfd5f1dba3d3ab7a11416960b322479f6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 8 01:12:51 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 8 01:47:43 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e785021c app-office/calligra: Fix build with poppler-0.72 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-3.1.0-r3.ebuild | 1 + .../files/calligra-3.1.0-poppler-0.72.patch| 54 ++ 2 files changed, 55 insertions(+) diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild index f126c2aad96..766e2b2b60a 100644 --- a/app-office/calligra/calligra-3.1.0-r3.ebuild +++ b/app-office/calligra/calligra-3.1.0-r3.ebuild @@ -120,6 +120,7 @@ PATCHES=( "${FILESDIR}"/${P}-stage-qt-5.11.patch "${FILESDIR}"/${P}-poppler-0.69.patch "${FILESDIR}"/${P}-poppler-0.71.patch + "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable "${FILESDIR}"/${P}-no-webkit.patch ) diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch new file mode 100644 index 000..3b2e690257b --- /dev/null +++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch @@ -0,0 +1,54 @@ +From 8f20ea906235cbee1d4aac4706e4eb03366875bf Mon Sep 17 00:00:00 2001 +From: "Tobias C. Berner" +Date: Mon, 7 Jan 2019 19:50:48 +0100 +Subject: [PATCH] Make compatible with poppler 0.72 + +--- + filters/karbon/pdf/SvgOutputDev.cpp | 13 + + 1 file changed, 13 insertions(+) + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 4a1fad6bbcf..b1d4ea2d427 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -409,7 +410,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) + + QString str; + ++#if POPPLER_CHECK_VERSION(0,72,0) ++const char * p = s->c_str(); ++#else + const char * p = s->getCString(); ++#endif + int len = s->getLength(); + CharCode code; + Unicode *u = nullptr; +@@ -459,10 +464,18 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) + *d->body << " y=\"" << y << "px\""; + + if (font && font->getFamily()) { ++#if POPPLER_CHECK_VERSION(0,72,0) ++*d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\""; ++#else + *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\""; ++#endif + //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() ); + } else if (font && font->getName()) { ++#if POPPLER_CHECK_VERSION(0,72,0) ++*d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\""; ++#else + *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\""; ++#endif + //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() ); + } + *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\""; +-- +2.20.1
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 3c55b2008f5417f6ddf252fddde26820cdad6b44 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 1 13:38:58 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 1 19:40:08 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c55b200 app-office/calligra: Split out plan, fix build with >=poppler-0.71 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-3.1.0-r3.ebuild | 211 + .../files/calligra-3.1.0-poppler-0.69.patch| 83 .../files/calligra-3.1.0-poppler-0.71.patch| 202 3 files changed, 496 insertions(+) diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild new file mode 100644 index 000..46e011852b1 --- /dev/null +++ b/app-office/calligra/calligra-3.1.0-r3.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +CHECKREQS_DISK_BUILD="4G" +KDE_DOC_DIR="xxx" # contains no language subdirs +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +inherit check-reqs kde5 + +DESCRIPTION="KDE Office Suite" +HOMEPAGE="https://www.calligra.org/"; +SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" + +CAL_FTS=( karbon sheets words ) + +IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf + phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) + calligra_experimental_features_stage" + +# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) +# Required for the matlab/octave formula tool +COMMON_DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kemoticons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemmodels) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kross) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep sonnet) + $(add_qt_dep designer) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtscript) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-lang/perl + sys-libs/zlib + virtual/libiconv + activities? ( $(add_frameworks_dep kactivities) ) + crypt? ( app-crypt/qca:2[qt5(+)] ) + fontconfig? ( media-libs/fontconfig ) + gemini? ( $(add_qt_dep qtdeclarative 'widgets') ) + gsl? ( sci-libs/gsl ) + import-filter? ( + $(add_frameworks_dep khtml) + app-text/libetonyek + app-text/libodfgen + app-text/libwpd:* + app-text/libwpg:* + >=app-text/libwps-0.4 + dev-libs/librevenge + media-libs/libvisio + ) + lcms? ( + media-libs/ilmbase:= + media-libs/lcms:2 + ) + openexr? ( media-libs/openexr ) + pdf? ( >=app-text/poppler-0.64:=[qt5] ) + phonon? ( media-libs/phonon[qt5(+)] ) + pim? ( $(add_kdeapps_dep kcalcore) ) + spacenav? ( dev-libs/libspnav ) + truetype? ( media-libs/freetype:2 ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libX11 + ) + calligra_experimental_features_stage? ( + $(add_qt_dep qtwebkit) + okular? ( $(add_kdeapps_dep okular) ) + ) + calligra_features_sheets? ( dev-cpp/eigen:3 ) + calligra_features_words? ( + dev-libs/libxslt + okular? ( $(add_kdeapps_dep okular) ) + ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost + sys-devel/gettext + x11-misc/shared-mime-info + test? ( $(add_frameworks_dep threadweaver) ) +" +RDEPEND="${COMMON_DEPEND} + calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) + !app-office/calligra:4 + !app-office/calligra-l10n:4 +" +RESTRICT
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 634a047520c11151ac1316bd382327fd1efcbfb9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 1 15:02:54 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 1 19:40:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=634a0475 app-office/calligra: Drop bogus Qt5WebKit dependency Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-3.1.0-r3.ebuild | 7 +-- .../calligra/files/calligra-3.1.0-no-webkit.patch | 70 ++ 2 files changed, 71 insertions(+), 6 deletions(-) diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild index 46e011852b1..0fe2f8fc959 100644 --- a/app-office/calligra/calligra-3.1.0-r3.ebuild +++ b/app-office/calligra/calligra-3.1.0-r3.ebuild @@ -95,7 +95,6 @@ COMMON_DEPEND=" x11-libs/libX11 ) calligra_experimental_features_stage? ( - $(add_qt_dep qtwebkit) okular? ( $(add_kdeapps_dep okular) ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) @@ -124,6 +123,7 @@ PATCHES=( "${FILESDIR}"/${P}-stage-qt-5.11.patch "${FILESDIR}"/${P}-poppler-0.69.patch "${FILESDIR}"/${P}-poppler-0.71.patch + "${FILESDIR}"/${P}-no-webkit.patch ) pkg_pretend() { @@ -147,11 +147,6 @@ src_prepare() { punt_bogus_dep Qt5 Declarative punt_bogus_dep Qt5 OpenGL - if ! use calligra_experimental_features_stage; then - punt_bogus_dep Qt5 WebKitWidgets - punt_bogus_dep Qt5 WebKit - fi - # Hack around the excessive use of CMake macros if use okular && ! use calligra_features_words; then sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \ diff --git a/app-office/calligra/files/calligra-3.1.0-no-webkit.patch b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch new file mode 100644 index 000..f126e2e5138 --- /dev/null +++ b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch @@ -0,0 +1,70 @@ +From 9817c4c2ee1e11ae1d2eacb31b8a2a65d6ea6e8d Mon Sep 17 00:00:00 2001 +From: Dag Andersen +Date: Mon, 22 Oct 2018 09:41:53 +0200 +Subject: Stage does not use WebKit, so remove + +--- + CMakeLists.txt| 21 + + stage/part/CMakeLists.txt | 1 - + 2 files changed, 1 insertion(+), 21 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b148c0..1e29140 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -272,14 +272,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET + Quick + QuickWidgets + Sql +-WebKit +-# WebKitWidgets +-) +-message("**") +-message("**") +-message("Qt WebKitWidgets is required for Stage's html export preview. This will need porting, as that module no longer exists.") +-message("**") +-message("**") ++) + + # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call + # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error: +@@ -313,14 +306,6 @@ set_package_properties(Qt5WebKit PROPERTIES + PURPOSE "Required for Braindump's Web shape" + TYPE OPTIONAL + ) +-set_package_properties(Qt5WebKitWidget PROPERTIES +-PURPOSE "Required for Stage" +-TYPE RECOMMENDED +-) +- +-if(Qt5WebKit_FOUND) +-add_definitions( -DCAN_USE_QTWEBKIT ) +-endif() + + set(HAVE_OPENGL ${Qt5OpenGL_FOUND}) + +@@ -983,10 +968,6 @@ calligra_drop_product_on_bad_condition( FEATURE_RDF + Soprano_FOUND "Soprano not found" + ) + +-# calligra_drop_product_on_bad_condition( PART_STAGE +-# Qt5WebKitWidgets_FOUND "Qt5WebKitWidgets devel not found" +-# ) +- + calligra_drop_product_on_bad_condition( PART_SHEETS + EIGEN3_FOUND "Eigen devel not found" + ) +diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt +index d6000a1..9bdc840 100644 +--- a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt +@@ -165,7 +165,6 @@ target_link_libraries(calligrastageprivate + KF5::IconThemes + KF5::Completion + Qt5::Svg +-# Qt5::WebKitWidgets + ) + if(HAVE_OPENGL) + target_link_libraries(calligrastageprivate PRIVATE Qt5::OpenGL) +-- +cgit v1.1
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 11ee88aed98350f2c08ed36c1daa802182c10a38 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 24 06:42:17 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 24 06:42:17 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ee88ae app-office/calligra: Fix build w/o plan Closes: https://bugs.gentoo.org/651318 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-office/calligra/calligra-3.1.0-r2.ebuild | 2 + 11.patch => calligra-3.1.0-plan-qt-5.11.patch} | 93 -- .../calligra/files/calligra-3.1.0-qt-5.11.patch| 108 - 3 files changed, 2 insertions(+), 201 deletions(-) diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild index 2084d5f44db..b1da5f43076 100644 --- a/app-office/calligra/calligra-3.1.0-r2.ebuild +++ b/app-office/calligra/calligra-3.1.0-r2.ebuild @@ -159,6 +159,8 @@ src_prepare() { sed -e "/add_subdirectory(plan)/s/#//" \ -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \ -i CMakeLists.txt || die + + eapply "${FILESDIR}"/${P}-plan-qt-5.11.patch fi kde5_src_prepare diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch similarity index 54% copy from app-office/calligra/files/calligra-3.1.0-qt-5.11.patch copy to app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch index 09236c41de0..d63f5ccbe87 100644 --- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch +++ b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch @@ -9,8 +9,6 @@ Tags: #calligra:_3.0 Differential Revision: https://phabricator.kde.org/D11454 --- - libs/widgets/KoCsvImportDialog.cpp | 1 + - libs/widgets/KoPageLayoutWidget.cpp| 2 ++ plan/src/kptview.h | 1 + plan/src/kptviewlist.cpp | 1 + plan/src/libs/ui/kptaccountseditor.cpp | 1 + @@ -19,38 +17,8 @@ Differential Revision: https://phabricator.kde.org/D11454 plan/src/libs/ui/kpttaskeditor.cpp | 1 + plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 + plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++ - plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 + - plugins/formulashape/FormulaToolWidget.cpp | 1 + - sheets/dialogs/LayoutDialog.cpp| 1 + - words/part/dialogs/KWAnchoringProperties.cpp | 1 + - words/part/dialogs/KWRunAroundProperties.cpp | 2 ++ 15 files changed, 18 insertions(+), 1 deletion(-) -diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp -index 0ffdcf62a70..cdca006dc62 100644 a/libs/widgets/KoCsvImportDialog.cpp -+++ b/libs/widgets/KoCsvImportDialog.cpp -@@ -21,6 +21,7 @@ - #include "KoCsvImportDialog.h" - - // Qt -+#include - #include - #include - -diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp -index f91555ca262..a3816f96d8a 100644 a/libs/widgets/KoPageLayoutWidget.cpp -+++ b/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include - -+#include -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: diff --git a/plan/src/kptview.h b/plan/src/kptview.h index 44d11935e71..a98e55342db 100644 --- a/plan/src/kptview.h @@ -151,67 +119,6 @@ index c9e17b748a9..b67e9848807 100644 class Q_DECL_HIDDEN KoPageLayoutWidget::Private { public: -diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp -index c0d5136f09e..d2a772e83c2 100644 a/plugins/chartshape/dialogs/TableEditorDialog.cpp -+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp -@@ -24,6 +24,7 @@ - - // Qt - #include -+#include - - // Calligra - #include -diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp -index ed109192cc5..8f521779617 100644 a/plugins/formulashape/FormulaToolWidget.cpp -+++ b/plugins/formulashape/FormulaToolWidget.cpp -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) -diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp -index a0a9832ddfc..7d7db53823b 100644 a/sheets/dialogs/LayoutDialog.cpp -+++ b/sheets/dialogs/LayoutDialog.cpp -@@ -36,6 +36,7 @@ - #include - - #include -+#include - #include - #include - #include -diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp -index d64208cbdb6..bfddb3a03f5 100644 a/words/part/dialogs/KWAnchoringProperties.cpp -+++ b/words/part/dialogs/KWAnchoringPropertie
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: a7a23d6447956b728cf089be0637b49ff2f3e2d2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 18 00:56:10 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 18 08:31:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7a23d64 app-office/calligra: Drop 3.1.0-r4 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/Manifest | 1 - app-office/calligra/calligra-3.1.0-r4.ebuild | 213 - app-office/calligra/files/calligra-3.1.0-doc.patch | 13 -- .../files/calligra-3.1.0-missing-header.patch | 23 --- .../files/calligra-3.1.0-no-arch-detection.patch | 17 -- .../calligra/files/calligra-3.1.0-no-webkit.patch | 70 --- .../files/calligra-3.1.0-poppler-0.69.patch| 83 .../files/calligra-3.1.0-poppler-0.71.patch| 202 --- .../files/calligra-3.1.0-poppler-0.72.patch| 39 .../files/calligra-3.1.0-poppler-0.73.patch| 35 .../files/calligra-3.1.0-poppler-0.82.patch| 35 .../files/calligra-3.1.0-poppler-0.83.patch| 69 --- .../calligra/files/calligra-3.1.0-qt-5.11.patch| 109 --- .../files/calligra-3.1.0-stage-qt-5.11.patch | 23 --- 14 files changed, 932 deletions(-) diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 867835ec111..351fbb7e9b7 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,2 +1 @@ -DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild b/app-office/calligra/calligra-3.1.0-r4.ebuild deleted file mode 100644 index 9e095aa4722..000 --- a/app-office/calligra/calligra-3.1.0-r4.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CHECKREQS_DISK_BUILD="4G" -ECM_HANDBOOK_DIR="xxx" # contains no language subdirs -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit check-reqs ecm - -DESCRIPTION="KDE Office Suite" -HOMEPAGE="https://www.calligra.org/"; -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="amd64 x86" - -CAL_FTS=( karbon sheets stage words ) - -IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr - +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" - -# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) -# Required for the matlab/octave formula tool -BDEPEND=" - sys-devel/gettext -" -COMMON_DEPEND=" - dev-lang/perl - >=dev-qt/designer-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtscript-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kemoticons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kross-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonnet
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 91bae785446138e2818ca1c76de35b731c8fae45 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 25 21:14:54 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 25 21:20:14 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91bae785 app-office/calligra: Fix build with app-text/poppler-0.83.0 Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-3.1.0-r4.ebuild | 4 ++ .../files/calligra-3.1.0-poppler-0.83.patch| 69 ++ 2 files changed, 73 insertions(+) diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild b/app-office/calligra/calligra-3.1.0-r4.ebuild index 411c8177f1c..f4c78118f36 100644 --- a/app-office/calligra/calligra-3.1.0-r4.ebuild +++ b/app-office/calligra/calligra-3.1.0-r4.ebuild @@ -139,6 +139,10 @@ src_prepare() { eapply "${FILESDIR}/${P}-poppler-0.82.patch" # TODO: make upstreamable patch fi + if has_version ">=app-text/poppler-0.83"; then + eapply "${FILESDIR}/${P}-poppler-0.83.patch" # TODO: make upstreamable patch + fi + if ! use test; then sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \ -i libs/pigment/CMakeLists.txt || die diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch new file mode 100644 index 000..383131ab387 --- /dev/null +++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch @@ -0,0 +1,69 @@ +Source: Timo Gurr +Upstream: Reported, https://bugs.kde.org/show_bug.cgi?id=414795 +Reason: Fix build with poppler 0.83.0 + +diff -Naur calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp +--- calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp2019-12-04 12:41:13.0 +0100 calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp2019-12-04 12:39:03.0 +0100 +@@ -60,19 +60,17 @@ + } + + // read config file +-globalParams = new GlobalParams(); ++globalParams.reset(new GlobalParams()); + if (! globalParams) + return KoFilter::NotImplemented; + + GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); + PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); + if (! pdfDoc) { +-delete globalParams; + return KoFilter::StupidError; + } + + if (! pdfDoc->isOk()) { +-delete globalParams; + delete pdfDoc; + return KoFilter::StupidError; + } +@@ -99,7 +97,6 @@ + + delete dev; + delete pdfDoc; +-delete globalParams; + globalParams = 0; + + return KoFilter::OK; +diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp +--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:41:14.0 +0100 calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:35:30.0 +0100 +@@ -172,7 +172,7 @@ + *d->body << "/>" << endl; + } + +-QString SvgOutputDev::convertPath(GfxPath *path) ++QString SvgOutputDev::convertPath(const GfxPath *path) + { + if (! path) + return QString(); +@@ -180,7 +180,7 @@ + QString output; + + for (int i = 0; i < path->getNumSubpaths(); ++i) { +-GfxSubpath * subpath = path->getSubpath(i); ++const GfxSubpath * subpath = path->getSubpath(i); + if (subpath->getNumPoints() > 0) { + output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); + int j = 1; +diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h +--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h 2019-12-04 12:41:14.0 +0100 calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h 2019-12-04 12:30:41.0 +0100 +@@ -83,7 +83,7 @@ + /// Dumps content to svg file + void dumpContent(); + private: +-QString convertPath(GfxPath *path); ++QString convertPath(const GfxPath *path); + QString convertMatrix(const QMatrix &matrix); + QString convertMatrix(const double * matrix); + QString printFill();
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 502c8c6d98afd5a69a0323dfa2ea708c94bbafeb Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jun 17 12:18:00 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 17 12:18:48 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=502c8c6d app-office/calligra: Fix Fontconfig/Freetype cmake args/targets Closes: https://bugs.gentoo.org/796224 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-3.2.1-r2.ebuild | 5 +- .../calligra/files/calligra-3.2.1-cmake-3.16.patch | 86 ++ 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/app-office/calligra/calligra-3.2.1-r2.ebuild b/app-office/calligra/calligra-3.2.1-r2.ebuild index 88df884a68a..7fa46d30c39 100644 --- a/app-office/calligra/calligra-3.2.1-r2.ebuild +++ b/app-office/calligra/calligra-3.2.1-r2.ebuild @@ -117,7 +117,10 @@ RDEPEND="${COMMON_DEPEND} RESTRICT+=" test" -PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch + "${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224 +) pkg_pretend() { check-reqs_pkg_pretend diff --git a/app-office/calligra/files/calligra-3.2.1-cmake-3.16.patch b/app-office/calligra/files/calligra-3.2.1-cmake-3.16.patch new file mode 100644 index 000..7e1fd9d41ea --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-cmake-3.16.patch @@ -0,0 +1,86 @@ +From c7636fb343c848000300a9429410b74d17a4d54d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= +Date: Tue, 8 Jun 2021 05:13:23 + +Subject: [PATCH] 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() + + +-- +GitLab +
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 4df1ed41c45ff68105b9f40ddbe40a93f680b60b Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 16 18:44:12 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 16 18:45:47 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df1ed41 app-office/calligra: Fix build with >=app-text/poppler-22.04.0 Use upstream patches for app-text/poppler-22.03.0 instead of ArchLinux's. Closes: https://bugs.gentoo.org/843605 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-3.2.1-r5.ebuild | 3 +- .../files/calligra-3.2.1-poppler-22.03.0-1.patch | 73 + .../files/calligra-3.2.1-poppler-22.03.0-2.patch | 94 ++ .../files/calligra-3.2.1-poppler-22.03.0.patch | 51 .../files/calligra-3.2.1-poppler-22.04.0.patch | 25 ++ 5 files changed, 194 insertions(+), 52 deletions(-) diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild b/app-office/calligra/calligra-3.2.1-r5.ebuild index d80568af53ec..49246e3bca3d 100644 --- a/app-office/calligra/calligra-3.2.1-r5.ebuild +++ b/app-office/calligra/calligra-3.2.1-r5.ebuild @@ -120,7 +120,8 @@ PATCHES=( "${FILESDIR}"/${P}-{openexr-3,imath-{1,2}}.patch "${FILESDIR}"/${P}-cxx17-for-poppler-22.patch "${FILESDIR}"/${P}-cxx17-fixes.patch - "${FILESDIR}"/${P}-poppler-22.03.0.patch # by Archlinux, TODO upstream + "${FILESDIR}"/${P}-poppler-22.03.0-{1,2}.patch + "${FILESDIR}"/${P}-poppler-22.04.0.patch ) pkg_pretend() { diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-1.patch b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-1.patch new file mode 100644 index ..2d308371a0a7 --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-1.patch @@ -0,0 +1,73 @@ +From 63ae4ecc780ba42901e6934302b75bd18d3bc5eb Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 13 Apr 2022 01:25:44 +0200 +Subject: [PATCH 1/3] 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. +--- + CMakeLists.txt| 1 + + filters/karbon/pdf/CMakeLists.txt | 2 +- + filters/karbon/pdf/PdfImport.cpp | 9 + + 3 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bdd9ed74406..d8c86810b54 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -998,6 +998,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 94d4071da3d..ef360f44359 100644 +--- a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt +@@ -19,7 +19,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 286f5fa78bc..c171c754116 100644 +--- a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp +@@ -30,6 +30,10 @@ + + #include + ++#include ++ ++#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" +@@ -73,8 +77,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 fname = std::make_unique(QFile::encodeName(m_chain->inputFile()).data()); ++PDFDoc * pdfDoc = new PDFDoc(std::move(fname)); ++#endif + if (! pdfDoc) { + #ifdef HAVE_POPPLER_PRE_0_83 + delete globalParams; +-- +2.35.1 + diff --git a/app-office/calligr
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: e73ec37c544d40eddf1f950778c66b10e7f27a6b Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 9 18:30:14 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 9 18:31:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73ec37c app-office/calligra: drop 3.2.1-r9, dropping stable keywords This wouldn't have been considered a stable package for a long time. Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/Manifest | 1 - app-office/calligra/calligra-3.2.1-r9.ebuild | 203 - .../files/calligra-3.2.1-clang-16-configure.patch | 19 -- .../calligra/files/calligra-3.2.1-okularpart.patch | 78 .../files/calligra-3.2.1-poppler-24.05.0.patch | 42 - .../calligra-3.2.1-use-cmake-FindGSL-module.patch | 29 --- app-office/calligra/metadata.xml | 3 - 7 files changed, 375 deletions(-) diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 5cf5a8973143..5a47f72b8b0a 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,3 +1,2 @@ DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc -DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f DIST calligra-4.0.1.tar.xz 57780728 BLAKE2B 0ea82f5b21d36e04222db4ee282048b61a6d144630cc26d007d722fa8fc3081ee38e8f54b7256f9e722cccedc7ddc7489e3a3bd7dff34263d81cd5a7081aa6b2 SHA512 79569a1e75d5c70c8b2c3e5c7cf88d26d9b7a81be52c131c932521c65d1712a531829bcd29f7233f1ee7601fa363ca9ce2c4783a76dfdc5abe3c8b04b5741b78 diff --git a/app-office/calligra/calligra-3.2.1-r9.ebuild b/app-office/calligra/calligra-3.2.1-r9.ebuild deleted file mode 100644 index 0503c3fba007.. --- a/app-office/calligra/calligra-3.2.1-r9.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CHECKREQS_DISK_BUILD="4G" -CMAKE_REMOVE_MODULES_LIST=( FindGSL ) -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.88.0 -QTMIN=5.15.2 -inherit check-reqs ecm flag-o-matic kde.org - -DESCRIPTION="KDE Office Suite" -HOMEPAGE="https://calligra.org/"; - -if [[ ${KDE_BUILD_TYPE} == release ]]; then - PATCHSET="${P}-patchset-1" - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"; - KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" -fi - -CAL_FTS=( karbon sheets stage words ) - -LICENSE="GPL-2" -SLOT="5" -IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms - okular +pdf phonon spacenav +truetype X - $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" - -RESTRICT="test" - -# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) -# Required for the matlab/octave formula tool -COMMON_DEPEND=" - dev-lang/perl - >=dev-qt/designer-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kemoticons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonne
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 87e54ac491002dcb3fa18a57110d700c12dcb7a7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jun 6 17:45:07 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 6 18:09:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e54ac4 app-office/calligra: Fix build with >=app-text/poppler-24.05 Thanks-to: Attila Tóth Closes: https://bugs.gentoo.org/933490 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-3.2.1-r9.ebuild | 1 + .../files/calligra-3.2.1-poppler-24.05.0.patch | 42 ++ 2 files changed, 43 insertions(+) diff --git a/app-office/calligra/calligra-3.2.1-r9.ebuild b/app-office/calligra/calligra-3.2.1-r9.ebuild index 32314e5d0f86..0503c3fba007 100644 --- a/app-office/calligra/calligra-3.2.1-r9.ebuild +++ b/app-office/calligra/calligra-3.2.1-r9.ebuild @@ -130,6 +130,7 @@ PATCHES=( "${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532 "${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343 "${FILESDIR}"/${P}-clang-16-configure.patch + "${FILESDIR}"/${P}-poppler-24.05.0.patch # bug 933490 ) pkg_pretend() { diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch new file mode 100644 index ..2ef45d675e3b --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch @@ -0,0 +1,42 @@ +diff '--color=auto' -urNp calligra-3.2.1-orig/CMakeLists.txt calligra-3.2.1-dwok/CMakeLists.txt +--- calligra-3.2.1-orig/CMakeLists.txt 2024-06-05 13:06:55.730007129 +0200 calligra-3.2.1-dwok/CMakeLists.txt 2024-06-05 13:08:00.587082911 +0200 +@@ -104,7 +104,7 @@ if(NOT DEFINED RELEASE_BUILD) + endif() + message(STATUS "Release build: ${RELEASE_BUILD}") + +-set (CMAKE_CXX_STANDARD 17) # required for >=poppler-22.01 ++set (CMAKE_CXX_STANDARD 20) # required for >=poppler-22.04 + + + # +diff '--color=auto' -urNp calligra-3.2.1-orig/libs/pigment/lut.h calligra-3.2.1-dwok/libs/pigment/lut.h +--- calligra-3.2.1-orig/libs/pigment/lut.h 2024-06-05 13:06:55.922010313 +0200 calligra-3.2.1-dwok/libs/pigment/lut.h 2024-06-05 13:09:24.460474108 +0200 +@@ -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 f; + }; + public: +-LutKey(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.
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 057cec87f1c1d0ca1f034a88f7c401101c4d70b3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Mar 15 11:55:46 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Mar 15 12:18:14 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057cec87 app-office/calligra: Switch okularpart headers to okular5 Bug: https://bugs.gentoo.org/926748 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-3.2.1-r9.ebuild | 4 ++ .../calligra/files/calligra-3.2.1-okularpart.patch | 78 ++ 2 files changed, 82 insertions(+) diff --git a/app-office/calligra/calligra-3.2.1-r9.ebuild b/app-office/calligra/calligra-3.2.1-r9.ebuild index fb8f5a53b31b..32314e5d0f86 100644 --- a/app-office/calligra/calligra-3.2.1-r9.ebuild +++ b/app-office/calligra/calligra-3.2.1-r9.ebuild @@ -142,6 +142,10 @@ pkg_setup() { } src_prepare() { + if has_version "media-gfx/okularpart:5"; then + eapply "${FILESDIR}/${P}-okularpart.patch" + fi + ecm_src_prepare # Unconditionally disable deprecated deps (required by QtQuick1) diff --git a/app-office/calligra/files/calligra-3.2.1-okularpart.patch b/app-office/calligra/files/calligra-3.2.1-okularpart.patch new file mode 100644 index ..75a3b0d05416 --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-okularpart.patch @@ -0,0 +1,78 @@ +From e3b1fe06a2593edcaf33f106b2f77679cd1ea9c8 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Fri, 15 Mar 2024 12:39:45 +0100 +Subject: [PATCH] Switch okular headers to okular5 + +Otherwise it will be using okular6's. + +Signed-off-by: Andreas Sturmlechner +--- + extras/okularodpgenerator/OkularOdpGenerator.cpp | 2 +- + extras/okularodpgenerator/OkularOdpGenerator.h | 6 +++--- + extras/okularodtgenerator/OkularOdtGenerator.cpp | 2 +- + extras/okularodtgenerator/OkularOdtGenerator.h | 6 +++--- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/extras/okularodpgenerator/OkularOdpGenerator.cpp b/extras/okularodpgenerator/OkularOdpGenerator.cpp +index 823d039b3b0..a4614f38f6b 100644 +--- a/extras/okularodpgenerator/OkularOdpGenerator.cpp b/extras/okularodpgenerator/OkularOdpGenerator.cpp +@@ -33,7 +33,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/extras/okularodpgenerator/OkularOdpGenerator.h b/extras/okularodpgenerator/OkularOdpGenerator.h +index 9107c52c52b..5564ec7f881 100644 +--- a/extras/okularodpgenerator/OkularOdpGenerator.h b/extras/okularodpgenerator/OkularOdpGenerator.h +@@ -22,9 +22,9 @@ + + #include "kookulargenerator_odp_export.h" + +-#include +-#include +-#include ++#include ++#include ++#include + + class KoPADocument; + +diff --git a/extras/okularodtgenerator/OkularOdtGenerator.cpp b/extras/okularodtgenerator/OkularOdtGenerator.cpp +index 9ba114d6080..bccfb11a068 100644 +--- a/extras/okularodtgenerator/OkularOdtGenerator.cpp b/extras/okularodtgenerator/OkularOdtGenerator.cpp +@@ -41,7 +41,7 @@ + #include + #include + +-#include ++#include + + + OkularOdtGenerator::OkularOdtGenerator( QObject *parent, const QVariantList &args ) +diff --git a/extras/okularodtgenerator/OkularOdtGenerator.h b/extras/okularodtgenerator/OkularOdtGenerator.h +index d3e9692b385..994a81aae2c 100644 +--- a/extras/okularodtgenerator/OkularOdtGenerator.h b/extras/okularodtgenerator/OkularOdtGenerator.h +@@ -22,9 +22,9 @@ + + #include "kookulargenerator_odt_export.h" + +-#include +-#include +-#include ++#include ++#include ++#include + + class KWDocument; + +-- +2.44.0 +
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 46f5f2f97a7786d593d77593844096d5ce84c501 Author: Sam James gentoo org> AuthorDate: Sat Apr 22 16:45:19 2023 + Commit: Sam James gentoo org> CommitDate: Sat Apr 22 16:47:30 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f5f2f9 app-office/calligra: fix configure w/ clang 16 May be misconfigured otherwise. Signed-off-by: Sam James gentoo.org> ...ligra-3.2.1-r7.ebuild => calligra-3.2.1-r8.ebuild} | 1 + .../files/calligra-3.2.1-clang-16-configure.patch | 19 +++ 2 files changed, 20 insertions(+) diff --git a/app-office/calligra/calligra-3.2.1-r7.ebuild b/app-office/calligra/calligra-3.2.1-r8.ebuild similarity index 99% rename from app-office/calligra/calligra-3.2.1-r7.ebuild rename to app-office/calligra/calligra-3.2.1-r8.ebuild index 27b0ebbf1634..d757ece3bddd 100644 --- a/app-office/calligra/calligra-3.2.1-r7.ebuild +++ b/app-office/calligra/calligra-3.2.1-r8.ebuild @@ -126,6 +126,7 @@ PATCHES=( "${WORKDIR}"/${PATCHSET}/${P}-clang-16-c++17.patch "${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532 "${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343 + "${FILESDIR}"/${P}-clang-16-configure.patch ) pkg_pretend() { diff --git a/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch b/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch new file mode 100644 index ..c723eca0b75f --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch @@ -0,0 +1,19 @@ +https://invent.kde.org/office/calligra/-/merge_requests/81 +https://invent.kde.org/office/calligra/-/commit/30c905a6a34ad656446839c844abb78a2aa3f586 + +From 30c905a6a34ad656446839c844abb78a2aa3f586 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Wed, 19 Apr 2023 10:34:25 +0200 +Subject: [PATCH] Avoid implicit declaration of atoi in CMake check + +Future compilers will not support implicit function declarations by +default, so include for a declaration of atoi. +--- a/cmake/TestModernZlib.c b/cmake/TestModernZlib.c +@@ -1,3 +1,4 @@ ++#include + #include + #include + +-- +GitLab
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: b67543f8bb06015c098c3adea74641e27d531045 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 29 12:35:05 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Mar 29 12:46:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67543f8 app-office/calligra: Drop unused KF5Kross dep, use patchset See also: https://invent.kde.org/office/calligra/-/merge_requests/79 Bug: https://bugs.gentoo.org/903532 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/Manifest | 1 + app-office/calligra/calligra-3.2.1-r5.ebuild | 20 +- ...ra-3.2.1-r5.ebuild => calligra-3.2.1-r6.ebuild} | 25 +- .../files/calligra-3.1.89-no-arch-detection.patch | 17 - .../files/calligra-3.2.1-clang-16-c++17.patch | 359 - .../calligra/files/calligra-3.2.1-cmake-3.16.patch | 86 .../files/calligra-3.2.1-cxx17-fixes.patch | 443 - .../calligra-3.2.1-cxx17-for-poppler-22.patch | 31 -- .../calligra/files/calligra-3.2.1-imath-1.patch| 30 -- .../calligra/files/calligra-3.2.1-imath-2.patch| 25 -- .../calligra/files/calligra-3.2.1-openexr-3.patch | 93 - .../files/calligra-3.2.1-poppler-22.03.0-1.patch | 73 .../files/calligra-3.2.1-poppler-22.03.0-2.patch | 94 - .../files/calligra-3.2.1-poppler-22.04.0.patch | 25 -- 14 files changed, 26 insertions(+), 1296 deletions(-) diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 351fbb7e9b7c..d7c2d4419fe5 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1 +1,2 @@ +DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild b/app-office/calligra/calligra-3.2.1-r5.ebuild index c9290de8b5ac..2acce0b09496 100644 --- a/app-office/calligra/calligra-3.2.1-r5.ebuild +++ b/app-office/calligra/calligra-3.2.1-r5.ebuild @@ -14,7 +14,9 @@ DESCRIPTION="KDE Office Suite" HOMEPAGE="https://calligra.org/"; if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + PATCHSET="${P}-patchset-1" + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"; KEYWORDS="amd64 ~ppc64 ~riscv x86" fi @@ -115,14 +117,14 @@ RDEPEND="${COMMON_DEPEND} BDEPEND="sys-devel/gettext" PATCHES=( - "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch - "${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224 - "${FILESDIR}"/${P}-{openexr-3,imath-{1,2}}.patch - "${FILESDIR}"/${P}-cxx17-for-poppler-22.patch - "${FILESDIR}"/${P}-cxx17-fixes.patch - "${FILESDIR}"/${P}-poppler-22.03.0-{1,2}.patch - "${FILESDIR}"/${P}-poppler-22.04.0.patch - "${FILESDIR}"/${P}-clang-16-c++17.patch + "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch + "${WORKDIR}"/${PATCHSET}/${P}-cmake-3.16.patch # bug 796224 + "${WORKDIR}"/${PATCHSET}/${P}-{openexr-3,imath-{1,2}}.patch + "${WORKDIR}"/${PATCHSET}/${P}-cxx17-for-poppler-22.patch + "${WORKDIR}"/${PATCHSET}/${P}-cxx17-fixes.patch + "${WORKDIR}"/${PATCHSET}/${P}-poppler-22.03.0-{1,2}.patch + "${WORKDIR}"/${PATCHSET}/${P}-poppler-22.04.0.patch + "${WORKDIR}"/${PATCHSET}/${P}-clang-16-c++17.patch ) pkg_pretend() { diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild b/app-office/calligra/calligra-3.2.1-r6.ebuild similarity index 87% copy from app-office/calligra/calligra-3.2.1-r5.ebuild copy to app-office/calligra/calligra-3.2.1-r6.ebuild index c9290de8b5ac..4d434a0c1d25 100644 --- a/app-office/calligra/calligra-3.2.1-r5.ebuild +++ b/app-office/calligra/calligra-3.2.1-r6.ebuild @@ -14,8 +14,10 @@ DESCRIPTION="KDE Office Suite" HOMEPAGE="https://calligra.org/"; if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~ppc64 ~riscv x86" + PATCHSET="${P}-patchset-1" + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"; + KEYWORDS="~amd64 ~ppc64 ~riscv ~x86" fi CAL_FTS=( karbon sheets stage words ) @@ -62,7 +64,6 @@ COMMON_DEPEND=" >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
commit: e3ae04d9c5f068e17d903ac7d5b16336589fb56e Author: Sam James gentoo org> AuthorDate: Thu Feb 16 02:52:20 2023 + Commit: Sam James gentoo org> CommitDate: Thu Feb 16 03:26:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ae04d9 app-office/calligra: fix build w/ clang 16 deux I was a bit naive and just checked for the appearance of register warnings by eye & -std=c++14 appearing and that's not good enough here, as we force C++17 for Poppler in a patch. Again, this is fixed upstream anyway, so this is a downstream-only patch. Fixes: e0a0a09c1bb283024c1a10f737eba380a22bcc1f Closes: https://bugs.gentoo.org/894578 Closes: https://bugs.gentoo.org/883067 Signed-off-by: Sam James gentoo.org> app-office/calligra/calligra-3.2.1-r5.ebuild | 4 +- .../files/calligra-3.2.1-clang-16-c++17.patch | 359 + 2 files changed, 360 insertions(+), 3 deletions(-) diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild b/app-office/calligra/calligra-3.2.1-r5.ebuild index f26074e74960..c9290de8b5ac 100644 --- a/app-office/calligra/calligra-3.2.1-r5.ebuild +++ b/app-office/calligra/calligra-3.2.1-r5.ebuild @@ -122,6 +122,7 @@ PATCHES=( "${FILESDIR}"/${P}-cxx17-fixes.patch "${FILESDIR}"/${P}-poppler-22.03.0-{1,2}.patch "${FILESDIR}"/${P}-poppler-22.04.0.patch + "${FILESDIR}"/${P}-clang-16-c++17.patch ) pkg_pretend() { @@ -144,9 +145,6 @@ src_prepare() { src_configure() { local cal_ft myproducts - # Uses removed 'register' keyword, drop on next release. bug #883067 - append-cxxflags -std=c++14 - # applications for cal_ft in ${CAL_FTS[@]}; do use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) diff --git a/app-office/calligra/files/calligra-3.2.1-clang-16-c++17.patch b/app-office/calligra/files/calligra-3.2.1-clang-16-c++17.patch new file mode 100644 index ..d826e006249d --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-clang-16-c++17.patch @@ -0,0 +1,359 @@ +Fixed in upstream master but in a far larger patch. + +C++ 17 removes 'register'. GCC allows it as an extension (for now?) but Clang +16 which defaults to -std=c++17 doesn't. + +Further, we have to use C++17 for Poppler, so we can't just force e.g. c++14. + +https://bugs.gentoo.org/883067#c4 +https://bugs.gentoo.org/894578 +--- a/sheets/part/Digest.cpp b/sheets/part/Digest.cpp +@@ -250,8 +250,8 @@ typedef struct digest_impl_st { + */ + static void __rtl_digest_swapLong(sal_uInt32 *pData, sal_uInt32 nDatLen) + { +-register sal_uInt32 *X; +-register int i, n; ++sal_uInt32 *X; ++int i, n; + + X = pData; + n = nDatLen; +@@ -465,10 +465,10 @@ static void __rtl_digest_initSHA( + */ + static void __rtl_digest_updateSHA(DigestContextSHA *ctx) + { +-register sal_uInt32 A, B, C, D, E, T; +-register sal_uInt32 *X; ++sal_uInt32 A, B, C, D, E, T; ++sal_uInt32 *X; + +-register DigestSHA_update_t *U; ++DigestSHA_update_t *U; + U = ctx->m_update; + + A = ctx->m_nA; +@@ -577,10 +577,10 @@ static void __rtl_digest_endSHA(DigestContextSHA *ctx) + static const sal_uInt8 end[4] = { + 0x80, 0x00, 0x00, 0x00 + }; +-register const sal_uInt8 *p = end; ++const sal_uInt8 *p = end; + +-register sal_uInt32 *X; +-register int i; ++sal_uInt32 *X; ++int i; + + X = ctx->m_pData; + i = (ctx->m_nDatLen >> 2); +--- a/sheets/ui/CellToolBase_p.cpp b/sheets/ui/CellToolBase_p.cpp +@@ -246,7 +246,7 @@ void CellToolBase::Private::processArrowKey(QKeyEvent *event) + /* NOTE: hitting the tab key also calls this function. Don't forget + to account for it + */ +-register Sheet * const sheet = q->selection()->activeSheet(); ++Sheet * const sheet = q->selection()->activeSheet(); + if (!sheet) + return; + +@@ -300,7 +300,7 @@ void CellToolBase::Private::processEscapeKey(QKeyEvent * event) + + bool CellToolBase::Private::processHomeKey(QKeyEvent* event) + { +-register Sheet * const sheet = q->selection()->activeSheet(); ++Sheet * const sheet = q->selection()->activeSheet(); + if (!sheet) + return false; + +@@ -355,7 +355,7 @@ bool CellToolBase::Private::processHomeKey(QKeyEvent* event) + + bool CellToolBase::Private::processEndKey(QKeyEvent *event) + { +-register Sheet * const sheet = q->selection()->activeSheet(); ++Sheet * const sheet = q->selection()->activeSheet(); + if (!sheet) + return false; + +@@ -438,7 +438,7 @@ bool CellToolBase::Private::processNextKey(QKeyEvent *event) + + void CellToolBase::Private::processOtherKey(QKeyEvent *event) + { +-register Sheet * const sheet = q->selection()->activeSheet(); ++Sheet * const sheet = q->selection()->activeSheet(); + + // No null character ... + if (event->text().isEmpty() || !q->selection()->active