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

2018-08-23 Thread Antonio Rojas via arch-commits 
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
===
--- PKGBUILD2018-08-23 22:00:20 UTC (rev 332888)
+++ PKGBUILD2018-08-23 22:05:40 UTC (rev 332889)
@@ -3,14 +3,17 @@
 # Maintainer: Antonio Rojas 
 # Contributor: Andrea Scarpino 
 
-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 

 
 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
-}

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

2018-08-04 Thread Felix Yan via arch-commits 
Date: Saturday, August 4, 2018 @ 17:03:05
  Author: felixonmars
Revision: 330519

upgpkg: oxygen 5.13.4-1

Upstream release

Modified:
  oxygen/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-04 17:03:00 UTC (rev 330518)
+++ PKGBUILD2018-08-04 17:03:05 UTC (rev 330519)
@@ -5,7 +5,7 @@
 
 pkgbase=oxygen
 pkgname=(oxygen oxygen-kde4)
-pkgver=5.13.3
+pkgver=5.13.4
 pkgrel=1
 arch=(x86_64)
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -12,7 +12,7 @@
 license=(LGPL)
 makedepends=(frameworkintegration kcmutils kdecoration extra-cmake-modules 
kdoctools kdelibs automoc4 kwayland)
 
source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('7f322a3d409dcf89dc643662e31ae06dfd253134d9121e6db9739413e71a0281'
+sha256sums=('426e621984e64f77ea477a1397550d3fcd2ef10efb3dc564a16d39b249fa6500'
 'SKIP')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
   '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah

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

2016-08-26 Thread Felix Yan 
Date: Friday, August 26, 2016 @ 17:56:58
  Author: felixonmars
Revision: 274675

upgpkg: oxygen 5.7.4-1

Upstream release

Modified:
  oxygen/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-26 17:56:52 UTC (rev 274674)
+++ PKGBUILD2016-08-26 17:56:58 UTC (rev 274675)
@@ -5,7 +5,7 @@
 
 pkgbase=oxygen
 pkgname=('oxygen' 'oxygen-kde4')
-pkgver=5.7.3
+pkgver=5.7.4
 pkgrel=1
 arch=('i686' 'x86_64')
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -13,7 +13,7 @@
 makedepends=('frameworkintegration' 'kcmutils' 'kdecoration' 
'extra-cmake-modules' 'kdoctools' 'kdelibs' 'automoc4'
  'python')
 
source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('79f872fe52967279f92c046f9f9aaa4e858ce7599890bfd3f6f7b7207c717278'
+sha256sums=('a35bf27afb242359c5ca345b76346672b7f63d78e9f1036ebf47f53d548128bc'
 'SKIP')
 validpgpkeys=('13C16D03EDE728514473AA73A506E6D4DD4D5088'  # Jonathan Riddell
   '348C8651206633FD983A8FC4DEACEA00075E1D76'  # KDE Neon

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

2015-12-08 Thread Felix Yan 
Date: Tuesday, December 8, 2015 @ 13:17:12
  Author: fyan
Revision: 253748

C++11 ABI rebuild

Modified:
  oxygen/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-08 12:15:50 UTC (rev 253747)
+++ PKGBUILD2015-12-08 12:17:12 UTC (rev 253748)
@@ -6,7 +6,7 @@
 pkgbase=oxygen
 pkgname=('oxygen' 'oxygen-cursors' 'oxygen-kde4')
 pkgver=5.4.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/workspace/oxygen'
 license=('LGPL')

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

2015-09-08 Thread Felix Yan 
Date: Tuesday, September 8, 2015 @ 17:05:50
  Author: fyan
Revision: 245537

upgpkg: oxygen 5.4.1-1

Modified:
  oxygen/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-08 15:01:28 UTC (rev 245536)
+++ PKGBUILD2015-09-08 15:05:50 UTC (rev 245537)
@@ -5,7 +5,7 @@
 
 pkgbase=oxygen
 pkgname=('oxygen' 'oxygen-cursors' 'oxygen-kde4')
-pkgver=5.4.0
+pkgver=5.4.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/workspace/oxygen'
@@ -12,7 +12,7 @@
 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=('8a8b312d21eed54912a0357df1c4f1ec')
+md5sums=('a56031b9600712eabcc0f6baeb8a2947')
 
 prepare() {
   mkdir build{,-kde4}

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

2015-02-24 Thread Felix Yan 
Date: Wednesday, February 25, 2015 @ 04:02:24
  Author: fyan
Revision: 231887

upgpkg: oxygen 5.2.1-1

Modified:
  oxygen/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-25 03:00:43 UTC (rev 231886)
+++ PKGBUILD2015-02-25 03:02:24 UTC (rev 231887)
@@ -1,10 +1,11 @@
 # $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
+# Maintainer: Felix Yan felixonm...@archlinux.org
+# Contributor: Andrea Scarpino and...@archlinux.org
 # Contributor: Antonio Rojas
 
 pkgbase=oxygen
 pkgname=('oxygen' 'oxygen-cursors' 'oxygen-kde4')
-pkgver=5.2.0
+pkgver=5.2.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/workspace/oxygen'
@@ -11,7 +12,7 @@
 license=('LGPL')
 makedepends=('frameworkintegration' 'extra-cmake-modules' 'kdoctools' 
'kdelibs' 'automoc4')
 
source=(http://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz;)
-md5sums=('b919c30021bff3bc09c105ddcaa0c7f6')
+md5sums=('23c3bf8a581b2dfd72e3c1cbcc3712a4')
 
 prepare() {
   mkdir build{,-kde4}

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

2014-10-21 Thread Andrea Scarpino 
Date: Tuesday, October 21, 2014 @ 18:33:15
  Author: andrea
Revision: 225150

upgpkg: oxygen 5.1.0.1-2

Ship the decoration for KDE4 apps

Modified:
  oxygen/trunk/PKGBUILD

--+
 PKGBUILD |   40 
 1 file changed, 32 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-21 16:15:22 UTC (rev 225149)
+++ PKGBUILD2014-10-21 16:33:15 UTC (rev 225150)
@@ -2,21 +2,19 @@
 # Maintainer: Andrea Scarpino and...@archlinux.org
 # Contributor: Antonio Rojas
 
-pkgname=oxygen
+pkgbase=oxygen
+pkgname=('oxygen' 'oxygen-kde4')
 pkgver=5.1.0.1
-pkgrel=1
-pkgdesc='KDE Oxygen style'
+pkgrel=2
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/workspace/oxygen'
 license=('LGPL')
-depends=('frameworkintegration' 'kwin')
-makedepends=('extra-cmake-modules' 'kdoctools')
-groups=('plasma-next')
+makedepends=('frameworkintegration' 'kwin' 'extra-cmake-modules' 'kdoctools' 
'kdelibs' 'automoc4')
 
source=(http://download.kde.org/stable/plasma/5.1.0/${pkgname}-${pkgver}.tar.xz;)
 md5sums=('24667744ad797a612d0fe57b2b1d30e0')
 
 prepare() {
-  mkdir -p build
+  mkdir -p build{,-kde4}
 }
 
 build() {
@@ -28,9 +26,35 @@
 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
 -DBUILD_TESTING=OFF
   make
+  cd ..
+
+  cd build-kde4
+  cmake ../$pkgname-$pkgver \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DBUILD_TESTING=OFF \
+-DUSE_KDE4=ON
+  make
 }
 
-package() {
+package_oxygen() {
+  pkgdesc='KDE Oxygen style'
+  depends=('frameworkintegration' 'kwin')
+  groups=('plasma-next')
+
   cd build
   make DESTDIR=${pkgdir} install
 }
+
+package_oxygen-kde4() {
+  pkgdesc='KDE Oxygen style for KDE4 applications'
+  depends=('kdelibs')
+  conflicts=('kdebase-workspace')
+
+  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
+}

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

2014-10-15 Thread Andrea Scarpino 
Date: Wednesday, October 15, 2014 @ 19:01:16
  Author: andrea
Revision: 224439

upgpkg: oxygen 5.1.0.1-1

Upstream release

Modified:
  oxygen/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-15 16:56:29 UTC (rev 224438)
+++ PKGBUILD2014-10-15 17:01:16 UTC (rev 224439)
@@ -3,7 +3,7 @@
 # Contributor: Antonio Rojas
 
 pkgname=oxygen
-pkgver=5.0.2
+pkgver=5.1.0.1
 pkgrel=1
 pkgdesc='KDE Oxygen style'
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@
 depends=('frameworkintegration' 'kwin')
 makedepends=('extra-cmake-modules' 'kdoctools')
 groups=('plasma-next')
-source=(http://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz;)
-md5sums=('b9e4e84e68e7b69babd899725ea8bb94')
+source=(http://download.kde.org/stable/plasma/5.1.0/${pkgname}-${pkgver}.tar.xz;)
+md5sums=('24667744ad797a612d0fe57b2b1d30e0')
 
 prepare() {
   mkdir -p build
@@ -26,7 +26,6 @@
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DLIB_INSTALL_DIR=lib \
 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
--DLOCALE_INSTALL_DIR=/usr/share/locale/kf5 \
 -DBUILD_TESTING=OFF
   make
 }

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

2014-09-19 Thread Andrea Scarpino 
Date: Friday, September 19, 2014 @ 12:00:24
  Author: andrea
Revision: 222085

upgpkg: oxygen 5.0.2-1

Upstream release

Modified:
  oxygen/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-19 09:44:26 UTC (rev 222084)
+++ PKGBUILD2014-09-19 10:00:24 UTC (rev 222085)
@@ -3,7 +3,7 @@
 # Contributor: Antonio Rojas
 
 pkgname=oxygen
-pkgver=5.0.1
+pkgver=5.0.2
 pkgrel=1
 pkgdesc='KDE Oxygen style'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 makedepends=('extra-cmake-modules' 'kdoctools')
 groups=('plasma-next')
 
source=(http://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz;)
-md5sums=('525e8b8706beb558cc673166175ab00f')
+md5sums=('b9e4e84e68e7b69babd899725ea8bb94')
 
 prepare() {
   mkdir -p build
@@ -25,7 +25,8 @@
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DLIB_INSTALL_DIR=lib \
--DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
+-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+-DLOCALE_INSTALL_DIR=/usr/share/locale/kf5 \
 -DBUILD_TESTING=OFF
   make
 }

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

2014-09-09 Thread Andrea Scarpino 
Date: Tuesday, September 9, 2014 @ 14:20:44
  Author: andrea
Revision: 221293

upgpkg: oxygen 5.0.1-1

Upstream release

Modified:
  oxygen/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-09 12:19:04 UTC (rev 221292)
+++ PKGBUILD2014-09-09 12:20:44 UTC (rev 221293)
@@ -3,7 +3,7 @@
 # Contributor: Antonio Rojas
 
 pkgname=oxygen
-pkgver=5.0.0
+pkgver=5.0.1
 pkgrel=1
 pkgdesc='KDE Oxygen style'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 makedepends=('extra-cmake-modules' 'kdoctools')
 groups=('plasma-next')
 
source=(http://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz;)
-md5sums=('c7222727589ed965b6d457d2aaeb38db')
+md5sums=('525e8b8706beb558cc673166175ab00f')
 
 prepare() {
   mkdir -p build
@@ -20,12 +20,10 @@
 }
 
 build() {
-  export XDG_DATA_DIRS=/opt/kf5/share:$XDG_DATA_DIRS
-
   cd build
   cmake ../$pkgname-$pkgver \
 -DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/opt/kf5 \
+-DCMAKE_INSTALL_PREFIX=/usr \
 -DLIB_INSTALL_DIR=lib \
 -DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
 -DBUILD_TESTING=OFF

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

2014-07-15 Thread Andrea Scarpino 
Date: Tuesday, July 15, 2014 @ 21:41:29
  Author: andrea
Revision: 216916

upgpkg: oxygen 5.0.0-1

Upstream release

Modified:
  oxygen/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-15 19:40:32 UTC (rev 216915)
+++ PKGBUILD2014-07-15 19:41:29 UTC (rev 216916)
@@ -3,7 +3,7 @@
 # Contributor: Antonio Rojas
 
 pkgname=oxygen
-pkgver=4.97.0
+pkgver=5.0.0
 pkgrel=1
 pkgdesc='KDE Oxygen style'
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@
 depends=('frameworkintegration' 'kwin')
 makedepends=('extra-cmake-modules' 'kdoctools')
 groups=('plasma-next')
-source=(http://download.kde.org/unstable/plasma/$pkgver/src/$pkgname-$pkgver.tar.xz;)
-md5sums=('ae205e16cab10cc3e3b31e84b45b27c4')
+source=(http://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz;)
+md5sums=('c7222727589ed965b6d457d2aaeb38db')
 
 prepare() {
   mkdir -p build

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

2014-06-16 Thread Andrea Scarpino 
Date: Monday, June 16, 2014 @ 23:59:06
  Author: andrea
Revision: 215228

upgpkg: oxygen 4.97.0-1

Upstream release

Modified:
  oxygen/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-16 21:53:52 UTC (rev 215227)
+++ PKGBUILD2014-06-16 21:59:06 UTC (rev 215228)
@@ -3,7 +3,7 @@
 # Contributor: Antonio Rojas
 
 pkgname=oxygen
-pkgver=4.96.0
+pkgver=4.97.0
 pkgrel=1
 pkgdesc='KDE Oxygen style'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 makedepends=('extra-cmake-modules' 'kdoctools')
 groups=('plasma-next')
 
source=(http://download.kde.org/unstable/plasma/$pkgver/src/$pkgname-$pkgver.tar.xz;)
-md5sums=('44b81eb12e92456a12663c7014bcb196')
+md5sums=('ae205e16cab10cc3e3b31e84b45b27c4')
 
 prepare() {
   mkdir -p build

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

2014-05-18 Thread Andrea Scarpino 
Date: Sunday, May 18, 2014 @ 21:32:22
  Author: andrea
Revision: 213107

svn keywords

Modified:
  oxygen/trunk/PKGBUILD (properties)

Index: oxygen/trunk/PKGBUILD
===
--- oxygen/trunk/PKGBUILD   2014-05-18 19:32:13 UTC (rev 213106)
+++ oxygen/trunk/PKGBUILD   2014-05-18 19:32:22 UTC (rev 213107)

Property changes on: oxygen/trunk/PKGBUILD
___
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property