diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
commit | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch) | |
tree | 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /app-office/calligra | |
parent | 2891d29af8907ce881662f4a02844926d7a293c7 (diff) |
gentoo resync : 12.01.2019
Diffstat (limited to 'app-office/calligra')
-rw-r--r-- | app-office/calligra/Manifest | 5 | ||||
-rw-r--r-- | app-office/calligra/calligra-3.1.0-r3.ebuild | 202 | ||||
-rw-r--r-- | app-office/calligra/files/calligra-3.1.0-no-webkit.patch | 70 | ||||
-rw-r--r-- | app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch | 83 | ||||
-rw-r--r-- | app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch | 202 | ||||
-rw-r--r-- | app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch | 54 |
6 files changed, 616 insertions, 0 deletions
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index e0baa7c705bb..dc6cc9666e60 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,9 +1,14 @@ AUX calligra-3.1.0-doc.patch 323 BLAKE2B 56a886a5b4a4f371eebe3c4f72d5a4817b2fa19af29e55ee0af1f84751a84ec28df8794b8cb7ceb026c701843356ef83d0310dfc2454815d09c95edbb93a0c08 SHA512 6254828157896b44ba77ae36f99876a2806dd917e65a36fdf25ee75e1a6683678ef1dd4275d6712d4f25f808d53dcb20bc3787bb4217e77054e9797bf0ccef72 AUX calligra-3.1.0-no-arch-detection.patch 436 BLAKE2B 117544b6089912f34b3c4cb3ee7837fb4f4377cdc0edc8a6de91156fb99ce010bc857752cf683f7f57ca604dd6393b36eeb807a6007e59bf589e404d02d0cef1 SHA512 f8f747279eabb165da68fe83300223a2bd49a530116c04c9a31de2a32f9f2b3eb46f7866ce194c91d9fcb0ab77fde628574dc9a55e6a08c327e2716849a0da8d +AUX calligra-3.1.0-no-webkit.patch 2587 BLAKE2B 9c5de12f3fe100060ec89eec8190ac2d5e97cc0e3f6e97e8b5e6f9c6c46f80e49b1e85e052dc16831aaf0a2b70abd9ecb4fa787bcefdeb2685c72dc59f2ea0ef SHA512 582d5e532ab237ee3f4bb87b12e47272d27f8c57448056a8900df7a76b38e8831dd2d352e0d4a3eb6bd1d651c5a34a7714a307c32ed218ce225ac17723615479 AUX calligra-3.1.0-plan-qt-5.11.patch 3818 BLAKE2B 1a1f619a491cbc3440ec8db091a1a0775c56f37ebb0be1a4ea0815ced8b6d22598b985e1a419bb572edb430c253d3fd5d0194d6f264ed4ac59c10d8d811cbc72 SHA512 fc375a35f5e29efc404f3546b995568f3c0a9cd3fb94e3c98085a897f9e9d08a1ea41ad1359665392b2f7449e552dead236c3617a4462d94ad4fa2689538150d +AUX calligra-3.1.0-poppler-0.69.patch 2963 BLAKE2B 8fac1f298d414ac52073dfdb645d00eab1f2c71f876eea08feb8d9057f33b3ff5dbf69abe10984aa15717ef505522b07153341e846ace24a5f80f175dfed4600 SHA512 b408f1333af40c7270a2f14fa5f9069ec16baeceac7e2b91be2e9759d095d6df92a16b33e0b7c6897dbb15f01ae789436f8864cd1dd38ff009c1a77501e32083 +AUX calligra-3.1.0-poppler-0.71.patch 6868 BLAKE2B 3787bcc3564598450ec14b9bd4e63559af6ebd3a92f9c80560812f7b9a8f94681987ca6dfa49faee7ed3985d09a7f49d2a2499f9c6acfb5a96a0f8c86d7b8484 SHA512 1376ac7940e6ca0e9615445dc9c16f5ff75db547944dc8a5006520ff30b9d34eced1e5fa679a82535ceb581ae96352d1b6c039b54038290973f456de4d792917 +AUX calligra-3.1.0-poppler-0.72.patch 2053 BLAKE2B 1a69315b986aeb2464a57c5fdb63e2d0c33cb256be64c868af666169ab693109c45ad0ed15f35639020e2e1eb707592694b07896dced4f364e0cff817ce3190a SHA512 216eb134eb24f10492581a30dacd7e7b8259cdac3d6f21423cc773b1752a8464eabb15c6263c5bbe4e8e741cf1e02db07e854b4f2113399773ad6c56025fe1b9 AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302e40b4aaf75c2a838a3009a3b3b6df7e75afdc798f27f08e76b7ad0ea60766612912d06eebe87c209ad9cab45db4bb3ccf54 SHA512 685bfca658404dc9920c805b97832b0a481a0ec0614bf142978c4ae03329e5e93b28d5af09d021b53c6d7a1316404f87612ab316f6a47c3f174572b50c65989b DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 EBUILD calligra-3.1.0-r2.ebuild 6841 BLAKE2B 08d6ba5579bec64f7fe865ecd47678cec0d85829063f4e8578792bf79a5a288943a6bd42fead2a557c8dc594676a8c04afe07f75762b40bc6de12957a9b3072b SHA512 1e0fdf8cc1a2b75320671be47eea2982aefaf108d158fa998d1b1a3a07e1e3332bd671075df281aa0ae34eb22fd2bc8c55f591f49fc7dec3f8b78b58555273f1 +EBUILD calligra-3.1.0-r3.ebuild 5738 BLAKE2B f4d518cd1d7556ea5685681e74da885baf760613a1ceb0f281d61402b3134537ae78938fa5fbb91e27c60404e0ca5f1cadee6d90a98ff69b61df46bfabd08308 SHA512 e3e4bd0fb709f2affe5a0f3433a67c17a606f365c39ae792cd98eb2facf68489ed4b8f53c78e87d500a7b3dce67ab3c6178b639a5d7e4ce839e5f2d927655386 MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893 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 000000000000..766e2b2b60aa --- /dev/null +++ b/app-office/calligra/calligra-3.1.0-r3.ebuild @@ -0,0 +1,202 @@ +# 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 stage words ) + +IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf + phonon pim 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 +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_features_sheets? ( dev-cpp/eigen:3 ) + calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) ) + 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 + "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable + "${FILESDIR}"/${P}-no-webkit.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 + + # 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-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_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-no-webkit.patch b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch new file mode 100644 index 000000000000..f126e2e51386 --- /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 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 000000000000..c82fbd242b8a --- /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 000000000000..6b50e3a42ed0 --- /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(); + } 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 000000000000..3b2e690257be --- /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 |