| author | Antonio Rojas
<arojas@archlinux.org> 2023-12-20 22:09:39 UTC |
| committer | Antonio Rojas
<arojas@archlinux.org> 2023-12-20 22:09:39 UTC |
| parent | 4383a4ebe2afddd65bde60c198935d758525b83c |
| .SRCINFO | +48 | -8 |
| PKGBUILD | +69 | -13 |
diff --git a/.SRCINFO b/.SRCINFO index 47a87a8..e95df68 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,24 +1,64 @@ pkgbase = oxygen pkgdesc = KDE Oxygen style - pkgver = 5.27.10 + pkgver = 5.91.0 pkgrel = 1 url = https://kde.org/plasma-desktop/ arch = x86_64 groups = plasma license = LGPL makedepends = extra-cmake-modules - makedepends = kcmutils5 - makedepends = kdoctools5 - depends = frameworkintegration5 + 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 depends = kdecoration - optdepends = kcmutils5: for oxygen-settings5 - source = https://download.kde.org/stable/plasma/5.27.10/oxygen-5.27.10.tar.xz - source = https://download.kde.org/stable/plasma/5.27.10/oxygen-5.27.10.tar.xz.sig + depends = kguiaddons + depends = ki18n + depends = kwidgetsaddons + depends = kwindowsystem + depends = libxcb + depends = qt6-base + depends = qt6-declarative + source = https://download.kde.org/unstable/plasma/5.91.0/oxygen-5.91.0.tar.xz + source = https://download.kde.org/unstable/plasma/5.91.0/oxygen-5.91.0.tar.xz.sig + source = qt-6.7.patch validpgpkeys = E0A3EB202F8E57528E13E72FD7574483BB57B18D validpgpkeys = 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D validpgpkeys = D07BD8662C56CB291B316EB2F5675605C74E02CF validpgpkeys = 1FA881591C26B276D7A5518EEAAF29B42A678C20 - sha256sums = 5b16f6e3e5ee11bb959fc0e1fd233bbb0231b54ea8eff5e14fd78003ba2d090b + sha256sums = 42ba04eebbf5db951eec6aaa0f922e8e2c53b321980bb022ef41e8b13f522508 sha256sums = SKIP + sha256sums = 5895153afd265e9a45b54e3a4c84c57372d78bb1b549593f8bdb3a7833cfaefb 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 5e8b7bf..8b8952b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,35 +2,91 @@ # Maintainer: Antonio Rojas <arojas@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> -pkgname=oxygen +pkgbase=oxygen +pkgname=(oxygen + oxygen5) pkgdesc='KDE Oxygen style' -pkgver=5.27.10 +pkgver=5.91.0 _dirver=$(echo $pkgver | cut -d. -f1-3) pkgrel=1 arch=(x86_64) url='https://kde.org/plasma-desktop/' license=(LGPL) -depends=(frameworkintegration5 - kdecoration) +depends=(frameworkintegration + gcc-libs + glibc + kcmutils + kcolorscheme + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kdecoration + kguiaddons + ki18n + kwidgetsaddons + kwindowsystem + libxcb + qt6-base + qt6-declarative) makedepends=(extra-cmake-modules - kcmutils5 - kdoctools5) -optdepends=('kcmutils5: for oxygen-settings5') + frameworkintegration5 + kconfigwidgets5 + kiconthemes5 + kirigami2 + kwindowsystem5) groups=(plasma) -source=(https://download.kde.org/stable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig}) -sha256sums=('5b16f6e3e5ee11bb959fc0e1fd233bbb0231b54ea8eff5e14fd78003ba2d090b' - 'SKIP') +source=(https://download.kde.org/unstable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig} + qt-6.7.patch) +sha256sums=('42ba04eebbf5db951eec6aaa0f922e8e2c53b321980bb022ef41e8b13f522508' + 'SKIP' + '5895153afd265e9a45b54e3a4c84c57372d78bb1b549593f8bdb3a7833cfaefb') 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> +prepare() { + patch -d $pkgname-$pkgver -p1 < qt-6.7.patch # Fix build with Qt 6.7 +} + build() { - cmake -B build -S $pkgbase-$pkgver \ - -DBUILD_TESTING=OFF + cmake -B build -S $pkgname-$pkgver \ + -DBUILD_TESTING=OFF \ + -DBUILD_QT5=OFF cmake --build build + + cmake -B build5 -S $pkgname-$pkgver \ + -DBUILD_TESTING=OFF \ + -DBUILD_QT6=OFF + cmake --build build5 } -package() { +package_oxygen() { 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 + rm -r "$pkgdir"/usr/share/kstyle +}