mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-office/calligra: Drop 3.1.0-r4
Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
@@ -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)
|
||||
@@ -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
|
||||
@@ -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} )
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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();
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
@@ -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();
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user