[hackers] [wmii] Don't statically link wmiir. Broken on newer x86_64 glibc systems. || Kris Maglione

changeset: 2691:19101538ad58
tag: tip
user: Kris Maglione <kris_AT_suckless.org>
date: Wed Jun 02 17:31:08 2010 -0400
files: alternative_wmiircs/python/pyxp/mux.py alternative_wmiircs/python/wmiirc.py cmd/Makefile
description:
Don't statically link wmiir. Broken on newer x86_64 glibc systems.

diff -r 9a522510855e -r 19101538ad58 alternative_wmiircs/python/pyxp/mux.py
--- a/alternative_wmiircs/python/pyxp/mux.py Wed Jun 02 12:05:45 2010 -0400
+++ b/alternative_wmiircs/python/pyxp/mux.py Wed Jun 02 17:31:08 2010 -0400
@@ -106,7 +106,6 @@
         if async:
             self.muxer = async
             t = Thread(target=self.mux, args=(async,))
- t.daemon = True
             t.start()
 
     def dispatch(self, dat):
diff -r 9a522510855e -r 19101538ad58 alternative_wmiircs/python/wmiirc.py
--- a/alternative_wmiircs/python/wmiirc.py Wed Jun 02 12:05:45 2010 -0400
+++ b/alternative_wmiircs/python/wmiirc.py Wed Jun 02 17:31:08 2010 -0400
@@ -18,6 +18,9 @@
 # Configuration should be placed in that file, and this file
 # left unmodified, if possible. wmiirc_local should import
 # wmiirc or any other modules it needs.
+#
+# Do *not* copy this file to wmiirc_local.py lest you want it
+# executed twice.
 
 # Keys
 keys.defs = dict(
@@ -96,9 +99,9 @@
 
     'Notice': lambda args: notice.show(args),
 
- Match(('LeftBarClick', 'LeftBarDND'), '1'): lambda e, b, tag: tags.select(tag),
- Match('LeftBarClick', '4'): lambda *a: tags.select(tags.next(True)),
- Match('LeftBarClick', '5'): lambda *a: tags.select(tags.next()),
+ Match(('LeftBarClick', 'LeftBarDND'), 1): lambda e, b, tag: tags.select(tag),
+ Match('LeftBarClick', 4): lambda *a: tags.select(tags.next(True)),
+ Match('LeftBarClick', 5): lambda *a: tags.select(tags.next()),
 
     Match('LeftBarMouseDown', 3): lambda e, n, tag: clickmenu((
             ('Delete', lambda t: Tag(t).delete()),
diff -r 9a522510855e -r 19101538ad58 cmd/Makefile
--- a/cmd/Makefile Wed Jun 02 12:05:45 2010 -0400
+++ b/cmd/Makefile Wed Jun 02 17:31:08 2010 -0400
@@ -14,17 +14,13 @@
         wmii9menu \
         wmiir
 
-LIBS += $(LIBS9)
+LIBS += $(LIBS9) $(LIBIXP)
 CFLAGS += $(INCX11)
 
 include $(ROOT)/mk/many.mk
 include $(ROOT)/mk/dir.mk
 
-OWMIIR=wmiir.o $(OFILES) $(LIBIXP)
-wmiir.out: $(OWMIIR)
- $(LINK) $@ $(STATIC) $(OWMIIR)
-
 O9MENU=wmii9menu.o $(ROOT)/lib/libstuff.a $(LIBIXP)
 wmii9menu.out: $(O9MENU)
- $(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xinerama) -lXext
+ $(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES)) -lXext
 
Received on Wed Jun 02 2010 - 21:31:20 UTC