mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-06 05:37:13 +08:00
* workspace: fix shutdown and sensors
This commit is contained in:
Phil
parent
b48598a5dc
commit
cf5647464a
@ -96,6 +96,8 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
|
||||
# feature_history-notifications-enable-disable-kde#119207.patch
|
||||
|
||||
# feature_kdm-plymouth.patch
|
||||
shutdown-fix.patch
|
||||
sensors-fix.patch
|
||||
)
|
||||
|
||||
md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
|
||||
@ -132,6 +134,8 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
|
||||
# '894815a80f99a9a0dee1adbcda49b161' # feature_battery-tooltip.patch
|
||||
# '9b97ac1b4deb8d0c8ca7afffb80b4320' # feature_history-notifications-enable-disable-kde#119207.patch
|
||||
# '42b3b5e09372c57910c3435e63e2dfd6' # feature_kdm-plymouth.patch
|
||||
'c542f58979cf9cb2299dd42f63e6fd72' # shutdown-fix.patch
|
||||
'ecf3a9d6af9bdd3db0189e06ddf21034' # sensors-fix.patch
|
||||
)
|
||||
|
||||
#
|
||||
@ -144,7 +148,7 @@ build()
|
||||
# branch update
|
||||
if [ "$_branchupdate" = "yes" ] ; then
|
||||
msg "applying branch update ..."
|
||||
patch -p0 -i $startdir/branch-update-r*.patch || return 1
|
||||
patch -p0 -i $startdir/branch-update-r*.patch
|
||||
else
|
||||
warning "branch updates disabled ..."
|
||||
warning "if you want to make use of it, run branch_updater.sh"
|
||||
@ -153,32 +157,35 @@ build()
|
||||
|
||||
msg "applying main patchset ..."
|
||||
|
||||
patch -Np0 -i ${srcdir}/01_kdm_zsh_profile.patch || return 1
|
||||
patch -Np0 -i ${srcdir}/02_sane_env_and_shutdown_path.patch || return 1
|
||||
patch -Np1 -i ${srcdir}/03_plasma_menubutton_branding.patch || return 1
|
||||
patch -Np1 -i ${srcdir}/04_plasma_kickoff_url.patch || return 1
|
||||
# patch -Np1 -i ${srcdir}/05_plasma_desktop_defaults.patch || return 1
|
||||
patch -Np1 -i ${srcdir}/06_kickoff_default_favourites.patch || return 1
|
||||
patch -Np1 -i ${srcdir}/07_always_show_kickoff_subtext.patch || return 1
|
||||
patch -Np1 -i ${srcdir}/09_enable_start-shutdown-scripts.patch || return 1
|
||||
patch -Np0 -i ${srcdir}/01_kdm_zsh_profile.patch
|
||||
patch -Np0 -i ${srcdir}/02_sane_env_and_shutdown_path.patch
|
||||
patch -Np1 -i ${srcdir}/03_plasma_menubutton_branding.patch
|
||||
patch -Np1 -i ${srcdir}/04_plasma_kickoff_url.patch
|
||||
# patch -Np1 -i ${srcdir}/05_plasma_desktop_defaults.patch
|
||||
patch -Np1 -i ${srcdir}/06_kickoff_default_favourites.patch
|
||||
patch -Np1 -i ${srcdir}/07_always_show_kickoff_subtext.patch
|
||||
patch -Np1 -i ${srcdir}/09_enable_start-shutdown-scripts.patch
|
||||
|
||||
|
||||
msg "applying fixes ..."
|
||||
patch -Np0 -i ${srcdir}/fix_kdm-increase-xserver-timeout-bnc#462478.patch || return 1
|
||||
patch -Np0 -i ${srcdir}/fix_terminate-server.patch || return 1
|
||||
# patch -Np1 -i ${srcdir}/fix_ck-shutdown.patch || return 1
|
||||
patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch || return 1
|
||||
patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch || return 1
|
||||
patch -Np0 -i ${srcdir}/fix_kdm-increase-xserver-timeout-bnc#462478.patch
|
||||
patch -Np0 -i ${srcdir}/fix_terminate-server.patch
|
||||
# patch -Np1 -i ${srcdir}/fix_ck-shutdown.patch
|
||||
patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch
|
||||
patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch
|
||||
patch -Np1 -i ${srcdir}/shutdown-fix.patch
|
||||
|
||||
# FIXME: update feature patches
|
||||
# msg "applying feature patches ..."
|
||||
# patch -Np1 -i ${srcdir}/feature_plasma-transparent-panel-v4-rb#472.patch || return 1
|
||||
# patch -Np1 -i ${srcdir}/feature_brightness-osd.patch || return 1
|
||||
# patch -Np1 -i ${srcdir}/feature_battery-tooltip.patch || return 1
|
||||
# patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch || return 1
|
||||
# patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch || return 1
|
||||
# patch -Np1 -i ${srcdir}/feature_plasma-transparent-panel-v4-rb#472.patch
|
||||
# patch -Np1 -i ${srcdir}/feature_brightness-osd.patch
|
||||
# patch -Np1 -i ${srcdir}/feature_battery-tooltip.patch
|
||||
# patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch
|
||||
# patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch
|
||||
|
||||
msg "applying upstream patches ..."
|
||||
patch -Np1 -i ${srcdir}/sensors-fix.patch
|
||||
|
||||
#msg "applying upstream patches ..."
|
||||
|
||||
msg "starting workspace build ..."
|
||||
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
|
||||
@ -188,7 +195,7 @@ build()
|
||||
-DWITH_PolkitQt=OFF \
|
||||
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
|
||||
|
||||
make || return 1
|
||||
make
|
||||
|
||||
msg "starting kcm_touchpad build ..."
|
||||
cd ${srcdir}/mishaaq-kcm_touchpad-00370b5
|
||||
@ -214,7 +221,7 @@ build()
|
||||
-DCMAKE_SKIP_RPATH=ON \
|
||||
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
|
||||
|
||||
make || return 1
|
||||
make
|
||||
}
|
||||
|
||||
|
||||
@ -253,16 +260,16 @@ package_kdebase-workspace()
|
||||
install=${_origname}.install
|
||||
|
||||
cd ${srcdir}/${_origname}-${pkgver}
|
||||
make DESTDIR=${pkgdir} install || return 1
|
||||
make DESTDIR=${pkgdir} install
|
||||
|
||||
cd ${srcdir}/mishaaq-kcm_touchpad-00370b5
|
||||
make DESTDIR=${pkgdir} install || return 1
|
||||
make DESTDIR=${pkgdir} install
|
||||
|
||||
cd ${srcdir}/kcm_tablet-1.1.3
|
||||
make DESTDIR=${pkgdir} install || return 1
|
||||
make DESTDIR=${pkgdir} install
|
||||
|
||||
cd ${srcdir}/favorites-0.1
|
||||
make DESTDIR=${pkgdir} install || return 1
|
||||
make DESTDIR=${pkgdir} install
|
||||
|
||||
# install pam configuration
|
||||
install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
|
||||
@ -350,7 +357,7 @@ package_kdebase-workspace-doc()
|
||||
splitdirs="doc"
|
||||
for i in ${splitdirs} ; do
|
||||
cd ${srcdir}/${_origname}-${pkgver}/${i}
|
||||
make DESTDIR=${pkgdir} install || return 1
|
||||
make DESTDIR=${pkgdir} install
|
||||
done
|
||||
}
|
||||
|
||||
@ -364,7 +371,7 @@ package_kdebase-workspace-wallpapers()
|
||||
splitdirs="wallpapers"
|
||||
for i in ${splitdirs} ; do
|
||||
cd ${srcdir}/${_origname}-${pkgver}/${i}
|
||||
make DESTDIR=${pkgdir} install || return 1
|
||||
make DESTDIR=${pkgdir} install
|
||||
done
|
||||
|
||||
rm -rfv ${pkgdir}/usr/share/wallpapers/${_default_wp}
|
||||
|
||||
22
kdebase-workspace/sensors-fix.patch
Normal file
22
kdebase-workspace/sensors-fix.patch
Normal file
@ -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"
|
||||
11
kdebase-workspace/shutdown-fix.patch
Normal file
11
kdebase-workspace/shutdown-fix.patch
Normal file
@ -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"
|
||||
Loading…
Reference in New Issue
Block a user