diff options
author | Adriaan de Groot <adridg@FreeBSD.org> | 2019-08-15 10:01:34 +0000 |
---|---|---|
committer | Adriaan de Groot <adridg@FreeBSD.org> | 2019-08-15 10:01:34 +0000 |
commit | 0a7455c83ce45910f0ee6965d5db7b95bc54c9db (patch) | |
tree | ba72125e7521f7704b77323205dcde5c796ca7bb /archivers | |
parent | 949aa029a9916060e028096dff572f2f2fceebb7 (diff) | |
download | ports-0a7455c83ce45910f0ee6965d5db7b95bc54c9db.tar.gz ports-0a7455c83ce45910f0ee6965d5db7b95bc54c9db.zip |
Update KDE Frameworks to latest upstream release, 5.61
Release notes at
https://kde.org/announcements/kde-frameworks-5.61.0.php
Thanks to
antoine@ for the exp-runs,
tcberner@ for most of the prep-work,
the Gentoo community for cherry-picking patches
There are a bunch of changes in (implicitly included) headers, which
broke existing KDE Applications builds; that's why there are a whole
bunch of "patch-gentoo-kf5-5.61-headers" patches (taken from Gentoo
packaging). Those will go away with the next KDE Applications release,
PR: 239777
Submitted by: tcberner
Notes
Notes:
svn path=/head/; revision=508988
Diffstat (limited to 'archivers')
-rw-r--r-- | archivers/ark/files/patch-gentoo-kf5-5.61-headers | 54 | ||||
-rw-r--r-- | archivers/kf5-karchive/Makefile | 1 | ||||
-rw-r--r-- | archivers/kf5-karchive/distinfo | 6 |
3 files changed, 57 insertions, 4 deletions
diff --git a/archivers/ark/files/patch-gentoo-kf5-5.61-headers b/archivers/ark/files/patch-gentoo-kf5-5.61-headers new file mode 100644 index 000000000000..53b57109cfef --- /dev/null +++ b/archivers/ark/files/patch-gentoo-kf5-5.61-headers @@ -0,0 +1,54 @@ +From dfad7a3f389c3b852f45563854df123ac6facdec Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Mon, 15 Jul 2019 00:09:18 +0200 +Subject: Add missing QVector include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Summary: +My build was failing with +``` +In file included from /home/nico/kde/src/ark/kerfuffle/pluginmanager.cpp:28: +/home/nico/kde/src/ark/kerfuffle/pluginmanager.h:138:22: error: field ‘m_plugins’ has incomplete type ‘QVector<Kerfuffle::Plugin*>’ + QVector<Plugin*> m_plugins; + ^~~~~~~~~ +In file included from /usr/include/qt/QtCore/qglobal.h:1204, + from /usr/include/qt/QtCore/qnamespace.h:43, + from /usr/include/qt/QtCore/qobjectdefs.h:48, + from /usr/include/qt/QtCore/qobject.h:46, + from /usr/include/qt/QtCore/QObject:1, + from /home/nico/kde/src/ark/kerfuffle/plugin.h:33, + from /home/nico/kde/src/ark/kerfuffle/pluginmanager.h:31, + from /home/nico/kde/src/ark/kerfuffle/pluginmanager.cpp:28 +``` + +Test Plan: Builds. Can open a file + +Reviewers: #ark, elvisangelaccio + +Reviewed By: #ark, elvisangelaccio + +Subscribers: kde-utils-devel, #ark + +Tags: #ark + +Differential Revision: https://phabricator.kde.org/D22461 +--- + kerfuffle/pluginmanager.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kerfuffle/pluginmanager.h b/kerfuffle/pluginmanager.h +index 75a971b..8b9ad69 100644 +--- kerfuffle/pluginmanager.h ++++ kerfuffle/pluginmanager.h +@@ -31,6 +31,7 @@ + #include "plugin.h" + + #include <QMimeType> ++#include <QVector> + + namespace Kerfuffle + { +-- +cgit v1.1 diff --git a/archivers/kf5-karchive/Makefile b/archivers/kf5-karchive/Makefile index 9e318a420873..1b3c102f4f22 100644 --- a/archivers/kf5-karchive/Makefile +++ b/archivers/kf5-karchive/Makefile @@ -2,7 +2,6 @@ PORTNAME= karchive DISTVERSION= ${KDE_FRAMEWORKS_VERSION} -PORTREVISION= 1 CATEGORIES= archivers kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/archivers/kf5-karchive/distinfo b/archivers/kf5-karchive/distinfo index 386169d5f497..ea4fdd5f7e75 100644 --- a/archivers/kf5-karchive/distinfo +++ b/archivers/kf5-karchive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562535565 -SHA256 (KDE/frameworks/5.60.0/karchive-5.60.0.tar.xz) = 4e3d2a6ba551c6ada44a6517150e031df92691919119bc3b5eb4efc741ff7564 -SIZE (KDE/frameworks/5.60.0/karchive-5.60.0.tar.xz) = 459208 +TIMESTAMP = 1565017273 +SHA256 (KDE/frameworks/5.61.0/karchive-5.61.0.tar.xz) = 457ed420449630625cb161fcc9bedc7c6a16527f48d6db4008aea76cdb948387 +SIZE (KDE/frameworks/5.61.0/karchive-5.61.0.tar.xz) = 458492 |