* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/, kde-plasma/plasma-nm/files/
@ 2021-05-04 21:12 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-05-04 21:12 UTC (permalink / raw
To: gentoo-commits
commit: bba666cf172545cf750e6915fe3a76ad6aa21fd8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 16:45:27 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 4 20:17:49 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bba666cf
kde-plasma/plasma-nm: 5.21.5 version bump
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-nm-5.21.5-missing-include.patch | 30 ++++++++
kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild | 83 ++++++++++++++++++++++
2 files changed, 113 insertions(+)
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch
new file mode 100644
index 0000000000..db8f98b072
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch
@@ -0,0 +1,30 @@
+From 8d1720ac924c8453f80ac560470d9d92bdd94b07 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Tue, 4 May 2021 20:49:29 +0200
+Subject: [PATCH] Add missing QQueue include
+
+Used since 64dc6234b6980172bb53084c16a0e4e693d6011a. I suppose it's
+implicitly pulled in some cases, but for me the build fails with
+"networkmodel.h:126:56: error: field 'm_updateQueue' has incomplete
+type 'QQueue<QPair<NetworkModel::ModelChangeType, NetworkModelItem*> >'".
+
+(cherry picked from commit 2bccd7c3bc3aa12ddd1886b14041f1448c634a69)
+---
+ libs/models/networkmodel.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libs/models/networkmodel.h b/libs/models/networkmodel.h
+index ebe6db52..749cb919 100644
+--- a/libs/models/networkmodel.h
++++ b/libs/models/networkmodel.h
+@@ -22,6 +22,7 @@
+ #define PLASMA_NM_NETWORK_MODEL_H
+
+ #include <QAbstractListModel>
++#include <QQueue>
+
+ #include "networkitemslist.h"
+
+--
+GitLab
+
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
new file mode 100644
index 0000000000..a24d6cab27
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.82.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+ >=app-crypt/qca-2.3.0:2
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ net-misc/networkmanager[teamd=]
+ modemmanager? (
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/modemmanager-qt-${KFMIN}:5
+ net-misc/mobile-broadband-provider-info
+ )
+ openconnect? (
+ >=dev-qt/qtxml-${QTMIN}:5
+ net-vpn/networkmanager-openconnect
+ net-vpn/openconnect:=
+ )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-missing-include.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
+ $(cmake_use_find_package modemmanager KF5ModemManagerQt)
+ $(cmake_use_find_package openconnect OpenConnect)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+
+ if ! has_version "kde-plasma/plasma-workspace:5"; then
+ elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
+ elog "However, the networkmanagement KCM can be called from either systemsettings"
+ elog "or manually: $ kcmshell5 kcm_networkmanagement"
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/, kde-plasma/plasma-nm/files/
@ 2022-10-11 12:39 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-10-11 12:39 UTC (permalink / raw
To: gentoo-commits
commit: f904997509e89ba5da9ee3cb14da5f6f880f2ba4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 13:01:58 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 12:39:11 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f9049975
kde-plasma/plasma-nm: Make kde-frameworks/kdeclarative RDEPEND-only
Add missing kde-frameworks/kquickcharts RDEPEND too.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-nm-5.26.0-unused-dep.patch | 62 ++++++++++++++++++++++
kde-plasma/plasma-nm/plasma-nm-5.26.49.9999.ebuild | 5 +-
kde-plasma/plasma-nm/plasma-nm-9999.ebuild | 3 +-
3 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch
new file mode 100644
index 0000000000..400a3fcdfc
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch
@@ -0,0 +1,62 @@
+From 6f6958586e5a89ad5ff597550894a5770b5fb7cf Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Wed, 5 Oct 2022 16:38:37 +0200
+Subject: [PATCH] Remove deprecated KDeclarative use
+
+The icon image engine seems not required here.
+---
+ CMakeLists.txt | 1 -
+ kcm/CMakeLists.txt | 1 -
+ kcm/kcm.cpp | 5 -----
+ 3 files changed, 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6495c735..c245f60e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,7 +40,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+ ConfigWidgets
+ Completion
+ CoreAddons
+- Declarative
+ DBusAddons
+ KIO
+ I18n
+diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt
+index cbd7ad32..8f3e60d3 100755
+--- a/kcm/CMakeLists.txt
++++ b/kcm/CMakeLists.txt
+@@ -16,7 +16,6 @@ target_link_libraries(kcm_networkmanagement
+ plasmanm_internal
+ plasmanm_editor
+ KF5::ConfigWidgets
+- KF5::Declarative
+ KF5::I18n
+ KF5::Service
+ Qt::Quick
+diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
+index 11663fe9..e350be54 100644
+--- a/kcm/kcm.cpp
++++ b/kcm/kcm.cpp
+@@ -20,7 +20,6 @@
+ #include <KPluginFactory>
+ #include <KPluginMetaData>
+ #include <KSharedConfig>
+-#include <kdeclarative/kdeclarative.h>
+
+ #include <NetworkManagerQt/ActiveConnection>
+ #include <NetworkManagerQt/Connection>
+@@ -58,10 +57,6 @@ KCMNetworkmanagement::KCMNetworkmanagement(QWidget *parent, const QVariantList &
+ auto mainWidget = new QWidget(this);
+ m_ui->setupUi(mainWidget);
+
+- KDeclarative::KDeclarative kdeclarative;
+- kdeclarative.setDeclarativeEngine(m_ui->connectionView->engine());
+- kdeclarative.setupEngine(m_ui->connectionView->engine());
+-
+ KLocalizedContext *l10nContext = new KLocalizedContext(m_ui->connectionView->engine());
+ l10nContext->setTranslationDomain(QStringLiteral(TRANSLATION_DOMAIN));
+ m_ui->connectionView->engine()->rootContext()->setContextObject(l10nContext);
+--
+2.38.0
+
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.26.49.9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.26.49.9999.ebuild
index 7601bcd3c7..c1d9609ffb 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.26.49.9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.26.49.9999.ebuild
@@ -28,7 +28,6 @@ DEPEND="
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kitemviews-${KFMIN}:5
@@ -56,7 +55,9 @@ DEPEND="
RDEPEND="${DEPEND}
>=dev-qt/qtquickcontrols-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
>=kde-plasma/kde-cli-tools-${PVCUT}:5
"
BDEPEND="
@@ -64,6 +65,8 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}/${PN}-5.26.0-unused-dep.patch" )
+
src_prepare() {
ecm_src_prepare
diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
index 81dda08dfe..681b70f036 100644
--- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
@@ -28,7 +28,6 @@ DEPEND="
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kitemviews-${KFMIN}:5
@@ -56,7 +55,9 @@ DEPEND="
RDEPEND="${DEPEND}
>=dev-qt/qtquickcontrols-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
>=kde-plasma/kde-cli-tools-${PVCUT}:5
"
BDEPEND="
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/, kde-plasma/plasma-nm/files/
@ 2023-02-23 22:43 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-02-23 22:43 UTC (permalink / raw
To: gentoo-commits
commit: 812c4dc366899fdd36ffb61d4b6b0137186a256b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 22:39:01 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 22:42:38 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=812c4dc3
kde-plasma/plasma-nm: Fix IUSE openconnect, add new dependency
See also:
https://invent.kde.org/plasma/plasma-nm/-/merge_requests/222
Closes: https://bugs.gentoo.org/892709
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-nm-5.27.80-openconnect-optional.patch | 77 ++++++++++++++++++++++
kde-plasma/plasma-nm/plasma-nm-9999.ebuild | 14 ++--
2 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.27.80-openconnect-optional.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.27.80-openconnect-optional.patch
new file mode 100644
index 0000000000..fc2b5a9c72
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.27.80-openconnect-optional.patch
@@ -0,0 +1,77 @@
+From 50ace5c0641e0f2e7b8cdaf8f57afda147df7f96 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 23 Feb 2023 22:00:41 +0100
+Subject: [PATCH] Introduce BUILD_OPENCONNECT option (default ON)
+
+QtWebEngine is a huge dependency, considerably increasing the entry barrier
+to build and contribute to plasma-nm. It is easily possible to make it
+optional in this case so it should be done.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 19 +++++++++++++++----
+ vpn/CMakeLists.txt | 2 +-
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3acdb4b7..f03f6e3a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,6 +17,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
+
++option(BUILD_OPENCONNECT "Build OpenConnect VPN plugin" ON)
++
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+@@ -34,11 +36,22 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+ Network
+ Quick
+ QuickWidgets
+- WebEngineCore
+- WebEngineWidgets
+ Widgets
+ )
+
++find_package(PkgConfig REQUIRED)
++
++if (BUILD_OPENCONNECT)
++ pkg_check_modules(OPENCONNECT IMPORTED_TARGET openconnect>=3.99)
++ if (NOT TARGET PkgConfig::OPENCONNECT)
++ set(BUILD_OPENCONNECT OFF)
++ endif()
++endif()
++
++if (BUILD_OPENCONNECT)
++ find_package(Qt${QT_MAJOR_VERSION}WebEngineWidgets ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
++
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+ ConfigWidgets
+ Completion
+@@ -80,8 +93,6 @@ set_package_properties(KF5Prison PROPERTIES DESCRIPTION "Prison library"
+ PURPOSE "Needed to create mobile barcodes for WiFi networks"
+ )
+
+-find_package(PkgConfig REQUIRED)
+-pkg_check_modules(OPENCONNECT IMPORTED_TARGET openconnect>=3.99)
+ pkg_check_modules(NETWORKMANAGER IMPORTED_TARGET libnm>1.4.0 REQUIRED)
+ pkg_check_modules(MOBILEBROADBANDPROVIDERINFO mobile-broadband-provider-info)
+ pkg_get_variable(BROADBANDPROVIDER_DATABASE mobile-broadband-provider-info database)
+diff --git a/vpn/CMakeLists.txt b/vpn/CMakeLists.txt
+index 2bf0086a..25baa308 100644
+--- a/vpn/CMakeLists.txt
++++ b/vpn/CMakeLists.txt
+@@ -9,6 +9,6 @@ add_subdirectory(sstp)
+ add_subdirectory(strongswan)
+ add_subdirectory(vpnc)
+
+-if(TARGET PkgConfig::OPENCONNECT)
++if (BUILD_OPENCONNECT)
+ add_subdirectory(openconnect)
+ endif()
+--
+2.39.2
+
diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
index a1404f67a5..5bbcfbb12e 100644
--- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
@@ -45,6 +45,7 @@ DEPEND="
>=dev-qt/qtxml-${QTMIN}:5
net-misc/mobile-broadband-provider-info
openconnect? (
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtxml-${QTMIN}:5
net-vpn/networkmanager-openconnect
net-vpn/openconnect:=
@@ -63,13 +64,14 @@ BDEPEND="
virtual/pkgconfig
"
-src_prepare() {
- ecm_src_prepare
+PATCHES=( "${FILESDIR}/${PN}-5.27.80-openconnect-optional.patch" )
- # TODO: try to get a build switch upstreamed
- if ! use openconnect; then
- sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die
- fi
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_OPENCONNECT=$(usex openconnect)
+ )
+
+ ecm_src_configure
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-23 22:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-04 21:12 [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/, kde-plasma/plasma-nm/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-10-11 12:39 Andreas Sturmlechner
2023-02-23 22:43 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox