[arch-commits] Commit in plasma-workspace/repos (14 files)
Felix Yan
fyan at archlinux.org
Wed Oct 7 05:59:40 UTC 2015
Date: Wednesday, October 7, 2015 @ 07:59:39
Author: fyan
Revision: 248445
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
plasma-workspace/repos/extra-i686/PKGBUILD
(from rev 248444, plasma-workspace/trunk/PKGBUILD)
plasma-workspace/repos/extra-i686/dbus-update-environment.patch
(from rev 248444, plasma-workspace/trunk/dbus-update-environment.patch)
plasma-workspace/repos/extra-i686/include-env-vars-from-sourced-files.patch
(from rev 248444, plasma-workspace/trunk/include-env-vars-from-sourced-files.patch)
plasma-workspace/repos/extra-i686/kde.pam
(from rev 248444, plasma-workspace/trunk/kde.pam)
plasma-workspace/repos/extra-x86_64/PKGBUILD
(from rev 248444, plasma-workspace/trunk/PKGBUILD)
plasma-workspace/repos/extra-x86_64/dbus-update-environment.patch
(from rev 248444, plasma-workspace/trunk/dbus-update-environment.patch)
plasma-workspace/repos/extra-x86_64/include-env-vars-from-sourced-files.patch
(from rev 248444, plasma-workspace/trunk/include-env-vars-from-sourced-files.patch)
plasma-workspace/repos/extra-x86_64/kde.pam
(from rev 248444, plasma-workspace/trunk/kde.pam)
Deleted:
plasma-workspace/repos/extra-i686/PKGBUILD
plasma-workspace/repos/extra-i686/dbus-update-environment.patch
plasma-workspace/repos/extra-i686/kde.pam
plasma-workspace/repos/extra-x86_64/PKGBUILD
plasma-workspace/repos/extra-x86_64/dbus-update-environment.patch
plasma-workspace/repos/extra-x86_64/kde.pam
--------------------------------------------------------+
/PKGBUILD | 156 +++++++++++++++
/dbus-update-environment.patch | 108 ++++++++++
/kde.pam | 18 +
extra-i686/PKGBUILD | 75 -------
extra-i686/dbus-update-environment.patch | 54 -----
extra-i686/include-env-vars-from-sourced-files.patch | 23 ++
extra-i686/kde.pam | 9
extra-x86_64/PKGBUILD | 75 -------
extra-x86_64/dbus-update-environment.patch | 54 -----
extra-x86_64/include-env-vars-from-sourced-files.patch | 23 ++
extra-x86_64/kde.pam | 9
11 files changed, 328 insertions(+), 276 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-10-07 05:58:46 UTC (rev 248444)
+++ extra-i686/PKGBUILD 2015-10-07 05:59:39 UTC (rev 248445)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: 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.4.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=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
- 'libksysguard' 'libkscreen' 'ktexteditor' 'libqalculate'
- 'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
- 'xorg-xmessage' 'xorg-xprop' 'milou' 'breeze' 'prison-frameworks')
-makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo'
- 'krunner' 'kxmlrpcclient' 'networkmanager-qt')
-groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
- 'kde.pam' 'dbus-update-environment.patch')
-md5sums=('a4fe835089c213c52f1407715163bf80'
- '378ee33a9ec2870a1a899f2e05ee00d4'
- '5ca1a098128753c12b23ee316d9ee78e')
-
-prepare() {
- mkdir build
-
- cd ${pkgbase}-${pkgver}
- # sends env vars to existing dbus
- patch -p1 -i "${srcdir}"/dbus-update-environment.patch
- # 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 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
-}
-
-package_drkonqi() {
- pkgdesc='KDE crash handler'
- depends=('kdewebkit' 'kxmlrpcclient' 'gdb')
-
- cd build/drkonqi
- make DESTDIR="${pkgdir}" install
-}
Copied: plasma-workspace/repos/extra-i686/PKGBUILD (from rev 248444, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-10-07 05:59:39 UTC (rev 248445)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: 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.4.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=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
+ 'libksysguard' 'libkscreen' 'ktexteditor' 'libqalculate'
+ 'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
+ 'xorg-xmessage' 'xorg-xprop' 'milou' 'breeze' 'prison-frameworks')
+makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo'
+ 'krunner' 'kxmlrpcclient' 'networkmanager-qt')
+groups=('plasma')
+source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
+ 'kde.pam' 'dbus-update-environment.patch' 'include-env-vars-from-sourced-files.patch')
+md5sums=('a4fe835089c213c52f1407715163bf80'
+ '378ee33a9ec2870a1a899f2e05ee00d4'
+ '5ca1a098128753c12b23ee316d9ee78e'
+ '0dc67c9132d08a58e787d69f2eee2138')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgbase}-${pkgver}
+ # Include env vars from sourced files on pre-startup
+ patch -p1 -i "${srcdir}"/include-env-vars-from-sourced-files.patch
+ # sends env vars to existing dbus
+ patch -p1 -i "${srcdir}"/dbus-update-environment.patch
+ # 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 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
+}
+
+package_drkonqi() {
+ pkgdesc='KDE crash handler'
+ depends=('kdewebkit' 'kxmlrpcclient' 'gdb')
+
+ cd build/drkonqi
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/dbus-update-environment.patch
===================================================================
--- extra-i686/dbus-update-environment.patch 2015-10-07 05:58:46 UTC (rev 248444)
+++ extra-i686/dbus-update-environment.patch 2015-10-07 05:59:39 UTC (rev 248445)
@@ -1,54 +0,0 @@
-From 195a2f24ea87d642c654ad6e06f3fede4fb66c64 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Fri, 25 Sep 2015 19:27:29 +0200
-Subject: [PATCH] [startkde] Use dbus-update-activation-environment
-
-The difference to ksyncdbusenv is that d-u-a-e can update systemd's
-environment, too. This is only important if a userspace (dbus-daemon) bus
-is used and service files make use of SystemdService to have dbus-daemon
-tell systemd to start the service.
-
-In the kernel bus (kdbus) case, systemd's environment gets updated when
-org.freedesktop.dbus.UpdateActivationEnvironment is called.
----
- startkde/startkde.cmake | 6 +++++-
- startkde/startplasmacompositor.cmake | 6 +++++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index b034b96..f5748dc 100644
---- a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -343,7 +343,11 @@ if test -n "$PAM_KWALLET5_LOGIN" ; then
- fi
-
- # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
-- at CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
-+if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
-+ dbus-update-activation-environment --systemd --all
-+else
-+ @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
-+fi
- if test $? -ne 0; then
- # Startup error
- echo 'startkde: Could not sync environment to dbus.' 1>&2
-diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
-index d8ed68e..17f5881 100644
---- a/startkde/startplasmacompositor.cmake
-+++ b/startkde/startplasmacompositor.cmake
-@@ -212,7 +212,11 @@ QT_QPA_PLATFORM=wayland
- export QT_QPA_PLATFORM
-
- # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
-- at CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
-+if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
-+ dbus-update-activation-environment --systemd --all
-+else
-+ @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
-+fi
- if test $? -ne 0; then
- # Startup error
- echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2
---
-2.4.6
-
Copied: plasma-workspace/repos/extra-i686/dbus-update-environment.patch (from rev 248444, plasma-workspace/trunk/dbus-update-environment.patch)
===================================================================
--- extra-i686/dbus-update-environment.patch (rev 0)
+++ extra-i686/dbus-update-environment.patch 2015-10-07 05:59:39 UTC (rev 248445)
@@ -0,0 +1,54 @@
+From 195a2f24ea87d642c654ad6e06f3fede4fb66c64 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Fri, 25 Sep 2015 19:27:29 +0200
+Subject: [PATCH] [startkde] Use dbus-update-activation-environment
+
+The difference to ksyncdbusenv is that d-u-a-e can update systemd's
+environment, too. This is only important if a userspace (dbus-daemon) bus
+is used and service files make use of SystemdService to have dbus-daemon
+tell systemd to start the service.
+
+In the kernel bus (kdbus) case, systemd's environment gets updated when
+org.freedesktop.dbus.UpdateActivationEnvironment is called.
+---
+ startkde/startkde.cmake | 6 +++++-
+ startkde/startplasmacompositor.cmake | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index b034b96..f5748dc 100644
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
+@@ -343,7 +343,11 @@ if test -n "$PAM_KWALLET5_LOGIN" ; then
+ fi
+
+ # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+- at CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
++if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
++ dbus-update-activation-environment --systemd --all
++else
++ @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
++fi
+ if test $? -ne 0; then
+ # Startup error
+ echo 'startkde: Could not sync environment to dbus.' 1>&2
+diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
+index d8ed68e..17f5881 100644
+--- a/startkde/startplasmacompositor.cmake
++++ b/startkde/startplasmacompositor.cmake
+@@ -212,7 +212,11 @@ QT_QPA_PLATFORM=wayland
+ export QT_QPA_PLATFORM
+
+ # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+- at CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
++if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
++ dbus-update-activation-environment --systemd --all
++else
++ @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
++fi
+ if test $? -ne 0; then
+ # Startup error
+ echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2
+--
+2.4.6
+
Copied: plasma-workspace/repos/extra-i686/include-env-vars-from-sourced-files.patch (from rev 248444, plasma-workspace/trunk/include-env-vars-from-sourced-files.patch)
===================================================================
--- extra-i686/include-env-vars-from-sourced-files.patch (rev 0)
+++ extra-i686/include-env-vars-from-sourced-files.patch 2015-10-07 05:59:39 UTC (rev 248445)
@@ -0,0 +1,23 @@
+From: Siddhartha Sahu <sh.siddhartha at gmail.com>
+Date: Tue, 06 Oct 2015 13:51:52 +0000
+Subject: Include env vars from sourced files on pre-startup
+X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=f869daca8244131f6b452e2c15b4dee5903ff768
+---
+Include env vars from sourced files on pre-startup
+
+REVIEW: 125323
+---
+
+
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
+@@ -206,7 +206,7 @@
+ # Add /env/ to the directory to locate the scripts to be sourced
+ for prefix in `echo $scriptpath`; do
+ for file in "$prefix"/env/*.sh; do
+- (test -r "$file" && . "$file") || :
++ test -r "$file" && . "$file" || true
+ done
+ done
+
+
Deleted: extra-i686/kde.pam
===================================================================
--- extra-i686/kde.pam 2015-10-07 05:58:46 UTC (rev 248444)
+++ extra-i686/kde.pam 2015-10-07 05:59:39 UTC (rev 248445)
@@ -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 248444, plasma-workspace/trunk/kde.pam)
===================================================================
--- extra-i686/kde.pam (rev 0)
+++ extra-i686/kde.pam 2015-10-07 05:59:39 UTC (rev 248445)
@@ -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 2015-10-07 05:58:46 UTC (rev 248444)
+++ extra-x86_64/PKGBUILD 2015-10-07 05:59:39 UTC (rev 248445)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: 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.4.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=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
- 'libksysguard' 'libkscreen' 'ktexteditor' 'libqalculate'
- 'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
- 'xorg-xmessage' 'xorg-xprop' 'milou' 'breeze' 'prison-frameworks')
-makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo'
- 'krunner' 'kxmlrpcclient' 'networkmanager-qt')
-groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
- 'kde.pam' 'dbus-update-environment.patch')
-md5sums=('a4fe835089c213c52f1407715163bf80'
- '378ee33a9ec2870a1a899f2e05ee00d4'
- '5ca1a098128753c12b23ee316d9ee78e')
-
-prepare() {
- mkdir build
-
- cd ${pkgbase}-${pkgver}
- # sends env vars to existing dbus
- patch -p1 -i "${srcdir}"/dbus-update-environment.patch
- # 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 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
-}
-
-package_drkonqi() {
- pkgdesc='KDE crash handler'
- depends=('kdewebkit' 'kxmlrpcclient' 'gdb')
-
- cd build/drkonqi
- make DESTDIR="${pkgdir}" install
-}
Copied: plasma-workspace/repos/extra-x86_64/PKGBUILD (from rev 248444, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-10-07 05:59:39 UTC (rev 248445)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: 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.4.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=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
+ 'libksysguard' 'libkscreen' 'ktexteditor' 'libqalculate'
+ 'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
+ 'xorg-xmessage' 'xorg-xprop' 'milou' 'breeze' 'prison-frameworks')
+makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo'
+ 'krunner' 'kxmlrpcclient' 'networkmanager-qt')
+groups=('plasma')
+source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
+ 'kde.pam' 'dbus-update-environment.patch' 'include-env-vars-from-sourced-files.patch')
+md5sums=('a4fe835089c213c52f1407715163bf80'
+ '378ee33a9ec2870a1a899f2e05ee00d4'
+ '5ca1a098128753c12b23ee316d9ee78e'
+ '0dc67c9132d08a58e787d69f2eee2138')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgbase}-${pkgver}
+ # Include env vars from sourced files on pre-startup
+ patch -p1 -i "${srcdir}"/include-env-vars-from-sourced-files.patch
+ # sends env vars to existing dbus
+ patch -p1 -i "${srcdir}"/dbus-update-environment.patch
+ # 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 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
+}
+
+package_drkonqi() {
+ pkgdesc='KDE crash handler'
+ depends=('kdewebkit' 'kxmlrpcclient' 'gdb')
+
+ cd build/drkonqi
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/dbus-update-environment.patch
===================================================================
--- extra-x86_64/dbus-update-environment.patch 2015-10-07 05:58:46 UTC (rev 248444)
+++ extra-x86_64/dbus-update-environment.patch 2015-10-07 05:59:39 UTC (rev 248445)
@@ -1,54 +0,0 @@
-From 195a2f24ea87d642c654ad6e06f3fede4fb66c64 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Fri, 25 Sep 2015 19:27:29 +0200
-Subject: [PATCH] [startkde] Use dbus-update-activation-environment
-
-The difference to ksyncdbusenv is that d-u-a-e can update systemd's
-environment, too. This is only important if a userspace (dbus-daemon) bus
-is used and service files make use of SystemdService to have dbus-daemon
-tell systemd to start the service.
-
-In the kernel bus (kdbus) case, systemd's environment gets updated when
-org.freedesktop.dbus.UpdateActivationEnvironment is called.
----
- startkde/startkde.cmake | 6 +++++-
- startkde/startplasmacompositor.cmake | 6 +++++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index b034b96..f5748dc 100644
---- a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -343,7 +343,11 @@ if test -n "$PAM_KWALLET5_LOGIN" ; then
- fi
-
- # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
-- at CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
-+if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
-+ dbus-update-activation-environment --systemd --all
-+else
-+ @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
-+fi
- if test $? -ne 0; then
- # Startup error
- echo 'startkde: Could not sync environment to dbus.' 1>&2
-diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
-index d8ed68e..17f5881 100644
---- a/startkde/startplasmacompositor.cmake
-+++ b/startkde/startplasmacompositor.cmake
-@@ -212,7 +212,11 @@ QT_QPA_PLATFORM=wayland
- export QT_QPA_PLATFORM
-
- # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
-- at CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
-+if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
-+ dbus-update-activation-environment --systemd --all
-+else
-+ @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
-+fi
- if test $? -ne 0; then
- # Startup error
- echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2
---
-2.4.6
-
Copied: plasma-workspace/repos/extra-x86_64/dbus-update-environment.patch (from rev 248444, plasma-workspace/trunk/dbus-update-environment.patch)
===================================================================
--- extra-x86_64/dbus-update-environment.patch (rev 0)
+++ extra-x86_64/dbus-update-environment.patch 2015-10-07 05:59:39 UTC (rev 248445)
@@ -0,0 +1,54 @@
+From 195a2f24ea87d642c654ad6e06f3fede4fb66c64 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Fri, 25 Sep 2015 19:27:29 +0200
+Subject: [PATCH] [startkde] Use dbus-update-activation-environment
+
+The difference to ksyncdbusenv is that d-u-a-e can update systemd's
+environment, too. This is only important if a userspace (dbus-daemon) bus
+is used and service files make use of SystemdService to have dbus-daemon
+tell systemd to start the service.
+
+In the kernel bus (kdbus) case, systemd's environment gets updated when
+org.freedesktop.dbus.UpdateActivationEnvironment is called.
+---
+ startkde/startkde.cmake | 6 +++++-
+ startkde/startplasmacompositor.cmake | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index b034b96..f5748dc 100644
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
+@@ -343,7 +343,11 @@ if test -n "$PAM_KWALLET5_LOGIN" ; then
+ fi
+
+ # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+- at CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
++if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
++ dbus-update-activation-environment --systemd --all
++else
++ @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
++fi
+ if test $? -ne 0; then
+ # Startup error
+ echo 'startkde: Could not sync environment to dbus.' 1>&2
+diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
+index d8ed68e..17f5881 100644
+--- a/startkde/startplasmacompositor.cmake
++++ b/startkde/startplasmacompositor.cmake
+@@ -212,7 +212,11 @@ QT_QPA_PLATFORM=wayland
+ export QT_QPA_PLATFORM
+
+ # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+- at CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
++if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
++ dbus-update-activation-environment --systemd --all
++else
++ @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
++fi
+ if test $? -ne 0; then
+ # Startup error
+ echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2
+--
+2.4.6
+
Copied: plasma-workspace/repos/extra-x86_64/include-env-vars-from-sourced-files.patch (from rev 248444, plasma-workspace/trunk/include-env-vars-from-sourced-files.patch)
===================================================================
--- extra-x86_64/include-env-vars-from-sourced-files.patch (rev 0)
+++ extra-x86_64/include-env-vars-from-sourced-files.patch 2015-10-07 05:59:39 UTC (rev 248445)
@@ -0,0 +1,23 @@
+From: Siddhartha Sahu <sh.siddhartha at gmail.com>
+Date: Tue, 06 Oct 2015 13:51:52 +0000
+Subject: Include env vars from sourced files on pre-startup
+X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=f869daca8244131f6b452e2c15b4dee5903ff768
+---
+Include env vars from sourced files on pre-startup
+
+REVIEW: 125323
+---
+
+
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
+@@ -206,7 +206,7 @@
+ # Add /env/ to the directory to locate the scripts to be sourced
+ for prefix in `echo $scriptpath`; do
+ for file in "$prefix"/env/*.sh; do
+- (test -r "$file" && . "$file") || :
++ test -r "$file" && . "$file" || true
+ done
+ done
+
+
Deleted: extra-x86_64/kde.pam
===================================================================
--- extra-x86_64/kde.pam 2015-10-07 05:58:46 UTC (rev 248444)
+++ extra-x86_64/kde.pam 2015-10-07 05:59:39 UTC (rev 248445)
@@ -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 248444, plasma-workspace/trunk/kde.pam)
===================================================================
--- extra-x86_64/kde.pam (rev 0)
+++ extra-x86_64/kde.pam 2015-10-07 05:59:39 UTC (rev 248445)
@@ -0,0 +1,9 @@
+#%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