[arch-commits] Commit in oxygen/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Thursday, August 23, 2018 @ 22:05:40
  Author: arojas
Revision: 332889

Drop KDE4 support

Modified:
  oxygen/trunk/PKGBUILD

----------+
 PKGBUILD |   42 ++++++++++--------------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-23 22:00:20 UTC (rev 332888)
+++ PKGBUILD	2018-08-23 22:05:40 UTC (rev 332889)
@@ -3,14 +3,17 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
-pkgbase=oxygen
-pkgname=(oxygen oxygen-kde4)
+pkgname=oxygen
+pkgdesc='KDE Oxygen style'
 pkgver=5.13.4
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://www.kde.org/workspaces/plasmadesktop/'
 license=(LGPL)
-makedepends=(frameworkintegration kcmutils kdecoration extra-cmake-modules kdoctools kdelibs automoc4 kwayland)
+depends=(frameworkintegration kdecoration kwayland hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools kcmutils)
+optdepends=('kcmutils: for oxygen-settings5')
+groups=(plasma)
 source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig})
 sha256sums=('426e621984e64f77ea477a1397550d3fcd2ef10efb3dc564a16d39b249fa6500'
             'SKIP')
@@ -20,45 +23,20 @@
               '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart at gmail.com>
 
 prepare() {
-  mkdir -p build{,-kde4}
+  mkdir -p build
 }
 
 build() {
   cd build
-  cmake ../$pkgname-$pkgver \
+  cmake ../$pkgbase-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DBUILD_TESTING=OFF
   make
   cd ..
-
-  cd build-kde4
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_TESTING=OFF \
-    -DUSE_KDE4=ON
-  make
 }
 
-package_oxygen() {
-  pkgdesc='KDE Oxygen style'
-  depends=(frameworkintegration kdecoration kcmutils kwayland hicolor-icon-theme)
-  conflicts=(oxygen-cursors)
-  replaces=(oxygen-cursors)
-  groups=(plasma)
-
+package() {
   cd build
   make DESTDIR="$pkgdir" install
 }
-
-package_oxygen-kde4() {
-  pkgdesc='KDE Oxygen style for KDE4 applications'
-  depends=(kdelibs)
-
-  cd build-kde4
-  make DESTDIR="$pkgdir" install
-
-  # needed so that pure Qt4 apps are correctly themed
-  install -d -m755 "$pkgdir"/usr/lib/qt4/plugins/styles
-  ln -s /usr/lib/kde4/plugins/styles/oxygen.so "$pkgdir"/usr/lib/qt4/plugins/styles
-}