commit: ccd141f4db88a1b13364330931a0762585150967 Author: Till Schäfer <till2.schaefer <AT> uni-dortmund <DOT> de> AuthorDate: Wed Mar 6 15:38:14 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Mar 7 09:20:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd141f4
kde-misc/playbar2: fix build issues with qt 5.12 raise QtQuick imports to 2.7 use EAPI=7 drop kde5-functions.eclass Closes: https://bugs.gentoo.org/679596 Signed-off-by: Till Schäfer <till2.schaefer <AT> uni-dortmund.de> Package-Manager: Portage-2.3.51, Repoman-2.3.11 Closes: https://github.com/gentoo/gentoo/pull/11282 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/playbar2-2.5-raise_qtquick_to_2_7.patch | 333 +++++++++++++++++++++ kde-misc/playbar2/playbar2-2.5-r1.ebuild | 35 +++ 2 files changed, 368 insertions(+) diff --git a/kde-misc/playbar2/files/playbar2-2.5-raise_qtquick_to_2_7.patch b/kde-misc/playbar2/files/playbar2-2.5-raise_qtquick_to_2_7.patch new file mode 100644 index 00000000000..3c9d3f3ce56 --- /dev/null +++ b/kde-misc/playbar2/files/playbar2-2.5-raise_qtquick_to_2_7.patch @@ -0,0 +1,333 @@ +From 666d468c106df1f6200d9dae4103e281e20c654d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Till=20Sch=C3=A4fer?= <[email protected]> +Date: Wed, 6 Mar 2019 15:50:05 +0100 +Subject: [PATCH] raise QtQuick 2.4 imports to 2.7 + +--- + plasmoid/contents/ui/AutoscrollText.qml | 2 +- + plasmoid/contents/ui/CompactApplet.qml | 2 +- + plasmoid/contents/ui/CoverArt.qml | 2 +- + plasmoid/contents/ui/DefaultLayout.qml | 2 +- + plasmoid/contents/ui/FullApplet.qml | 2 +- + plasmoid/contents/ui/IconWidget.qml | 2 +- + plasmoid/contents/ui/MediaPlayerArea.qml | 2 +- + plasmoid/contents/ui/Mpris2.qml | 2 +- + plasmoid/contents/ui/PlaybackBar.qml | 2 +- + plasmoid/contents/ui/PlaybackItem.qml | 2 +- + plasmoid/contents/ui/PlaybackWidget.qml | 2 +- + plasmoid/contents/ui/PopupButton.qml | 2 +- + plasmoid/contents/ui/SeekBar.qml | 2 +- + plasmoid/contents/ui/SliderSeek.qml | 2 +- + plasmoid/contents/ui/SliderVolume.qml | 2 +- + plasmoid/contents/ui/SystrayLayout.qml | 2 +- + plasmoid/contents/ui/TimeLabel.qml | 2 +- + plasmoid/contents/ui/TitleBar.qml | 2 +- + plasmoid/contents/ui/TrackInfo.qml | 2 +- + plasmoid/contents/ui/VerticalLayout.qml | 2 +- + plasmoid/contents/ui/VolumeIcon.qml | 2 +- + plasmoid/contents/ui/VolumeLabel.qml | 2 +- + plasmoid/contents/ui/main.qml | 2 +- + 23 files changed, 23 insertions(+), 23 deletions(-) + +diff --git a/plasmoid/contents/ui/AutoscrollText.qml b/plasmoid/contents/ui/AutoscrollText.qml +index 20ec8bf..72ff297 100644 +--- a/plasmoid/contents/ui/AutoscrollText.qml ++++ b/plasmoid/contents/ui/AutoscrollText.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + + Item { + id: scroll +diff --git a/plasmoid/contents/ui/CompactApplet.qml b/plasmoid/contents/ui/CompactApplet.qml +index a53939f..d01ad23 100644 +--- a/plasmoid/contents/ui/CompactApplet.qml ++++ b/plasmoid/contents/ui/CompactApplet.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import QtQuick.Layouts 1.2 + + Flow { +diff --git a/plasmoid/contents/ui/CoverArt.qml b/plasmoid/contents/ui/CoverArt.qml +index 2d6d0d6..65006ad 100644 +--- a/plasmoid/contents/ui/CoverArt.qml ++++ b/plasmoid/contents/ui/CoverArt.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import QtQuick.Layouts 1.2 + import org.kde.plasma.core 2.0 as PlasmaCore + import QtGraphicalEffects 1.0 +diff --git a/plasmoid/contents/ui/DefaultLayout.qml b/plasmoid/contents/ui/DefaultLayout.qml +index 6bcbc0d..ac7a4ac 100644 +--- a/plasmoid/contents/ui/DefaultLayout.qml ++++ b/plasmoid/contents/ui/DefaultLayout.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import QtQuick.Layouts 1.2 + import QtGraphicalEffects 1.0 + import org.kde.plasma.core 2.0 as PlasmaCore +diff --git a/plasmoid/contents/ui/FullApplet.qml b/plasmoid/contents/ui/FullApplet.qml +index 9b78c2e..55d2792 100644 +--- a/plasmoid/contents/ui/FullApplet.qml ++++ b/plasmoid/contents/ui/FullApplet.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import QtQuick.Layouts 1.2 + import org.kde.plasma.plasmoid 2.0 + import org.kde.plasma.core 2.0 as PlasmaCore +diff --git a/plasmoid/contents/ui/IconWidget.qml b/plasmoid/contents/ui/IconWidget.qml +index 4355814..d59df17 100644 +--- a/plasmoid/contents/ui/IconWidget.qml ++++ b/plasmoid/contents/ui/IconWidget.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.extras 2.0 as PlasmaExtras + +diff --git a/plasmoid/contents/ui/MediaPlayerArea.qml b/plasmoid/contents/ui/MediaPlayerArea.qml +index e017634..1740ae1 100644 +--- a/plasmoid/contents/ui/MediaPlayerArea.qml ++++ b/plasmoid/contents/ui/MediaPlayerArea.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + + MouseArea { + id: volumeWheelArea +diff --git a/plasmoid/contents/ui/Mpris2.qml b/plasmoid/contents/ui/Mpris2.qml +index b563191..9eba2f4 100644 +--- a/plasmoid/contents/ui/Mpris2.qml ++++ b/plasmoid/contents/ui/Mpris2.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import org.kde.plasma.core 2.0 as PlasmaCore + import "../code/utils.js" as Utils + +diff --git a/plasmoid/contents/ui/PlaybackBar.qml b/plasmoid/contents/ui/PlaybackBar.qml +index 5beb8c8..7bf27cb 100644 +--- a/plasmoid/contents/ui/PlaybackBar.qml ++++ b/plasmoid/contents/ui/PlaybackBar.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.components 2.0 as PlasmaComponents + +diff --git a/plasmoid/contents/ui/PlaybackItem.qml b/plasmoid/contents/ui/PlaybackItem.qml +index 751dd19..1470d94 100644 +--- a/plasmoid/contents/ui/PlaybackItem.qml ++++ b/plasmoid/contents/ui/PlaybackItem.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + + Item { + id: playbackitem +diff --git a/plasmoid/contents/ui/PlaybackWidget.qml b/plasmoid/contents/ui/PlaybackWidget.qml +index 434e105..fc69af5 100644 +--- a/plasmoid/contents/ui/PlaybackWidget.qml ++++ b/plasmoid/contents/ui/PlaybackWidget.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import QtQuick.Layouts 1.2 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.components 2.0 as PlasmaComponents +diff --git a/plasmoid/contents/ui/PopupButton.qml b/plasmoid/contents/ui/PopupButton.qml +index 1b77cc1..8daf82a 100644 +--- a/plasmoid/contents/ui/PopupButton.qml ++++ b/plasmoid/contents/ui/PopupButton.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import org.kde.plasma.core 2.0 as PlasmaCore + + IconWidget { +diff --git a/plasmoid/contents/ui/SeekBar.qml b/plasmoid/contents/ui/SeekBar.qml +index a12d3e7..50c1253 100644 +--- a/plasmoid/contents/ui/SeekBar.qml ++++ b/plasmoid/contents/ui/SeekBar.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.components 2.0 as PlasmaComponents + import org.kde.plasma.plasmoid 2.0 +diff --git a/plasmoid/contents/ui/SliderSeek.qml b/plasmoid/contents/ui/SliderSeek.qml +index c39fd5b..7bc974a 100644 +--- a/plasmoid/contents/ui/SliderSeek.qml ++++ b/plasmoid/contents/ui/SliderSeek.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import QtQuick.Layouts 1.2 + import org.kde.plasma.components 2.0 as PlasmaComponents + +diff --git a/plasmoid/contents/ui/SliderVolume.qml b/plasmoid/contents/ui/SliderVolume.qml +index d5081db..d6ba1e4 100644 +--- a/plasmoid/contents/ui/SliderVolume.qml ++++ b/plasmoid/contents/ui/SliderVolume.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import QtQuick.Layouts 1.2 + import org.kde.plasma.components 2.0 as PlasmaComponents + +diff --git a/plasmoid/contents/ui/SystrayLayout.qml b/plasmoid/contents/ui/SystrayLayout.qml +index 984b39b..cf0607f 100644 +--- a/plasmoid/contents/ui/SystrayLayout.qml ++++ b/plasmoid/contents/ui/SystrayLayout.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import QtQuick.Layouts 1.2 + import QtGraphicalEffects 1.0 + import org.kde.plasma.core 2.0 as PlasmaCore +diff --git a/plasmoid/contents/ui/TimeLabel.qml b/plasmoid/contents/ui/TimeLabel.qml +index 02104f3..8e55404 100644 +--- a/plasmoid/contents/ui/TimeLabel.qml ++++ b/plasmoid/contents/ui/TimeLabel.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import org.kde.plasma.components 2.0 as PlasmaComponents + import "../code/utils.js" as Utils + +diff --git a/plasmoid/contents/ui/TitleBar.qml b/plasmoid/contents/ui/TitleBar.qml +index 86e2b53..f747fba 100644 +--- a/plasmoid/contents/ui/TitleBar.qml ++++ b/plasmoid/contents/ui/TitleBar.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import QtQuick.Layouts 1.2 + import org.kde.plasma.components 2.0 as PlasmaComponents + import org.kde.plasma.extras 2.0 as PlasmaExtras +diff --git a/plasmoid/contents/ui/TrackInfo.qml b/plasmoid/contents/ui/TrackInfo.qml +index 2744564..10294c2 100644 +--- a/plasmoid/contents/ui/TrackInfo.qml ++++ b/plasmoid/contents/ui/TrackInfo.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import QtQuick.Layouts 1.2 + import org.kde.plasma.extras 2.0 as PlasmaExtras + import "../code/utils.js" as Utils +diff --git a/plasmoid/contents/ui/VerticalLayout.qml b/plasmoid/contents/ui/VerticalLayout.qml +index 7fd0416..c38b32b 100644 +--- a/plasmoid/contents/ui/VerticalLayout.qml ++++ b/plasmoid/contents/ui/VerticalLayout.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import QtQuick.Layouts 1.2 + import QtGraphicalEffects 1.0 + import org.kde.plasma.core 2.0 as PlasmaCore +diff --git a/plasmoid/contents/ui/VolumeIcon.qml b/plasmoid/contents/ui/VolumeIcon.qml +index a87fabc..0cba10d 100644 +--- a/plasmoid/contents/ui/VolumeIcon.qml ++++ b/plasmoid/contents/ui/VolumeIcon.qml +@@ -17,7 +17,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import org.kde.plasma.core 2.0 as PlasmaCore + + IconWidget { +diff --git a/plasmoid/contents/ui/VolumeLabel.qml b/plasmoid/contents/ui/VolumeLabel.qml +index 54efd00..498f55b 100644 +--- a/plasmoid/contents/ui/VolumeLabel.qml ++++ b/plasmoid/contents/ui/VolumeLabel.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import org.kde.plasma.components 2.0 as PlasmaComponents + import "../code/utils.js" as Utils + +diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml +index 7ae1e0b..3a007fc 100644 +--- a/plasmoid/contents/ui/main.qml ++++ b/plasmoid/contents/ui/main.qml +@@ -16,7 +16,7 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +-import QtQuick 2.4 ++import QtQuick 2.7 + import QtQuick.Layouts 1.2 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.plasmoid 2.0 +-- +2.19.2 + diff --git a/kde-misc/playbar2/playbar2-2.5-r1.ebuild b/kde-misc/playbar2/playbar2-2.5-r1.ebuild new file mode 100644 index 00000000000..889812d1ec0 --- /dev/null +++ b/kde-misc/playbar2/playbar2-2.5-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +DESCRIPTION="MPRIS2 client, written in QML for Plasma 5" +HOMEPAGE="https://github.com/audoban/PlayBar2"; +SRC_URI="https://github.com/audoban/PlayBar2/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +IUSE="" +KEYWORDS="~amd64 ~x86" + +BDEPEND="kde-frameworks/extra-cmake-modules:5 + kde-frameworks/kdoctools:5" +DEPEND="kde-frameworks/kconfig:5 + kde-frameworks/kconfigwidgets:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kglobalaccel:5 + kde-frameworks/ki18n:5 + kde-frameworks/kwidgetsaddons:5 + kde-frameworks/kwindowsystem:5 + kde-frameworks/kxmlgui:5 + kde-frameworks/plasma:5 + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtwidgets:5" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-raise_qtquick_to_2_7.patch" )
