[gentoo-commits] repo/gentoo:master commit in: kde-misc/plasma-pass/, kde-misc/plasma-pass/files/
commit: 494ec0c253357d84f04eeb29b38ed40f3edb8632 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 1 20:08:20 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 1 21:21:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494ec0c2 kde-misc/plasma-pass: Drop -Werror Closes: https://bugs.gentoo.org/785832 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/plasma-pass-1.2.0-no-werror.patch| 31 ++ kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild | 2 ++ 2 files changed, 33 insertions(+) diff --git a/kde-misc/plasma-pass/files/plasma-pass-1.2.0-no-werror.patch b/kde-misc/plasma-pass/files/plasma-pass-1.2.0-no-werror.patch new file mode 100644 index 000..42c40bfe923 --- /dev/null +++ b/kde-misc/plasma-pass/files/plasma-pass-1.2.0-no-werror.patch @@ -0,0 +1,31 @@ +From 468db75d4a4f2620921c00ebd91fd7d12e7a2bce Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Sat, 1 May 2021 21:58:56 +0200 +Subject: [PATCH] Remove -Werror, one can't predict what future compilers will + do + +I assume this was supposed to be set only temporarily. + +CCMAIL: dvra...@kde.org +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8131494..26cea6e 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -46,8 +46,8 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) + add_definitions(-DQT_NO_FOREACH) + +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -pedantic") +-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -pedantic") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic") ++set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic") + + # plasmoid + plasma_install_package(package org.kde.plasma.pass) +-- +GitLab + diff --git a/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild b/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild index d713294e830..b62a307e42d 100644 --- a/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild +++ b/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild @@ -35,3 +35,5 @@ RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 " + +PATCHES=( "${FILESDIR}"/${P}-no-werror.patch ) # bug 785832
[gentoo-commits] repo/gentoo:master commit in: kde-misc/plasma-pass/, kde-misc/plasma-pass/files/
commit: 4131ac07c3955368ce6a7d37d288120857d86160 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Apr 5 16:55:15 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Apr 5 16:58:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4131ac07 kde-misc/plasma-pass: Drop 1.1.0 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-misc/plasma-pass/Manifest | 1 - .../files/plasma-pass-1.1.0-qt-5.15.patch | 29 - kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild | 36 -- 3 files changed, 66 deletions(-) diff --git a/kde-misc/plasma-pass/Manifest b/kde-misc/plasma-pass/Manifest index 48b2540aa19..5b88fa30eb6 100644 --- a/kde-misc/plasma-pass/Manifest +++ b/kde-misc/plasma-pass/Manifest @@ -1,2 +1 @@ -DIST plasma-pass-1.1.0.tar.xz 28204 BLAKE2B 69aa9d8f5ece8625c0d371ebfb565b2ce60e0a0fa73458ab30eaa9acf1858f0d9b2e30532d7a56dc821533964f09d9b6fced2b965d5fc9b5c1728e1b79f9a2c6 SHA512 402a19d44028117878214140c4eff74f25775aea6492fd751883e56bfe8ae08b330bb93f0a271c55f942f8ce1ee3de00cb6ad1b7fd4629beb59e898650b8166d DIST plasma-pass-1.2.0.tar.xz 34324 BLAKE2B a6fce04ca5b29066f026e01bb62a2ba4f312795bc4e0676fad82e7a7612ac29386b34047b74cda68ee1cef1fe08cb28ccda6c214565f18573594c281a3dd8658 SHA512 4ac72af97a8026022459c46eb3d8dec1489dedf0ea47ab8c71a5ab92a9c5e2faca92ef2ed512e5cd0cc181a6aa7b6ab802ae98ce525e97818704e0bf58e4603a diff --git a/kde-misc/plasma-pass/files/plasma-pass-1.1.0-qt-5.15.patch b/kde-misc/plasma-pass/files/plasma-pass-1.1.0-qt-5.15.patch deleted file mode 100644 index ea67cf18dd2..000 --- a/kde-misc/plasma-pass/files/plasma-pass-1.1.0-qt-5.15.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3fb633159ca4a1db166d5c54bbc025f71aba1652 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= -Date: Thu, 9 Apr 2020 12:48:53 +0200 -Subject: Fix build against Qt 5.15 - -* asturm 2020-06-07: Rebased for 1.1.0 - - plugin/passwordfiltermodel.cpp | 4 - 1 file changed, 4 insertions(+) - -diff --git a/plugin/passwordfiltermodel.cpp b/plugin/passwordfiltermodel.cpp -index e815797..2d323ad 100644 a/plugin/passwordfiltermodel.cpp 2019-12-06 07:59:15.0 +0100 -+++ b/plugin/passwordfiltermodel.cpp 2020-06-07 11:22:23.310950571 +0200 -@@ -79,7 +79,11 @@ - Q_ASSERT(sender() == ); - - mFilter = mUpdateTimer.property(newFilterProperty).toString(); -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - mParts = mFilter.splitRef(QLatin1Char('/'), QString::SkipEmptyParts); -+#else -+mParts = mFilter.splitRef(QLatin1Char('/'), Qt::SkipEmptyParts); -+#endif - Q_EMIT passwordFilterChanged(); - mSortingLookup.clear(); - invalidate(); --- -cgit v1.1 diff --git a/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild b/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild deleted file mode 100644 index 8bc8f79a2ca..000 --- a/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.64.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Plasma applet to access password from pass" -HOMEPAGE="https://www.dvratil.cz/2018/05/plasma-pass/ https://invent.kde.org/plasma/plasma-pass; - -if [[ ${KDE_BUILD_TYPE} != live ]] ; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="amd64 ~ppc64" -fi - -LICENSE="LGPL-2.1+" -SLOT="5" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=kde-frameworks/kirigami-${KFMIN}:5 -" - -PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
[gentoo-commits] repo/gentoo:master commit in: kde-misc/plasma-pass/, kde-misc/plasma-pass/files/
commit: 3cfdd312f28d0dd9d2a22aae19fa1a8d1dbaf7be Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 7 09:29:12 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 7 09:30:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cfdd312 kde-misc/plasma-pass: Fix build with Qt 5.15 Closes: https://bugs.gentoo.org/727398 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/plasma-pass-1.1.0-qt-5.15.patch | 29 ++ kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild | 2 ++ 2 files changed, 31 insertions(+) diff --git a/kde-misc/plasma-pass/files/plasma-pass-1.1.0-qt-5.15.patch b/kde-misc/plasma-pass/files/plasma-pass-1.1.0-qt-5.15.patch new file mode 100644 index 000..ea67cf18dd2 --- /dev/null +++ b/kde-misc/plasma-pass/files/plasma-pass-1.1.0-qt-5.15.patch @@ -0,0 +1,29 @@ +From 3fb633159ca4a1db166d5c54bbc025f71aba1652 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= +Date: Thu, 9 Apr 2020 12:48:53 +0200 +Subject: Fix build against Qt 5.15 + +* asturm 2020-06-07: Rebased for 1.1.0 + +--- + plugin/passwordfiltermodel.cpp | 4 + 1 file changed, 4 insertions(+) + +diff --git a/plugin/passwordfiltermodel.cpp b/plugin/passwordfiltermodel.cpp +index e815797..2d323ad 100644 +--- a/plugin/passwordfiltermodel.cpp 2019-12-06 07:59:15.0 +0100 b/plugin/passwordfiltermodel.cpp 2020-06-07 11:22:23.310950571 +0200 +@@ -79,7 +79,11 @@ + Q_ASSERT(sender() == ); + + mFilter = mUpdateTimer.property(newFilterProperty).toString(); ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + mParts = mFilter.splitRef(QLatin1Char('/'), QString::SkipEmptyParts); ++#else ++mParts = mFilter.splitRef(QLatin1Char('/'), Qt::SkipEmptyParts); ++#endif + Q_EMIT passwordFilterChanged(); + mSortingLookup.clear(); + invalidate(); +-- +cgit v1.1 diff --git a/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild b/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild index 39281fe41e4..8bc8f79a2ca 100644 --- a/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild +++ b/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild @@ -32,3 +32,5 @@ DEPEND=" RDEPEND="${DEPEND} >=kde-frameworks/kirigami-${KFMIN}:5 " + +PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )