* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2016-03-22 19:11 Johannes Huber
0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2016-03-22 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 5f8fcc52db2a134f1189d4cde2a9bdd1aabc51b2
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 19:09:35 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 19:11:27 2016 +0000
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 ce082f04cfb7947219e317ba9a4a6ce436a3aa0784f1cad6206f3febd072f177961111ccbb89227d3c8dede1eafc647409b26f1f4fb304b1d482db0fe8c758b9
-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..0000000
--- 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].9999)
- # stable branch live ebuild
- SRC_URI="" ;;
- 9999)
- # 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
-+xml"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="words stage sheets author karbon krita kexi flow plan braindump"
-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_krita? ( eigen exif lcms )
- calligra_features_plan? ( kdepim )
- calligra_features_sheets? ( eigen )
- vc? ( calligra_features_krita )
- test? ( calligra_features_karbon )
-"
-
-RDEPEND="
- !app-office/karbon
- !app-office/kexi
- !app-office/koffice-data
- !app-office/koffice-l10n
- !app-office/koffice-libs
- !app-office/koffice-meta
- !app-office/kplato
- !app-office/kpresenter
- !app-office/krita
- !app-office/kspread
- !app-office/kword
- $(add_kdeapps_dep knewstuff)
- dev-lang/perl
- dev-libs/boost
- dev-qt/qtcore:4[exceptions]
- media-libs/libpng:0
- sys-libs/zlib
- >=dev-qt/qtgui-4.8.1-r1:4
- virtual/libiconv
- attica? ( dev-libs/libattica )
- crypt? ( app-crypt/qca:2[qt4(+)] )
- eigen? ( dev-cpp/eigen:2 )
- 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
- media-libs/libvisio
- )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
- kdcraw? ( $(add_kdeapps_dep libkdcraw) )
- kde? ( $(add_kdebase_dep kactivities) )
- kdepim? ( $(add_kdeapps_dep kdepimlibs) )
- lcms? (
- media-libs/lcms:2
- x11-libs/libX11
- )
- marble? ( $(add_kdeapps_dep marble) )
- mysql? ( virtual/mysql )
- okular? ( $(add_kdeapps_dep okular) )
- opengl? (
- media-libs/glew
- virtual/glu
- )
- openexr? ( media-libs/openexr )
- pdf? (
- app-text/poppler:=
- media-gfx/pstoedit
- )
- 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-libs/vc-1.0.0 )
- xbase? ( dev-db/xbase )
- calligra_features_kexi? (
- >=dev-db/sqlite-3.7.9:3[extensions(+)]
- dev-libs/icu:=
- )
- calligra_features_krita? (
- dev-qt/qtdeclarative:4
- x11-libs/libX11
- x11-libs/libXi
- )
- calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-RESTRICT=test
-# bug 394273
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- kde4-base_pkg_setup
- check-reqs_pkg_setup
-}
-
-src_configure() {
- local cal_ft
-
- # first write out things we want to hard-enable
- local mycmakeargs=(
- "-DWITH_PNG=ON"
- "-DWITH_ZLIB=ON"
- "-DGHNS=ON"
- "-DWITH_Iconv=ON" # available on all supported arches and many more
- )
-
- # default disablers
- mycmakeargs+=(
- "-DBUILD_active=OFF" # we dont support active gui, maybe arm could
- "-DCREATIVEONLY=OFF"
- "-DPACKAGERS_BUILD=OFF"
- "-DWITH_Soprano=OFF"
- )
-
- # regular options
- mycmakeargs+=(
- $(cmake-utils_use_with attica LibAttica)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with eigen Eigen2)
- $(cmake-utils_use_with exif Exiv2)
- $(cmake-utils_use_with fftw FFTW3)
- $(cmake-utils_use_with fontconfig Fontconfig)
- $(cmake-utils_use_with freetds FreeTDS)
- $(cmake-utils_use_with glib GLIB2)
- $(cmake-utils_use_with gsl GSL)
- $(cmake-utils_use_with import-filter LibEtonyek)
- $(cmake-utils_use_with import-filter LibOdfGen)
- $(cmake-utils_use_with import-filter LibVisio)
- $(cmake-utils_use_with import-filter LibWpd)
- $(cmake-utils_use_with import-filter LibWpg)
- $(cmake-utils_use_with import-filter LibWps)
- $(cmake-utils_use_with jpeg JPEG)
- $(cmake-utils_use_with jpeg2k OpenJPEG)
- $(cmake-utils_use_with kdcraw Kdcraw)
- $(cmake-utils_use_with kde KActivities)
- $(cmake-utils_use_with kdepim KdepimLibs)
- $(cmake-utils_use_with lcms LCMS2)
- $(cmake-utils_use_with marble Marble)
- $(cmake-utils_use_with mysql MySQL)
- $(cmake-utils_use_with okular Okular)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use_with opengl GLEW)
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with pdf Poppler)
- $(cmake-utils_use_with pdf Pstoedit)
- $(cmake-utils_use_with postgres PostgreSQL)
- $(cmake-utils_use_build postgres pqxx)
- $(cmake-utils_use_with spacenav Spnav)
- $(cmake-utils_use_with sybase FreeTDS)
- $(cmake-utils_use_with tiff TIFF)
- $(cmake-utils_use_with threads Threads)
- $(cmake-utils_use_with truetype Freetype)
- $(cmake-utils_use_with vc Vc)
- $(cmake-utils_use_with xbase XBase)
- )
-
- # applications
- for cal_ft in ${CAL_FTS}; do
- mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
- done
- mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
- # filters
-
- kde4-base_src_configure
-}
diff --git a/app-office/calligra/calligra-2.9.10.ebuild b/app-office/calligra/calligra-2.9.10.ebuild
deleted file mode 100644
index b53f1a5..0000000
--- a/app-office/calligra/calligra-2.9.10.ebuild
+++ /dev/null
@@ -1,223 +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"
-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].?|2.[456789].??)
- # stable releases
- SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
- 2.[456789].9999)
- # stable branch live ebuild
- SRC_URI="" ;;
- 9999)
- # 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 kde +kdepim +lcms
-marble mysql +okular openexr +pdf 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? ( kdepim )
- calligra_features_sheets? ( eigen )
- 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) )
- kde? ( $(add_kdebase_dep kactivities) )
- kdepim? ( $(add_kdeapps_dep kdepimlibs) )
- lcms? (
- media-libs/lcms:2
- x11-libs/libX11
- )
- marble? ( $(add_kdeapps_dep marble) )
- mysql? ( virtual/mysql )
- okular? ( $(add_kdeapps_dep okular) )
- opengl? (
- media-libs/glew
- virtual/glu
- )
- openexr? ( media-libs/openexr )
- pdf? (
- app-text/poppler:=
- media-gfx/pstoedit
- )
- 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-libs/vc-1.0.0 )
- xbase? ( dev-db/xbase )
- calligra_features_kexi? (
- >=dev-db/sqlite-3.8.7:3[extensions(+)]
- dev-libs/icu:=
- )
- calligra_features_krita? (
- dev-qt/qtdeclarative:4
- x11-libs/libX11
- x11-libs/libXi
- )
- calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}
- x11-misc/shared-mime-info
-"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-# bug 394273
-RESTRICT=test
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- kde4-base_pkg_setup
- check-reqs_pkg_setup
-}
-
-src_configure() {
- local cal_ft myproducts
-
- # applications
- for cal_ft in ${CAL_FTS}; do
- # Switch to ^^ when we switch to EAPI=6.
- #local prod=${cal_ft^^}
- local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
- use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
- done
-
- local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
- # first write out things we want to hard-enable
- mycmakeargs+=(
- "-DWITH_Iconv=ON" # available on all supported arches and many more
- )
-
- # default disablers
- mycmakeargs+=(
- "-DCREATIVEONLY=OFF"
- "-DPACKAGERS_BUILD=OFF"
- "-DWITH_Soprano=OFF"
- )
-
- # regular options
- mycmakeargs+=(
- $(cmake-utils_use_with attica LibAttica)
- $(cmake-utils_use_with color-management OCIO)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with eigen Eigen3)
- $(cmake-utils_use_with exif Exiv2)
- $(cmake-utils_use_with fftw FFTW3)
- $(cmake-utils_use_with fontconfig Fontconfig)
- $(cmake-utils_use_with freetds FreeTDS)
- $(cmake-utils_use_with glib GLIB2)
- $(cmake-utils_use_with gsl GSL)
- $(cmake-utils_use_with import-filter LibEtonyek)
- $(cmake-utils_use_with import-filter LibOdfGen)
- $(cmake-utils_use_with import-filter LibRevenge)
- $(cmake-utils_use_with import-filter LibVisio)
- $(cmake-utils_use_with import-filter LibWpd)
- $(cmake-utils_use_with import-filter LibWpg)
- $(cmake-utils_use_with import-filter LibWps)
- $(cmake-utils_use_with jpeg JPEG)
- $(cmake-utils_use_with jpeg2k OpenJPEG)
- $(cmake-utils_use_with kdcraw Kdcraw)
- $(cmake-utils_use_with kde KActivities)
- $(cmake-utils_use_with kdepim KdepimLibs)
- $(cmake-utils_use_with lcms LCMS2)
- $(cmake-utils_use_with marble CalligraMarble)
- $(cmake-utils_use_with mysql MySQL)
- $(cmake-utils_use_with okular Okular)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use opengl USEOPENGL)
- $(cmake-utils_use_with pdf Poppler)
- $(cmake-utils_use_with pdf Pstoedit)
- $(cmake-utils_use_with postgres CalligraPostgreSQL)
- $(cmake-utils_use_build postgres pqxx)
- $(cmake-utils_use_with spacenav Spnav)
- $(cmake-utils_use_with sybase FreeTDS)
- $(cmake-utils_use_with tiff TIFF)
- $(cmake-utils_use_with threads Threads)
- $(cmake-utils_use_with truetype Freetype)
- $(cmake-utils_use_with vc Vc)
- $(cmake-utils_use_with xbase XBase)
- )
-
- mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
- kde4-base_src_configure
-}
diff --git a/app-office/calligra/calligra-2.9.6.ebuild b/app-office/calligra/calligra-2.9.6.ebuild
deleted file mode 100644
index ae7485f..0000000
--- a/app-office/calligra/calligra-2.9.6.ebuild
+++ /dev/null
@@ -1,230 +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"
-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].9999)
- # stable branch live ebuild
- SRC_URI="" ;;
- 9999)
- # 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 kde +kdepim +lcms
-marble mysql +okular openexr +pdf 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? ( kdepim )
- calligra_features_sheets? ( eigen )
- vc? ( calligra_features_krita )
- test? ( calligra_features_karbon )
-"
-
-RDEPEND="
- $(add_kdeapps_dep knewstuff)
- 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) )
- kde? ( $(add_kdebase_dep kactivities) )
- kdepim? ( $(add_kdeapps_dep kdepimlibs) )
- lcms? (
- media-libs/lcms:2
- x11-libs/libX11
- )
- marble? ( $(add_kdeapps_dep marble) )
- mysql? ( virtual/mysql )
- okular? ( $(add_kdeapps_dep okular) )
- opengl? (
- media-libs/glew
- virtual/glu
- )
- openexr? ( media-libs/openexr )
- pdf? (
- app-text/poppler:=
- media-gfx/pstoedit
- )
- 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-libs/vc-1.0.0 )
- xbase? ( dev-db/xbase )
- calligra_features_kexi? (
- >=dev-db/sqlite-3.8.7:3[extensions(+)]
- dev-libs/icu:=
- )
- calligra_features_krita? (
- dev-qt/qtdeclarative:4
- x11-libs/libX11
- x11-libs/libXi
- )
- calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}
- x11-misc/shared-mime-info
-"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-# bug 394273
-RESTRICT=test
-
-PATCHES=(
- "${FILESDIR}/${P}-version.patch"
- "${FILESDIR}/${P}-ghns-linking.patch"
-)
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- kde4-base_pkg_setup
- check-reqs_pkg_setup
-}
-
-src_configure() {
- local cal_ft myproducts
-
- # applications
- for cal_ft in ${CAL_FTS}; do
- # Switch to ^^ when we switch to EAPI=6.
- #local prod=${cal_ft^^}
- local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
- use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
- done
-
- local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
- # first write out things we want to hard-enable
- mycmakeargs+=(
- "-DGHNS=ON"
- "-DWITH_Iconv=ON" # available on all supported arches and many more
- )
-
- # default disablers
- mycmakeargs+=(
- "-DCREATIVEONLY=OFF"
- "-DPACKAGERS_BUILD=OFF"
- "-DWITH_Soprano=OFF"
- )
-
- # regular options
- mycmakeargs+=(
- $(cmake-utils_use_with attica LibAttica)
- $(cmake-utils_use_with color-management OCIO)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with eigen Eigen3)
- $(cmake-utils_use_with exif Exiv2)
- $(cmake-utils_use_with fftw FFTW3)
- $(cmake-utils_use_with fontconfig Fontconfig)
- $(cmake-utils_use_with freetds FreeTDS)
- $(cmake-utils_use_with glib GLIB2)
- $(cmake-utils_use_with gsl GSL)
- $(cmake-utils_use_with import-filter LibEtonyek)
- $(cmake-utils_use_with import-filter LibOdfGen)
- $(cmake-utils_use_with import-filter LibRevenge)
- $(cmake-utils_use_with import-filter LibVisio)
- $(cmake-utils_use_with import-filter LibWpd)
- $(cmake-utils_use_with import-filter LibWpg)
- $(cmake-utils_use_with import-filter LibWps)
- $(cmake-utils_use_with jpeg JPEG)
- $(cmake-utils_use_with jpeg2k OpenJPEG)
- $(cmake-utils_use_with kdcraw Kdcraw)
- $(cmake-utils_use_with kde KActivities)
- $(cmake-utils_use_with kdepim KdepimLibs)
- $(cmake-utils_use_with lcms LCMS2)
- $(cmake-utils_use_with marble CalligraMarble)
- $(cmake-utils_use_with mysql MySQL)
- $(cmake-utils_use_with okular Okular)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use opengl USEOPENGL)
- $(cmake-utils_use_with pdf Poppler)
- $(cmake-utils_use_with pdf Pstoedit)
- $(cmake-utils_use_with postgres CalligraPostgreSQL)
- $(cmake-utils_use_build postgres pqxx)
- $(cmake-utils_use_with spacenav Spnav)
- $(cmake-utils_use_with sybase FreeTDS)
- $(cmake-utils_use_with tiff TIFF)
- $(cmake-utils_use_with threads Threads)
- $(cmake-utils_use_with truetype Freetype)
- $(cmake-utils_use_with vc Vc)
- $(cmake-utils_use_with xbase XBase)
- )
-
- mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
- kde4-base_src_configure
-}
diff --git a/app-office/calligra/calligra-2.9.7.ebuild b/app-office/calligra/calligra-2.9.7.ebuild
deleted file mode 100644
index 722ca60..0000000
--- a/app-office/calligra/calligra-2.9.7.ebuild
+++ /dev/null
@@ -1,227 +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"
-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].9999)
- # stable branch live ebuild
- SRC_URI="" ;;
- 9999)
- # 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 kde +kdepim +lcms
-marble mysql +okular openexr +pdf 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? ( kdepim )
- calligra_features_sheets? ( eigen )
- vc? ( calligra_features_krita )
- test? ( calligra_features_karbon )
-"
-
-RDEPEND="
- $(add_kdeapps_dep knewstuff)
- 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) )
- kde? ( $(add_kdebase_dep kactivities) )
- kdepim? ( $(add_kdeapps_dep kdepimlibs) )
- lcms? (
- media-libs/lcms:2
- x11-libs/libX11
- )
- marble? ( $(add_kdeapps_dep marble) )
- mysql? ( virtual/mysql )
- okular? ( $(add_kdeapps_dep okular) )
- opengl? (
- media-libs/glew
- virtual/glu
- )
- openexr? ( media-libs/openexr )
- pdf? (
- app-text/poppler:=
- media-gfx/pstoedit
- )
- 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-libs/vc-1.0.0 )
- xbase? ( dev-db/xbase )
- calligra_features_kexi? (
- >=dev-db/sqlite-3.8.7:3[extensions(+)]
- dev-libs/icu:=
- )
- calligra_features_krita? (
- dev-qt/qtdeclarative:4
- x11-libs/libX11
- x11-libs/libXi
- )
- calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}
- x11-misc/shared-mime-info
-"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-# bug 394273
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}/${PN}-2.9.6-ghns-linking.patch" )
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- kde4-base_pkg_setup
- check-reqs_pkg_setup
-}
-
-src_configure() {
- local cal_ft myproducts
-
- # applications
- for cal_ft in ${CAL_FTS}; do
- # Switch to ^^ when we switch to EAPI=6.
- #local prod=${cal_ft^^}
- local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
- use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
- done
-
- local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
- # first write out things we want to hard-enable
- mycmakeargs+=(
- "-DGHNS=ON"
- "-DWITH_Iconv=ON" # available on all supported arches and many more
- )
-
- # default disablers
- mycmakeargs+=(
- "-DCREATIVEONLY=OFF"
- "-DPACKAGERS_BUILD=OFF"
- "-DWITH_Soprano=OFF"
- )
-
- # regular options
- mycmakeargs+=(
- $(cmake-utils_use_with attica LibAttica)
- $(cmake-utils_use_with color-management OCIO)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with eigen Eigen3)
- $(cmake-utils_use_with exif Exiv2)
- $(cmake-utils_use_with fftw FFTW3)
- $(cmake-utils_use_with fontconfig Fontconfig)
- $(cmake-utils_use_with freetds FreeTDS)
- $(cmake-utils_use_with glib GLIB2)
- $(cmake-utils_use_with gsl GSL)
- $(cmake-utils_use_with import-filter LibEtonyek)
- $(cmake-utils_use_with import-filter LibOdfGen)
- $(cmake-utils_use_with import-filter LibRevenge)
- $(cmake-utils_use_with import-filter LibVisio)
- $(cmake-utils_use_with import-filter LibWpd)
- $(cmake-utils_use_with import-filter LibWpg)
- $(cmake-utils_use_with import-filter LibWps)
- $(cmake-utils_use_with jpeg JPEG)
- $(cmake-utils_use_with jpeg2k OpenJPEG)
- $(cmake-utils_use_with kdcraw Kdcraw)
- $(cmake-utils_use_with kde KActivities)
- $(cmake-utils_use_with kdepim KdepimLibs)
- $(cmake-utils_use_with lcms LCMS2)
- $(cmake-utils_use_with marble CalligraMarble)
- $(cmake-utils_use_with mysql MySQL)
- $(cmake-utils_use_with okular Okular)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use opengl USEOPENGL)
- $(cmake-utils_use_with pdf Poppler)
- $(cmake-utils_use_with pdf Pstoedit)
- $(cmake-utils_use_with postgres CalligraPostgreSQL)
- $(cmake-utils_use_build postgres pqxx)
- $(cmake-utils_use_with spacenav Spnav)
- $(cmake-utils_use_with sybase FreeTDS)
- $(cmake-utils_use_with tiff TIFF)
- $(cmake-utils_use_with threads Threads)
- $(cmake-utils_use_with truetype Freetype)
- $(cmake-utils_use_with vc Vc)
- $(cmake-utils_use_with xbase XBase)
- )
-
- mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
- kde4-base_src_configure
-}
diff --git a/app-office/calligra/files/calligra-2.9.6-ghns-linking.patch b/app-office/calligra/files/calligra-2.9.6-ghns-linking.patch
deleted file mode 100644
index b150972..0000000
--- a/app-office/calligra/files/calligra-2.9.6-ghns-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- calligra-2.9.6/libs/widgets/CMakeLists.txt.orig 2015-08-09 21:35:06.673116594 +0200
-+++ calligra-2.9.6/libs/widgets/CMakeLists.txt 2015-08-09 21:47:31.458881310 +0200
-@@ -102,7 +102,7 @@
- target_link_libraries(kowidgets kotext pigmentcms kowidgetutils ${KDE4_KIO_LIBS})
-
- if(GHNS)
-- target_link_libraries(kowidgets {KDE4_KNEWSTUFF3_LIBS})
-+ target_link_libraries(kowidgets ${KDE4_KNEWSTUFF3_LIBS})
- endif ()
-
- target_link_libraries(kowidgets LINK_INTERFACE_LIBRARIES kotext pigmentcms kowidgetutils ${KDE4_KDEUI_LIBS})
diff --git a/app-office/calligra/files/calligra-2.9.6-version.patch b/app-office/calligra/files/calligra-2.9.6-version.patch
deleted file mode 100644
index 277d65f..0000000
--- a/app-office/calligra/files/calligra-2.9.6-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Boudewijn Rempt <boud@valdyas.org>
-Date: Thu, 09 Jul 2015 06:14:05 +0000
-Subject: Update to 2.9.6
-X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=8d47cbdc81bbc3853837c6fc342d5b2dc77c3c0a
----
-Update to 2.9.6
----
-
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,10 +27,10 @@
-
- # define common versions of Calligra applications, used to generate calligraversion.h
- # update these version for every release:
--set(CALLIGRA_VERSION_STRING "2.9.5")
-+set(CALLIGRA_VERSION_STRING "2.9.6")
- set(CALLIGRA_VERSION_MAJOR 2)
- set(CALLIGRA_STABLE_VERSION_MINOR 9)
--set(CALLIGRA_VERSION_RELEASE 5) # 89 for Alpha, increase for next test releases, set 0 for first Stable, etc.
-+set(CALLIGRA_VERSION_RELEASE 6) # 89 for Alpha, increase for next test releases, set 0 for first Stable, etc.
- #set(CALLIGRA_ALPHA 1) # uncomment only for Pre-Alpha and Alpha
- #set(CALLIGRA_BETA 1) # uncomment only for Beta
- #set(CALLIGRA_RC 1) # uncomment only for RC
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2016-12-08 14:10 Johannes Huber
0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2016-12-08 14:10 UTC (permalink / raw
To: gentoo-commits
commit: 3fb992b4a31755f1c289dbf1f1f25dfbd8557303
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 7 18:52:21 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Dec 8 14:10:22 2016 +0000
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 <amadio <AT> gentoo.org>
Signed-off-by: Johannes Huber <johu <AT> 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 00000000..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].9999)
+ # stable branch live ebuild
+ SRC_URI="" ;;
+ 9999)
+ # 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-libs/vc-1.0.0 )
+ xbase? ( dev-db/xbase )
+ calligra_features_kexi? (
+ >=dev-db/sqlite-3.8.7:3[extensions(+)]
+ dev-libs/icu:=
+ )
+ calligra_features_krita? (
+ dev-qt/qtdeclarative:4
+ net-misc/curl
+ x11-libs/libX11
+ x11-libs/libXi
+ )
+ calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${RDEPEND}
+ x11-misc/shared-mime-info
+"
+
+[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
+PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
+
+# bug 394273
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch )
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ kde4-base_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_prepare() {
+ if ! use webkit; then
+ sed -i CMakeLists.txt -e "/^find_package/ s/QtWebKit //" || die
+ fi
+ kde4-base_src_prepare
+}
+
+src_configure() {
+ local cal_ft myproducts
+
+ # applications
+ for cal_ft in ${CAL_FTS}; do
+ # Switch to ^^ when we switch to EAPI=6.
+ #local prod=${cal_ft^^}
+ local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
+ use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
+ done
+
+ local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
+
+ # first write out things we want to hard-enable
+ mycmakeargs+=(
+ "-DWITH_Iconv=ON" # available on all supported arches and many more
+ )
+
+ # default disablers
+ mycmakeargs+=(
+ "-DCREATIVEONLY=OFF"
+ "-DPACKAGERS_BUILD=OFF"
+ "-DWITH_Soprano=OFF"
+ "-DWITH_KActivities=OFF" # deprecated Plasma 4 activities integration
+ )
+
+ # regular options
+ mycmakeargs+=(
+ $(cmake-utils_use_with attica LibAttica)
+ $(cmake-utils_use_with color-management OCIO)
+ $(cmake-utils_use_with crypt QCA2)
+ $(cmake-utils_use_with eigen Eigen3)
+ $(cmake-utils_use_with exif Exiv2)
+ $(cmake-utils_use_with fftw FFTW3)
+ $(cmake-utils_use_with fontconfig Fontconfig)
+ $(cmake-utils_use_with freetds FreeTDS)
+ $(cmake-utils_use_with glib GLIB2)
+ $(cmake-utils_use_with gsl GSL)
+ $(cmake-utils_use_with import-filter LibEtonyek)
+ $(cmake-utils_use_with import-filter LibOdfGen)
+ $(cmake-utils_use_with import-filter LibRevenge)
+ $(cmake-utils_use_with import-filter LibVisio)
+ $(cmake-utils_use_with import-filter LibWpd)
+ $(cmake-utils_use_with import-filter LibWpg)
+ $(cmake-utils_use_with import-filter LibWps)
+ $(cmake-utils_use_with jpeg JPEG)
+ $(cmake-utils_use_with jpeg2k OpenJPEG)
+ $(cmake-utils_use_with kdcraw Kdcraw)
+ $(cmake-utils_use_with lcms LCMS2)
+ $(cmake-utils_use_with marble CalligraMarble)
+ $(cmake-utils_use_with mysql MySQL)
+ $(cmake-utils_use_with okular Okular)
+ $(cmake-utils_use_with openexr OpenEXR)
+ $(cmake-utils_use opengl USEOPENGL)
+ $(cmake-utils_use_with pdf Poppler)
+ $(cmake-utils_use_with pdf Pstoedit)
+ $(cmake-utils_use_with pim KdepimLibs)
+ $(cmake-utils_use_with postgres CalligraPostgreSQL)
+ $(cmake-utils_use_build postgres pqxx)
+ $(cmake-utils_use_with spacenav Spnav)
+ $(cmake-utils_use_with sybase FreeTDS)
+ $(cmake-utils_use_with tiff TIFF)
+ $(cmake-utils_use_with threads Threads)
+ $(cmake-utils_use_with truetype Freetype)
+ $(cmake-utils_use_with vc Vc)
+ $(cmake-utils_use_with xbase XBase)
+ )
+
+ mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+ kde4-base_src_configure
+}
diff --git a/app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch b/app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch
new file mode 100644
index 00000000..85f401b
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt 2016-12-07 12:48:03.771533639 -0200
++++ b/CMakeLists.txt 2016-12-07 12:49:07.534866207 -0200
+@@ -441,11 +441,6 @@
+ endif()
+ endmacro()
+ endif()
+-
+- if (NOT PACKAGERS_BUILD)
+- # Optimize the whole Calligra for current architecture
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
+- endif ()
+ endif()
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
+
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2017-01-06 22:35 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-01-06 22:35 UTC (permalink / raw
To: gentoo-commits
commit: bc67da033112ad06b72a1eb5019f20e0fe987b89
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 14:27:54 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 6 22:30:34 2017 +0000
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..00000000
--- 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 kcalcore)
- $(add_kdeapps_dep kcontacts)
- )
- )
- calligra_features_words? (
- dev-libs/libxslt
- okular? ( $(add_kdeapps_dep okular) )
- )
-"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
- x11-misc/shared-mime-info
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
- !app-office/calligra:4
-"
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.0-no-arch-detection.patch"
- "${FILESDIR}/${PN}-3.0.0-optionaldeps.patch"
-)
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- kde5_pkg_setup
- check-reqs_pkg_setup
-}
-
-src_prepare() {
- kde5_src_prepare
-
- # Unconditionally disable deprecated deps (required by QtQuick1)
- punt_bogus_dep Qt5 Declarative
- punt_bogus_dep Qt5 OpenGL
-
- if ! use calligra_experimental_features_stage && \
- ! use calligra_experimental_features_braindump; 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/" \
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
- fi
-
- if use okular && ! use calligra_experimental_features_stage; then
- sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
- fi
-}
-
-src_configure() {
- local cal_ft myproducts experimental=OFF
-
- # applications
- for cal_ft in ${CAL_FTS[@]}; do
- if use calligra_features_${cal_ft} ; then
- myproducts+=( "${cal_ft^^}" )
- fi
- done
- # experimental/unmaintained applications
- for cal_ft in ${CAL_EXP_FTS[@]}; do
- if use calligra_experimental_features_${cal_ft} ; then
- experimental=ON
- myproducts+=( "${cal_ft^^}" )
- fi
- done
-
- local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
- if [[ ${KDE_BUILD_TYPE} == release ]] ; then
- mycmakeargs+=(
- -DRELEASE_BUILD=ON
- -DBUILD_UNMAINTAINED=${experimental}
- )
- fi
-
- mycmakeargs+=(
- -DPACKAGERS_BUILD=OFF
- -DWITH_Iconv=ON
- $(cmake-utils_use_find_package activities KF5Activities)
- -DWITH_Qca-qt5=$(usex crypt)
- -DWITH_Eigen3=$(usex eigen)
- -DWITH_Fontconfig=$(usex fontconfig)
- -DWITH_GSL=$(usex gsl)
- -DWITH_LibEtonyek=$(usex import-filter)
- -DWITH_LibOdfGen=$(usex import-filter)
- -DWITH_LibRevenge=$(usex import-filter)
- -DWITH_LibVisio=$(usex import-filter)
- -DWITH_LibWpd=$(usex import-filter)
- -DWITH_LibWpg=$(usex import-filter)
- -DWITH_LibWps=$(usex import-filter)
- $(cmake-utils_use_find_package pim KF5Akonadi)
- $(cmake-utils_use_find_package pim KF5AkonadiContact)
- $(cmake-utils_use_find_package pim KF5CalendarCore)
- $(cmake-utils_use_find_package pim KF5Contacts)
- -DWITH_LCMS2=$(usex lcms)
- $(cmake-utils_use_find_package marble Marble)
- -DWITH_Okular5=$(usex okular)
- -DWITH_OpenEXR=$(usex openexr)
- -DWITH_Poppler=$(usex pdf)
- $(cmake-utils_use_find_package spacenav Spnav)
- -ENABLE_CSTESTER_TESTING=$(usex test)
- -DWITH_Freetype=$(usex truetype)
- -DWITH_Vc=$(usex vc)
- -DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
- )
-
- kde5_src_configure
-}
diff --git a/app-office/calligra/files/calligra-3.0.0-optionaldeps.patch b/app-office/calligra/files/calligra-3.0.0-optionaldeps.patch
deleted file mode 100644
index a36edee..00000000
--- a/app-office/calligra/files/calligra-3.0.0-optionaldeps.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0394af4..e11d998 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -223,11 +223,10 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
- Notifications
- KCMUtils
- )
--find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET
-- OPTIONAL_COMPONENTS
-- Activities
-- KHtml
--)
-+
-+find_package(KF5Activities)
-+find_package(KF5KHtml)
-+
- set_package_properties(KF5Activities PROPERTIES
- TYPE OPTIONAL
- )
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2017-03-21 20:52 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-03-21 20:52 UTC (permalink / raw
To: gentoo-commits
commit: 371eb8a1679d3e33e57a6d7860d2cbe734875bf2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 14:19:48 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 20:52:05 2017 +0000
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 00000000000..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 <dtardon@redhat.com>
+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;
+ }
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2018-01-28 1:19 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2018-01-28 1:19 UTC (permalink / raw
To: gentoo-commits
commit: 2b37981a42b6f9259a31f4b1269dadcf6a36bb95
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 22:36:56 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 01:19:37 2018 +0000
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 00000000000..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? ( 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:=[qt5] )
+ phonon? ( media-libs/phonon[qt5(+)] )
+ 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_plan? (
+ $(add_frameworks_dep khtml)
+ $(add_kdeapps_dep kholidays)
+ dev-libs/kdiagram:5
+ pim? (
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcontacts)
+ )
+ )
+ 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+=" test"
+
+PATCHES=( "${FILESDIR}"/${P}-no-arch-detection.patch )
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ kde5_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_prepare() {
+ if use calligra_features_plan && [[ ${KDE_BUILD_TYPE} == release ]]; then
+ mv ../${PN}plan-${PV} plan || die
+ sed -e "/add_subdirectory(plan)/s/#//" \
+ -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
+ -i CMakeLists.txt || die
+ fi
+ kde5_src_prepare
+
+ if ! use test; then
+ sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
+ -i libs/pigment/CMakeLists.txt || die
+ fi
+
+ # Unconditionally disable deprecated deps (required by QtQuick1)
+ 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/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
+ fi
+
+ if use okular && ! use calligra_experimental_features_stage; then
+ sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
+ fi
+}
+
+src_configure() {
+ local cal_ft myproducts
+
+ # applications
+ for cal_ft in ${CAL_FTS[@]}; do
+ if use calligra_features_${cal_ft} ; then
+ myproducts+=( "${cal_ft^^}" )
+ fi
+ done
+
+ [[ ${KDE_BUILD_TYPE} == release ]] && \
+ use calligra_experimental_features_stage && \
+ myproducts+=( CALLIGRA_FEATURES_STAGE )
+
+ use lcms && myproducts+=( PLUGIN_COLORENGINES )
+ use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+ local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
+
+ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
+ mycmakeargs+=(
+ -DRELEASE_BUILD=ON
+ -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
+ )
+ fi
+
+ mycmakeargs+=(
+ -DPACKAGERS_BUILD=OFF
+ -DWITH_Iconv=ON
+ $(cmake-utils_use_find_package activities KF5Activities)
+ -DWITH_Qca-qt5=$(usex crypt)
+ -DWITH_Fontconfig=$(usex fontconfig)
+ $(cmake-utils_use_find_package gemini Libgit2)
+ $(cmake-utils_use_find_package gemini Qt5QuickWidgets)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_LibEtonyek=$(usex import-filter)
+ -DWITH_LibOdfGen=$(usex import-filter)
+ -DWITH_LibRevenge=$(usex import-filter)
+ -DWITH_LibVisio=$(usex import-filter)
+ -DWITH_LibWpd=$(usex import-filter)
+ -DWITH_LibWpg=$(usex import-filter)
+ -DWITH_LibWps=$(usex import-filter)
+ $(cmake-utils_use_find_package phonon Phonon4Qt5)
+ $(cmake-utils_use_find_package pim KF5CalendarCore)
+ $(cmake-utils_use_find_package pim KF5Contacts)
+ -DWITH_LCMS2=$(usex lcms)
+ -DWITH_Okular5=$(usex okular)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_Poppler=$(usex pdf)
+ -DWITH_Eigen3=$(usex calligra_features_sheets)
+ -ENABLE_CSTESTER_TESTING=$(usex test)
+ -DWITH_Freetype=$(usex truetype)
+ )
+
+ kde5_src_configure
+}
diff --git a/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch
new file mode 100644
index 00000000000..aa83ba1a301
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch
@@ -0,0 +1,17 @@
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
+
+Gentoo-bug: 584118
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -617,10 +617,6 @@
+ endif()
+ endmacro()
+
+- if (NOT PACKAGERS_BUILD)
+- # Optimize the whole Calligra for current architecture
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
+- endif ()
+ endif()
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
+
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index d600cd47a36..575f0b0a917 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,6 +11,7 @@
</maintainer>
<use>
<flag name="activities">Enable kactivities support</flag>
+ <flag name="gemini">Enable tablet and 2:1 devices support</flag>
<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2018-03-24 6:42 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2018-03-24 6:42 UTC (permalink / raw
To: gentoo-commits
commit: 11ee88aed98350f2c08ed36c1daa802182c10a38
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 06:42:17 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 06:42:17 2018 +0000
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 <QButtonGroup>
- #include <QTextCodec>
- #include <QTextStream>
-
-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 <KoUnit.h>
-
-+#include <QButtonGroup>
-+
- 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 <QAbstractItemModel>
-+#include <QAction>
-
- // Calligra
- #include <KoIcon.h>
-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 <QWidgetAction>
- #include <QTableWidget>
- #include <QAction>
-+#include <QHeaderView>
- #include <QMenu>
-
- 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 <math.h>
-
- #include <QIntValidator>
-+#include <QButtonGroup>
- #include <QCheckBox>
- #include <QFrame>
- #include <QLabel>
-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/KWAnchoringProperties.cpp
-@@ -35,6 +35,7 @@
-
- #include <kundo2command.h>
-
-+#include <QButtonGroup>
- #include <QComboBox>
-
- const int KWAnchoringProperties::vertRels[4][20] = {
-diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
-index e38599a06d7..7e8b2d51ef9 100644
---- a/words/part/dialogs/KWRunAroundProperties.cpp
-+++ b/words/part/dialogs/KWRunAroundProperties.cpp
-@@ -28,6 +28,8 @@
-
- #include <kundo2command.h>
-
-+#include <QButtonGroup>
-+
- KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
- : m_state(state)
- {
--
2.16.2
diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
index 09236c41de0..bdbe4b6e855 100644
--- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
+++ b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
@@ -11,14 +11,6 @@ Differential Revision: https://phabricator.kde.org/D11454
---
libs/widgets/KoCsvImportDialog.cpp | 1 +
libs/widgets/KoPageLayoutWidget.cpp | 2 ++
- plan/src/kptview.h | 1 +
- plan/src/kptviewlist.cpp | 1 +
- plan/src/libs/ui/kptaccountseditor.cpp | 1 +
- plan/src/libs/ui/kptdocumentspanel.h | 1 +
- plan/src/libs/ui/kptitemviewsettup.cpp | 2 +-
- plan/src/libs/ui/kpttaskeditor.cpp | 1 +
- plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
- plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++
plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 +
plugins/formulashape/FormulaToolWidget.cpp | 1 +
sheets/dialogs/LayoutDialog.cpp | 1 +
@@ -46,106 +38,6 @@ index f91555ca262..a3816f96d8a 100644
#include <KoUnit.h>
-+#include <QButtonGroup>
-+
- 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
-+++ b/plan/src/kptview.h
-@@ -28,6 +28,7 @@
- #include "kptcontext.h"
- #include "kptviewbase.h"
-
-+#include <QActionGroup>
- #include <QDockWidget>
- #include <QMap>
-
-diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp
-index f34e702e055..0e6db7b2ffe 100644
---- a/plan/src/kptviewlist.cpp
-+++ b/plan/src/kptviewlist.cpp
-@@ -25,6 +25,7 @@
- #include <QStyle>
- #include <QBrush>
- #include <QContextMenuEvent>
-+#include <QHeaderView>
- #include <QMenu>
-
- #include <kmessagebox.h>
-diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp
-index 7991fafd779..54e3a87c94f 100644
---- a/plan/src/libs/ui/kptaccountseditor.cpp
-+++ b/plan/src/libs/ui/kptaccountseditor.cpp
-@@ -40,6 +40,7 @@
- #include <QContextMenuEvent>
- #include <QMenu>
- #include <QAction>
-+#include <QHeaderView>
-
- #include <KLocalizedString>
- #include <kactioncollection.h>
-diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h
-index 00ea3af80b2..491cb1ebb86 100644
---- a/plan/src/libs/ui/kptdocumentspanel.h
-+++ b/plan/src/libs/ui/kptdocumentspanel.h
-@@ -26,6 +26,7 @@
-
- #include "kptdocuments.h"
-
-+#include <QModelIndexList>
- #include <QWidget>
- #include <kundo2qstack.h>
-
-diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp
-index d1c3b1fc157..7c97a070b9a 100644
---- a/plan/src/libs/ui/kptitemviewsettup.cpp
-+++ b/plan/src/libs/ui/kptitemviewsettup.cpp
-@@ -25,9 +25,9 @@
-
- #include "KoPageLayoutWidget.h"
-
-+#include <QHeaderView>
- #include <QPushButton>
-
--
- namespace KPlato
- {
-
-diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp
-index 21546118d33..91db5acbb18 100644
---- a/plan/src/libs/ui/kpttaskeditor.cpp
-+++ b/plan/src/libs/ui/kpttaskeditor.cpp
-@@ -45,6 +45,7 @@
- #include <QVBoxLayout>
- #include <QDragMoveEvent>
- #include <QAction>
-+#include <QHeaderView>
- #include <QMenu>
-
- #include <kactionmenu.h>
-diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-index 344ebc2b599..9146f06ab8c 100644
---- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-+++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-@@ -31,6 +31,7 @@
- #include <KFile>
-
- #include <QAction>
-+#include <QHeaderView>
- #include <QTreeView>
- #include <QStandardItemModel>
- #include <QModelIndex>
-diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-index c9e17b748a9..b67e9848807 100644
---- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-+++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-@@ -23,6 +23,8 @@
-
- #include <KoUnit.h>
-
+#include <QButtonGroup>
+
class Q_DECL_HIDDEN KoPageLayoutWidget::Private
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2018-04-05 23:38 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2018-04-05 23:38 UTC (permalink / raw
To: gentoo-commits
commit: ed29e62fa20e94e2601da05749127fab941b2050
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 5 23:23:28 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 5 23:24:57 2018 +0000
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..00000000000
--- 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
- 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[qt5] )
- phonon? ( media-libs/phonon[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_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) )
- calligra_features_plan? (
- $(add_frameworks_dep khtml)
- $(add_qt_dep qtcore '' '' '5=')
- dev-libs/kdiagram:5
- =dev-libs/kproperty-3.0*:5
- =dev-libs/kreport-3.0*:5
- pim? (
- $(add_kdeapps_dep kcalcore)
- $(add_kdeapps_dep kcontacts)
- )
- )
- 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+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}"-3.0.0-no-arch-detection.patch )
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- kde5_pkg_setup
- check-reqs_pkg_setup
-}
-
-src_prepare() {
- kde5_src_prepare
-
- if ! use test; then
- sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
- -i libs/pigment/CMakeLists.txt || die
- fi
-
- # Unconditionally disable deprecated deps (required by QtQuick1)
- punt_bogus_dep Qt5 Declarative
- punt_bogus_dep Qt5 OpenGL
-
- if ! use calligra_experimental_features_stage && \
- ! use calligra_experimental_features_braindump; 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/" \
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
- fi
-
- if use okular && ! use calligra_experimental_features_stage; then
- sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
- fi
-}
-
-src_configure() {
- local cal_ft myproducts experimental=OFF
-
- # applications
- for cal_ft in ${CAL_FTS[@]}; do
- if use calligra_features_${cal_ft} ; then
- myproducts+=( "${cal_ft^^}" )
- fi
- done
- # experimental/unmaintained applications
- for cal_ft in ${CAL_EXP_FTS[@]}; do
- if use calligra_experimental_features_${cal_ft} ; then
- experimental=ON
- myproducts+=( "${cal_ft^^}" )
- fi
- done
-
- use lcms && myproducts+=( PLUGIN_COLORENGINES )
- use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
- local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
- if [[ ${KDE_BUILD_TYPE} == release ]] ; then
- mycmakeargs+=(
- -DRELEASE_BUILD=ON
- -DBUILD_UNMAINTAINED=${experimental}
- )
- fi
-
- use calligra_features_karbon && \
- mycmakeargs+=( $(cmake-utils_use_find_package jpeg2k OpenJPEG) )
-
- mycmakeargs+=(
- -DPACKAGERS_BUILD=OFF
- -DWITH_Iconv=ON
- $(cmake-utils_use_find_package activities KF5Activities)
- -DWITH_Qca-qt5=$(usex crypt)
- -DWITH_Fontconfig=$(usex fontconfig)
- -DWITH_GSL=$(usex gsl)
- -DWITH_LibEtonyek=$(usex import-filter)
- -DWITH_LibOdfGen=$(usex import-filter)
- -DWITH_LibRevenge=$(usex import-filter)
- -DWITH_LibVisio=$(usex import-filter)
- -DWITH_LibWpd=$(usex import-filter)
- -DWITH_LibWpg=$(usex import-filter)
- -DWITH_LibWps=$(usex import-filter)
- $(cmake-utils_use_find_package phonon Phonon4Qt5)
- $(cmake-utils_use_find_package pim KF5CalendarCore)
- $(cmake-utils_use_find_package pim KF5Contacts)
- -DWITH_LCMS2=$(usex lcms)
- -DWITH_Okular5=$(usex okular)
- -DWITH_OpenEXR=$(usex openexr)
- -DWITH_Poppler=$(usex pdf)
- -DWITH_Eigen3=$(usex calligra_features_sheets)
- -ENABLE_CSTESTER_TESTING=$(usex test)
- -DWITH_Freetype=$(usex truetype)
- -DWITH_Vc=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
- )
-
- kde5_src_configure
-}
diff --git a/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch b/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch
deleted file mode 100644
index 1c544e9277d..00000000000
--- a/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
-
-Gentoo-bug: 584118
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -617,10 +617,6 @@
- endif()
- endmacro()
-
-- if (NOT PACKAGERS_BUILD)
-- # Optimize the whole Calligra for current architecture
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
-- endif ()
- endif()
- set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
-
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2019-01-01 19:40 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2019-01-01 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 3c55b2008f5417f6ddf252fddde26820cdad6b44
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 1 13:38:58 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 1 19:40:08 2019 +0000
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 <asturm <AT> 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 00000000000..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+=" test"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-no-arch-detection.patch
+ "${FILESDIR}"/${P}-doc.patch
+ "${FILESDIR}"/${P}-qt-5.11.patch
+ "${FILESDIR}"/${P}-stage-qt-5.11.patch
+ "${FILESDIR}"/${P}-poppler-0.69.patch
+ "${FILESDIR}"/${P}-poppler-0.71.patch
+)
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ kde5_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_prepare() {
+ kde5_src_prepare
+
+ if ! use test; then
+ sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
+ -i libs/pigment/CMakeLists.txt || die
+ fi
+
+ # Unconditionally disable deprecated deps (required by QtQuick1)
+ 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/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
+ fi
+
+ if use okular && ! use calligra_experimental_features_stage; then
+ sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
+ fi
+}
+
+src_configure() {
+ local cal_ft myproducts
+
+ # applications
+ for cal_ft in ${CAL_FTS[@]}; do
+ use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+ done
+
+ use calligra_experimental_features_stage && myproducts+=( STAGE )
+
+ use lcms && myproducts+=( PLUGIN_COLORENGINES )
+ use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+ local mycmakeargs=(
+ -DPACKAGERS_BUILD=OFF
+ -DRELEASE_BUILD=ON
+ -DWITH_Iconv=ON
+ -DPRODUCTSET="${myproducts[*]}"
+ $(cmake-utils_use_find_package activities KF5Activities)
+ -DWITH_Qca-qt5=$(usex crypt)
+ -DWITH_Fontconfig=$(usex fontconfig)
+ $(cmake-utils_use_find_package gemini Libgit2)
+ $(cmake-utils_use_find_package gemini Qt5QuickWidgets)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_LibEtonyek=$(usex import-filter)
+ -DWITH_LibOdfGen=$(usex import-filter)
+ -DWITH_LibRevenge=$(usex import-filter)
+ -DWITH_LibVisio=$(usex import-filter)
+ -DWITH_LibWpd=$(usex import-filter)
+ -DWITH_LibWpg=$(usex import-filter)
+ -DWITH_LibWps=$(usex import-filter)
+ $(cmake-utils_use_find_package phonon Phonon4Qt5)
+ $(cmake-utils_use_find_package pim KF5CalendarCore)
+ -DWITH_LCMS2=$(usex lcms)
+ -DWITH_Okular5=$(usex okular)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_Poppler=$(usex pdf)
+ -DWITH_Eigen3=$(usex calligra_features_sheets)
+ -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
+ -ENABLE_CSTESTER_TESTING=$(usex test)
+ -DWITH_Freetype=$(usex truetype)
+ )
+
+ kde5_src_configure
+}
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch
new file mode 100644
index 00000000000..c82fbd242b8
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch
@@ -0,0 +1,83 @@
+From 56bd4bab320b0c0a893751caee9a15a2241e3ef8 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Wed, 24 Oct 2018 08:28:00 +0200
+Subject: Fix build with poppler>=0.69
+
+Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's
+
+Differential Revision: https://phabricator.kde.org/D16388
+---
+ filters/karbon/pdf/PdfImport.cpp | 3 ---
+ filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++----
+ filters/karbon/pdf/SvgOutputDev.h | 2 +-
+ 3 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
+index c3e96b0..48b08df 100644
+--- a/filters/karbon/pdf/PdfImport.cpp
++++ b/filters/karbon/pdf/PdfImport.cpp
+@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
+ delete globalParams;
+ globalParams = 0;
+
+- // check for memory leaks
+- Object::memCheck(stderr);
+-
+ return KoFilter::OK;
+ }
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 931917a..7901317 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix)
+ .arg(matrix.dx()) .arg(matrix.dy());
+ }
+
+-QString SvgOutputDev::convertMatrix(double * matrix)
++QString SvgOutputDev::convertMatrix(const double * matrix)
+ {
+ return QString("matrix(%1 %2 %3 %4 %5 %6)")
+ .arg(matrix[0]).arg(matrix[1])
+@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
+
+ QString str;
+
+- char * p = s->getCString();
++ const char * p = s->getCString();
+ int len = s->getLength();
+ CharCode code;
+ Unicode *u = nullptr;
+@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
+ double x = state->getCurX();
+ double y = state->getCurY();
+
+- double * ctm = state->getCTM();
++ const double * ctm = state->getCTM();
+ QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
+
+ QMatrix mirror;
+@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
+ return;
+ }
+
+- double * ctm = state->getCTM();
++ const double * ctm = state->getCTM();
+ QMatrix m;
+ m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
+index 85fe55d..2a44908 100644
+--- a/filters/karbon/pdf/SvgOutputDev.h
++++ b/filters/karbon/pdf/SvgOutputDev.h
+@@ -84,7 +84,7 @@ public:
+ private:
+ QString convertPath(GfxPath *path);
+ QString convertMatrix(const QMatrix &matrix);
+- QString convertMatrix(double * matrix);
++ QString convertMatrix(const double * matrix);
+ QString printFill();
+ QString printStroke();
+
+--
+cgit v1.1
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch
new file mode 100644
index 00000000000..6b50e3a42ed
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch
@@ -0,0 +1,202 @@
+From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 25 Oct 2018 23:04:39 +0200
+Subject: Mark the functions as override
+
+So when poppler API breaks (as it often does) it stops compiling and
+someone has to fix it
+
+From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 25 Oct 2018 23:06:34 +0200
+Subject: GBool -> bool
+
+It was just a typedef in poppler and it'll die in next versions
+
+From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Fri, 2 Nov 2018 21:23:13 +0100
+Subject: Fix build with poppler 0.71
+
+Port away from removed API
+
+diff -u a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -39,7 +39,7 @@
+ {
+ public:
+ Private(const QString &fname)
+- : svgFile(fname), defs(0), body(0), state(gTrue)
++ : svgFile(fname), defs(0), body(0), state(true)
+ , brush(Qt::SolidPattern) {}
+
+ ~Private() {
+@@ -52,7 +52,7 @@
+ QString defsData;
+ QTextStream * defs;
+ QTextStream * body;
+- GBool state;
++ bool state;
+ QSizeF pageSize;
+ QPen pen;
+ QBrush brush;
+@@ -62,7 +62,7 @@
+ : d(new Private(fileName))
+ {
+ if (! d->svgFile.open(QIODevice::WriteOnly)) {
+- d->state = gFalse;
++ d->state = false;
+ return;
+ }
+
+@@ -75,24 +75,24 @@
+ delete d;
+ }
+
+-GBool SvgOutputDev::isOk()
++bool SvgOutputDev::isOk()
+ {
+ return d->state;
+ }
+
+-GBool SvgOutputDev::upsideDown()
++bool SvgOutputDev::upsideDown()
+ {
+- return gTrue;
++ return true;
+ }
+
+-GBool SvgOutputDev::useDrawChar()
++bool SvgOutputDev::useDrawChar()
+ {
+- return gFalse;
++ return false;
+ }
+
+-GBool SvgOutputDev::interpretType3Chars()
++bool SvgOutputDev::interpretType3Chars()
+ {
+- return gFalse;
++ return false;
+ }
+
+ void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/)
+@@ -387,7 +387,7 @@
+ return stroke;
+ }
+
+-void SvgOutputDev::drawString(GfxState * state, GooString * s)
++void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ {
+ int render = state->getRender();
+ // check for invisible text -- this is used by Acrobat Capture
+@@ -476,7 +476,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+
+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+- int *maskColors, GBool /*inlineImg*/)
++ bool /*interpolate*/, int *maskColors, bool inlineImg)
+ {
+ ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+ imgStr->reset();
+@@ -550,7 +549,0 @@
+-void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+- int width, int height, GfxImageColorMap *colorMap,
+- GBool /*interpolate*/, int *maskColors, GBool inlineImg)
+-{
+- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
+-}
+-
+
+--- a/filters/karbon/pdf/SvgOutputDev.h
++++ b/filters/karbon/pdf/SvgOutputDev.h
+@@ -20,11 +20,6 @@
+ #ifndef SVGOUTPUTDEV_H
+ #define SVGOUTPUTDEV_H
+
+-// Don't show this warning: it's an issue in poppler
+-#ifdef __GNUC__
+-#pragma GCC diagnostic ignored "-Wunused-parameter"
+-#endif
+-
+ #include <poppler/Object.h>
+ #include <poppler/OutputDev.h>
+
+@@ -44,40 +44,37 @@
+ explicit SvgOutputDev(const QString &fileName);
+ virtual ~SvgOutputDev();
+
+- GBool isOk();
++ bool isOk();
+
+- virtual GBool upsideDown();
+- virtual GBool useDrawChar();
+- virtual GBool interpretType3Chars();
+- virtual void startPage(int pageNum, GfxState *state, XRef *xref);
+- virtual void endPage();
++ bool upsideDown() override;
++ bool useDrawChar() override;
++ bool interpretType3Chars() override;
++ void startPage(int pageNum, GfxState *state, XRef *xref) override;
++ void endPage() override;
+
+ // path painting
+- virtual void stroke(GfxState * state);
+- virtual void fill(GfxState * state);
+- virtual void eoFill(GfxState *state);
++ void stroke(GfxState * state) override;
++ void fill(GfxState * state) override;
++ void eoFill(GfxState *state) override;
+
+ // text
+- virtual void drawString(GfxState * state, GooString * s);
++ void drawString(GfxState * state, const GooString * s) override;
+
+ // images
+- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
++ void drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+- int *maskColors, GBool inlineImg);
+- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+- int width, int height, GfxImageColorMap *colorMap,
+- GBool interpolate, int *maskColors, GBool inlineImg);
++ bool interpolate, int *maskColors, bool inlineImg) override;
+
+ // styles
+- virtual void updateAll(GfxState *state);
+- virtual void updateFillColor(GfxState *state);
+- virtual void updateStrokeColor(GfxState *state);
+- virtual void updateFillOpacity(GfxState *state);
+- virtual void updateStrokeOpacity(GfxState *state);
+- virtual void updateLineJoin(GfxState *state);
+- virtual void updateLineCap(GfxState *state);
+- virtual void updateMiterLimit(GfxState *state);
+- virtual void updateLineWidth(GfxState *state);
++ void updateAll(GfxState *state) override;
++ void updateFillColor(GfxState *state) override;
++ void updateStrokeColor(GfxState *state) override;
++ void updateFillOpacity(GfxState *state) override;
++ void updateStrokeOpacity(GfxState *state) override;
++ void updateLineJoin(GfxState *state) override;
++ void updateLineCap(GfxState *state) override;
++ void updateMiterLimit(GfxState *state) override;
++ void updateLineWidth(GfxState *state) override;
+
+ /// Dumps content to svg file
+ void dumpContent();
+--- a/filters/karbon/pdf/PdfImport.cpp
++++ b/filters/karbon/pdf/PdfImport.cpp
+@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
+ SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile());
+ if (dev->isOk()) {
+ int rotate = 0;
+- GBool useMediaBox = gTrue;
+- GBool crop = gFalse;
+- GBool printing = gFalse;
++ bool useMediaBox = true;
++ bool crop = false;
++ bool printing = false;
+ pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing);
+ dev->dumpContent();
+ }
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2019-01-01 19:40 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2019-01-01 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 634a047520c11151ac1316bd382327fd1efcbfb9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 1 15:02:54 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 1 19:40:09 2019 +0000
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 <asturm <AT> 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 00000000000..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 <danders@get2net.dk>
+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
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2019-01-08 1:47 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2019-01-08 1:47 UTC (permalink / raw
To: gentoo-commits
commit: e785021cfd5f1dba3d3ab7a11416960b322479f6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 01:12:51 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 8 01:47:43 2019 +0000
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 <asturm <AT> 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 00000000000..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" <tcberner@FreeBSD.org>
+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 <poppler/GfxState.h>
+ #include <poppler/Stream.h>
+ #include <poppler/GfxFont.h>
++#include <poppler/glib/poppler-features.h>
+
+ #include <QFile>
+ #include <QTextStream>
+@@ -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
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2019-01-16 16:30 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2019-01-16 16:30 UTC (permalink / raw
To: gentoo-commits
commit: 9699b1c310d94b9a4c76336a5f0a4aebe2589e91
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 16:20:59 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 16:20:59 2019 +0000
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 <asturm <AT> 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 00000000000..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 <aacid@kde.org>
+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
+
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2019-12-25 21:20 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2019-12-25 21:20 UTC (permalink / raw
To: gentoo-commits
commit: 91bae785446138e2818ca1c76de35b731c8fae45
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 21:14:54 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 21:20:14 2019 +0000
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 <asturm <AT> 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 00000000000..383131ab387
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch
@@ -0,0 +1,69 @@
+Source: Timo Gurr <tgurr@exherbo.org>
+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.cpp 2019-12-04 12:41:13.000000000 +0100
++++ calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp 2019-12-04 12:39:03.000000000 +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.000000000 +0100
++++ calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:35:30.000000000 +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.000000000 +0100
++++ calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h 2019-12-04 12:30:41.000000000 +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();
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2020-07-18 8:41 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2020-07-18 8:41 UTC (permalink / raw
To: gentoo-commits
commit: a7a23d6447956b728cf089be0637b49ff2f3e2d2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 00:56:10 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 08:31:57 2020 +0000
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 <asturm <AT> 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 --
| 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..00000000000
--- 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-${KFMIN}:5
- sys-libs/zlib
- virtual/libiconv
- activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
- charts? ( dev-libs/kdiagram:5 )
- crypt? ( app-crypt/qca:2[qt5(+)] )
- fontconfig? ( media-libs/fontconfig )
- gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
- gsl? ( sci-libs/gsl )
- import-filter? (
- app-text/libetonyek
- app-text/libodfgen
- app-text/libwpd:*
- app-text/libwpg:*
- >=app-text/libwps-0.4
- dev-libs/librevenge
- >=kde-frameworks/khtml-${KFMIN}:5
- media-libs/libvisio
- )
- lcms? (
- media-libs/ilmbase:=
- media-libs/lcms:2
- )
- openexr? ( media-libs/openexr )
- pdf? ( >=app-text/poppler-0.73:=[qt5] )
- phonon? ( media-libs/phonon[qt5(+)] )
- spacenav? ( dev-libs/libspnav )
- truetype? ( media-libs/freetype:2 )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
- calligra_features_sheets? ( dev-cpp/eigen:3 )
- calligra_features_stage? ( okular? ( >=kde-apps/okular-19.04.3:5 ) )
- calligra_features_words? (
- dev-libs/libxslt
- okular? ( >=kde-apps/okular-19.04.3:5 )
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
- !app-office/calligra:4
- !app-office/calligra-l10n:4
-"
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-no-arch-detection.patch
- "${FILESDIR}"/${P}-doc.patch
- "${FILESDIR}"/${P}-{,stage-}qt-5.11.patch
- "${FILESDIR}"/${P}-poppler-0.{69,71,72,73}.patch
- "${FILESDIR}"/${P}-no-webkit.patch
- "${FILESDIR}"/${P}-missing-header.patch
-)
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- ecm_pkg_setup
- check-reqs_pkg_setup
-}
-
-src_prepare() {
- ecm_src_prepare
-
- if has_version ">=app-text/poppler-0.82"; then
- 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
- fi
-
- # Unconditionally disable deprecated deps (required by QtQuick1)
- ecm_punt_bogus_dep Qt5 Declarative
- ecm_punt_bogus_dep Qt5 OpenGL
-
- # Hack around the excessive use of CMake macros
- if use okular && ! use calligra_features_words; then
- sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
- fi
-
- if use okular && ! use calligra_features_stage; then
- sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
- fi
-}
-
-src_configure() {
- local cal_ft myproducts
-
- # applications
- for cal_ft in ${CAL_FTS[@]}; do
- use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
- done
-
- use lcms && myproducts+=( PLUGIN_COLORENGINES )
- use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
- local mycmakeargs=(
- -DPACKAGERS_BUILD=OFF
- -DRELEASE_BUILD=ON
- -DWITH_Iconv=ON
- -DPRODUCTSET="${myproducts[*]}"
- $(cmake_use_find_package activities KF5Activities)
- $(cmake_use_find_package charts KChart)
- -DWITH_Qca-qt5=$(usex crypt)
- -DWITH_Fontconfig=$(usex fontconfig)
- $(cmake_use_find_package gemini Libgit2)
- $(cmake_use_find_package gemini Qt5QuickWidgets)
- -DWITH_GSL=$(usex gsl)
- -DWITH_LibEtonyek=$(usex import-filter)
- -DWITH_LibOdfGen=$(usex import-filter)
- -DWITH_LibRevenge=$(usex import-filter)
- -DWITH_LibVisio=$(usex import-filter)
- -DWITH_LibWpd=$(usex import-filter)
- -DWITH_LibWpg=$(usex import-filter)
- -DWITH_LibWps=$(usex import-filter)
- $(cmake_use_find_package phonon Phonon4Qt5)
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
- -DWITH_LCMS2=$(usex lcms)
- -DWITH_Okular5=$(usex okular)
- -DWITH_OpenEXR=$(usex openexr)
- -DWITH_Poppler=$(usex pdf)
- -DWITH_Eigen3=$(usex calligra_features_sheets)
- -DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
- -ENABLE_CSTESTER_TESTING=$(usex test)
- -DWITH_Freetype=$(usex truetype)
- )
-
- ecm_src_configure
-}
diff --git a/app-office/calligra/files/calligra-3.1.0-doc.patch b/app-office/calligra/files/calligra-3.1.0-doc.patch
deleted file mode 100644
index ad150edbf8a..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt 2018-03-15 16:59:36.624682111 +0100
-+++ b/CMakeLists.txt 2018-03-15 17:07:02.306267220 +0100
-@@ -1160,9 +1160,7 @@
- add_subdirectory(braindump)
- endif()
-
--if(SHOULD_BUILD_DOC)
-- add_subdirectory(doc)
--endif()
-+add_subdirectory(doc)
-
- if(SHOULD_BUILD_PART_QTQUICK)
- add_subdirectory(qtquick)
diff --git a/app-office/calligra/files/calligra-3.1.0-missing-header.patch b/app-office/calligra/files/calligra-3.1.0-missing-header.patch
deleted file mode 100644
index f15c3787172..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-missing-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Tue, 23 Jul 2019 13:02:34 +0200
-Subject: Fix compilation with Qt 5.13 (missing include)
-
----
- sheets/plugins/calendar/CalendarToolWidget.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp
-index b10b230..0c5eeb6 100644
---- a/sheets/plugins/calendar/CalendarToolWidget.cpp
-+++ b/sheets/plugins/calendar/CalendarToolWidget.cpp
-@@ -30,6 +30,7 @@
- #include <kdatepicker.h>
-
- #include <QPushButton>
-+#include <QDate>
-
- namespace Calligra
- {
---
-cgit v1.1
diff --git a/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch
deleted file mode 100644
index aa83ba1a301..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
-
-Gentoo-bug: 584118
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -617,10 +617,6 @@
- endif()
- endmacro()
-
-- if (NOT PACKAGERS_BUILD)
-- # Optimize the whole Calligra for current architecture
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
-- endif ()
- endif()
- set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
-
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
deleted file mode 100644
index f126e2e5138..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-no-webkit.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 9817c4c2ee1e11ae1d2eacb31b8a2a65d6ea6e8d Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-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
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch
deleted file mode 100644
index c82fbd242b8..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 56bd4bab320b0c0a893751caee9a15a2241e3ef8 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Wed, 24 Oct 2018 08:28:00 +0200
-Subject: Fix build with poppler>=0.69
-
-Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's
-
-Differential Revision: https://phabricator.kde.org/D16388
----
- filters/karbon/pdf/PdfImport.cpp | 3 ---
- filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++----
- filters/karbon/pdf/SvgOutputDev.h | 2 +-
- 3 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
-index c3e96b0..48b08df 100644
---- a/filters/karbon/pdf/PdfImport.cpp
-+++ b/filters/karbon/pdf/PdfImport.cpp
-@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
- delete globalParams;
- globalParams = 0;
-
-- // check for memory leaks
-- Object::memCheck(stderr);
--
- return KoFilter::OK;
- }
-
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 931917a..7901317 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix)
- .arg(matrix.dx()) .arg(matrix.dy());
- }
-
--QString SvgOutputDev::convertMatrix(double * matrix)
-+QString SvgOutputDev::convertMatrix(const double * matrix)
- {
- return QString("matrix(%1 %2 %3 %4 %5 %6)")
- .arg(matrix[0]).arg(matrix[1])
-@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
-
- QString str;
-
-- char * p = s->getCString();
-+ const char * p = s->getCString();
- int len = s->getLength();
- CharCode code;
- Unicode *u = nullptr;
-@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
- double x = state->getCurX();
- double y = state->getCurY();
-
-- double * ctm = state->getCTM();
-+ const double * ctm = state->getCTM();
- QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
-
- QMatrix mirror;
-@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
- return;
- }
-
-- double * ctm = state->getCTM();
-+ const double * ctm = state->getCTM();
- QMatrix m;
- m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
-
-diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
-index 85fe55d..2a44908 100644
---- a/filters/karbon/pdf/SvgOutputDev.h
-+++ b/filters/karbon/pdf/SvgOutputDev.h
-@@ -84,7 +84,7 @@ public:
- private:
- QString convertPath(GfxPath *path);
- QString convertMatrix(const QMatrix &matrix);
-- QString convertMatrix(double * matrix);
-+ QString convertMatrix(const double * matrix);
- QString printFill();
- QString printStroke();
-
---
-cgit v1.1
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch
deleted file mode 100644
index 6b50e3a42ed..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Thu, 25 Oct 2018 23:04:39 +0200
-Subject: Mark the functions as override
-
-So when poppler API breaks (as it often does) it stops compiling and
-someone has to fix it
-
-From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Thu, 25 Oct 2018 23:06:34 +0200
-Subject: GBool -> bool
-
-It was just a typedef in poppler and it'll die in next versions
-
-From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Fri, 2 Nov 2018 21:23:13 +0100
-Subject: Fix build with poppler 0.71
-
-Port away from removed API
-
-diff -u a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -39,7 +39,7 @@
- {
- public:
- Private(const QString &fname)
-- : svgFile(fname), defs(0), body(0), state(gTrue)
-+ : svgFile(fname), defs(0), body(0), state(true)
- , brush(Qt::SolidPattern) {}
-
- ~Private() {
-@@ -52,7 +52,7 @@
- QString defsData;
- QTextStream * defs;
- QTextStream * body;
-- GBool state;
-+ bool state;
- QSizeF pageSize;
- QPen pen;
- QBrush brush;
-@@ -62,7 +62,7 @@
- : d(new Private(fileName))
- {
- if (! d->svgFile.open(QIODevice::WriteOnly)) {
-- d->state = gFalse;
-+ d->state = false;
- return;
- }
-
-@@ -75,24 +75,24 @@
- delete d;
- }
-
--GBool SvgOutputDev::isOk()
-+bool SvgOutputDev::isOk()
- {
- return d->state;
- }
-
--GBool SvgOutputDev::upsideDown()
-+bool SvgOutputDev::upsideDown()
- {
-- return gTrue;
-+ return true;
- }
-
--GBool SvgOutputDev::useDrawChar()
-+bool SvgOutputDev::useDrawChar()
- {
-- return gFalse;
-+ return false;
- }
-
--GBool SvgOutputDev::interpretType3Chars()
-+bool SvgOutputDev::interpretType3Chars()
- {
-- return gFalse;
-+ return false;
- }
-
- void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/)
-@@ -387,7 +387,7 @@
- return stroke;
- }
-
--void SvgOutputDev::drawString(GfxState * state, GooString * s)
-+void SvgOutputDev::drawString(GfxState * state, const GooString * s)
- {
- int render = state->getRender();
- // check for invisible text -- this is used by Acrobat Capture
-@@ -476,7 +476,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
-
- void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
- int width, int height, GfxImageColorMap *colorMap,
-- int *maskColors, GBool /*inlineImg*/)
-+ bool /*interpolate*/, int *maskColors, bool inlineImg)
- {
- ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
- imgStr->reset();
-@@ -550,7 +549,0 @@
--void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-- int width, int height, GfxImageColorMap *colorMap,
-- GBool /*interpolate*/, int *maskColors, GBool inlineImg)
--{
-- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
--}
--
-
---- a/filters/karbon/pdf/SvgOutputDev.h
-+++ b/filters/karbon/pdf/SvgOutputDev.h
-@@ -20,11 +20,6 @@
- #ifndef SVGOUTPUTDEV_H
- #define SVGOUTPUTDEV_H
-
--// Don't show this warning: it's an issue in poppler
--#ifdef __GNUC__
--#pragma GCC diagnostic ignored "-Wunused-parameter"
--#endif
--
- #include <poppler/Object.h>
- #include <poppler/OutputDev.h>
-
-@@ -44,40 +44,37 @@
- explicit SvgOutputDev(const QString &fileName);
- virtual ~SvgOutputDev();
-
-- GBool isOk();
-+ bool isOk();
-
-- virtual GBool upsideDown();
-- virtual GBool useDrawChar();
-- virtual GBool interpretType3Chars();
-- virtual void startPage(int pageNum, GfxState *state, XRef *xref);
-- virtual void endPage();
-+ bool upsideDown() override;
-+ bool useDrawChar() override;
-+ bool interpretType3Chars() override;
-+ void startPage(int pageNum, GfxState *state, XRef *xref) override;
-+ void endPage() override;
-
- // path painting
-- virtual void stroke(GfxState * state);
-- virtual void fill(GfxState * state);
-- virtual void eoFill(GfxState *state);
-+ void stroke(GfxState * state) override;
-+ void fill(GfxState * state) override;
-+ void eoFill(GfxState *state) override;
-
- // text
-- virtual void drawString(GfxState * state, GooString * s);
-+ void drawString(GfxState * state, const GooString * s) override;
-
- // images
-- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
-+ void drawImage(GfxState *state, Object *ref, Stream *str,
- int width, int height, GfxImageColorMap *colorMap,
-- int *maskColors, GBool inlineImg);
-- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
-- int width, int height, GfxImageColorMap *colorMap,
-- GBool interpolate, int *maskColors, GBool inlineImg);
-+ bool interpolate, int *maskColors, bool inlineImg) override;
-
- // styles
-- virtual void updateAll(GfxState *state);
-- virtual void updateFillColor(GfxState *state);
-- virtual void updateStrokeColor(GfxState *state);
-- virtual void updateFillOpacity(GfxState *state);
-- virtual void updateStrokeOpacity(GfxState *state);
-- virtual void updateLineJoin(GfxState *state);
-- virtual void updateLineCap(GfxState *state);
-- virtual void updateMiterLimit(GfxState *state);
-- virtual void updateLineWidth(GfxState *state);
-+ void updateAll(GfxState *state) override;
-+ void updateFillColor(GfxState *state) override;
-+ void updateStrokeColor(GfxState *state) override;
-+ void updateFillOpacity(GfxState *state) override;
-+ void updateStrokeOpacity(GfxState *state) override;
-+ void updateLineJoin(GfxState *state) override;
-+ void updateLineCap(GfxState *state) override;
-+ void updateMiterLimit(GfxState *state) override;
-+ void updateLineWidth(GfxState *state) override;
-
- /// Dumps content to svg file
- void dumpContent();
---- a/filters/karbon/pdf/PdfImport.cpp
-+++ b/filters/karbon/pdf/PdfImport.cpp
-@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
- SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile());
- if (dev->isOk()) {
- int rotate = 0;
-- GBool useMediaBox = gTrue;
-- GBool crop = gFalse;
-- GBool printing = gFalse;
-+ bool useMediaBox = true;
-+ bool crop = false;
-+ bool printing = false;
- pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing);
- dev->dumpContent();
- }
diff --git a/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
deleted file mode 100644
index 817a8ddcd67..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3784fdf0259a14f1f7b20c156dcfe42b45d76896 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 24 Jan 2019 23:55:02 +0100
-Subject: [PATCH] Fix build with poppler-0.72
-
-This is a downstream fix without backwards compat, not upstreamable.
----
- filters/karbon/pdf/SvgOutputDev.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 391e86cc117..bc72a003efb 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
-
- QString str;
-
-- const char * p = s->getCString();
-+ const char * p = s->c_str();
- int len = s->getLength();
- CharCode code;
- Unicode *u = nullptr;
-@@ -451,10 +451,10 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
- *d->body << " y=\"" << y << "px\"";
-
- if (font && font->getFamily()) {
-- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
-+ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
- //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
- } else if (font && font->getName()) {
-- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
-+ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
- //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
- }
- *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
---
-2.20.1
-
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
deleted file mode 100644
index 727f6edf3f1..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a1ddd91e6c354e8f0dda40f8a522053c3fa19c39 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-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
-
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch
deleted file mode 100644
index 4cb9d1872eb..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Patch stolen from Mageia Cauldron but had to be modified quite a bit.
-
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index ffdbf01..70bc9f8 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
- const char * p = s->c_str();
- int len = s->getLength();
- CharCode code;
-- Unicode *u = nullptr;
-+ const Unicode *u = nullptr;
- int uLen;
- double dx, dy, originX, originY;
- while (len > 0) {
-@@ -545,7 +545,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
-
- void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
- int width, int height, GfxImageColorMap *colorMap,
-- bool /*interpolate*/, int *maskColors, bool inlineImg)
-+ bool /*interpolate*/, const int *maskColors, bool inlineImg)
- {
- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
- }
---- a/filters/karbon/pdf/SvgOutputDev.h
-+++ b/filters/karbon/pdf/SvgOutputDev.h
-@@ -63,7 +63,7 @@ public:
- // images
- void drawImage(GfxState *state, Object *ref, Stream *str,
- int width, int height, GfxImageColorMap *colorMap,
-- bool interpolate, int *maskColors, bool inlineImg) override;
-+ bool interpolate, const int *maskColors, bool inlineImg) override;
-
- // styles
- virtual void updateAll(GfxState *state);
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
deleted file mode 100644
index 383131ab387..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Source: Timo Gurr <tgurr@exherbo.org>
-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.cpp 2019-12-04 12:41:13.000000000 +0100
-+++ calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp 2019-12-04 12:39:03.000000000 +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.000000000 +0100
-+++ calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:35:30.000000000 +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.000000000 +0100
-+++ calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h 2019-12-04 12:30:41.000000000 +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();
diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
deleted file mode 100644
index bdbe4b6e855..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 18 Mar 2018 11:56:57 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
-
-Reviewers: #calligra:_3.0
-
-Tags: #calligra:_3.0
-
-Differential Revision: https://phabricator.kde.org/D11454
----
- libs/widgets/KoCsvImportDialog.cpp | 1 +
- 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 <QButtonGroup>
- #include <QTextCodec>
- #include <QTextStream>
-
-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 <KoUnit.h>
-
-+#include <QButtonGroup>
-+
- 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 <QAbstractItemModel>
-+#include <QAction>
-
- // Calligra
- #include <KoIcon.h>
-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 <QWidgetAction>
- #include <QTableWidget>
- #include <QAction>
-+#include <QHeaderView>
- #include <QMenu>
-
- 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 <math.h>
-
- #include <QIntValidator>
-+#include <QButtonGroup>
- #include <QCheckBox>
- #include <QFrame>
- #include <QLabel>
-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/KWAnchoringProperties.cpp
-@@ -35,6 +35,7 @@
-
- #include <kundo2command.h>
-
-+#include <QButtonGroup>
- #include <QComboBox>
-
- const int KWAnchoringProperties::vertRels[4][20] = {
-diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
-index e38599a06d7..7e8b2d51ef9 100644
---- a/words/part/dialogs/KWRunAroundProperties.cpp
-+++ b/words/part/dialogs/KWRunAroundProperties.cpp
-@@ -28,6 +28,8 @@
-
- #include <kundo2command.h>
-
-+#include <QButtonGroup>
-+
- KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
- : m_state(state)
- {
---
-2.16.2
-
diff --git a/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch
deleted file mode 100644
index 120864e11d4..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Tue, 3 Apr 2018 00:31:19 +0200
-Subject: Fix compilation with Qt 5.11 (missing include)
-
----
- stage/part/KPrPresentationTool.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
-index ae743da..3007f91 100644
---- a/stage/part/KPrPresentationTool.cpp
-+++ b/stage/part/KPrPresentationTool.cpp
-@@ -32,6 +32,7 @@
- #include <QDesktopServices>
- #include <QUrl>
- #include <QDBusConnection>
-+#include <QFrame>
-
- #include <KoShape.h>
- #include <KoShapeManager.h>
---
-cgit v0.11.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2021-06-17 12:19 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2021-06-17 12:19 UTC (permalink / raw
To: gentoo-commits
commit: 502c8c6d98afd5a69a0323dfa2ea708c94bbafeb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 17 12:18:00 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 12:18:48 2021 +0000
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 <asturm <AT> 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 00000000000..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?= <omerusta@gmail.com>
+Date: Tue, 8 Jun 2021 05:13:23 +0000
+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
+
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2022-05-16 18:46 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2022-05-16 18:46 UTC (permalink / raw
To: gentoo-commits
commit: 4df1ed41c45ff68105b9f40ddbe40a93f680b60b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 18:44:12 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 16 18:45:47 2022 +0000
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 <asturm <AT> 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 000000000000..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 <aacid@kde.org>
+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 <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"
+@@ -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<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;
+--
+2.35.1
+
diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-2.patch b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-2.patch
new file mode 100644
index 000000000000..f39304e04c82
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-2.patch
@@ -0,0 +1,94 @@
+From feb28e5fbd4e3b41c74da1220bc14826bcf9b3c7 Mon Sep 17 00:00:00 2001
+From: Dag Andersen <dag.andersen@kdemail.net>
+Date: Wed, 13 Apr 2022 14:45:33 +0200
+Subject: [PATCH 2/3] PdfImport: Fix compile with newer poppler
+
+Also fixes odg2pdf filter.
+
+Same solution as commit 236bacbe13739414e919de868283b0caf2df5d8a
+by accid@kde.org.
+---
+ filters/karbon/pdf/CMakeLists.txt | 2 +-
+ filters/karbon/pdf/Pdf2OdgImport.cpp | 9 +++++++++
+ filters/karbon/pdf/SvgOutputDev.cpp | 9 +++++++++
+ 3 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
+index ef360f44359..849baa70f12 100644
+--- a/filters/karbon/pdf/CMakeLists.txt
++++ b/filters/karbon/pdf/CMakeLists.txt
+@@ -29,6 +29,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 745239c9c21..b5f3722b320 100644
+--- a/filters/karbon/pdf/Pdf2OdgImport.cpp
++++ b/filters/karbon/pdf/Pdf2OdgImport.cpp
+@@ -40,6 +40,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"
+@@ -49,6 +51,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>();)
+
+@@ -86,8 +90,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 b980fdf60f6..76b909e3b69 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -35,6 +35,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:
+@@ -410,7 +414,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;
+
+--
+2.35.1
+
diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch
deleted file mode 100644
index c704d7896e1f..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8f328bef497a9e3bc628e4e294c1a70b0c8b0eab Mon Sep 17 00:00:00 2001
-From: foutrelis <foutrelis@eb2447ed-0c53-47e4-bac8-5bc4a241df78>
-Date: Wed, 2 Mar 2022 10:28:24 +0000
-Subject: [PATCH] Fix build with poppler 22.03.0
-
-diff -uprw a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
---- a/filters/karbon/pdf/CMakeLists.txt 2020-05-14 09:51:30.000000000 +0300
-+++ b/filters/karbon/pdf/CMakeLists.txt 2022-03-02 12:19:08.039939530 +0200
-@@ -14,6 +14,10 @@ if(Poppler_VERSION VERSION_LESS "0.83.0"
- add_definitions("-DHAVE_POPPLER_PRE_0_83")
- endif()
-
-+if(Poppler_VERSION VERSION_LESS "22.3.0")
-+ add_definitions("-DHAVE_POPPLER_PRE_22_3")
-+endif()
-+
- set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
-
- add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
-diff -uprw a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp
---- a/filters/karbon/pdf/Pdf2OdgImport.cpp 2020-05-14 09:51:30.000000000 +0300
-+++ b/filters/karbon/pdf/Pdf2OdgImport.cpp 2022-03-02 12:20:35.125605950 +0200
-@@ -86,8 +86,12 @@ KoFilter::ConversionStatus Pdf2OdgImport
- if (! globalParams)
- return KoFilter::NotImplemented;
-
-+#ifdef HAVE_POPPLER_PRE_22_3
- GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
- PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
-+#else
-+ PDFDoc * pdfDoc = new PDFDoc(std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data()));
-+#endif
- if (! pdfDoc) {
- #ifdef HAVE_POPPLER_PRE_0_83
- delete globalParams;
-diff -uprw a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
---- a/filters/karbon/pdf/PdfImport.cpp 2020-05-14 09:51:30.000000000 +0300
-+++ b/filters/karbon/pdf/PdfImport.cpp 2022-03-02 12:21:46.197510028 +0200
-@@ -73,8 +73,12 @@ KoFilter::ConversionStatus PdfImport::co
- if (! globalParams)
- return KoFilter::NotImplemented;
-
-+#ifdef HAVE_POPPLER_PRE_22_3
- GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
- PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
-+#else
-+ PDFDoc * pdfDoc = new PDFDoc(std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data()));
-+#endif
- if (! pdfDoc) {
- #ifdef HAVE_POPPLER_PRE_0_83
- delete globalParams;
diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.04.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-22.04.0.patch
new file mode 100644
index 000000000000..f76ef92d8fcf
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-poppler-22.04.0.patch
@@ -0,0 +1,25 @@
+From 2dd2c02094ab9dfd964b2363039527d414db3b28 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 13 Apr 2022 21:30:14 +0200
+Subject: [PATCH 3/3] SvgOutputDev: Fix ifdef version for getFont API change
+
+---
+ filters/karbon/pdf/SvgOutputDev.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 76b909e3b69..588cda8ecbe 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -414,7 +414,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ if (s->getLength() == 0)
+ return;
+
+-#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 04, 0)
+ GfxFont * font = state->getFont();
+ #else
+ std::shared_ptr<GfxFont> font = state->getFont();
+--
+2.35.1
+
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2023-02-16 3:29 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2023-02-16 3:29 UTC (permalink / raw
To: gentoo-commits
commit: e3ae04d9c5f068e17d903ac7d5b16336589fb56e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 02:52:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 03:26:38 2023 +0000
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 <sam <AT> 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 000000000000..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()->activeSheet()->map()->isReadWrite() ||
+@@ -456,7 +456,7 @@ void CellToolBase::Private::processOtherKey(QKeyEvent *event)
+
+ bool CellToolBase::Private::processControlArrowKey(QKeyEvent *event)
+ {
+- register Sheet * const sheet = q->selection()->activeSheet();
++ Sheet * const sheet = q->selection()->activeSheet();
+ if (!sheet)
+ return false;
+
+@@ -801,7 +801,7 @@ QRect CellToolBase::Private::moveDirection(Calligra::Sheets::MoveTo direction, b
+ {
+ debugSheetsUI << "Canvas::moveDirection";
+
+- register Sheet * const sheet = q->selection()->activeSheet();
++ Sheet * const sheet = q->selection()->activeSheet();
+ if (!sheet)
+ return QRect();
+
+--- a/sheets/part/Headers.cpp
++++ b/sheets/part/Headers.cpp
+@@ -102,7 +102,7 @@ void RowHeader::mousePress(KoPointerEvent * _ev)
+ if (!m_cellToolIsActive)
+ return;
+
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -192,7 +192,7 @@ void RowHeader::mouseRelease(KoPointerEvent * _ev)
+
+ m_bMousePressed = false;
+
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -295,7 +295,7 @@ void RowHeader::mouseDoubleClick(KoPointerEvent*)
+ {
+ if (!m_cellToolIsActive)
+ return;
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -317,7 +317,7 @@ void RowHeader::mouseMove(KoPointerEvent* _ev)
+ return;
+ }
+
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -379,7 +379,7 @@ void RowHeader::mouseMove(KoPointerEvent* _ev)
+
+ void RowHeader::paint(QPainter* painter, const QRectF& painterRect)
+ {
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -545,7 +545,7 @@ void ColumnHeader::mousePress(KoPointerEvent * _ev)
+ m_pCanvas->enableAutoScroll();
+ }
+
+- const register Sheet * const sheet = m_pCanvas->activeSheet();
++ const Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -682,7 +682,7 @@ void ColumnHeader::mouseRelease(KoPointerEvent * _ev)
+
+ m_bMousePressed = false;
+
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -794,7 +794,7 @@ void ColumnHeader::mouseDoubleClick(KoPointerEvent*)
+ {
+ if (!m_cellToolIsActive)
+ return;
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -813,7 +813,7 @@ void ColumnHeader::mouseMove(KoPointerEvent* _ev)
+ if (!m_cellToolIsActive)
+ return;
+
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+
+ if (!sheet)
+ return;
+@@ -911,7 +911,7 @@ void ColumnHeader::mouseMove(KoPointerEvent* _ev)
+
+ void ColumnHeader::resize(const QSizeF& size, const QSizeF& oldSize)
+ {
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -929,7 +929,7 @@ void ColumnHeader::resize(const QSizeF& size, const QSizeF& oldSize)
+
+ void ColumnHeader::paint(QPainter* painter, const QRectF& painterRect)
+ {
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+--- a/sheets/part/CanvasBase.cpp
++++ b/sheets/part/CanvasBase.cpp
+@@ -230,7 +230,7 @@ bool CanvasBase::eventFilter(QObject *o, QEvent *e)
+
+ void CanvasBase::validateSelection()
+ {
+- register Sheet * const sheet = activeSheet();
++ Sheet * const sheet = activeSheet();
+ if (!sheet)
+ return;
+ #if 0
+@@ -443,7 +443,7 @@ void CanvasBase::paint(QPainter* painter, const QRectF& painterRect)
+ if (doc()->map()->isLoading() || isViewLoading())
+ return;
+
+- register Sheet * const sheet = activeSheet();
++ Sheet * const sheet = activeSheet();
+ if (!sheet)
+ return;
+
+@@ -513,7 +513,7 @@ bool CanvasBase::dragEnter(const QMimeData* mimeData)
+
+ bool CanvasBase::dragMove(const QMimeData* mimeData, const QPointF& eventPos, const QObject *source)
+ {
+- register Sheet * const sheet = activeSheet();
++ Sheet * const sheet = activeSheet();
+ if (!sheet) {
+ return false;
+ }
+@@ -596,7 +596,7 @@ void CanvasBase::dragLeave()
+
+ bool CanvasBase::drop(const QMimeData* mimeData, const QPointF& eventPos, const QObject *source)
+ {
+- register Sheet * const sheet = activeSheet();
++ Sheet * const sheet = activeSheet();
+ // FIXME Sheet protection: Not all cells have to be protected.
+ if (!sheet || sheet->isProtected()) {
+ return false;
+@@ -656,7 +656,7 @@ bool CanvasBase::drop(const QMimeData* mimeData, const QPointF& eventPos, const
+
+ QRect CanvasBase::viewToCellCoordinates(const QRectF& viewRect) const
+ {
+- register Sheet * const sheet = activeSheet();
++ Sheet * const sheet = activeSheet();
+ if (!sheet)
+ return QRect();
+
+@@ -685,7 +685,7 @@ QRect CanvasBase::visibleCells() const
+
+ QRectF CanvasBase::cellCoordinatesToView(const QRect& cellRange) const
+ {
+- register Sheet * const sheet = activeSheet();
++ Sheet * const sheet = activeSheet();
+ if (!sheet)
+ return QRectF();
+
+@@ -706,7 +706,7 @@ QRectF CanvasBase::cellCoordinatesToView(const QRect& cellRange) const
+
+ void CanvasBase::showToolTip(const QPoint& p)
+ {
+- register Sheet * const sheet = activeSheet();
++ Sheet * const sheet = activeSheet();
+ if (!sheet)
+ return;
+ SheetView * const sheetView = this->sheetView(sheet);
+--- a/sheets/part/HeaderItems.cpp
++++ b/sheets/part/HeaderItems.cpp
+@@ -161,7 +161,7 @@ void RowHeaderItem::wheelEvent(QGraphicsSceneWheelEvent* _ev)
+
+ void RowHeaderItem::paintSizeIndicator(int mouseY)
+ {
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -216,7 +216,7 @@ void RowHeaderItem::removeSizeIndicator()
+
+ void RowHeaderItem::updateRows(int from, int to)
+ {
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -324,7 +324,7 @@ void ColumnHeaderItem::resizeEvent(QGraphicsSceneResizeEvent* _ev)
+
+ void ColumnHeaderItem::paintSizeIndicator(int mouseX)
+ {
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -389,7 +389,7 @@ void ColumnHeaderItem::removeSizeIndicator()
+
+ void ColumnHeaderItem::updateColumns(int from, int to)
+ {
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+--- a/sheets/part/HeaderWidgets.cpp
++++ b/sheets/part/HeaderWidgets.cpp
+@@ -155,7 +155,7 @@ void RowHeaderWidget::wheelEvent(QWheelEvent* _ev)
+
+ void RowHeaderWidget::paintSizeIndicator(int mouseY)
+ {
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -209,7 +209,7 @@ void RowHeaderWidget::removeSizeIndicator()
+
+ void RowHeaderWidget::updateRows(int from, int to)
+ {
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -314,7 +314,7 @@ void ColumnHeaderWidget::resizeEvent(QResizeEvent* _ev)
+
+ void ColumnHeaderWidget::paintSizeIndicator(int mouseX)
+ {
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+@@ -379,7 +379,7 @@ void ColumnHeaderWidget::removeSizeIndicator()
+
+ void ColumnHeaderWidget::updateColumns(int from, int to)
+ {
+- register Sheet * const sheet = m_pCanvas->activeSheet();
++ Sheet * const sheet = m_pCanvas->activeSheet();
+ if (!sheet)
+ return;
+
+--- a/sheets/ui/CellToolBase.cpp
++++ b/sheets/ui/CellToolBase.cpp
+@@ -987,7 +987,7 @@ void CellToolBase::mouseDoubleClickEvent(KoPointerEvent* event)
+
+ void CellToolBase::keyPressEvent(QKeyEvent* event)
+ {
+- register Sheet * const sheet = selection()->activeSheet();
++ Sheet * const sheet = selection()->activeSheet();
+ if (!sheet) {
+ return;
+ }
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2023-03-29 12:46 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2023-03-29 12:46 UTC (permalink / raw
To: gentoo-commits
commit: b67543f8bb06015c098c3adea74641e27d531045
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 12:35:05 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 12:46:26 2023 +0000
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 <asturm <AT> 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-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
@@ -115,14 +116,15 @@ 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
+ "${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532
)
pkg_pretend() {
@@ -162,6 +164,7 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON
-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5Kross=ON
-DPRODUCTSET="${myproducts[*]}"
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package charts KChart)
diff --git a/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch
deleted file mode 100644
index f4efa3d81a48..000000000000
--- a/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
-
-Gentoo-bug: 584118
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -617,10 +617,6 @@
- endif()
- endmacro()
-
-- if (NOT PACKAGERS_BUILD)
-- # Optimize the whole Calligra for current architecture
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
-- endif ()
- endif()
- set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
-
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
deleted file mode 100644
index d826e006249d..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-clang-16-c++17.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-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()->activeSheet()->map()->isReadWrite() ||
-@@ -456,7 +456,7 @@ void CellToolBase::Private::processOtherKey(QKeyEvent *event)
-
- bool CellToolBase::Private::processControlArrowKey(QKeyEvent *event)
- {
-- register Sheet * const sheet = q->selection()->activeSheet();
-+ Sheet * const sheet = q->selection()->activeSheet();
- if (!sheet)
- return false;
-
-@@ -801,7 +801,7 @@ QRect CellToolBase::Private::moveDirection(Calligra::Sheets::MoveTo direction, b
- {
- debugSheetsUI << "Canvas::moveDirection";
-
-- register Sheet * const sheet = q->selection()->activeSheet();
-+ Sheet * const sheet = q->selection()->activeSheet();
- if (!sheet)
- return QRect();
-
---- a/sheets/part/Headers.cpp
-+++ b/sheets/part/Headers.cpp
-@@ -102,7 +102,7 @@ void RowHeader::mousePress(KoPointerEvent * _ev)
- if (!m_cellToolIsActive)
- return;
-
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -192,7 +192,7 @@ void RowHeader::mouseRelease(KoPointerEvent * _ev)
-
- m_bMousePressed = false;
-
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -295,7 +295,7 @@ void RowHeader::mouseDoubleClick(KoPointerEvent*)
- {
- if (!m_cellToolIsActive)
- return;
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -317,7 +317,7 @@ void RowHeader::mouseMove(KoPointerEvent* _ev)
- return;
- }
-
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -379,7 +379,7 @@ void RowHeader::mouseMove(KoPointerEvent* _ev)
-
- void RowHeader::paint(QPainter* painter, const QRectF& painterRect)
- {
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -545,7 +545,7 @@ void ColumnHeader::mousePress(KoPointerEvent * _ev)
- m_pCanvas->enableAutoScroll();
- }
-
-- const register Sheet * const sheet = m_pCanvas->activeSheet();
-+ const Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -682,7 +682,7 @@ void ColumnHeader::mouseRelease(KoPointerEvent * _ev)
-
- m_bMousePressed = false;
-
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -794,7 +794,7 @@ void ColumnHeader::mouseDoubleClick(KoPointerEvent*)
- {
- if (!m_cellToolIsActive)
- return;
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -813,7 +813,7 @@ void ColumnHeader::mouseMove(KoPointerEvent* _ev)
- if (!m_cellToolIsActive)
- return;
-
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
-
- if (!sheet)
- return;
-@@ -911,7 +911,7 @@ void ColumnHeader::mouseMove(KoPointerEvent* _ev)
-
- void ColumnHeader::resize(const QSizeF& size, const QSizeF& oldSize)
- {
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -929,7 +929,7 @@ void ColumnHeader::resize(const QSizeF& size, const QSizeF& oldSize)
-
- void ColumnHeader::paint(QPainter* painter, const QRectF& painterRect)
- {
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
---- a/sheets/part/CanvasBase.cpp
-+++ b/sheets/part/CanvasBase.cpp
-@@ -230,7 +230,7 @@ bool CanvasBase::eventFilter(QObject *o, QEvent *e)
-
- void CanvasBase::validateSelection()
- {
-- register Sheet * const sheet = activeSheet();
-+ Sheet * const sheet = activeSheet();
- if (!sheet)
- return;
- #if 0
-@@ -443,7 +443,7 @@ void CanvasBase::paint(QPainter* painter, const QRectF& painterRect)
- if (doc()->map()->isLoading() || isViewLoading())
- return;
-
-- register Sheet * const sheet = activeSheet();
-+ Sheet * const sheet = activeSheet();
- if (!sheet)
- return;
-
-@@ -513,7 +513,7 @@ bool CanvasBase::dragEnter(const QMimeData* mimeData)
-
- bool CanvasBase::dragMove(const QMimeData* mimeData, const QPointF& eventPos, const QObject *source)
- {
-- register Sheet * const sheet = activeSheet();
-+ Sheet * const sheet = activeSheet();
- if (!sheet) {
- return false;
- }
-@@ -596,7 +596,7 @@ void CanvasBase::dragLeave()
-
- bool CanvasBase::drop(const QMimeData* mimeData, const QPointF& eventPos, const QObject *source)
- {
-- register Sheet * const sheet = activeSheet();
-+ Sheet * const sheet = activeSheet();
- // FIXME Sheet protection: Not all cells have to be protected.
- if (!sheet || sheet->isProtected()) {
- return false;
-@@ -656,7 +656,7 @@ bool CanvasBase::drop(const QMimeData* mimeData, const QPointF& eventPos, const
-
- QRect CanvasBase::viewToCellCoordinates(const QRectF& viewRect) const
- {
-- register Sheet * const sheet = activeSheet();
-+ Sheet * const sheet = activeSheet();
- if (!sheet)
- return QRect();
-
-@@ -685,7 +685,7 @@ QRect CanvasBase::visibleCells() const
-
- QRectF CanvasBase::cellCoordinatesToView(const QRect& cellRange) const
- {
-- register Sheet * const sheet = activeSheet();
-+ Sheet * const sheet = activeSheet();
- if (!sheet)
- return QRectF();
-
-@@ -706,7 +706,7 @@ QRectF CanvasBase::cellCoordinatesToView(const QRect& cellRange) const
-
- void CanvasBase::showToolTip(const QPoint& p)
- {
-- register Sheet * const sheet = activeSheet();
-+ Sheet * const sheet = activeSheet();
- if (!sheet)
- return;
- SheetView * const sheetView = this->sheetView(sheet);
---- a/sheets/part/HeaderItems.cpp
-+++ b/sheets/part/HeaderItems.cpp
-@@ -161,7 +161,7 @@ void RowHeaderItem::wheelEvent(QGraphicsSceneWheelEvent* _ev)
-
- void RowHeaderItem::paintSizeIndicator(int mouseY)
- {
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -216,7 +216,7 @@ void RowHeaderItem::removeSizeIndicator()
-
- void RowHeaderItem::updateRows(int from, int to)
- {
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -324,7 +324,7 @@ void ColumnHeaderItem::resizeEvent(QGraphicsSceneResizeEvent* _ev)
-
- void ColumnHeaderItem::paintSizeIndicator(int mouseX)
- {
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -389,7 +389,7 @@ void ColumnHeaderItem::removeSizeIndicator()
-
- void ColumnHeaderItem::updateColumns(int from, int to)
- {
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
---- a/sheets/part/HeaderWidgets.cpp
-+++ b/sheets/part/HeaderWidgets.cpp
-@@ -155,7 +155,7 @@ void RowHeaderWidget::wheelEvent(QWheelEvent* _ev)
-
- void RowHeaderWidget::paintSizeIndicator(int mouseY)
- {
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -209,7 +209,7 @@ void RowHeaderWidget::removeSizeIndicator()
-
- void RowHeaderWidget::updateRows(int from, int to)
- {
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -314,7 +314,7 @@ void ColumnHeaderWidget::resizeEvent(QResizeEvent* _ev)
-
- void ColumnHeaderWidget::paintSizeIndicator(int mouseX)
- {
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
-@@ -379,7 +379,7 @@ void ColumnHeaderWidget::removeSizeIndicator()
-
- void ColumnHeaderWidget::updateColumns(int from, int to)
- {
-- register Sheet * const sheet = m_pCanvas->activeSheet();
-+ Sheet * const sheet = m_pCanvas->activeSheet();
- if (!sheet)
- return;
-
---- a/sheets/ui/CellToolBase.cpp
-+++ b/sheets/ui/CellToolBase.cpp
-@@ -987,7 +987,7 @@ void CellToolBase::mouseDoubleClickEvent(KoPointerEvent* event)
-
- void CellToolBase::keyPressEvent(QKeyEvent* event)
- {
-- register Sheet * const sheet = selection()->activeSheet();
-+ Sheet * const sheet = selection()->activeSheet();
- if (!sheet) {
- return;
- }
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
deleted file mode 100644
index 7e1fd9d41eab..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-cmake-3.16.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] 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
-
diff --git a/app-office/calligra/files/calligra-3.2.1-cxx17-fixes.patch b/app-office/calligra/files/calligra-3.2.1-cxx17-fixes.patch
deleted file mode 100644
index 127dcda34795..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-cxx17-fixes.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);
-
---
-GitLab
-
diff --git a/app-office/calligra/files/calligra-3.2.1-cxx17-for-poppler-22.patch b/app-office/calligra/files/calligra-3.2.1-cxx17-for-poppler-22.patch
deleted file mode 100644
index 288c72b61558..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-cxx17-for-poppler-22.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 175b92c26637a08be4093c9579128f2f89253090 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 7 Jan 2022 14:00:05 +0100
-Subject: [PATCH] Fix build with >=app-text/poppler-22.01.0
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 71272ffef2d..bdd9ed74406 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -104,12 +104,7 @@ if(NOT DEFINED RELEASE_BUILD)
- endif()
- message(STATUS "Release build: ${RELEASE_BUILD}")
-
--# use CPP-11
--if (CMAKE_VERSION VERSION_LESS "3.1")
-- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
--else ()
-- set (CMAKE_CXX_STANDARD 11)
--endif ()
-+set (CMAKE_CXX_STANDARD 17) # required for >=poppler-22.01
-
- ############
- #############
---
-2.34.1
-
diff --git a/app-office/calligra/files/calligra-3.2.1-imath-1.patch b/app-office/calligra/files/calligra-3.2.1-imath-1.patch
deleted file mode 100644
index 62a2daa2f5dc..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-imath-1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c52eb33f20a66acb648b725e2eee3ed977eae896 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Tue, 3 Aug 2021 10:41:09 +0200
-Subject: [PATCH] Only link to Imath when OpenEXR version is >= 3.0
-
-Since OpenEXR 3.0, Imath is in a separate, independently released library. Since that's the only library that Calligra needs, there's no need to link to the full OpenEXR
----
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cdcc02f0236..91c72882d3a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -338,9 +338,9 @@ endif ()
- ## Check for OpenEXR
- ##
-
--macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
--if(TARGET OpenEXR::OpenEXR)
-- set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
-+macro_optional_find_package(Imath 3.0 CONFIG QUIET)
-+if(TARGET Imath::Imath)
-+ set(OPENEXR_LIBRARIES Imath::Imath)
- else()
- macro_optional_find_package(OpenEXR)
- endif()
---
-GitLab
-
diff --git a/app-office/calligra/files/calligra-3.2.1-imath-2.patch b/app-office/calligra/files/calligra-3.2.1-imath-2.patch
deleted file mode 100644
index 113e885726f4..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-imath-2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4d42f7b414f9cf15051509a80fd8ecdd745b989c Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Mon, 20 Dec 2021 18:46:33 +0100
-Subject: [PATCH] Fixup Imath 3.0 support
-
-OpenEXR_FOUND needs to be set to true in order to compile it.
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4a77c4be50b..89636205c2b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -341,6 +341,7 @@ endif ()
- macro_optional_find_package(Imath 3.0 CONFIG QUIET)
- if(TARGET Imath::Imath)
- set(OPENEXR_LIBRARIES Imath::Imath)
-+ set(OpenEXR_FOUND TRUE)
- else()
- macro_optional_find_package(OpenEXR)
- endif()
---
-GitLab
-
diff --git a/app-office/calligra/files/calligra-3.2.1-openexr-3.patch b/app-office/calligra/files/calligra-3.2.1-openexr-3.patch
deleted file mode 100644
index d9175a63ce6b..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-openexr-3.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Sat, 24 Apr 2021 11:19:52 +0200
-Subject: [PATCH] Support building with OpenEXR 3
-
-Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
----
- CMakeLists.txt | 9 +++++++--
- libs/pigment/CMakeLists.txt | 2 +-
- plugins/colorengines/lcms2/CMakeLists.txt | 6 +++---
- plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
- 4 files changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8955357ff97..ea56c84bb11 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -363,8 +363,13 @@ endif ()
- ## Check for OpenEXR
- ##
-
--macro_optional_find_package(OpenEXR)
--macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
-+macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
-+if(TARGET OpenEXR::OpenEXR)
-+ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
-+else()
-+ macro_optional_find_package(OpenEXR)
-+endif()
-+macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
-
- ##
- ## Test for GNU Scientific Library
-diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
-index a039251e2ad..6eb6a8e70b6 100644
---- a/libs/pigment/CMakeLists.txt
-+++ b/libs/pigment/CMakeLists.txt
-@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES} ${Boost_INCLUDE_DIR})
-
- set(FILE_OPENEXR_SOURCES)
- set(LINK_OPENEXR_LIB)
--if(OPENEXR_FOUND)
-+if(OpenEXR_FOUND)
- include_directories(${OPENEXR_INCLUDE_DIR})
- set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
- add_definitions(${OPENEXR_DEFINITIONS})
-diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
-index 77807ff9702..920adbeaf87 100644
---- a/plugins/colorengines/lcms2/CMakeLists.txt
-+++ b/plugins/colorengines/lcms2/CMakeLists.txt
-@@ -31,7 +31,7 @@ include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
- )
-
--if (HAVE_LCMS24 AND OPENEXR_FOUND)
-+if (HAVE_LCMS24 AND OpenEXR_FOUND)
- include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
- ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
-@@ -41,7 +41,7 @@ endif ()
-
- set(FILE_OPENEXR_SOURCES)
- set(LINK_OPENEXR_LIB)
--if(OPENEXR_FOUND)
-+if(OpenEXR_FOUND)
- include_directories(${OPENEXR_INCLUDE_DIR})
- set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
- add_definitions(${OPENEXR_DEFINITIONS})
-@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
- LcmsEnginePlugin.cpp
- )
-
--if (HAVE_LCMS24 AND OPENEXR_FOUND)
-+if (HAVE_LCMS24 AND OpenEXR_FOUND)
- set ( lcmsengine_SRCS
- ${lcmsengine_SRCS}
- colorspaces/gray_f16/GrayF16ColorSpace.cpp
-diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
-index 2540acc834c..77bd0b3fe4a 100644
---- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
-+++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
-@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
- ../colorprofiles
- ..
- )
--if(OPENEXR_FOUND)
-+if(OpenEXR_FOUND)
- include_directories(${OPENEXR_INCLUDE_DIR})
- endif()
- include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
---
-GitLab
-
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
deleted file mode 100644
index 2d308371a0a7..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-1.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 63ae4ecc780ba42901e6934302b75bd18d3bc5eb Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-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 <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"
-@@ -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<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;
---
-2.35.1
-
diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-2.patch b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-2.patch
deleted file mode 100644
index f39304e04c82..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-2.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From feb28e5fbd4e3b41c74da1220bc14826bcf9b3c7 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <dag.andersen@kdemail.net>
-Date: Wed, 13 Apr 2022 14:45:33 +0200
-Subject: [PATCH 2/3] PdfImport: Fix compile with newer poppler
-
-Also fixes odg2pdf filter.
-
-Same solution as commit 236bacbe13739414e919de868283b0caf2df5d8a
-by accid@kde.org.
----
- filters/karbon/pdf/CMakeLists.txt | 2 +-
- filters/karbon/pdf/Pdf2OdgImport.cpp | 9 +++++++++
- filters/karbon/pdf/SvgOutputDev.cpp | 9 +++++++++
- 3 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
-index ef360f44359..849baa70f12 100644
---- a/filters/karbon/pdf/CMakeLists.txt
-+++ b/filters/karbon/pdf/CMakeLists.txt
-@@ -29,6 +29,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 745239c9c21..b5f3722b320 100644
---- a/filters/karbon/pdf/Pdf2OdgImport.cpp
-+++ b/filters/karbon/pdf/Pdf2OdgImport.cpp
-@@ -40,6 +40,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"
-@@ -49,6 +51,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>();)
-
-@@ -86,8 +90,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 b980fdf60f6..76b909e3b69 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -35,6 +35,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:
-@@ -410,7 +414,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;
-
---
-2.35.1
-
diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.04.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-22.04.0.patch
deleted file mode 100644
index f76ef92d8fcf..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-poppler-22.04.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2dd2c02094ab9dfd964b2363039527d414db3b28 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Wed, 13 Apr 2022 21:30:14 +0200
-Subject: [PATCH 3/3] SvgOutputDev: Fix ifdef version for getFont API change
-
----
- filters/karbon/pdf/SvgOutputDev.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 76b909e3b69..588cda8ecbe 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -414,7 +414,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
- if (s->getLength() == 0)
- return;
-
--#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
-+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 04, 0)
- GfxFont * font = state->getFont();
- #else
- std::shared_ptr<GfxFont> font = state->getFont();
---
-2.35.1
-
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2023-04-22 16:48 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2023-04-22 16:48 UTC (permalink / raw
To: gentoo-commits
commit: 46f5f2f97a7786d593d77593844096d5ce84c501
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 16:45:19 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 16:47:30 2023 +0000
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 <sam <AT> 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 000000000000..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 <fweimer@redhat.com>
+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 <stdlib.h> for a declaration of atoi.
+--- a/cmake/TestModernZlib.c
++++ b/cmake/TestModernZlib.c
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <string.h>
+ #include <zlib.h>
+
+--
+GitLab
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2024-03-15 12:19 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2024-03-15 12:19 UTC (permalink / raw
To: gentoo-commits
commit: 057cec87f1c1d0ca1f034a88f7c401101c4d70b3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 11:55:46 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 12:18:14 2024 +0000
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 <asturm <AT> 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 000000000000..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 <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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 <KoDocumentInfo.h>
+ #include <KoGlobal.h>
+
+-#include <okular/core/page.h>
++#include <okular5/core/page.h>
+
+ #include <KLocalizedString>
+
+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 <okular/core/generator.h>
+-#include <okular/core/document.h>
+-#include <okular/core/version.h>
++#include <okular5/core/generator.h>
++#include <okular5/core/document.h>
++#include <okular5/core/version.h>
+
+ 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 <KoTextLayoutRootArea.h>
+ #include <KoCharAreaInfo.h>
+
+-#include <okular/core/page.h>
++#include <okular5/core/page.h>
+
+
+ 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 <okular/core/generator.h>
+-#include <okular/core/document.h>
+-#include <okular/core/version.h>
++#include <okular5/core/generator.h>
++#include <okular5/core/document.h>
++#include <okular5/core/version.h>
+
+ class KWDocument;
+
+--
+2.44.0
+
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2024-06-06 18:09 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2024-06-06 18:09 UTC (permalink / raw
To: gentoo-commits
commit: 87e54ac491002dcb3fa18a57110d700c12dcb7a7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 17:45:07 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 18:09:25 2024 +0000
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 <asturm <AT> 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 000000000000..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> {
+ 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.
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
@ 2024-09-09 18:32 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2024-09-09 18:32 UTC (permalink / raw
To: gentoo-commits
commit: e73ec37c544d40eddf1f950778c66b10e7f27a6b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 9 18:30:14 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 9 18:31:05 2024 +0000
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 <asturm <AT> 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..000000000000
--- 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/sonnet-${KFMIN}:5
- sys-libs/zlib
- virtual/libiconv
- activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
- charts? ( dev-libs/kdiagram:5 )
- crypt? ( >=app-crypt/qca-2.3.0:2[qt5(+)] )
- fontconfig? ( media-libs/fontconfig )
- gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
- gsl? ( sci-libs/gsl:= )
- import-filter? (
- 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 )
- okular? ( || (
- media-gfx/okularpart:5
- kde-apps/okular:5
- ) )
- pdf? ( app-text/poppler:=[qt5] )
- phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
- spacenav? ( dev-libs/libspnav )
- truetype? ( media-libs/freetype:2 )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
- calligra_features_sheets? ( dev-cpp/eigen:3 )
- calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- lcms? ( dev-libs/imath:3 )
- test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
- gemini? (
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- )
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
- "${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
- "${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() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- ecm_pkg_setup
- check-reqs_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)
- ecm_punt_bogus_dep Qt5 Declarative
- ecm_punt_bogus_dep Qt5 OpenGL
-}
-
-src_configure() {
- local cal_ft myproducts
-
- # applications
- for cal_ft in ${CAL_FTS[@]}; do
- use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
- done
-
- use lcms && myproducts+=( PLUGIN_COLORENGINES )
- use okular && myproducts+=( OKULAR )
- use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
- local mycmakeargs=(
- -DPACKAGERS_BUILD=OFF
- -DRELEASE_BUILD=ON
- -DWITH_Iconv=ON
- -DWITH_Imath=ON # w/ LCMS: 16 bit floating point Grayscale colorspace
- -DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5Kross=ON
- -DPRODUCTSET="${myproducts[*]}"
- $(cmake_use_find_package activities KF5Activities)
- $(cmake_use_find_package charts KChart)
- -DWITH_Qca-qt5=$(usex crypt)
- -DWITH_Fontconfig=$(usex fontconfig)
- $(cmake_use_find_package gemini Libgit2)
- $(cmake_use_find_package gemini Qt5QuickWidgets)
- -DWITH_GSL=$(usex gsl)
- -DWITH_LibEtonyek=$(usex import-filter)
- -DWITH_LibOdfGen=$(usex import-filter)
- -DWITH_LibRevenge=$(usex import-filter)
- -DWITH_LibVisio=$(usex import-filter)
- -DWITH_LibWpd=$(usex import-filter)
- -DWITH_LibWpg=$(usex import-filter)
- -DWITH_LibWps=$(usex import-filter)
- $(cmake_use_find_package phonon Phonon4Qt5)
- -DWITH_LCMS2=$(usex lcms)
- -DWITH_Okular5=$(usex okular)
- -DWITH_Poppler=$(usex pdf)
- -DWITH_Eigen3=$(usex calligra_features_sheets)
- -DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
- -DWITH_Freetype=$(usex truetype)
- )
-
- ecm_src_configure
-}
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
deleted file mode 100644
index c723eca0b75f..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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 <fweimer@redhat.com>
-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 <stdlib.h> for a declaration of atoi.
---- a/cmake/TestModernZlib.c
-+++ b/cmake/TestModernZlib.c
-@@ -1,3 +1,4 @@
-+#include <stdlib.h>
- #include <string.h>
- #include <zlib.h>
-
---
-GitLab
diff --git a/app-office/calligra/files/calligra-3.2.1-okularpart.patch b/app-office/calligra/files/calligra-3.2.1-okularpart.patch
deleted file mode 100644
index 75a3b0d05416..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-okularpart.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From e3b1fe06a2593edcaf33f106b2f77679cd1ea9c8 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-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 <asturm@gentoo.org>
----
- 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 <KoDocumentInfo.h>
- #include <KoGlobal.h>
-
--#include <okular/core/page.h>
-+#include <okular5/core/page.h>
-
- #include <KLocalizedString>
-
-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 <okular/core/generator.h>
--#include <okular/core/document.h>
--#include <okular/core/version.h>
-+#include <okular5/core/generator.h>
-+#include <okular5/core/document.h>
-+#include <okular5/core/version.h>
-
- 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 <KoTextLayoutRootArea.h>
- #include <KoCharAreaInfo.h>
-
--#include <okular/core/page.h>
-+#include <okular5/core/page.h>
-
-
- 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 <okular/core/generator.h>
--#include <okular/core/document.h>
--#include <okular/core/version.h>
-+#include <okular5/core/generator.h>
-+#include <okular5/core/document.h>
-+#include <okular5/core/version.h>
-
- class KWDocument;
-
---
-2.44.0
-
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
deleted file mode 100644
index 2ef45d675e3b..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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> {
- 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/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch b/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch
deleted file mode 100644
index 07e31a0ed77d..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fb545574a3e3b48b937dc4f741048c7033735e04 Mon Sep 17 00:00:00 2001
-From: Dan Leinir Turthra Jensen <admin@leinir.dk>
-Date: Thu, 29 Apr 2021 13:02:39 +0100
-Subject: [PATCH] Fix GSL find module
-
-This increases the CMake requirement to 3.2 so we can use the GSL find
-module that ships with CMake since then. The custom find module
-apparently doesn't work right on Windows, so...
----
- sheets/plugins/solver/CMakeLists.txt | 4 +-
- 1 filee changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sheets/plugins/solver/CMakeLists.txt b/sheets/plugins/solver/CMakeLists.txt
-index 41bc4a77ae9..ecd4bd8d218 100644
---- a/sheets/plugins/solver/CMakeLists.txt
-+++ b/sheets/plugins/solver/CMakeLists.txt
-@@ -25,8 +25,8 @@ calligrasheets_viewplugin_desktop_to_json(sheetssolver sheetssolver.desktop)
-
-
- target_link_libraries( sheetssolver
-- ${GSL_LIBRARIES}
-- ${GSL_CBLAS_LIBRARIES}
-+ GSL::gsl
-+ GSL::gslcblas
- calligrasheetscommon
- )
-
---
-GitLab
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index e6718f9f6204..09de55c3d00f 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -14,14 +14,11 @@
<remote-id type="cpe">cpe:/a:calligra:calligra</remote-id>
</upstream>
<use>
- <flag name="activities">Enable kactivities support</flag>
<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kdiagram</pkg></flag>
- <flag name="gemini">Enable tablet and 2:1 devices support</flag>
<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
<flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag>
- <flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
<flag name="webengine">Enable Braindump support using <pkg>dev-qt/qtwebengine</pkg></flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 21+ messages in thread
end of thread, other threads:[~2024-09-09 18:32 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-08 1:47 [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-09-09 18:32 Andreas Sturmlechner
2024-06-06 18:09 Andreas Sturmlechner
2024-03-15 12:19 Andreas Sturmlechner
2023-04-22 16:48 Sam James
2023-03-29 12:46 Andreas Sturmlechner
2023-02-16 3:29 Sam James
2022-05-16 18:46 Andreas Sturmlechner
2021-06-17 12:19 Andreas Sturmlechner
2020-07-18 8:41 Andreas Sturmlechner
2019-12-25 21:20 Andreas Sturmlechner
2019-01-16 16:30 Andreas Sturmlechner
2019-01-01 19:40 Andreas Sturmlechner
2019-01-01 19:40 Andreas Sturmlechner
2018-04-05 23:38 Andreas Sturmlechner
2018-03-24 6:42 Andreas Sturmlechner
2018-01-28 1:19 Andreas Sturmlechner
2017-03-21 20:52 Andreas Sturmlechner
2017-01-06 22:35 Andreas Sturmlechner
2016-12-08 14:10 Johannes Huber
2016-03-22 19:11 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox