sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (9bc788e1dedacb8bed74a9f16497fb927b155b1d)

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 (9bc788e1dedacb8bed74a9f16497fb927b155b1d)
Date: Wed, 5 Mar 2008 14:44:35 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ftp/pure-ftpd/init.d/pure-ftpd | 10
ftp/pure-ftpd/init.d/smgl-pure-ftpd | 10
windowmanagers/windowmaker/DEPENDS | 2
windowmanagers/windowmaker/HISTORY | 5
windowmanagers/windowmaker/PRE_BUILD | 8
windowmanagers/windowmaker/windowmaker-0.92.0-configure.patch | 23 +
windowmanagers/windowmaker/windowmaker-0.92.0-gcc41.patch | 131
++++++++++
wm-addons/wdm/DEPENDS | 1
wm-addons/wdm/HISTORY | 3
9 files changed, 179 insertions(+), 14 deletions(-)

New commits:
commit 2d71d6d4558b3f9040e1246d08810ec2fa9c5d5b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

renamed init script for pure-ftpd

commit 7b815dbb54295a2151509a63edcc83c3e57e1028
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

wm-addons/wdm: removed unnecessary dependency

commit d3a039a24b6fe7b51b806f06f18d5820542f715b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

windowmanagers/windowmaker: added patches to make the spell compile on
x86_64

diff --git a/ftp/pure-ftpd/init.d/pure-ftpd b/ftp/pure-ftpd/init.d/pure-ftpd
new file mode 100755
index 0000000..44e83bc
--- /dev/null
+++ b/ftp/pure-ftpd/init.d/pure-ftpd
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+. /etc/sysconfig/pure-ftpd
+
+PROGRAM=/usr/sbin/pure-ftpd
+ARGS="-B $CONFIG"
+RUNLEVEL=3
+NEEDS="+remote_fs"
+
+. /etc/init.d/smgl_init
diff --git a/ftp/pure-ftpd/init.d/smgl-pure-ftpd
b/ftp/pure-ftpd/init.d/smgl-pure-ftpd
deleted file mode 100755
index 44e83bc..0000000
--- a/ftp/pure-ftpd/init.d/smgl-pure-ftpd
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. /etc/sysconfig/pure-ftpd
-
-PROGRAM=/usr/sbin/pure-ftpd
-ARGS="-B $CONFIG"
-RUNLEVEL=3
-NEEDS="+remote_fs"
-
-. /etc/init.d/smgl_init
diff --git a/windowmanagers/windowmaker/DEPENDS
b/windowmanagers/windowmaker/DEPENDS
index d7f5bc8..ba21bc8 100755
--- a/windowmanagers/windowmaker/DEPENDS
+++ b/windowmanagers/windowmaker/DEPENDS
@@ -5,7 +5,7 @@ depends zlib &&
depends jpeg &&
depends LIBGIF &&

-if [[ "${WINDOWMAKER_CVS}" == "y" ]] ; then
+if [[ "${WINDOWMAKER_CVS}" == "y" ]] || [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64
]]; then
depends CVS &&
depends libtool &&
depends autoconf
diff --git a/windowmanagers/windowmaker/HISTORY
b/windowmanagers/windowmaker/HISTORY
index cc4a438..59cde79 100644
--- a/windowmanagers/windowmaker/HISTORY
+++ b/windowmanagers/windowmaker/HISTORY
@@ -1,3 +1,8 @@
+2008-03-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, PRE_BUILD, windowmaker-0.92.0-configure.patch,
+ windowmaker-0.92.0-gcc41.patch: added patches from gentoo to
+ make the spell compile on x86_64
+
2006-12-31 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: do _not_ disable PIC on alpha!

diff --git a/windowmanagers/windowmaker/PRE_BUILD
b/windowmanagers/windowmaker/PRE_BUILD
index 0883e93..092c798 100755
--- a/windowmanagers/windowmaker/PRE_BUILD
+++ b/windowmanagers/windowmaker/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
-if [[ "${WINDOWMAKER_CVS}" == "y" ]] ; then
- cd ${SOURCE_DIRECTORY} &&
+cd ${SOURCE_DIRECTORY} &&
+if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
+ patch -p0 < $SCRIPT_DIRECTORY/windowmaker-0.92.0-configure.patch &&
+ patch -p1 < $SCRIPT_DIRECTORY/windowmaker-0.92.0-gcc41.patch
+fi &&
+if [[ "${WINDOWMAKER_CVS}" == "y" ]] || [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64
]]; then
libtoolize --copy --force --automake &&
aclocal &&
autoheader &&
diff --git a/windowmanagers/windowmaker/windowmaker-0.92.0-configure.patch
b/windowmanagers/windowmaker/windowmaker-0.92.0-configure.patch
new file mode 100644
index 0000000..e3b50ac
--- /dev/null
+++ b/windowmanagers/windowmaker/windowmaker-0.92.0-configure.patch
@@ -0,0 +1,23 @@
+--- configure.ac.orig 2007-08-27 00:51:31.000000000 +0200
++++ configure.ac 2007-08-27 00:52:14.000000000 +0200
+@@ -197,7 +197,7 @@
+
+ AC_CACHE_CHECK(whether gcc supports x86 inline asm,
+ ac_cv_c_inline_asm,
+- [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax,
%%ebx\n"::
++ [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax,
%%ebx\n\t pushal\n\t popal"::
+ "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
+ "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m"
(x));}],
+ ac_cv_c_inline_asm=yes,
+@@ -840,11 +840,6 @@
+ else
+ gnustepdir=$appspath
+
+- if test "x$GNUSTEP_LOCAL_ROOT" != "x" ; then
+- gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e
"s|^${prefix}|prefix|"`
+- gnustepdir=`echo $gnustepdir | sed -e 's|^prefix|${prefix}|'`
+- fi
+-
+ wprefs_base_dir=$gnustepdir/Applications
+ wprefs_datadir=$wprefs_base_dir/WPrefs.app
+ wprefs_bindir=$wprefs_base_dir/WPrefs.app
diff --git a/windowmanagers/windowmaker/windowmaker-0.92.0-gcc41.patch
b/windowmanagers/windowmaker/windowmaker-0.92.0-gcc41.patch
new file mode 100644
index 0000000..4312435
--- /dev/null
+++ b/windowmanagers/windowmaker/windowmaker-0.92.0-gcc41.patch
@@ -0,0 +1,131 @@
+--- NEW FILE windowmaker-gcc4-x86_64.patch ---
+--- WindowMaker-0.92.0/wrlib/x86_specific.c 2004-10-31 02:44:01.000000000
+0100
++++ WindowMaker-0.92.0/wrlib/x86_specific.c 2005-08-22 21:07:57.000000000
+0200
+@@ -98,15 +98,23 @@
+ int height,
+ int line_offset)
+ {
+- long long rrggbbaa;
+- long long pixel;
++ union {
++ long long rrggbbaa;
++ struct {short int rr, gg, bb, aa;} words;
++ } rrggbbaa;
++
++ union {
++ long long pixel;
++ struct {short int rr, gg, bb, aa;} words;
++ } pixel;
++
+ short *tmp_err;
+ short *tmp_nerr;
+ int x;
+
+ asm volatile
+ (
+- "pushal \n\t"
++ "pushl %%ebx \n\t"
+
+ // pack dr, dg and db into mm6
+ "movl %7, %%eax \n\t"
+@@ -290,7 +298,7 @@
+
+ ".Enda: \n\t" // THE END
+ "emms \n\t"
+- "popal \n\t"
++ "popl %%ebx \n\t"
+ :
+ :
+ "m" (image), // %0
+@@ -309,17 +317,18 @@
+ "m" (width), // %13
+ "m" (height), // %14
+ "m" (line_offset), // %15
+- "m" (rrggbbaa), // %16 (access to rr)
+- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
+- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
+- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
+- "m" (pixel), // %20 (access to pixel.r)
+- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
+- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
+- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
++ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
++ "m" (rrggbbaa.words.gg), // %17 (access to gg)
++ "m" (rrggbbaa.words.bb), // %18 (access to bb)
++ "m" (rrggbbaa.words.aa), // %19 (access to aa)
++ "m" (pixel.pixel), // %20 (access to pixel.r)
++ "m" (pixel.words.gg), // %21 (access to pixel.g)
++ "m" (pixel.words.bb), // %22 (access to pixel.b)
++ "m" (pixel.words.aa), // %23 (access to pixel.a)
+ "m" (tmp_err), // %24
+ "m" (tmp_nerr), // %25
+ "m" (x) // %26
++ : "eax", "ecx", "edx", "esi", "edi"
+ );
+ }
+
+@@ -342,8 +351,15 @@
+ int height,
+ int line_offset)
+ {
+- long long rrggbbaa;
+- long long pixel;
++ union {
++ long long rrggbbaa;
++ struct {short int rr, gg, bb, aa;} words;
++ } rrggbbaa;
++
++ union {
++ long long pixel;
++ struct {short int rr, gg, bb, aa;} words;
++ } pixel;
+
+ short *tmp_err;
+ short *tmp_nerr;
+@@ -354,7 +370,7 @@
+
+ asm volatile
+ (
+- "pushal \n\t"
++ "pushl %%ebx \n\t"
+
+ "movl %13, %%eax \n\t" // eax = width
+ "movl %%eax, %%ebx \n\t"
+@@ -424,7 +440,7 @@
+
+ ".Endc: \n\t" // THE END
+ "emms \n\t"
+- "popal \n\t"
++ "popl %%ebx \n\t"
+ :
+ :
+ "m" (image), // %0
+@@ -443,19 +459,20 @@
+ "m" (width), // %13
+ "m" (height), // %14
+ "m" (line_offset), // %15
+- "m" (rrggbbaa), // %16 (access to rr)
+- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
+- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
+- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
+- "m" (pixel), // %20 (access to pixel.r)
+- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
+- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
+- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
++ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
++ "m" (rrggbbaa.words.gg), // %17 (access to gg)
++ "m" (rrggbbaa.words.bb), // %18 (access to bb)
++ "m" (rrggbbaa.words.aa), // %19 (access to aa)
++ "m" (pixel.pixel), // %20 (access to pixel.r)
++ "m" (pixel.words.gg), // %21 (access to pixel.g)
++ "m" (pixel.words.bb), // %22 (access to pixel.b)
++ "m" (pixel.words.aa), // %23 (access to pixel.a)
+ "m" (tmp_err), // %24
+ "m" (tmp_nerr), // %25
+ "m" (x), // %26
+ "m" (w1), // %27
+ "m" (w2) // %28
++ : "eax", "ecx", "edx", "esi", "edi"
+ );
+ }
+
diff --git a/wm-addons/wdm/DEPENDS b/wm-addons/wdm/DEPENDS
index cbf2ac2..57e8aa6 100755
--- a/wm-addons/wdm/DEPENDS
+++ b/wm-addons/wdm/DEPENDS
@@ -1,6 +1,5 @@
depends gtk+ &&
depends windowmaker &&
-depends libproplist &&

optional_depends linux-pam \
"" \
diff --git a/wm-addons/wdm/HISTORY b/wm-addons/wdm/HISTORY
index fc9641b..1515b73 100644
--- a/wm-addons/wdm/HISTORY
+++ b/wm-addons/wdm/HISTORY
@@ -1,3 +1,6 @@
+2008-03-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: removed unnecessary dependency on libproplist
+
2006-12-02 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Changed dependency on libungif to LIBGIF

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (9bc788e1dedacb8bed74a9f16497fb927b155b1d), Florian Franzmann, 03/05/2008