Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (9d0cb3609b9326425c7964a5518ff51e75f3c0e5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (9d0cb3609b9326425c7964a5518ff51e75f3c0e5)
  • Date: Fri, 8 Apr 2011 11:06:24 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

kde4/kdebase-workspace4/HISTORY | 3 +++
kde4/kdebase-workspace4/PRE_BUILD | 5 ++++-
kde4/kdebase-workspace4/sensors-fix.patch | 22 ++++++++++++++++++++++
kde4/kdebase-workspace4/shutdown-fix.patch | 11 +++++++++++
kde4/kdebase-workspace4/terminate-server.patch | 11 +++++++++++
5 files changed, 51 insertions(+), 1 deletion(-)

New commits:
commit 9d0cb3609b9326425c7964a5518ff51e75f3c0e5
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdebase-workspace4: added patches to fix glitches

diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index 9a1cb3f..fea4ee3 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,6 @@
+2011-04-08 Bor Kraljič <pyrobor AT ver.si>
+ * terminate-server.patch, shutdown-fix.patch, sensors-fix.patch:
added patches to fix glitches
+
2011-04-06 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.6.2

diff --git a/kde4/kdebase-workspace4/PRE_BUILD
b/kde4/kdebase-workspace4/PRE_BUILD
index 2a8ec76..0ad017a 100755
--- a/kde4/kdebase-workspace4/PRE_BUILD
+++ b/kde4/kdebase-workspace4/PRE_BUILD
@@ -1,2 +1,5 @@
create_group kde4 &&
-default_pre_build
+default_pre_build &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/sensors-fix.patch &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/shutdown-fix.patch &&
+patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/terminate-server.patch
diff --git a/kde4/kdebase-workspace4/sensors-fix.patch
b/kde4/kdebase-workspace4/sensors-fix.patch
new file mode 100644
index 0000000..2d9b70c
--- /dev/null
+++ b/kde4/kdebase-workspace4/sensors-fix.patch
@@ -0,0 +1,22 @@
+commit 23863a99399cbb274f6756146b3c08de2efa0c7f
+Author: John Tapsell <johnflux AT 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 AT 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/kde4/kdebase-workspace4/shutdown-fix.patch
b/kde4/kdebase-workspace4/shutdown-fix.patch
new file mode 100644
index 0000000..b01ab7f
--- /dev/null
+++ b/kde4/kdebase-workspace4/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"
diff --git a/kde4/kdebase-workspace4/terminate-server.patch
b/kde4/kdebase-workspace4/terminate-server.patch
new file mode 100644
index 0000000..0945913
--- /dev/null
+++ b/kde4/kdebase-workspace4/terminate-server.patch
@@ -0,0 +1,11 @@
+--- kdm/config.def 2009-08-27 10:17:39.000000000 +0200
++++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100
+@@ -1448,7 +1448,7 @@
+
+ Key: TerminateServer
+ Type: bool
+-Default: false
++Default: true
+ User: core
+ Instance: #:*/!
+ Merge: xdm



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (9d0cb3609b9326425c7964a5518ff51e75f3c0e5), Bor Kraljič, 04/08/2011

Archive powered by MHonArc 2.6.24.

Top of Page