[arch-commits] Commit in plasma-workspace/trunk (2 files)
Felix Yan
fyan at archlinux.org
Wed Oct 7 05:58:46 UTC 2015
Date: Wednesday, October 7, 2015 @ 07:58:46
Author: fyan
Revision: 248444
upgpkg: plasma-workspace 5.4.2-2
add a patch to fix broken gpg-agent etc.
Added:
plasma-workspace/trunk/include-env-vars-from-sourced-files.patch
Modified:
plasma-workspace/trunk/PKGBUILD
-------------------------------------------+
PKGBUILD | 9 ++++++---
include-env-vars-from-sourced-files.patch | 23 +++++++++++++++++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-10-07 03:00:50 UTC (rev 248443)
+++ PKGBUILD 2015-10-07 05:58:46 UTC (rev 248444)
@@ -7,7 +7,7 @@
pkgbase=plasma-workspace
pkgname=('plasma-workspace' 'drkonqi')
pkgver=5.4.2
-pkgrel=1
+pkgrel=2
pkgdesc='KDE Plasma Workspace'
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
@@ -23,15 +23,18 @@
'krunner' 'kxmlrpcclient' 'networkmanager-qt')
groups=('plasma')
source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
- 'kde.pam' 'dbus-update-environment.patch')
+ 'kde.pam' 'dbus-update-environment.patch' 'include-env-vars-from-sourced-files.patch')
md5sums=('a4fe835089c213c52f1407715163bf80'
'378ee33a9ec2870a1a899f2e05ee00d4'
- '5ca1a098128753c12b23ee316d9ee78e')
+ '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
Added: include-env-vars-from-sourced-files.patch
===================================================================
--- include-env-vars-from-sourced-files.patch (rev 0)
+++ include-env-vars-from-sourced-files.patch 2015-10-07 05:58:46 UTC (rev 248444)
@@ -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
+
+
More information about the arch-commits
mailing list