[arch-commits] Commit in oxygen/repos (4 files)
Andrea Scarpino
andrea at archlinux.org
Tue Oct 21 16:33:24 UTC 2014
Date: Tuesday, October 21, 2014 @ 18:33:24
Author: andrea
Revision: 225151
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
oxygen/repos/extra-i686/PKGBUILD
(from rev 225150, oxygen/trunk/PKGBUILD)
oxygen/repos/extra-x86_64/PKGBUILD
(from rev 225150, oxygen/trunk/PKGBUILD)
Deleted:
oxygen/repos/extra-i686/PKGBUILD
oxygen/repos/extra-x86_64/PKGBUILD
-----------------------+
/PKGBUILD | 120 ++++++++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 36 --------------
extra-x86_64/PKGBUILD | 36 --------------
3 files changed, 120 insertions(+), 72 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-10-21 16:33:15 UTC (rev 225150)
+++ extra-i686/PKGBUILD 2014-10-21 16:33:24 UTC (rev 225151)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Antonio Rojas
-
-pkgname=oxygen
-pkgver=5.1.0.1
-pkgrel=1
-pkgdesc='KDE Oxygen style'
-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')
-source=("http://download.kde.org/stable/plasma/5.1.0/${pkgname}-${pkgver}.tar.xz")
-md5sums=('24667744ad797a612d0fe57b2b1d30e0')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: oxygen/repos/extra-i686/PKGBUILD (from rev 225150, oxygen/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-10-21 16:33:24 UTC (rev 225151)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Antonio Rojas
+
+pkgbase=oxygen
+pkgname=('oxygen' 'oxygen-kde4')
+pkgver=5.1.0.1
+pkgrel=2
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/oxygen'
+license=('LGPL')
+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{,-kde4}
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -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_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
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-10-21 16:33:15 UTC (rev 225150)
+++ extra-x86_64/PKGBUILD 2014-10-21 16:33:24 UTC (rev 225151)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Antonio Rojas
-
-pkgname=oxygen
-pkgver=5.1.0.1
-pkgrel=1
-pkgdesc='KDE Oxygen style'
-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')
-source=("http://download.kde.org/stable/plasma/5.1.0/${pkgname}-${pkgver}.tar.xz")
-md5sums=('24667744ad797a612d0fe57b2b1d30e0')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: oxygen/repos/extra-x86_64/PKGBUILD (from rev 225150, oxygen/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-10-21 16:33:24 UTC (rev 225151)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Antonio Rojas
+
+pkgbase=oxygen
+pkgname=('oxygen' 'oxygen-kde4')
+pkgver=5.1.0.1
+pkgrel=2
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/oxygen'
+license=('LGPL')
+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{,-kde4}
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -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_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
+}
More information about the arch-commits
mailing list