git » plasma-desktop.git » commit 29bc501

Unsplit knetattach, since kio no longer uses it

author Antonio Rojas
2021-01-09 10:38:56 UTC
committer Antonio Rojas
2021-01-09 10:38:56 UTC
parent 8297fe10b4384746ff5ac61982745506eab48b11

Unsplit knetattach, since kio no longer uses it

PKGBUILD +10 -23

diff --git a/PKGBUILD b/PKGBUILD
index eaab976..2bdd19c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,22 @@
 # Maintainer: Antonio Rojas <arojas@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
-pkgbase=plasma-desktop
-pkgname=(plasma-desktop knetattach)
+pkgname=plasma-desktop
 pkgver=5.20.5
-pkgrel=1
+pkgrel=2
 pkgdesc='KDE Plasma Desktop'
 arch=(x86_64)
 url='https://kde.org/plasma-desktop/'
 license=(LGPL)
 source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig})
 depends=(polkit-kde-agent libxkbfile kmenuedit systemsettings ksysguard baloo libibus accountsservice)
+optdepends=('plasma-nm: Network manager applet'
+            'powerdevil: power management, suspend and hibernate support'
+            'kscreen: screen management'
+            'ibus: kimpanel IBUS support'
+            'scim: kimpanel SCIM support'
+            'kaccounts-integration: OpenDesktop integration plugin')
+replaces=(user-manager knetattach)
 makedepends=(extra-cmake-modules kdoctools xf86-input-evdev xf86-input-synaptics xf86-input-libinput xorg-server-devel
              scim kdesignerplugin kaccounts-integration intltool)
 groups=(plasma)
@@ -29,25 +35,6 @@ build() {
   cmake --build build
 }
 
-package_plasma-desktop() {
-  depends+=(knetattach)
-  optdepends=('plasma-nm: Network manager applet'
-              'powerdevil: power management, suspend and hibernate support'
-              'kscreen: screen management'
-              'ibus: kimpanel IBUS support'
-              'scim: kimpanel SCIM support'
-              'kaccounts-integration: OpenDesktop integration plugin')
-  replaces=(user-manager)
-
+package() {
   DESTDIR="$pkgdir" cmake --install build
-
-# Split knetattach
-  rm "$pkgdir"/usr/{bin/knetattach,share/applications/org.kde.knetattach.desktop}
-}
-
-package_knetattach() {
-  pkgdesc='Wizard which makes it easier to integrate network resources with the Plasma Desktop'
-  depends=(kdelibs4support)
-
-  DESTDIR="$pkgdir" cmake --install build/knetattach
 }