SOURCES: wmii-9base.patch, wmii-Makefile.patch - updated to 2.5.2

[adamg]

Author: adamg                        Date: Sat Dec 20 10:57:47 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 2.5.2

---- Files affected:
SOURCES:
   wmii-9base.patch (1.2 -> 1.3) , wmii-Makefile.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/wmii-9base.patch
diff -u SOURCES/wmii-9base.patch:1.2 SOURCES/wmii-9base.patch:1.3
--- SOURCES/wmii-9base.patch:1.2	Fri Jan 27 21:55:19 2006
+++ SOURCES/wmii-9base.patch	Sat Dec 20 11:57:41 2008
@@ -157,14 +157,14 @@
  }
  
 @@ -121,11 +121,11 @@
- wmiir write /bar/'^$clab^'/data $"text'
+ wmiir write /bar/'^$clab^'/data $"n'
  wmiir write /wm/event/page-update \
- 'text=`{wmiir read /wm/page/sel/name} ^ \
--`{wmiir read /wm/page/sel/mode/name|awk ''{print substr($0,0,1)}''} ^ \
--`{wmiir read /keys/lookup|awk ''{print substr($0,7,1)}''} \
-+`{wmiir read /wm/page/sel/mode/name|9awk ''{print substr($0,0,1)}''} ^ \
-+`{wmiir read /keys/lookup|9awk ''{print substr($0,7,1)}''} \
- wmiir write /bar/'^$plab^'/data $"text'
+ 'n=`{wmiir read /wm/page/sel/name >[2]/dev/null} \
+-l=`{wmiir read /wm/page/sel/mode/name >[2]/dev/null|awk ''{print substr($0,0,1)}''} \
+-m=`{wmiir read /keys/lookup >[2]/dev/null|awk ''{print substr($0,7,1)}''} \
++l=`{wmiir read /wm/page/sel/mode/name >[2]/dev/null|9awk ''{print substr($0,0,1)}''} \
++m=`{wmiir read /keys/lookup >[2]/dev/null|9awk ''{print substr($0,7,1)}''} \
+ wmiir write /bar/'^$plab^'/data $"n^$"l^$"m'
  
 -for(page in `{wmiir read /wm/page | grep '^[0-9]'}) {
 +for(page in `{wmiir read /wm/page | 9grep '^[0-9]'}) {

================================================================
Index: SOURCES/wmii-Makefile.patch
diff -u SOURCES/wmii-Makefile.patch:1.1 SOURCES/wmii-Makefile.patch:1.2
--- SOURCES/wmii-Makefile.patch:1.1	Fri Jan 27 21:54:51 2006
+++ SOURCES/wmii-Makefile.patch	Sat Dec 20 11:57:42 2008
@@ -23,16 +23,16 @@
  # includes and libs
  INCLUDES = -I. -I${INCDIR} -I/usr/include -I${X11INC}
 @@ -17,8 +17,8 @@
- VERSION = 2.5.1
+ VERSION = 2.5.2
  
  # flags
 -CFLAGS = -g -Wall ${INCLUDES} -DVERSION=\"${VERSION}\"
 -LDFLAGS = ${LIBS}
 +CFLAGS = $(OPTCFLAGS) -Wall ${INCLUDES} -DVERSION=\"${VERSION}\"
 +LDFLAGS = $(OPTLDFLAGS) ${LIBS}
+ # Solaris
+ #CFLAGS = -fast -xtarget=ultra ${INCLUDES} -DVERSION=\"${VERSION}\"
  
- # compiler
- # Note: - under Solaris add -D__EXTENSIONS__ to CFLAGS
 diff -Nur wmii-2.5.1/cmd/Makefile wmii-2.5.1.new/cmd/Makefile
 --- wmii-2.5.1/cmd/Makefile	2006-01-12 16:36:54.000000000 +0000
 +++ wmii-2.5.1.new/cmd/Makefile	2006-01-27 20:47:47.000000000 +0000
@@ -45,3 +45,25 @@
  		-L../libixp -lixp -L../libcext -lcext
  
  wmiifs: ${OBJ_fs}
+--- wmii-2.5.2/cmd/Makefile~	2008-12-20 11:50:52.577887125 +0100
++++ wmii-2.5.2/cmd/Makefile	2008-12-20 11:51:04.211219470 +0100
+@@ -5,7 +5,7 @@
+ 
+ CFLAGS += -I../liblitz -I../libixp -I../libwmii -I../libcext
+ LDFLAGS += -L../liblitz -llitz -L../libixp -lixp \
+-	-L../libwmii -lwmii -L../libcext -lcext
++	-L../libwmii -lwmii -L../libcext -lcext -lm
+ 
+ SRC_bar = wmiibar.c
+ OBJ_bar = ${SRC_bar:.c=.o}
+--- wmii-2.5.2/cmd/wm/Makefile.wm~	2006-01-27 22:09:37.000000000 +0100
++++ wmii-2.5.2/cmd/wm/Makefile.wm	2008-12-20 11:51:16.874551929 +0100
+@@ -6,7 +6,7 @@
+ CFLAGS   += -I../../liblitz -I../../libixp -I../../libwmii \
+             -I../../libcext
+ LDFLAGS  += -L../../liblitz -llitz -L../../libixp -lixp \
+-            -L../../libwmii -lwmii -L../../libcext -lcext
++            -L../../libwmii -lwmii -L../../libcext -lcext -lm
+ 			
+ # Solaris
+ # LDFLAGS += -lsocket
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/wmii-9base.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/wmii-Makefile.patch?r1=1.1&r2=1.2&f=u