git » plasma-workspace.git » commit d39732a

Revert "upgpkg: 5.27.80-4: Add libkexiv2 dependency"

author Antonio Rojas
2023-11-11 09:07:53 UTC
committer Antonio Rojas
2023-11-11 09:07:53 UTC
parent d5d2ee984993b61dffe151a211511fbc6857634c

Revert "upgpkg: 5.27.80-4: Add libkexiv2 dependency"

This reverts commit d5d2ee984993b61dffe151a211511fbc6857634c.

.SRCINFO +49 -112
PKGBUILD +35 -125

diff --git a/.SRCINFO b/.SRCINFO
index 117a828..39ad582 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,132 +1,69 @@
 pkgbase = plasma-workspace
 	pkgdesc = KDE Plasma Workspace
-	pkgver = 5.27.80
-	pkgrel = 4
+	pkgver = 5.27.9.1
+	pkgrel = 2
 	url = https://kde.org/plasma-desktop/
 	arch = x86_64
 	groups = plasma
 	license = LGPL
-	makedepends = baloo
 	makedepends = extra-cmake-modules
+	makedepends = kdoctools5
 	makedepends = gpsd
-	makedepends = kdoctools
-	makedepends = kunitconversion
-	makedepends = networkmanager-qt
+	makedepends = baloo5
+	makedepends = networkmanager-qt5
 	makedepends = plasma-wayland-protocols
-	makedepends = qt6-shadertools
-	depends = accountsservice
-	depends = fontconfig
-	depends = freetype2
-	depends = gcc-libs
-	depends = glibc
-	depends = icu
-	depends = kactivities
-	depends = kactivities-stats
-	depends = kactivitymanagerd
-	depends = karchive
-	depends = kauth
-	depends = kbookmarks
-	depends = kcmutils
-	depends = kcolorscheme
-	depends = kcompletion
-	depends = kconfig
-	depends = kconfigwidgets
-	depends = kcoreaddons
-	depends = kcrash
-	depends = kde-cli-tools
-	depends = kdeclarative
-	depends = kded
-	depends = kdbusaddons
-	depends = kglobalaccel
-	depends = kguiaddons
-	depends = kholidays
-	depends = ki18n
-	depends = kiconthemes
-	depends = kidletime
-	depends = kio
-	depends = kitemmodels
-	depends = kjobwidgets
-	depends = knewstuff
-	depends = knotifications
-	depends = knotifyconfig
-	depends = kpackage
-	depends = kparts
-	depends = kpipewire
-	depends = krunner
-	depends = kquickcharts
-	depends = kscreenlocker
-	depends = kservice
-	depends = kstatusnotifieritem
-	depends = ksvg
+	makedepends = wayland-protocols
+	makedepends = kunitconversion5
+	depends = knotifyconfig5
 	depends = ksystemstats
-	depends = ktexteditor
-	depends = ktextwidgets
-	depends = kuserfeedback
-	depends = kwallet
-	depends = kwayland
-	depends = kwidgetsaddons
-	depends = kwin
-	depends = kwindowsystem
-	depends = kxmlgui
-	depends = layer-shell-qt
-	depends = libcanberra
-	depends = libice
-	depends = libkexiv2
-	depends = libkscreen
-	depends = libksysguard
+	depends = ktexteditor5
 	depends = libqalculate
-	depends = libsm
-	depends = libx11
-	depends = libxau
-	depends = libxcb
-	depends = libxcrypt
-	depends = libxcursor
-	depends = libxfixes
-	depends = libxft
-	depends = libxtst
-	depends = milou
-	depends = ocean-sound-theme
-	depends = perl
-	depends = phonon-qt6
-	depends = plasma-integration
-	depends = plasma-framework
-	depends = plasma5support
-	depends = prison
-	depends = qt6-5compat
-	depends = qt6-base
-	depends = qt6-declarative
-	depends = qt6-shadertools
-	depends = qt6-svg
-	depends = qt6-tools
-	depends = qt6-virtualkeyboard
-	depends = qt6-wayland
-	depends = solid
-	depends = systemd-libs
-	depends = wayland
-	depends = xcb-util
-	depends = xcb-util-image
-	depends = xorg-xmessage
+	depends = kde-cli-tools
+	depends = appstream-qt
 	depends = xorg-xrdb
 	depends = xorg-xsetroot
-	depends = xorg-xwayland
-	depends = zlib
-	optdepends = appmenu-gtk-module: global menu support for GTK2 and some GTK3 applications
-	optdepends = baloo: Baloo search runner
-	optdepends = discover: manage applications installation from the launcher
-	optdepends = gpsd: GPS based geolocation
-	optdepends = kdepim-addons: displaying PIM events in the calendar
-	optdepends = kwayland-integration: Wayland integration for Qt5 applications
-	optdepends = networkmanager-qt: IP based geolocation
-	optdepends = plasma-workspace-wallpapers: additional wallpapers
-	conflicts = plasma-wayland-session
-	replaces = plasma-wayland-session
-	source = https://download.kde.org/unstable/plasma/5.27.80/plasma-workspace-5.27.80.tar.xz
-	source = https://download.kde.org/unstable/plasma/5.27.80/plasma-workspace-5.27.80.tar.xz.sig
+	depends = kactivitymanagerd
+	depends = kholidays5
+	depends = xorg-xmessage
+	depends = milou
+	depends = prison5
+	depends = kwin
+	depends = plasma-integration
+	depends = kpeople5
+	depends = kactivities-stats5
+	depends = kquickcharts5
+	depends = kuserfeedback5
+	depends = kpipewire
+	depends = accountsservice
+	depends = kio-extras
+	depends = kio-fuse
+	depends = qt5-tools
+	depends = oxygen-sounds
+	source = https://download.kde.org/stable/plasma/5.27.9/plasma-workspace-5.27.9.1.tar.xz
+	source = https://download.kde.org/stable/plasma/5.27.9/plasma-workspace-5.27.9.1.tar.xz.sig
+	source = kde.pam
 	validpgpkeys = E0A3EB202F8E57528E13E72FD7574483BB57B18D
 	validpgpkeys = 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D
 	validpgpkeys = D07BD8662C56CB291B316EB2F5675605C74E02CF
 	validpgpkeys = 1FA881591C26B276D7A5518EEAAF29B42A678C20
-	sha256sums = 4082d4e61484d0a62c88a0ef04347e3ff1758477fdb313f1d82e4e770d9a5a6b
+	sha256sums = 8d00b691cfbb4d7218f97d0c68a677f41cba6eaf18e8fe29976c92d3718201b8
 	sha256sums = SKIP
+	sha256sums = 00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739
 
 pkgname = plasma-workspace
+	optdepends = plasma-workspace-wallpapers: additional wallpapers
+	optdepends = gpsd: GPS based geolocation
+	optdepends = networkmanager-qt5: IP based geolocation
+	optdepends = kdepim-addons: displaying PIM events in the calendar
+	optdepends = appmenu-gtk-module: global menu support for GTK2 and some GTK3 applications
+	optdepends = baloo5: Baloo search runner
+	optdepends = discover: manage applications installation from the launcher
+	backup = etc/pam.d/kde
+
+pkgname = plasma-wayland-session
+	pkgdesc = Plasma Wayland session
+	groups = 
+	depends = plasma-workspace
+	depends = qt5-wayland
+	depends = kwayland-integration
+	depends = xorg-xwayland
diff --git a/PKGBUILD b/PKGBUILD
index fab8acf..1aff421 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,148 +3,58 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexey D. <lq07829icatm at rambler.ru>
 
-pkgname=plasma-workspace
-pkgver=5.27.80
+pkgbase=plasma-workspace
+pkgname=(plasma-workspace plasma-wayland-session)
+pkgver=5.27.9.1
 _dirver=$(echo $pkgver | cut -d. -f1-3)
-pkgrel=4
+pkgrel=2
 pkgdesc='KDE Plasma Workspace'
 arch=(x86_64)
 url='https://kde.org/plasma-desktop/'
 license=(LGPL)
-depends=(accountsservice
-       # appstream-qt
-         fontconfig
-         freetype2
-         gcc-libs
-         glibc
-         icu
-         kactivities
-         kactivities-stats
-         kactivitymanagerd
-         karchive
-         kauth
-         kbookmarks
-         kcmutils
-         kcolorscheme
-         kcompletion
-         kconfig
-         kconfigwidgets
-         kcoreaddons
-         kcrash
-         kde-cli-tools
-         kdeclarative
-         kded
-         kdbusaddons
-         kglobalaccel
-         kguiaddons
-         kholidays
-         ki18n
-         kiconthemes
-         kidletime
-         kio
-       # kio-extras 
-       # kio-fuse  
-         kitemmodels
-         kjobwidgets
-         knewstuff
-         knotifications
-         knotifyconfig
-         kpackage
-         kparts
-         kpipewire
-         krunner
-         kquickcharts
-         kscreenlocker
-         kservice
-         kstatusnotifieritem
-         ksvg
-         ksystemstats
-         ktexteditor
-         ktextwidgets
-         kuserfeedback
-         kwallet
-         kwayland
-         kwidgetsaddons
-         kwin
-         kwindowsystem
-         kxmlgui
-         layer-shell-qt
-         libcanberra
-         libice
-         libkexiv2
-         libkscreen
-         libksysguard
-         libqalculate
-         libsm
-         libx11
-         libxau
-         libxcb
-         libxcrypt
-         libxcursor
-         libxfixes
-         libxft
-         libxtst
-         milou
-         ocean-sound-theme
-         perl
-         phonon-qt6
-         plasma-integration
-         plasma-framework
-         plasma5support
-         prison
-         qt6-5compat
-         qt6-base
-         qt6-declarative
-         qt6-shadertools # for QtGrphicalEffects
-         qt6-svg
-         qt6-tools # for qdbus
-         qt6-virtualkeyboard # QML
-         qt6-wayland
-         solid
-         systemd-libs
-         wayland
-         xcb-util
-         xcb-util-image
-         xorg-xmessage
-         xorg-xrdb
-         xorg-xsetroot
-         xorg-xwayland
-         zlib)
-makedepends=(baloo
-             extra-cmake-modules
-             gpsd
-             kdoctools
-             kunitconversion
-             networkmanager-qt
-             plasma-wayland-protocols
-             qt6-shadertools)
-optdepends=('appmenu-gtk-module: global menu support for GTK2 and some GTK3 applications'
-            'baloo: Baloo search runner'
-            'discover: manage applications installation from the launcher'
-            'gpsd: GPS based geolocation'
-            'kdepim-addons: displaying PIM events in the calendar'
-            'kwayland-integration: Wayland integration for Qt5 applications'
-            'networkmanager-qt: IP based geolocation'
-            'plasma-workspace-wallpapers: additional wallpapers')
-conflicts=(plasma-wayland-session)
-replaces=(plasma-wayland-session)
+depends=(knotifyconfig5 ksystemstats ktexteditor5 libqalculate kde-cli-tools appstream-qt
+         xorg-xrdb xorg-xsetroot kactivitymanagerd kholidays5 xorg-xmessage milou prison5 kwin
+         plasma-integration kpeople5 kactivities-stats5 kquickcharts5 kuserfeedback5 kpipewire
+         accountsservice kio-extras kio-fuse qt5-tools oxygen-sounds)
+makedepends=(extra-cmake-modules kdoctools5 gpsd baloo5 networkmanager-qt5 plasma-wayland-protocols wayland-protocols kunitconversion5)
 groups=(plasma)
-source=(https://download.kde.org/unstable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('4082d4e61484d0a62c88a0ef04347e3ff1758477fdb313f1d82e4e770d9a5a6b'
-            'SKIP')
+source=(https://download.kde.org/stable/plasma/$_dirver/$pkgbase-$pkgver.tar.xz{,.sig} kde.pam)
+sha256sums=('8d00b691cfbb4d7218f97d0c68a677f41cba6eaf18e8fe29976c92d3718201b8'
+            'SKIP'
+            '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739')
 validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D'  # Jonathan Esk-Riddell <jr@jriddell.org>
               '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah@kde.org>
               'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson <davidedmundson@kde.org>
               '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com>
 
 build() {
-  cmake -B build -S $pkgname-$pkgver \
+  cmake -B build -S $pkgbase-$pkgver \
     -DCMAKE_INSTALL_LIBEXECDIR=lib \
     -DGLIBC_LOCALE_GEN=OFF \
     -DBUILD_TESTING=OFF
   cmake --build build
 }
 
-package() {
+package_plasma-workspace() {
+  optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+              'gpsd: GPS based geolocation' 'networkmanager-qt5: IP based geolocation'
+              'kdepim-addons: displaying PIM events in the calendar'
+              'appmenu-gtk-module: global menu support for GTK2 and some GTK3 applications'
+              'baloo5: Baloo search runner' 'discover: manage applications installation from the launcher')
+  backup=('etc/pam.d/kde')
+
   DESTDIR="$pkgdir" cmake --install build
+
+  install -Dm644 "$srcdir"/kde.pam "$pkgdir"/etc/pam.d/kde
+
+  # Split plasma-wayland scripts
+  rm -r "$pkgdir"/usr/share/wayland-sessions
+}
+
+package_plasma-wayland-session() {
+  pkgdesc='Plasma Wayland session'
+  depends=(plasma-workspace qt5-wayland kwayland-integration xorg-xwayland)
+  groups=()
+
+  install -Dm644 build/login-sessions/plasmawayland.desktop "$pkgdir"/usr/share/wayland-sessions/plasmawayland.desktop
 }