sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (273557d80e47eba57e16f2efa13ee23401298332)
- From: Florian Franzmann <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (273557d80e47eba57e16f2efa13ee23401298332)
- Date: Sat, 27 Nov 2010 04:34:42 -0600
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
lxde/lxappearance/DETAILS | 4 +-
lxde/lxappearance/HISTORY | 3 ++
lxde/lxdm/DETAILS | 4 +-
lxde/lxdm/HISTORY | 6 ++++
lxde/lxdm/PRE_BUILD | 3 ++
lxde/lxdm/init.d/lxdm | 8 +++++
lxde/lxdm/lxdm-pam.patch | 18 ++++++++++++
lxde/lxpanel/DETAILS | 4 +-
lxde/lxpanel/HISTORY | 5 +++
lxde/lxpanel/PRE_BUILD | 3 ++
lxde/lxpanel/lxpanel-alarm.patch | 44
+++++++++++++++++++++++++++++++
lxde/lxsession-lite/DETAILS | 4 +-
lxde/lxsession-lite/HISTORY | 3 ++
lxde/lxterminal/DETAILS | 4 +-
lxde/lxterminal/HISTORY | 3 ++
xorg-xserver/xorg-server/CONFIGURE | 6 +++-
xorg-xserver/xorg-server/DETAILS | 1
xorg-xserver/xorg-server/HISTORY | 5 +++
xorg-xserver/xorg-server/INSTALL | 5 +++
xorg-xserver/xorg-server/startxinitrc | 5 +++
xorg-xserver/xorg-server/xinitrc.desktop | 6 ++++
21 files changed, 133 insertions(+), 11 deletions(-)
New commits:
commit 273557d80e47eba57e16f2efa13ee23401298332
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
lxde/lxdm: added init.d script
commit 4d4bde1b3e2308eada361390118b490cfb9e3299
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
xorg-xservers/xorg-server: added optional .desktop file that calls
the user's .xinitrc
commit 19b3b12cfb5dc2b378d312b88aad1c6ca822804a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
lxde/lxdm: version 0.3.0
commit d67448d8246771ef7a8d387c51b7f7c98ab565c0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
lxde/lxpanel: version 0.5.6
commit 1288ae002c0383205da8369745a171529fa7bbab
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
lxde/lxterminal: version 0.1.9
commit 9b47b8c98510ca80983b03a0b0eef2f5145685a6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
lxde/lxappearance: version 0.5.0
commit acc74e4a2d856be05389787e019647c1ecda30b2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
lxde/lxsession-lite: version 0.4.5
diff --git a/lxde/lxappearance/DETAILS b/lxde/lxappearance/DETAILS
index b16d900..f8fb61b 100755
--- a/lxde/lxappearance/DETAILS
+++ b/lxde/lxappearance/DETAILS
@@ -1,8 +1,8 @@
SPELL=lxappearance
- VERSION=0.4.0
+ VERSION=0.5.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/lxde/${SOURCE}
-
SOURCE_HASH=sha512:be89e8059e8100aa1fe4ef7ceb009cc6e4c57bf80eb13fc530edde27707cac7a71aa17e4d691fe829474bd09f2783472d4a6601e6aa8fbe365bc77b4184cf5b6
+
SOURCE_HASH=sha512:44a60a77a04b7e3b19fd50b40c5bccdeea832ddf37257100be1772bc7693edf62b01f4efebcf3bc1b6b99550fb9db3f5a54dca285e0b22d1e18772afbb8ee83d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://lxde.sourceforge.net/
LICENSE[0]=GPL
diff --git a/lxde/lxappearance/HISTORY b/lxde/lxappearance/HISTORY
index 0c98b42..d7f6b2b 100644
--- a/lxde/lxappearance/HISTORY
+++ b/lxde/lxappearance/HISTORY
@@ -1,3 +1,6 @@
+2010-11-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.5.0
+
2010-06-01 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.4.0
diff --git a/lxde/lxdm/DETAILS b/lxde/lxdm/DETAILS
index 6cce4ec..b5ec0c2 100755
--- a/lxde/lxdm/DETAILS
+++ b/lxde/lxdm/DETAILS
@@ -1,8 +1,8 @@
SPELL=lxdm
- VERSION=0.2.0
+ VERSION=0.3.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=${SOURCEFORGE_URL}/lxde/${SOURCE}
-
SOURCE_HASH=sha512:17a95dbd5535bb8daebdc9198a0b64682c9a102ef96b9ab9cbd1d09a366f9b1e59bbe4381dc408fbe92fa358758ad3cb8a39e65bf0f4935c78f3fabb4eff4646
+
SOURCE_HASH=sha512:42498e54a716641407c83ffe04fb1554ff5055339dbbf9572bb0709f5732d809fffe27b3be64d1c5bdec3e0ebc2ced01cb39d552504f68c8b69ecd1131f451fc
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://lxde.org";
LICENSE[0]=GPL
diff --git a/lxde/lxdm/HISTORY b/lxde/lxdm/HISTORY
index 22ace44..bd4ef68 100644
--- a/lxde/lxdm/HISTORY
+++ b/lxde/lxdm/HISTORY
@@ -1,3 +1,9 @@
+2010-11-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.0
+ * lxdm-pam.patch, PRE_BUILD: added patch to fix compile error
+ if linux-pam is not installed
+ * init.d/lxdm: added init.d script
+
2010-07-13 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, CONFIGURE, DETAILS, DEPENDS: spell created
diff --git a/lxde/lxdm/PRE_BUILD b/lxde/lxdm/PRE_BUILD
new file mode 100755
index 0000000..fe76665
--- /dev/null
+++ b/lxde/lxdm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/lxdm-pam.patch
diff --git a/lxde/lxdm/init.d/lxdm b/lxde/lxdm/init.d/lxdm
new file mode 100755
index 0000000..2bd2167
--- /dev/null
+++ b/lxde/lxdm/init.d/lxdm
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+PROGRAM=/usr/sbin/lxdm-binary
+ARGS=-d
+RUNLEVEL=5
+PROVIDES=display_manager
+
+. /etc/init.d/smgl_init
diff --git a/lxde/lxdm/lxdm-pam.patch b/lxde/lxdm/lxdm-pam.patch
new file mode 100644
index 0000000..2194bb4
--- /dev/null
+++ b/lxde/lxdm/lxdm-pam.patch
@@ -0,0 +1,18 @@
+--- lxdm-0.3.0.orig/src/lxdm.c 2010-09-24 17:43:49.000000000 +0200
++++ lxdm-0.3.0/src/lxdm.c 2010-11-27 08:51:27.000000000 +0100
+@@ -150,6 +150,7 @@
+ while( waitpid(-1, 0, WNOHANG) > 0 ) ;
+ }
+
++#if HAVE_LIBPAM
+ static void close_pam_session(pam_handle_t *pamh)
+ {
+ int err;
+@@ -159,6 +160,7 @@
+ pam_end(pamh, err);
+ pamh = NULL;
+ }
++#endif
+
+ static LXSession *lxsession_find_greeter(void)
+ {
diff --git a/lxde/lxpanel/DETAILS b/lxde/lxpanel/DETAILS
index 0099e4c..1c5689a 100755
--- a/lxde/lxpanel/DETAILS
+++ b/lxde/lxpanel/DETAILS
@@ -1,8 +1,8 @@
SPELL=lxpanel
- VERSION=0.5.5
+ VERSION=0.5.6
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/lxde/${SOURCE}
-
SOURCE_HASH=sha512:316186c7d882732bacf5c4d38f7eddbbbaa789824e8fac6c307f00b778638bc1ca587bdaf727fa4a5b11df9eb5c64be8b818ffe1cd746bf53f78e1b378f851f5
+
SOURCE_HASH=sha512:83e37b9555152f4da43f73236713137178f5a1c629be68946afaa10d5c8d0248f1376058f4b72bba6b08577ee759c55194f938a85c5d6cd0c31b3c18d112867f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://lxde.sourceforge.net/
LICENSE[0]=GPL
diff --git a/lxde/lxpanel/HISTORY b/lxde/lxpanel/HISTORY
index 7de3cd5..7dfee17 100644
--- a/lxde/lxpanel/HISTORY
+++ b/lxde/lxpanel/HISTORY
@@ -1,3 +1,8 @@
+2010-11-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.5.6
+ * PRE_BUILD, lxpanel-alarm.patch: patch from gentoo to fix
+ compile error
+
2010-06-01 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.5.5
diff --git a/lxde/lxpanel/PRE_BUILD b/lxde/lxpanel/PRE_BUILD
new file mode 100755
index 0000000..b944a94
--- /dev/null
+++ b/lxde/lxpanel/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/lxpanel-alarm.patch
diff --git a/lxde/lxpanel/lxpanel-alarm.patch
b/lxde/lxpanel/lxpanel-alarm.patch
new file mode 100644
index 0000000..18850cd
--- /dev/null
+++ b/lxde/lxpanel/lxpanel-alarm.patch
@@ -0,0 +1,44 @@
+From 4a974f2686d2fafdcda4a180b0483a7b17fd2d71 Mon Sep 17 00:00:00 2001
+From: Marty Jack <martyj AT linux.local>
+Date: Thu, 22 Jul 2010 19:46:13 -0400
+Subject: [PATCH 3/3] Fix build issue with symbol "alarm" showing up on F14
(Bug3033293)
+
+---
+ src/plugins/batt/batt.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/plugins/batt/batt.c b/src/plugins/batt/batt.c
+index 288231f..05c0deb 100644
+--- a/src/plugins/batt/batt.c
++++ b/src/plugins/batt/batt.c
+@@ -95,7 +95,7 @@ typedef struct {
+ typedef struct {
+ char *command;
+ sem_t *lock;
+-} alarm;
++} Alarm;
+
+ static void destructor(Plugin *p);
+ static void update_display(lx_battery *lx_b, gboolean repaint);
+@@ -103,7 +103,7 @@ static void update_display(lx_battery *lx_b, gboolean
repaint);
+ /* alarmProcess takes the address of a dynamically allocated alarm struct
(which
+ it must free). It ensures that alarm commands do not run concurrently. */
+ static void * alarmProcess(void *arg) {
+- alarm *a = (alarm *) arg;
++ Alarm *a = (Alarm *) arg;
+
+ sem_wait(a->lock);
+ system(a->command);
+@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gboolean repaint) {
+ /* Run the alarm command if it isn't already running */
+ if (alarmCanRun) {
+
+- alarm *a = (alarm *) malloc(sizeof(alarm));
++ Alarm *a = (Alarm *) malloc(sizeof(Alarm));
+ a->command = lx_b->alarmCommand;
+ a->lock = &(lx_b->alarmProcessLock);
+
+--
+1.7.1.1
+
+
diff --git a/lxde/lxsession-lite/DETAILS b/lxde/lxsession-lite/DETAILS
index 6dae879..9b881a2 100755
--- a/lxde/lxsession-lite/DETAILS
+++ b/lxde/lxsession-lite/DETAILS
@@ -1,8 +1,8 @@
SPELL=lxsession-lite
- VERSION=0.4.4
+ VERSION=0.4.5
SOURCE="lxsession-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/lxde/${SOURCE}
-
SOURCE_HASH=sha512:bc224fee5da2dfe7573a89134eef44b3fc06642e4162329eafe0e1e604add6be260bd9ce4a7a90471768850899e1266095a4646ac495620a8473ad9a7352b856
+
SOURCE_HASH=sha512:c03f7c4022d817733ddc940953722e53952465859acf917ae3f7937e742e63a3aec4b2b8f07f906436c80ad5e7ffd36a3c7905a9e764ab52535933f0219d1ed6
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/lxsession-${VERSION}"
WEB_SITE=http://lxde.sourceforge.net/
LICENSE[0]=GPL
diff --git a/lxde/lxsession-lite/HISTORY b/lxde/lxsession-lite/HISTORY
index 3e575c9..5a149d8 100644
--- a/lxde/lxsession-lite/HISTORY
+++ b/lxde/lxsession-lite/HISTORY
@@ -1,3 +1,6 @@
+2010-11-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.4.5
+
2010-06-01 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.4.4
diff --git a/lxde/lxterminal/DETAILS b/lxde/lxterminal/DETAILS
index 679f76f..41b4184 100755
--- a/lxde/lxterminal/DETAILS
+++ b/lxde/lxterminal/DETAILS
@@ -1,8 +1,8 @@
SPELL=lxterminal
- VERSION=0.1.7
+ VERSION=0.1.9
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/lxde/${SOURCE}
-
SOURCE_HASH=sha512:19fde2bd3a7286347c65a17fdcb9d39c7cbdc414c5a2b10072fccd35cfd86857cc918fffe58df46375cb3210b013ad4b72de7414d72c4f846f0c89a78602fad5
+
SOURCE_HASH=sha512:0084656ef6fab749504525baf0672c1606004d64058af0a8898421d4f01df9dba1fbefcb42d704675303b34fdd5c8bbb643e55767e7f520b2f4683fdbe7917d2
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://lxde.sourceforge.net/
LICENSE[0]=GPL
diff --git a/lxde/lxterminal/HISTORY b/lxde/lxterminal/HISTORY
index fb5011c..76b14e0 100644
--- a/lxde/lxterminal/HISTORY
+++ b/lxde/lxterminal/HISTORY
@@ -1,3 +1,6 @@
+2010-11-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.1.9
+
2010-06-01 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: added vte
* DETAILS: updated spell to 0.1.7
diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index 4053ef4..b298eda 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -1,6 +1,10 @@
list_remove XORG_SERVER_OPTS "--enable-multibuffer" "--disable-multibuffer"
. $GRIMOIRE/config_query_multi.function
+config_query XORG_XINITRC_XSESSION \
+ "install a .desktop file that calls the user's .xinitrc?" \
+ n
&&
+
config_query_option XORG_SERVER_OPTS \
"Build documentation?" \
n \
@@ -109,7 +113,7 @@ message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR} provides
some advanced" \
"${PROBLEM_COLOR}BREAK${DEFAULT_COLOR} the build or the final" \
"executing of the server. So answer the following carefully"
&&
-config_query XORG_SERVER_ADVANCED "Do you wish the advanced options" n
&&
+config_query XORG_SERVER_ADVANCED "Do you wish the advanced options?" n
&&
if [[ $XORG_SERVER_ADVANCED == y ]] ; then
config_query_option XORG_SERVER_OPTS \
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index dc6a50e..f01be04 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -9,6 +9,7 @@
ENTERED=20051125
LICENSE[0]=XCL
SECURITY_PATCH=4
+ PATCHLEVEL=1
SHORT="X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx)"
cat << EOF
X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx), the core of the X
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 67df5f7..8b1a749 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,8 @@
+2010-11-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL, CONFIGURE, startxinitrc, xinitrc.desktop: added optional
+ .desktop file that calls the user's .xinitrc
+ * DETAILS: PATCHLEVEL=1
+
2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* gl_select.patch: updated for glselect
diff --git a/xorg-xserver/xorg-server/INSTALL
b/xorg-xserver/xorg-server/INSTALL
new file mode 100755
index 0000000..8ae839f
--- /dev/null
+++ b/xorg-xserver/xorg-server/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+if [[ $XORG_XINITRC_XSESSION == "y" ]]; then
+ install -m755 ${SCRIPT_DIRECTORY}/startxinitrc ${INSTALL_ROOT}/usr/bin &&
+ install -m644 ${SCRIPT_DIRECTORY}/xinitrc.desktop
${INSTALL_ROOT}/usr/share/xsessions || return 1
+fi
diff --git a/xorg-xserver/xorg-server/startxinitrc
b/xorg-xserver/xorg-server/startxinitrc
new file mode 100755
index 0000000..e1bf78c
--- /dev/null
+++ b/xorg-xserver/xorg-server/startxinitrc
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [[ -f "${HOME}/.xinitrc" ]]; then
+ source ${HOME}/.xinitrc
+fi
diff --git a/xorg-xserver/xorg-server/xinitrc.desktop
b/xorg-xserver/xorg-server/xinitrc.desktop
new file mode 100644
index 0000000..ca4e504
--- /dev/null
+++ b/xorg-xserver/xorg-server/xinitrc.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=xinitrc
+Comment=This session starts the .xinitrc file
+TryExec=startxinitrc
+Exec=startxinitrc
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (273557d80e47eba57e16f2efa13ee23401298332), Florian Franzmann, 11/27/2010
Archive powered by MHonArc 2.6.24.