diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2018-10-24 18:24:08 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2018-10-24 18:24:08 +0000 |
| commit | bdfa064a4d5488ddf0ee6c848b24539da1c56cbc (patch) | |
| tree | bf6cf5ba9a87ada4fcaaec2c96cfacdc6e130a83 | |
| parent | 2018-10-24 18:04:41 UTC (diff) | |
| parent | kde-misc/ktoshiba: Fix build with Qt 5.11 (diff) | |
| download | gentoo-bdfa064a4d5488ddf0ee6c848b24539da1c56cbc.tar.gz gentoo-bdfa064a4d5488ddf0ee6c848b24539da1c56cbc.tar.bz2 gentoo-bdfa064a4d5488ddf0ee6c848b24539da1c56cbc.zip | |
Merge updates from master
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild | 1 | ||||
| -rw-r--r-- | kde-misc/ktoshiba/files/ktoshiba-5.3.1-qt-5.11.patch | 10 | ||||
| -rw-r--r-- | kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild | 5 |
3 files changed, 14 insertions, 2 deletions
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild index a057c51763d5..57fa9ada481e 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild @@ -79,6 +79,7 @@ DEPEND="${RDEPEND} " PATCHES+=( + "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 ) diff --git a/kde-misc/ktoshiba/files/ktoshiba-5.3.1-qt-5.11.patch b/kde-misc/ktoshiba/files/ktoshiba-5.3.1-qt-5.11.patch new file mode 100644 index 000000000000..c7ec51226ad8 --- /dev/null +++ b/kde-misc/ktoshiba/files/ktoshiba-5.3.1-qt-5.11.patch @@ -0,0 +1,10 @@ +--- a/src/fnactions.cpp 2016-06-06 17:41:50.425121940 +0200 ++++ b/src/fnactions.cpp 2018-10-24 20:10:45.872718660 +0200 +@@ -17,6 +17,7 @@ + */ + + #include <QDesktopWidget> ++#include <QIcon> + #include <QTimer> + + #include <KLocalizedString> diff --git a/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild b/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild index 4295ad18882d..6bfd01a7e52c 100644 --- a/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild +++ b/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,11 +28,12 @@ RDEPEND=" $(add_qt_dep qtwidgets) net-libs/libmnl " - DEPEND="${RDEPEND} sys-devel/gettext " +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) + src_configure() { local mycmakeargs=( -DLIBMNL_INCLUDE_DIRS=/usr/include/libmnl |