Date: Saturday, January 2, 2016 @ 12:19:16
  Author: arojas
Revision: 257454

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

Added:
  plasma-workspace/repos/extra-i686/PKGBUILD
    (from rev 257453, plasma-workspace/trunk/PKGBUILD)
  plasma-workspace/repos/extra-i686/kde.pam
    (from rev 257453, plasma-workspace/trunk/kde.pam)
  plasma-workspace/repos/extra-x86_64/PKGBUILD
    (from rev 257453, plasma-workspace/trunk/PKGBUILD)
  plasma-workspace/repos/extra-x86_64/kde.pam
    (from rev 257453, 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             |  198 ++++++++++++++++++++++++++++++++++++++++++++++++
 /kde.pam              |   18 ++++
 extra-i686/PKGBUILD   |   81 -------------------
 extra-i686/kde.pam    |    9 --
 extra-x86_64/PKGBUILD |   81 -------------------
 extra-x86_64/kde.pam  |    9 --
 6 files changed, 216 insertions(+), 180 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-01-02 11:17:40 UTC (rev 257453)
+++ extra-i686/PKGBUILD 2016-01-02 11:19:16 UTC (rev 257454)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Antonio Rojas
-# Contributor: Alexey D. <lq07829icatm at rambler.ru>
-
-pkgbase=plasma-workspace
-pkgname=('plasma-workspace' 'drkonqi' 'plasma-wayland-session')
-pkgver=5.5.2
-pkgrel=1
-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=('kjsembed' 'knotifyconfig' 'libxdamage' 'libksysguard' 'libkscreen' 
'ktexteditor' 'libqalculate'
-         'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
-         'xorg-xmessage' 'xorg-xprop' 'milou' 'breeze' 'prison-frameworks' 
'kwin')
-makedepends=('extra-cmake-modules' 'kdoctools' 'gpsd' 'baloo'
-             'krunner' 'kxmlrpcclient' 'networkmanager-qt')
-groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz";
 'kde.pam')
-md5sums=('771be8128b03bc50d79b3579e631ae15'
-         '378ee33a9ec2870a1a899f2e05ee00d4')
-
-prepare() {
-  mkdir -p build
-
-  cd ${pkgbase}-${pkgver}
-  # be sure to use the Qt5 version of qtpaths
-  sed -e 's:qtpaths:qtpaths-qt5:' -i startkde/start*.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 based geolocation' 'networkmanager-qt: IP based 
geolocation')
-  conflicts=('kdebase-workspace')
-
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}"/kde.pam \
-    "${pkgdir}"/etc/pam.d/kde
-
-  # Remove conflicts with drkonqi
-  rm "${pkgdir}"/usr/lib/drkonqi
-  rm -r "${pkgdir}"/usr/share/drkonqi
-
-  # Split plasma-wayland scripts
-  rm -r "$pkgdir"/usr/share/wayland-sessions
-}
-
-package_drkonqi() {
-  pkgdesc='KDE crash handler'
-  depends=('kxmlrpcclient' 'gdb')
-
-  cd build/drkonqi
-  make DESTDIR="${pkgdir}" install
-}
-
-package_plasma-wayland-session() {
-  pkgdesc='Plasma Wayland session'
-  depends=('plasma-workspace' 'qt5-wayland' 'kwayland-integration' 
'xorg-server-xwayland')
-  groups=()
-
-  install -Dm644 build/plasmawayland.desktop 
"$pkgdir"/usr/share/wayland-sessions/plasmawayland.desktop
-}

Copied: plasma-workspace/repos/extra-i686/PKGBUILD (from rev 257453, 
plasma-workspace/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD                         (rev 0)
+++ extra-i686/PKGBUILD 2016-01-02 11:19:16 UTC (rev 257454)
@@ -0,0 +1,99 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Antonio Rojas
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgbase=plasma-workspace
+pkgname=('plasma-workspace' 'drkonqi' 'kuiserver' 'plasma-wayland-session')
+pkgver=5.5.2
+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=('kjsembed' 'knotifyconfig' 'libxdamage' 'libksysguard' 'libkscreen' 
'ktexteditor' 'libqalculate'
+         'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
+         'xorg-xmessage' 'xorg-xprop' 'milou' 'breeze' 'prison-frameworks' 
'kwin')
+makedepends=('extra-cmake-modules' 'kdoctools' 'gpsd' 'baloo'
+             'krunner' 'kxmlrpcclient' 'networkmanager-qt')
+groups=('plasma')
+source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz";
 'kde.pam'
+       
xembedsniproxy-crash.patch::"https://bugsfiles.kde.org/attachment.cgi?id=96251";)
+md5sums=('771be8128b03bc50d79b3579e631ae15'
+         '378ee33a9ec2870a1a899f2e05ee00d4'
+         '28113c15b8609db604b779a8d732fa91')
+
+prepare() {
+  mkdir -p build
+
+  cd ${pkgbase}-${pkgver}
+  # be sure to use the Qt5 version of qtpaths
+  sed -e 's:qtpaths:qtpaths-qt5:' -i startkde/start*.cmake
+
+  patch -p1 -i ../xembedsniproxy-crash.patch
+}
+
+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() {
+  depends+=('kuiserver')
+  optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+              'gpsd: GPS based geolocation' 'networkmanager-qt: IP based 
geolocation')
+  conflicts=('kdebase-workspace')
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir"/kde.pam "$pkgdir"/etc/pam.d/kde
+
+  # Remove conflicts with drkonqi
+  rm "$pkgdir"/usr/lib/drkonqi
+  rm -r "$pkgdir"/usr/share/drkonqi
+
+  # Remove conflicts with kuiserver
+  rm "$pkgdir"/usr/bin/kuiserver5
+  rm "$pkgdir"/usr/lib/libkdeinit5_kuiserver5.so
+  rm "$pkgdir"/usr/share/dbus-1/services/kf5_org.kde.kuiserver.service
+  rm "$pkgdir"/usr/share/kservices5/kuiserver.desktop
+
+  # Split plasma-wayland scripts
+  rm -r "$pkgdir"/usr/share/wayland-sessions
+}
+
+package_drkonqi() {
+  pkgdesc='KDE crash handler'
+  depends=('kxmlrpcclient' 'gdb')
+
+  cd build/drkonqi
+  make DESTDIR="$pkgdir" install
+}
+
+package_kuiserver() {
+  pkgdesc='KDE Progress Info UI server'
+  depends=('kxmlgui')
+
+  cd build/kuiserver
+  make DESTDIR="$pkgdir" install
+}
+
+package_plasma-wayland-session() {
+  pkgdesc='Plasma Wayland session'
+  depends=('plasma-workspace' 'qt5-wayland' 'kwayland-integration' 
'xorg-server-xwayland')
+  groups=()
+
+  install -Dm644 build/plasmawayland.desktop 
"$pkgdir"/usr/share/wayland-sessions/plasmawayland.desktop
+}

Deleted: extra-i686/kde.pam
===================================================================
--- extra-i686/kde.pam  2016-01-02 11:17:40 UTC (rev 257453)
+++ extra-i686/kde.pam  2016-01-02 11:19:16 UTC (rev 257454)
@@ -1,9 +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 257453, 
plasma-workspace/trunk/kde.pam)
===================================================================
--- extra-i686/kde.pam                          (rev 0)
+++ extra-i686/kde.pam  2016-01-02 11:19:16 UTC (rev 257454)
@@ -0,0 +1,9 @@
+#%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       2016-01-02 11:17:40 UTC (rev 257453)
+++ extra-x86_64/PKGBUILD       2016-01-02 11:19:16 UTC (rev 257454)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Antonio Rojas
-# Contributor: Alexey D. <lq07829icatm at rambler.ru>
-
-pkgbase=plasma-workspace
-pkgname=('plasma-workspace' 'drkonqi' 'plasma-wayland-session')
-pkgver=5.5.2
-pkgrel=1
-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=('kjsembed' 'knotifyconfig' 'libxdamage' 'libksysguard' 'libkscreen' 
'ktexteditor' 'libqalculate'
-         'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
-         'xorg-xmessage' 'xorg-xprop' 'milou' 'breeze' 'prison-frameworks' 
'kwin')
-makedepends=('extra-cmake-modules' 'kdoctools' 'gpsd' 'baloo'
-             'krunner' 'kxmlrpcclient' 'networkmanager-qt')
-groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz";
 'kde.pam')
-md5sums=('771be8128b03bc50d79b3579e631ae15'
-         '378ee33a9ec2870a1a899f2e05ee00d4')
-
-prepare() {
-  mkdir -p build
-
-  cd ${pkgbase}-${pkgver}
-  # be sure to use the Qt5 version of qtpaths
-  sed -e 's:qtpaths:qtpaths-qt5:' -i startkde/start*.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 based geolocation' 'networkmanager-qt: IP based 
geolocation')
-  conflicts=('kdebase-workspace')
-
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}"/kde.pam \
-    "${pkgdir}"/etc/pam.d/kde
-
-  # Remove conflicts with drkonqi
-  rm "${pkgdir}"/usr/lib/drkonqi
-  rm -r "${pkgdir}"/usr/share/drkonqi
-
-  # Split plasma-wayland scripts
-  rm -r "$pkgdir"/usr/share/wayland-sessions
-}
-
-package_drkonqi() {
-  pkgdesc='KDE crash handler'
-  depends=('kxmlrpcclient' 'gdb')
-
-  cd build/drkonqi
-  make DESTDIR="${pkgdir}" install
-}
-
-package_plasma-wayland-session() {
-  pkgdesc='Plasma Wayland session'
-  depends=('plasma-workspace' 'qt5-wayland' 'kwayland-integration' 
'xorg-server-xwayland')
-  groups=()
-
-  install -Dm644 build/plasmawayland.desktop 
"$pkgdir"/usr/share/wayland-sessions/plasmawayland.desktop
-}

Copied: plasma-workspace/repos/extra-x86_64/PKGBUILD (from rev 257453, 
plasma-workspace/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD                               (rev 0)
+++ extra-x86_64/PKGBUILD       2016-01-02 11:19:16 UTC (rev 257454)
@@ -0,0 +1,99 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Antonio Rojas
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgbase=plasma-workspace
+pkgname=('plasma-workspace' 'drkonqi' 'kuiserver' 'plasma-wayland-session')
+pkgver=5.5.2
+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=('kjsembed' 'knotifyconfig' 'libxdamage' 'libksysguard' 'libkscreen' 
'ktexteditor' 'libqalculate'
+         'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
+         'xorg-xmessage' 'xorg-xprop' 'milou' 'breeze' 'prison-frameworks' 
'kwin')
+makedepends=('extra-cmake-modules' 'kdoctools' 'gpsd' 'baloo'
+             'krunner' 'kxmlrpcclient' 'networkmanager-qt')
+groups=('plasma')
+source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz";
 'kde.pam'
+       
xembedsniproxy-crash.patch::"https://bugsfiles.kde.org/attachment.cgi?id=96251";)
+md5sums=('771be8128b03bc50d79b3579e631ae15'
+         '378ee33a9ec2870a1a899f2e05ee00d4'
+         '28113c15b8609db604b779a8d732fa91')
+
+prepare() {
+  mkdir -p build
+
+  cd ${pkgbase}-${pkgver}
+  # be sure to use the Qt5 version of qtpaths
+  sed -e 's:qtpaths:qtpaths-qt5:' -i startkde/start*.cmake
+
+  patch -p1 -i ../xembedsniproxy-crash.patch
+}
+
+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() {
+  depends+=('kuiserver')
+  optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+              'gpsd: GPS based geolocation' 'networkmanager-qt: IP based 
geolocation')
+  conflicts=('kdebase-workspace')
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir"/kde.pam "$pkgdir"/etc/pam.d/kde
+
+  # Remove conflicts with drkonqi
+  rm "$pkgdir"/usr/lib/drkonqi
+  rm -r "$pkgdir"/usr/share/drkonqi
+
+  # Remove conflicts with kuiserver
+  rm "$pkgdir"/usr/bin/kuiserver5
+  rm "$pkgdir"/usr/lib/libkdeinit5_kuiserver5.so
+  rm "$pkgdir"/usr/share/dbus-1/services/kf5_org.kde.kuiserver.service
+  rm "$pkgdir"/usr/share/kservices5/kuiserver.desktop
+
+  # Split plasma-wayland scripts
+  rm -r "$pkgdir"/usr/share/wayland-sessions
+}
+
+package_drkonqi() {
+  pkgdesc='KDE crash handler'
+  depends=('kxmlrpcclient' 'gdb')
+
+  cd build/drkonqi
+  make DESTDIR="$pkgdir" install
+}
+
+package_kuiserver() {
+  pkgdesc='KDE Progress Info UI server'
+  depends=('kxmlgui')
+
+  cd build/kuiserver
+  make DESTDIR="$pkgdir" install
+}
+
+package_plasma-wayland-session() {
+  pkgdesc='Plasma Wayland session'
+  depends=('plasma-workspace' 'qt5-wayland' 'kwayland-integration' 
'xorg-server-xwayland')
+  groups=()
+
+  install -Dm644 build/plasmawayland.desktop 
"$pkgdir"/usr/share/wayland-sessions/plasmawayland.desktop
+}

Deleted: extra-x86_64/kde.pam
===================================================================
--- extra-x86_64/kde.pam        2016-01-02 11:17:40 UTC (rev 257453)
+++ extra-x86_64/kde.pam        2016-01-02 11:19:16 UTC (rev 257454)
@@ -1,9 +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 257453, 
plasma-workspace/trunk/kde.pam)
===================================================================
--- extra-x86_64/kde.pam                                (rev 0)
+++ extra-x86_64/kde.pam        2016-01-02 11:19:16 UTC (rev 257454)
@@ -0,0 +1,9 @@
+#%PAM-1.0
+
+auth            include         system-login
+
+account         include         system-login
+
+password        include         system-login
+
+session         include         system-login

Reply via email to