git » oxygen.git » commit fb883db

Plasma 5.6.0

author Antonio Rojas
2016-03-20 00:15:23 UTC
committer Antonio Rojas
2016-03-20 00:15:23 UTC
parent eaa790c96ddfc42c46f33974644f060bb8d9b675

Plasma 5.6.0

PKGBUILD +5 -16

diff --git a/PKGBUILD b/PKGBUILD
index f9257eb..af8d1ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
 # Contributor: Antonio Rojas
 
 pkgbase=oxygen
-pkgname=('oxygen' 'oxygen-cursors' 'oxygen-kde4')
-pkgver=5.5.5
+pkgname=('oxygen' 'oxygen-kde4')
+pkgver=5.6.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/workspace/oxygen'
 license=('LGPL')
 makedepends=('frameworkintegration' 'kcmutils' 'kdecoration' 'extra-cmake-modules' 'kdoctools' 'kdelibs' 'automoc4')
 source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('1a4199609f385de4a3f1e4054719953e')
+md5sums=('3e2cf4a6b4ff58769249525686ecb990')
 
 prepare() {
   mkdir -p build{,-kde4}
@@ -40,23 +40,12 @@ build() {
 package_oxygen() {
   pkgdesc='KDE Oxygen style'
   depends=('frameworkintegration' 'kdecoration' 'kcmutils')
-  optdepends=('oxygen-cursors: cursor themes for Plasma 5')
+  conflicts=('oxygen-cursors')
+  replaces=('oxygen-cursors')
   groups=('plasma')
 
   cd build
   make DESTDIR="${pkgdir}" install
-
-  # Cursors conflicts with kdebase-workspace
-  rm -r "${pkgdir}"/usr/share/icons/
-}
-
-package_oxygen-cursors() {
-  pkgdesc='KDE Oxygen cursor themes for Plasma 5'
-  groups=('plasma')
-  conflicts=('kdebase-workspace')
-
-  cd build/cursors
-  make DESTDIR="${pkgdir}" install
 }
 
 package_oxygen-kde4() {