git » oxygen.git » commit 8e259d7

Revert "upgpkg: 5.90.0-1: kde-unstable"

author Antonio Rojas
2023-11-29 19:55:22 UTC
committer Antonio Rojas
2023-11-29 19:55:22 UTC
parent 6e7bbb1ad60c75787ef751188ae85608e7e565f7

Revert "upgpkg: 5.90.0-1: kde-unstable"

This reverts commit 6e7bbb1ad60c75787ef751188ae85608e7e565f7.

.SRCINFO +8 -46
PKGBUILD +12 -61

diff --git a/.SRCINFO b/.SRCINFO
index af95033..c156c77 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,62 +1,24 @@
 pkgbase = oxygen
 	pkgdesc = KDE Oxygen style
-	pkgver = 5.90.0
+	pkgver = 5.27.9
 	pkgrel = 1
 	url = https://kde.org/plasma-desktop/
 	arch = x86_64
 	groups = plasma
 	license = LGPL
 	makedepends = extra-cmake-modules
-	makedepends = frameworkintegration5
-	makedepends = kconfigwidgets5
-	makedepends = kiconthemes5
-	makedepends = kirigami2
-	makedepends = kwindowsystem5
-	depends = frameworkintegration
-	depends = gcc-libs
-	depends = glibc
-	depends = kcmutils
-	depends = kcolorscheme
-	depends = kcompletion
-	depends = kconfig
-	depends = kconfigwidgets
-	depends = kcoreaddons
+	makedepends = kcmutils5
+	makedepends = kdoctools5
+	depends = frameworkintegration5
 	depends = kdecoration
-	depends = kguiaddons
-	depends = ki18n
-	depends = kwidgetsaddons
-	depends = kwindowsystem
-	depends = libxcb
-	depends = qt6-base
-	depends = qt6-declarative
-	source = https://download.kde.org/unstable/plasma/5.90.0/oxygen-5.90.0.tar.xz
-	source = https://download.kde.org/unstable/plasma/5.90.0/oxygen-5.90.0.tar.xz.sig
+	optdepends = kcmutils5: for oxygen-settings5
+	source = https://download.kde.org/stable/plasma/5.27.9/oxygen-5.27.9.tar.xz
+	source = https://download.kde.org/stable/plasma/5.27.9/oxygen-5.27.9.tar.xz.sig
 	validpgpkeys = E0A3EB202F8E57528E13E72FD7574483BB57B18D
 	validpgpkeys = 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D
 	validpgpkeys = D07BD8662C56CB291B316EB2F5675605C74E02CF
 	validpgpkeys = 1FA881591C26B276D7A5518EEAAF29B42A678C20
-	sha256sums = fde31aa07f76385bd41d1c428de2b98322222352c84e4cf9dae54f4aaeea8ee8
+	sha256sums = 6420ebc7986d31c7e277a5862c9aaed959386e534530d10355d217b3cd36a973
 	sha256sums = SKIP
 
 pkgname = oxygen
-
-pkgname = oxygen5
-	pkgdesc = Qt5 Oxygen style
-	groups = 
-	depends = oxygen
-	depends = gcc-libs
-	depends = glibc
-	depends = frameworkintegration5
-	depends = kcompletion5
-	depends = kconfig5
-	depends = kconfigwidgets5
-	depends = kguiaddons5
-	depends = ki18n5
-	depends = kwidgetsaddons5
-	depends = kwindowsystem5
-	depends = libxcb
-	depends = qt5-base
-	depends = qt5-declarative
-	depends = qt5-x11extras
-	conflicts = oxygen<5.27.80
-	replaces = oxygen<5.27.80
diff --git a/PKGBUILD b/PKGBUILD
index 08027f3..41aae81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,42 +2,23 @@
 # Maintainer: Antonio Rojas <arojas@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
-pkgbase=oxygen
-pkgname=(oxygen
-         oxygen5)
+pkgname=oxygen
 pkgdesc='KDE Oxygen style'
-pkgver=5.90.0
+pkgver=5.27.9
 _dirver=$(echo $pkgver | cut -d. -f1-3)
 pkgrel=1
 arch=(x86_64)
 url='https://kde.org/plasma-desktop/'
 license=(LGPL)
-depends=(frameworkintegration
-         gcc-libs
-         glibc
-         kcmutils
-         kcolorscheme
-         kcompletion
-         kconfig
-         kconfigwidgets
-         kcoreaddons
-         kdecoration
-         kguiaddons
-         ki18n
-         kwidgetsaddons
-         kwindowsystem
-         libxcb
-         qt6-base
-         qt6-declarative)
+depends=(frameworkintegration5
+         kdecoration)
 makedepends=(extra-cmake-modules
-             frameworkintegration5
-             kconfigwidgets5
-             kiconthemes5
-             kirigami2
-             kwindowsystem5)
+             kcmutils5
+             kdoctools5)
+optdepends=('kcmutils5: for oxygen-settings5')
 groups=(plasma)
-source=(https://download.kde.org/unstable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('fde31aa07f76385bd41d1c428de2b98322222352c84e4cf9dae54f4aaeea8ee8'
+source=(https://download.kde.org/stable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('6420ebc7986d31c7e277a5862c9aaed959386e534530d10355d217b3cd36a973'
             'SKIP')
 validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D'  # Jonathan Esk-Riddell <jr@jriddell.org>
               '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah@kde.org>
@@ -45,41 +26,11 @@ validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D'  # Jonathan Esk-Riddell
               '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com>
 
 build() {
-  cmake -B build -S $pkgname-$pkgver \
-    -DBUILD_TESTING=OFF \
-    -DBUILD_QT5=OFF
+  cmake -B build -S $pkgbase-$pkgver \
+    -DBUILD_TESTING=OFF
   cmake --build build
-
-  cmake -B build5 -S $pkgname-$pkgver \
-    -DBUILD_TESTING=OFF \
-    -DBUILD_QT6=OFF
-  cmake --build build5
 }
 
-package_oxygen() {
+package() {
   DESTDIR="$pkgdir" cmake --install build
 }
-
-package_oxygen5() {
-  pkgdesc='Qt5 Oxygen style'
-  depends=(oxygen
-           gcc-libs
-           glibc
-           frameworkintegration5
-           kcompletion5
-           kconfig5
-           kconfigwidgets5
-           kguiaddons5
-           ki18n5
-           kwidgetsaddons5
-           kwindowsystem5
-           libxcb
-           qt5-base
-           qt5-declarative
-           qt5-x11extras)
-  conflicts=('oxygen<5.27.80')
-  replaces=('oxygen<5.27.80')
-  groups=()
-
-  DESTDIR="$pkgdir" cmake --install build5
-}