diff options
| author | root <root@rshg047.dnsready.net> | 2011-04-09 14:42:55 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-04-09 14:42:55 +0000 |
| commit | f87ab435eb966ec44eb006c48699e6ee90613286 (patch) | |
| tree | 28582481a3d3b5d8d82425bc3930f58a0572ae42 /extra/kdebase-workspace | |
| parent | 59075f0265483f32e9ac4c67ba9e69cb019ba044 (diff) | |
Sat Apr 9 14:42:55 UTC 2011
Diffstat (limited to 'extra/kdebase-workspace')
| -rw-r--r-- | extra/kdebase-workspace/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/kdebase-workspace/sensors-fix.patch | 22 | ||||
| -rw-r--r-- | extra/kdebase-workspace/shutdown-fix.patch | 11 |
3 files changed, 46 insertions, 6 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index e30f73a9a..44593c57b 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 118067 2011-04-05 10:07:59Z andrea $ +# $Id: PKGBUILD 118827 2011-04-08 07:49:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace pkgver=4.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -26,7 +26,9 @@ backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kscreensaver') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch') + 'fixpath.patch' 'terminate-server.patch' + 'shutdown-fix.patch' + 'sensors-fix.patch') sha1sums=('63efb68733f347d0b7d24a7a061c5a0e3f84dee7' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' @@ -34,13 +36,19 @@ sha1sums=('63efb68733f347d0b7d24a7a061c5a0e3f84dee7' '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' + 'c18422cb964e51d2cfcca3907904a361d507c8e1' + 'fd6bb3239705c23d38f51fb39048b05ed6e95703') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -p0 -i ${srcdir}/kdm-zsh-profile.patch patch -p0 -i ${srcdir}/fixpath.patch patch -p0 -i ${srcdir}/terminate-server.patch + patch -Np1 -i ${srcdir}/shutdown-fix.patch + + # Already fixed upstream + patch -Np1 -i ${srcdir}/sensors-fix.patch cd ${srcdir} mkdir build @@ -50,8 +58,7 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_Xmms=OFF \ - -DWITH_Googlegadgets=OFF \ - -DWITH_PolkitQt=OFF + -DWITH_Googlegadgets=OFF make } diff --git a/extra/kdebase-workspace/sensors-fix.patch b/extra/kdebase-workspace/sensors-fix.patch new file mode 100644 index 000000000..2d9b70c52 --- /dev/null +++ b/extra/kdebase-workspace/sensors-fix.patch @@ -0,0 +1,22 @@ +commit 23863a99399cbb274f6756146b3c08de2efa0c7f +Author: John Tapsell <johnflux@gmail.com> +Date: Thu Apr 7 10:59:20 2011 +0100 + + Fix accidental removal of a #include, when adding freebsd support. This broke the lmsensors at minimum + + BUG: 270246 + BUG: 270246 + CCMAIL: naylor.b.david@gmail.com + +diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h +index e780be6..9aae890 100644 +--- a/ksysguard/ksysguardd/modules.h ++++ b/ksysguard/ksysguardd/modules.h +@@ -23,6 +23,7 @@ + #ifndef KSG_MODULES_H + #define KSG_MODULES_H + ++#include "config-ksysguardd.h" + #include "Command.h" + #include "conf.h" + #include "ksysguardd.h" diff --git a/extra/kdebase-workspace/shutdown-fix.patch b/extra/kdebase-workspace/shutdown-fix.patch new file mode 100644 index 000000000..b01ab7fba --- /dev/null +++ b/extra/kdebase-workspace/shutdown-fix.patch @@ -0,0 +1,11 @@ +--- kdebase-workspace-4.6.2/kdm/config.def~ 2011-04-08 00:29:48.291941154 -0700 ++++ kdebase-workspace-4.6.2/kdm/config.def 2011-04-08 00:32:04.738607619 -0700 +@@ -38,7 +38,7 @@ + # define HALT_CMD "/usr/sbin/shutdown -h now" + # define REBOOT_CMD "/usr/sbin/shutdown -r now" + #elif defined(BSD) || defined(__linux__) +-# define HALT_CMD "/sbin/shutdown -p now" ++# define HALT_CMD "/sbin/shutdown -h now" + # define REBOOT_CMD "/sbin/shutdown -r now" + #elif defined(__SVR4) + # define HALT_CMD "/usr/sbin/halt" |