summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-01-14 01:57:58 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-01-14 01:57:58 +0000
commit1b5ac6b603626d26dbb3484ae4cb7624cb18a620 (patch)
tree9041a4b00af7a77dac1b32806fb24d03fbe30134
parenteb2ee1e3dc396b3dcf52e391c7227faaeb858d20 (diff)
downloadpackages-1b5ac6b603626d26dbb3484ae4cb7624cb18a620.tar.gz
packages-1b5ac6b603626d26dbb3484ae4cb7624cb18a620.tar.bz2
packages-1b5ac6b603626d26dbb3484ae4cb7624cb18a620.tar.xz
packages-1b5ac6b603626d26dbb3484ae4cb7624cb18a620.zip
user/*: Modernise / fix syntax / deps / code
-rw-r--r--user/calligra/APKBUILD35
-rw-r--r--user/calligra/kcalcore.patch74
-rw-r--r--user/calligra/kf5.patch38
-rw-r--r--user/calligra/plan.patch48
-rw-r--r--user/calligra/poppler-81.patch70
-rw-r--r--user/calligra/poppler-83.patch102
-rw-r--r--user/calligra/qt5.patch293
-rw-r--r--user/konversation/APKBUILD12
-rw-r--r--user/konversation/qt5.patch24
-rw-r--r--user/kst/APKBUILD12
-rw-r--r--user/kst/qt5.patch47
-rw-r--r--user/strongswan/APKBUILD6
-rw-r--r--user/w3m/APKBUILD2
13 files changed, 730 insertions, 33 deletions
diff --git a/user/calligra/APKBUILD b/user/calligra/APKBUILD
index fdaf6e4fe..60d8a0e8e 100644
--- a/user/calligra/APKBUILD
+++ b/user/calligra/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=calligra
pkgver=3.1.0
-pkgrel=3
+pkgrel=4
pkgdesc="KDE Office suite"
url="https://www.calligra.org/"
arch="all"
@@ -25,31 +25,34 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev
libwpd-dev libwpg-dev libwps-dev marble-dev poppler-dev poppler-qt5-dev
qca-dev
- kcalcore-dev kcontacts-dev kdiagram-dev"
+ kcalendarcore-dev kcontacts-dev kdiagram-dev"
subpackages="$pkgname-dev $pkgname-lang"
source="https://download.kde.org/stable/calligra/$pkgver/calligra-$pkgver.tar.xz
https://download.kde.org/stable/calligra/$pkgver/calligraplan-$pkgver.tar.xz
c99-math.patch
+ kcalcore.patch
+ kf5.patch
+ plan.patch
poppler.patch
poppler2.patch
poppler3.patch
poppler4.patch
poppler-73.patch
+ poppler-81.patch
+ poppler-83.patch
+ qt5.patch
"
prepare() {
- default_prepare
-
- cd "$builddir"
+ # Run this *before* default_prepare so patches can work on plan!
mv ../calligraplan-$pkgver plan
+ default_prepare
sed -e "/add_subdirectory(plan)/s/#//" \
-e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
-i CMakeLists.txt
- mkdir build
}
build() {
- cd "$builddir"/build
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -64,25 +67,29 @@ build() {
-DPRODUCTSET="KARBON PLAN SHEETS STAGE WORDS" \
-DBUILD_UNMAINTAINED=True \
${CMAKE_CROSSOPTS} \
- ..
- make
+ -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b calligra-3.1.0.tar.xz
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 calligraplan-3.1.0.tar.xz
b03d2f33a0233638be06b4219328404eac4a77c508619c4037b3b53556b257fc4888cd690bb3755562040a198cbd51a323d13553fed3f2082398556a49482c6e c99-math.patch
+7c7c0dbf0603e1ff1dba640364c58922e1f59f0c60ef4a1afbd330e454259a2ef767d94d54e8c0ef5c228c6972e91cbdc32cb6242a27e5374ddf0c5d4ea983d6 kcalcore.patch
+0edb2b9ef6c9aad374d3e25bbc637f9a3447a6e70d153fbec4ab87dc213e96076a6c8df5a65fb020d7f232269ee8cf4561f5d13724df827247379c321c15401d kf5.patch
+7d4654810d0aa1bcbd3609e0d9067e357284a9cd97d50aa3782ef8e341478c3c16acba85428595ddb1d5b22397703f2383304d2c39c48d3fd5e2cfa2768bc6bc plan.patch
960614eb2d367443810cc356d004d43867a4fa4085b054ffd1522b94ef09e9338e723117c91148383d33d54104729750a199ab1b75569aaa7164a908afd3cd4c poppler.patch
53296af0b1ad39c523bc93a0040f1316dfb52e2077d277a83841a741c5cb48d81efb1f6328b2af2c8f1dc92db12c4d771a9a65028498d7802b2c30dd702b9455 poppler2.patch
a22b78d9664284ee5de7a4299907ec37a7835cb6ae3af8e7c1ee0202cea8c1e544fbad7395e56115fb5fe13ec06aeff22e381431e20c6c151c93003cf8a45446 poppler3.patch
df0e592f8c314581b1811776f8aa1c3dd32f05f966f23ef4dd023c41dad759aea8b674b32e2bd7bee36efe4ba0ce0bdd08f3fc30d10115330605d09d46883a28 poppler4.patch
-8440f1c36aba9cb54efa36fae73d605f57e78d055225c776791b14554d6be6f081f8cdc3fa65fb9c0b600a3b030d7776b45f631b9bc00d495ab16bfc35bd66f4 poppler-73.patch"
+8440f1c36aba9cb54efa36fae73d605f57e78d055225c776791b14554d6be6f081f8cdc3fa65fb9c0b600a3b030d7776b45f631b9bc00d495ab16bfc35bd66f4 poppler-73.patch
+354d1ceab55dfd036c94aa0f9cd6792e58714011b2ef23f104f45fc46cd6d005a242ba18f47337dc1ead79fbeb1e3075062fc9d63d50a4058ca845ac9ec7810c poppler-81.patch
+b65384ddc4be747907d17b1eb944130dd27155034156faa4d3e3b704507fff03331535e875cb9dec929d5cba2f0a317ba1a7e7978336e3b57f28807f5ad5b383 poppler-83.patch
+440a5297ad0e1542c2892e6c84a6acf5cd61da3160dcf56163791ef4ade35d90f71c3bb3df28988deea60e9f68c292ce8ffa23150ddaa08d262b256dd91481f1 qt5.patch"
diff --git a/user/calligra/kcalcore.patch b/user/calligra/kcalcore.patch
new file mode 100644
index 000000000..8124192db
--- /dev/null
+++ b/user/calligra/kcalcore.patch
@@ -0,0 +1,74 @@
+From 2d484fda1b31a72659088a4bfce5c3708e923cb0 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 23 Jul 2019 12:20:29 +0200
+Subject: Fix compilation after recent KCalCore API changes
+
+---
+ .../filters/icalendar/export/icalendarexport.cpp | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp
+index 757d693..daf1c2d 100644
+--- a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp
++++ b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp
+@@ -31,6 +31,7 @@
+ #include <kcalcore/attachment.h>
+ #include <kcalcore/icalformat.h>
+ #include <kcalcore/memorycalendar.h>
++#include <kcalcore_version.h>
+
+ #include <QTextCodec>
+ #include <QByteArray>
+@@ -140,9 +141,15 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
+ todo->setOrganizer(node->projectNode()->leader());
+ }
+ if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) {
++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90)
++ KCalCore::Person p = KCalCore::Person::fromFullName(node->leader());
++ KCalCore::Attendee a(p.name(), p.email());
++ a.setRole(KCalCore::Attendee::NonParticipant);
++#else
+ KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader());
+ KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email()));
+ a->setRole(KCalCore::Attendee::NonParticipant);
++#endif
+ todo->addAttendee(a);
+ }
+ DateTime st = node->startTime(id);
+@@ -161,13 +168,21 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
+ const QList<Resource*> lst = task->requestedResources();
+ foreach(const Resource *r, lst) {
+ if (r->type() == Resource::Type_Work) {
++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90)
++ todo->addAttendee(KCalCore::Attendee(r->name(), r->email()));
++#else
+ todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email())));
++#endif
+ }
+ }
+ } else {
+ foreach(const Resource *r, s->resources()) {
+ if (r->type() == Resource::Type_Work) {
++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90)
++ todo->addAttendee(KCalCore::Attendee(r->name(), r->email()));
++#else
+ todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email())));
++#endif
+ }
+ }
+
+@@ -178,7 +193,11 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
+ todo->setPercentComplete(task->completion().percentFinished());
+ }
+ foreach(const Document *doc, node->documents().documents()) {
++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90)
++ todo->addAttachment(KCalCore::Attachment(doc->url().url()));
++#else
+ todo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment(doc->url().url())));
++#endif
+ }
+ if (! parent.isNull()) {
+ todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent);
+--
+cgit v1.1
+
diff --git a/user/calligra/kf5.patch b/user/calligra/kf5.patch
new file mode 100644
index 000000000..1a424ef98
--- /dev/null
+++ b/user/calligra/kf5.patch
@@ -0,0 +1,38 @@
+From 9611a8b3e09f7ae4b53640c11a2196274f39d60f Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 10 Nov 2019 14:28:36 +0100
+Subject: port away from deprecated methods in KWindowSystem >= 5.62
+
+(this is in order to make KWindowSystem independent from QtWidgets)
+---
+ plan/src/workpackage/commandlineparser.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/plan/src/workpackage/commandlineparser.cpp b/plan/src/workpackage/commandlineparser.cpp
+index 432f99a..f9be208 100644
+--- a/plan/src/workpackage/commandlineparser.cpp
++++ b/plan/src/workpackage/commandlineparser.cpp
+@@ -28,6 +28,7 @@
+ #include <KStartupInfo>
+ #include <KWindowSystem>
+ #include <KMessageBox>
++#include <kwindowsystem_version.h>
+
+ #include <QApplication>
+ #include <QDir>
+@@ -65,7 +66,12 @@ void CommandLineParser::handleActivateRequest(const QStringList &arguments, cons
+ handleCommandLine(QDir(workingDirectory));
+
+ // terminate startup notification and activate the mainwindow
++#if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5,62,0)
++ m_mainwindow->setAttribute(Qt::WA_NativeWindow, true);
++ KStartupInfo::setNewStartupId(m_mainwindow->windowHandle(), KStartupInfo::startupId());
++#else
+ KStartupInfo::setNewStartupId(m_mainwindow, KStartupInfo::startupId());
++#endif
+ KWindowSystem::forceActiveWindow(m_mainwindow->winId());
+
+ }
+--
+cgit v1.1
+
diff --git a/user/calligra/plan.patch b/user/calligra/plan.patch
new file mode 100644
index 000000000..c8f8c91fb
--- /dev/null
+++ b/user/calligra/plan.patch
@@ -0,0 +1,48 @@
+From 36ec68024620211edbcdb31a5ef6021545fe9451 Mon Sep 17 00:00:00 2001
+From: Dag Andersen <danders@get2net.dk>
+Date: Fri, 9 Feb 2018 08:40:34 +0100
+Subject: Plan: Fix crash in tj scheduler if a resource does not have a
+ calendar
+
+This can happen when there is no default calendar and no calendar has been set for a resource.
+---
+ plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp b/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp
+index 4f4e825..548969e 100644
+--- a/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp
++++ b/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp
+@@ -259,6 +259,9 @@ bool PlanTJScheduler::kplatoToTJ()
+ addRequests();
+ addStartEndJob();
+
++ if (result != -1) {
++ return false;
++ }
+ return check();
+ }
+
+@@ -596,6 +599,7 @@ TJ::Resource *PlanTJScheduler::addResource( KPlato::Resource *r)
+ res->setEfficiency( (double)(r->units()) / 100. );
+ }
+ Calendar *cal = r->calendar();
++ Q_ASSERT(cal);
+ DateTime start = qMax( r->availableFrom(), m_project->constraintStartTime() );
+ DateTime end = m_project->constraintEndTime();
+ if ( r->availableUntil().isValid() && end > r->availableUntil() ) {
+@@ -887,6 +891,11 @@ void PlanTJScheduler::addRequest( TJ::Task *job, Task *task )
+ return;
+ }
+ foreach ( ResourceRequest *rr, task->requests().resourceRequests( true /*resolveTeam*/ ) ) {
++ if (!rr->resource()->calendar()) {
++ result = 1; // stops scheduling
++ logError(task, 0, i18n("No working hours defined for resource: %1",rr->resource()->name()));
++ continue; // may happen if no calendar is set, and no default calendar
++ }
+ TJ::Resource *tjr = addResource( rr->resource() );
+ TJ::Allocation *a = new TJ::Allocation();
+ a->setSelectionMode( TJ::Allocation::order );
+--
+cgit v1.1
+
diff --git a/user/calligra/poppler-81.patch b/user/calligra/poppler-81.patch
new file mode 100644
index 000000000..3211b7b8e
--- /dev/null
+++ b/user/calligra/poppler-81.patch
@@ -0,0 +1,70 @@
+diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
+index 8f462b7b597..945eebbe676 100644
+--- a/filters/karbon/pdf/CMakeLists.txt
++++ b/filters/karbon/pdf/CMakeLists.txt
+@@ -1,4 +1,8 @@
+
++if(Poppler_VERSION VERSION_LESS "0.82.0")
++ add_definitions("-DHAVE_POPPLER_PRE_0_82")
++endif()
++
+ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
+
+ add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 18c6fbb4a44..3ebb2281bf3 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -405,7 +405,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ const char * p = s->c_str();
+ int len = s->getLength();
+ CharCode code;
++#ifdef HAVE_POPPLER_PRE_0_82
+ Unicode *u = nullptr;
++#else
++ const Unicode *u = nullptr;
++#endif
+ int uLen;
+ double dx, dy, originX, originY;
+ while (len > 0) {
+@@ -474,9 +478,15 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ *d->body << "</text>" << endl;
+ }
+
+-void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
++#ifdef HAVE_POPPLER_PRE_0_82
++ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
++ int width, int height, GfxImageColorMap *colorMap,
++ bool /*interpolate*/, int *maskColors, bool /*inlineImg*/)
++#else
++ 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)
++#endif
+ {
+ ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+ imgStr->reset();
+diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
+index 2c161ce50af..2b0ea41e30c 100644
+--- a/filters/karbon/pdf/SvgOutputDev.h
++++ b/filters/karbon/pdf/SvgOutputDev.h
+@@ -61,9 +61,17 @@ public:
+ void drawString(GfxState * state, const GooString * s) override;
+
++#ifdef HAVE_POPPLER_PRE_0_82
++ // images
++ void drawImage(GfxState *state, Object *ref, Stream *str,
++ int width, int height, GfxImageColorMap *colorMap,
++ bool interpolate, int *maskColors, bool inlineImg) override;
++#else
+ // 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;
++#endif
++
+
+ // styles
+ void updateAll(GfxState *state) override;
diff --git a/user/calligra/poppler-83.patch b/user/calligra/poppler-83.patch
new file mode 100644
index 000000000..e158ac4ff
--- /dev/null
+++ b/user/calligra/poppler-83.patch
@@ -0,0 +1,102 @@
+--- calligra-3.1.0/filters/karbon/pdf/CMakeLists.txt.old 2020-01-13 11:57:23.529485941 +0000
++++ calligra-3.1.0/filters/karbon/pdf/CMakeLists.txt 2020-01-13 12:08:05.610601265 +0000
+@@ -3,6 +3,10 @@
+ add_definitions("-DHAVE_POPPLER_PRE_0_82")
+ endif()
+
++if(Poppler_VERSION VERSION_LESS "0.83.0")
++ add_definitions("-DHAVE_POPPLER_PRE_0_83")
++endif()
++
+ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
+
+ add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
+--- calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp.old 2020-01-13 10:34:30.622852616 +0000
++++ calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp 2020-01-13 12:26:57.029441237 +0000
+@@ -60,19 +60,31 @@
+ }
+
+ // read config file
++#ifdef HAVE_POPPLER_PRE_0_83
+ globalParams = new GlobalParams();
++#else
++ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());
++#endif
+ 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) {
++#ifdef HAVE_POPPLER_PRE_0_83
+ delete globalParams;
++#else
++ globalParams.reset();
++#endif
+ return KoFilter::StupidError;
+ }
+
+ if (! pdfDoc->isOk()) {
++#ifdef HAVE_POPPLER_PRE_0_83
+ delete globalParams;
++#else
++ globalParams.reset();
++#endif
+ delete pdfDoc;
+ return KoFilter::StupidError;
+ }
+@@ -99,8 +111,12 @@
+
+ delete dev;
+ delete pdfDoc;
++#ifdef HAVE_POPPLER_PRE_0_83
+ delete globalParams;
+ globalParams = 0;
++#else
++ globalParams.reset();
++#endif
+
+ return KoFilter::OK;
+ }
+--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp.old 2020-01-13 11:57:43.537339118 +0000
++++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2020-01-13 12:18:49.211663293 +0000
+@@ -172,7 +172,11 @@
+ *d->body << "/>" << endl;
+ }
+
++#ifdef HAVE_POPPLER_PRE_0_83
+ QString SvgOutputDev::convertPath(GfxPath *path)
++#else
++QString SvgOutputDev::convertPath(const GfxPath *path)
++#endif
+ {
+ if (! path)
+ return QString();
+@@ -180,7 +184,12 @@
+ QString output;
+
+ for (int i = 0; i < path->getNumSubpaths(); ++i) {
+- GfxSubpath * subpath = path->getSubpath(i);
++#ifdef HAVE_POPPLER_PRE_0_83
++ GfxSubpath * subpath;
++#else
++ const GfxSubpath * subpath;
++#endif
++ subpath = path->getSubpath(i);
+ if (subpath->getNumPoints() > 0) {
+ output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));
+ int j = 1;
+--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h.old 2020-01-13 11:57:23.529485941 +0000
++++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h 2020-01-13 12:11:30.918610131 +0000
+@@ -87,7 +87,11 @@
+ /// Dumps content to svg file
+ void dumpContent();
+ private:
++#ifdef HAVE_POPPLER_PRE_0_83
+ QString convertPath(GfxPath *path);
++#else
++ QString convertPath(const GfxPath *path);
++#endif
+ QString convertMatrix(const QMatrix &matrix);
+ QString convertMatrix(const double * matrix);
+ QString printFill();
diff --git a/user/calligra/qt5.patch b/user/calligra/qt5.patch
new file mode 100644
index 000000000..a40d92127
--- /dev/null
+++ b/user/calligra/qt5.patch
@@ -0,0 +1,293 @@
+From a7ebecb9fbee2190e649c44ed53f1299013baa30 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 18 Mar 2018 11:56:57 +0100
+Subject: Fix build with Qt 5.11 (missing headers)
+
+Reviewers: #calligra:_3.0, anthonyfieroni, danders
+
+Reviewed By: #calligra:_3.0, anthonyfieroni, danders
+
+Subscribers: anthonyfieroni, danders
+
+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 +
+ 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 +
+ 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 0ffdcf6..cdca006 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 f91555c..a3816f9 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 44d1193..a98e553 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 f34e702..0e6db7b 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 7991faf..54e3a87 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 00ea3af..491cb1e 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 d1c3b1f..7c97a07 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 2154611..91db5ac 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 344ebc2..9146f06 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 c9e17b7..b67e984 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
+ {
+ public:
+diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp
+index c0d5136..d2a772e 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 ed10919..8f52177 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 a0a9832..7d7db53 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 d64208c..bfddb3a 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 e38599a..7e8b2d5 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)
+ {
+--
+cgit v1.1
+
+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 v1.1
+
+From acd0ef39e3c945d066d2902de0e19fa2d020c7f8 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 23 Jul 2019 12:20:03 +0200
+Subject: Fix compilation with Qt 5.13 (missing include)
+
+---
+ plan/src/workpackage/view.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plan/src/workpackage/view.h b/plan/src/workpackage/view.h
+index b10547e..c5231e59 100644
+--- a/plan/src/workpackage/view.h
++++ b/plan/src/workpackage/view.h
+@@ -24,6 +24,7 @@
+ #include <KoView.h>
+
+ #include <QStackedWidget>
++#include <QMap>
+
+ class QPrinter;
+ class QPrintDialog;
+--
+cgit v1.1
+
+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/user/konversation/APKBUILD b/user/konversation/APKBUILD
index dd280d582..36e0efe17 100644
--- a/user/konversation/APKBUILD
+++ b/user/konversation/APKBUILD
@@ -15,10 +15,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev
kdbusaddons-dev knotifications-dev kwindowsystem-dev kiconthemes-dev
kitemviews-dev phonon-dev qca-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/konversation/$pkgver/src/konversation-$pkgver.tar.xz"
+source="https://download.kde.org/stable/konversation/$pkgver/src/konversation-$pkgver.tar.xz
+ qt5.patch
+ "
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -29,18 +30,17 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504 konversation-1.7.5.tar.xz"
+sha512sums="001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504 konversation-1.7.5.tar.xz
+a407be142c896eeef3edc4b3b6fa9451341b660c80b300573a2029c6a2b3a4340a2b351ee13e9f0f65aeddf1e47e164faf13d81e626e17093d0ec84f35255b6a qt5.patch"
diff --git a/user/konversation/qt5.patch b/user/konversation/qt5.patch
new file mode 100644
index 000000000..d9d29bbd1
--- /dev/null
+++ b/user/konversation/qt5.patch
@@ -0,0 +1,24 @@
+From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sun, 21 Jul 2019 09:14:32 +0200
+Subject: Fix build with Qt 5.13
+
+---
+ src/irc/outputfilter.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp
+index f9e6253..45d11fb 100644
+--- a/src/irc/outputfilter.cpp
++++ b/src/irc/outputfilter.cpp
+@@ -32,6 +32,7 @@
+
+ #include <QStringList>
+ #include <QFile>
++#include <QMetaMethod>
+ #include <QRegExp>
+ #include <QTextCodec>
+ #include <QByteArray>
+--
+cgit v1.1
+
diff --git a/user/kst/APKBUILD b/user/kst/APKBUILD
index d87b6e693..c47aa32e3 100644
--- a/user/kst/APKBUILD
+++ b/user/kst/APKBUILD
@@ -12,11 +12,12 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev gsl-dev"
subpackages="$pkgname-doc $pkgname-lang"
langdir="/usr/share/kst/locale"
source="https://downloads.sourceforge.net/project/kst/Kst%20$pkgver/Kst-$pkgver.tar.gz
- kst-gsl2.patch"
+ kst-gsl2.patch
+ qt5.patch
+ "
builddir="$srcdir/Kst-$pkgver"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -29,19 +30,18 @@ build() {
-DCMAKE_C_FLAGS="$CFLAGS" \
-Dkst_qt5="YesPlease" \
-Dkst_install_prefix="/usr" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
sha512sums="81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb Kst-2.0.8.tar.gz
-1dbd94d7e4298d768ab1e9e020dd207b848e72b30db6b1f2ef2f3eb0d528ec5c0a120593e7e7c06f4cb1e59e950a965e217c30564a26510a180d82418628d4e5 kst-gsl2.patch"
+1dbd94d7e4298d768ab1e9e020dd207b848e72b30db6b1f2ef2f3eb0d528ec5c0a120593e7e7c06f4cb1e59e950a965e217c30564a26510a180d82418628d4e5 kst-gsl2.patch
+63705a561890792a1d3cced65075a46d0f507f5abf2599de6475491d7484bba3102152c8fe13a6d3c424e409e6b6070299208d09f74282137b6e95acc95df879 qt5.patch"
diff --git a/user/kst/qt5.patch b/user/kst/qt5.patch
new file mode 100644
index 000000000..64c5d3c40
--- /dev/null
+++ b/user/kst/qt5.patch
@@ -0,0 +1,47 @@
+From 9fc5140791ec00d6df2d65973f3ca61df17b1d47 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Sun, 3 Jun 2018 19:43:34 +0200
+Subject: Fix build with Qt 5.11
+
+Summary:
+- qt5_use_modules was removed in Qt 5.11. use target_link_libraries instead.
+- Add a missing #include
+
+Subscribers: kde-edu
+
+Tags: #kde_edu
+
+Differential Revision: https://phabricator.kde.org/D13339
+---
+ cmake/modules/KstMacros.cmake | 2 +-
+ src/libkstapp/view.h | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake
+index 4ff9c15..bc3d8a6 100644
+--- a/cmake/modules/KstMacros.cmake
++++ b/cmake/modules/KstMacros.cmake
+@@ -240,7 +240,7 @@ endmacro()
+ macro(kst_link)
+ target_link_libraries(${kst_name} ${ARGV})
+ if(kst_qt5)
+- qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport)
++ target_link_libraries(${kst_name} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport)
+ else()
+ target_link_libraries(${kst_name}
+ ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+diff --git a/src/libkstapp/view.h b/src/libkstapp/view.h
+index 95c8c6a..2af5393 100644
+--- a/src/libkstapp/view.h
++++ b/src/libkstapp/view.h
+@@ -14,6 +14,7 @@
+ #define VIEW_H
+
+ #include <QGraphicsView>
++#include <QMenu>
+
+ #include "kst_export.h"
+
+--
+cgit v1.1
+
diff --git a/user/strongswan/APKBUILD b/user/strongswan/APKBUILD
index 6c895911a..668224e95 100644
--- a/user/strongswan/APKBUILD
+++ b/user/strongswan/APKBUILD
@@ -14,8 +14,8 @@ depends="iproute2"
depends_dev=""
makedepends="$depends_dev linux-headers python3 sqlite-dev openssl-dev curl-dev
gmp-dev libcap-dev"
-install="$pkgname.pre-install"
subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc"
+install="$pkgname.pre-install"
source="https://download.strongswan.org/$pkgname-$pkgver.tar.bz2
0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch
1001-charon-add-optional-source-and-remote-overrides-for-.patch
@@ -31,8 +31,6 @@ source="https://download.strongswan.org/$pkgname-$pkgver.tar.bz2
# - CVE-2018-17540
build() {
- cd "$builddir"
-
# notes about configuration:
# - try to keep options in ./configure --help order
# - apk depends on openssl, so we use that
@@ -86,12 +84,10 @@ build() {
}
check() {
- cd "$builddir"
env TESTS_SUITES_EXCLUDE=printf make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -m755 -D "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
install -m755 -D "$srcdir/charon.initd" "$pkgdir/etc/init.d/charon"
diff --git a/user/w3m/APKBUILD b/user/w3m/APKBUILD
index 45fb1c014..702675358 100644
--- a/user/w3m/APKBUILD
+++ b/user/w3m/APKBUILD
@@ -18,7 +18,6 @@ source="w3m-$pkgver.tar.gz::https://github.com/tats/w3m/archive/v$_pkgverp.tar.g
builddir="$srcdir/$pkgname-$_pkgverm"
build() {
- cd "$builddir"
LIBS="-lX11 -ltinfo" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,7 +30,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}