[arch-commits] Commit in plasma-workspace/repos (8 files)

Andrea Scarpino andrea at archlinux.org
Wed Jan 28 17:52:57 UTC 2015


    Date: Wednesday, January 28, 2015 @ 18:52:57
  Author: andrea
Revision: 230212

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  plasma-workspace/repos/extra-i686/PKGBUILD
    (from rev 230211, plasma-workspace/trunk/PKGBUILD)
  plasma-workspace/repos/extra-i686/kde.pam
    (from rev 230211, plasma-workspace/trunk/kde.pam)
  plasma-workspace/repos/extra-x86_64/PKGBUILD
    (from rev 230211, plasma-workspace/trunk/PKGBUILD)
  plasma-workspace/repos/extra-x86_64/kde.pam
    (from rev 230211, plasma-workspace/trunk/kde.pam)
Deleted:
  plasma-workspace/repos/extra-i686/PKGBUILD
  plasma-workspace/repos/extra-i686/kde.pam
  plasma-workspace/repos/extra-x86_64/PKGBUILD
  plasma-workspace/repos/extra-x86_64/kde.pam

-----------------------+
 /PKGBUILD             |  144 ++++++++++++++++++++++++++++++++++++++++++++++++
 /kde.pam              |   12 ++++
 extra-i686/PKGBUILD   |   54 ------------------
 extra-i686/kde.pam    |    6 --
 extra-x86_64/PKGBUILD |   54 ------------------
 extra-x86_64/kde.pam  |    6 --
 6 files changed, 156 insertions(+), 120 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-01-28 17:52:49 UTC (rev 230211)
+++ extra-i686/PKGBUILD	2015-01-28 17:52:57 UTC (rev 230212)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Antonio Rojas
-# Contributor: Alexey D. <lq07829icatm at rambler.ru>
-
-pkgname=plasma-workspace
-pkgver=5.2.0
-pkgrel=1
-pkgdesc='KDE Plasma Workspace'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
-license=('LGPL')
-depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxcursor' 'kwayland'
-         'libksysguard' 'libkscreen-frameworks' 'ktexteditor' 'libqalculate'
-         'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
-         'xorg-xmessage' 'xorg-xprop')
-makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo-frameworks'
-             'krunner')
-optdepends=('plasma-workspace-wallpapers: additional wallpapers'
-            'gpsd: GPS support for geolocation')
-conflicts=('kdebase-workspace')
-groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
-        'kde.pam')
-md5sums=('4ffdb4c7e310dff222abd452fd67e74d'
-         '929b182dec8a096206ad493477c09d2c')
-
-prepare() {
-  mkdir build
-
-  cd ${pkgname}-${pkgver}
-  # be sure to use the Qt5 version of qtpaths
-  sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DLIB_INSTALL_DIR=lib \
-    -DLIBEXEC_INSTALL_DIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  install -D "${srcdir}"/kde.pam \
-    "${pkgdir}"/etc/pam.d/kde
-}

Copied: plasma-workspace/repos/extra-i686/PKGBUILD (from rev 230211, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-01-28 17:52:57 UTC (rev 230212)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Antonio Rojas
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgbase=plasma-workspace
+pkgname=('plasma-workspace' 'drkonqi')
+pkgver=5.2.0
+pkgrel=2
+pkgdesc='KDE Plasma Workspace'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
+license=('LGPL')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
+         'libksysguard' 'libkscreen-frameworks' 'ktexteditor' 'libqalculate'
+         'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
+         'xorg-xmessage' 'xorg-xprop')
+makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo-frameworks'
+             'krunner')
+conflicts=('kdebase-workspace')
+groups=('plasma')
+source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
+        'kde.pam')
+md5sums=('4ffdb4c7e310dff222abd452fd67e74d'
+         '929b182dec8a096206ad493477c09d2c')
+
+prepare() {
+  mkdir build
+
+  cd ${pkgbase}-${pkgver}
+  # be sure to use the Qt5 version of qtpaths
+  sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
+}
+
+build() {
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DLIB_INSTALL_DIR=lib \
+    -DLIBEXEC_INSTALL_DIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package_plasma-workspace() {
+  optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+              'gpsd: GPS support for geolocation')
+
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  install -D "${srcdir}"/kde.pam \
+    "${pkgdir}"/etc/pam.d/kde
+
+  # Remove conflicts with drkonqi
+  rm "${pkgdir}"/usr/lib/drkonqi
+  rm -r "${pkgdir}"/usr/share/drkonqi
+  rm "${pkgdir}"/usr/lib/libKF5XmlRpcClientPrivate.*
+}
+
+package_drkonqi() {
+  pkgdesc='KDE crash handler'
+  depends=('kdewebkit')
+
+  cd build/drkonqi
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/kde.pam
===================================================================
--- extra-i686/kde.pam	2015-01-28 17:52:49 UTC (rev 230211)
+++ extra-i686/kde.pam	2015-01-28 17:52:57 UTC (rev 230212)
@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth            include         system-login
-account         include         system-login
-password        include         system-login
-session         include         system-login

Copied: plasma-workspace/repos/extra-i686/kde.pam (from rev 230211, plasma-workspace/trunk/kde.pam)
===================================================================
--- extra-i686/kde.pam	                        (rev 0)
+++ extra-i686/kde.pam	2015-01-28 17:52:57 UTC (rev 230212)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth            include         system-login
+account         include         system-login
+password        include         system-login
+session         include         system-login

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-01-28 17:52:49 UTC (rev 230211)
+++ extra-x86_64/PKGBUILD	2015-01-28 17:52:57 UTC (rev 230212)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Antonio Rojas
-# Contributor: Alexey D. <lq07829icatm at rambler.ru>
-
-pkgname=plasma-workspace
-pkgver=5.2.0
-pkgrel=1
-pkgdesc='KDE Plasma Workspace'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
-license=('LGPL')
-depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxcursor' 'kwayland'
-         'libksysguard' 'libkscreen-frameworks' 'ktexteditor' 'libqalculate'
-         'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
-         'xorg-xmessage' 'xorg-xprop')
-makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo-frameworks'
-             'krunner')
-optdepends=('plasma-workspace-wallpapers: additional wallpapers'
-            'gpsd: GPS support for geolocation')
-conflicts=('kdebase-workspace')
-groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
-        'kde.pam')
-md5sums=('4ffdb4c7e310dff222abd452fd67e74d'
-         '929b182dec8a096206ad493477c09d2c')
-
-prepare() {
-  mkdir build
-
-  cd ${pkgname}-${pkgver}
-  # be sure to use the Qt5 version of qtpaths
-  sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DLIB_INSTALL_DIR=lib \
-    -DLIBEXEC_INSTALL_DIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  install -D "${srcdir}"/kde.pam \
-    "${pkgdir}"/etc/pam.d/kde
-}

Copied: plasma-workspace/repos/extra-x86_64/PKGBUILD (from rev 230211, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-01-28 17:52:57 UTC (rev 230212)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Antonio Rojas
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgbase=plasma-workspace
+pkgname=('plasma-workspace' 'drkonqi')
+pkgver=5.2.0
+pkgrel=2
+pkgdesc='KDE Plasma Workspace'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
+license=('LGPL')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
+         'libksysguard' 'libkscreen-frameworks' 'ktexteditor' 'libqalculate'
+         'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
+         'xorg-xmessage' 'xorg-xprop')
+makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo-frameworks'
+             'krunner')
+conflicts=('kdebase-workspace')
+groups=('plasma')
+source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
+        'kde.pam')
+md5sums=('4ffdb4c7e310dff222abd452fd67e74d'
+         '929b182dec8a096206ad493477c09d2c')
+
+prepare() {
+  mkdir build
+
+  cd ${pkgbase}-${pkgver}
+  # be sure to use the Qt5 version of qtpaths
+  sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
+}
+
+build() {
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DLIB_INSTALL_DIR=lib \
+    -DLIBEXEC_INSTALL_DIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package_plasma-workspace() {
+  optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+              'gpsd: GPS support for geolocation')
+
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  install -D "${srcdir}"/kde.pam \
+    "${pkgdir}"/etc/pam.d/kde
+
+  # Remove conflicts with drkonqi
+  rm "${pkgdir}"/usr/lib/drkonqi
+  rm -r "${pkgdir}"/usr/share/drkonqi
+  rm "${pkgdir}"/usr/lib/libKF5XmlRpcClientPrivate.*
+}
+
+package_drkonqi() {
+  pkgdesc='KDE crash handler'
+  depends=('kdewebkit')
+
+  cd build/drkonqi
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/kde.pam
===================================================================
--- extra-x86_64/kde.pam	2015-01-28 17:52:49 UTC (rev 230211)
+++ extra-x86_64/kde.pam	2015-01-28 17:52:57 UTC (rev 230212)
@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth            include         system-login
-account         include         system-login
-password        include         system-login
-session         include         system-login

Copied: plasma-workspace/repos/extra-x86_64/kde.pam (from rev 230211, plasma-workspace/trunk/kde.pam)
===================================================================
--- extra-x86_64/kde.pam	                        (rev 0)
+++ extra-x86_64/kde.pam	2015-01-28 17:52:57 UTC (rev 230212)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth            include         system-login
+account         include         system-login
+password        include         system-login
+session         include         system-login



More information about the arch-commits mailing list