restore things lost with repo clone occasionally removed before pushed:

 - update to the newest libixp
 - remove embedded libixp in debian/clean
 - drop no longer needed patches

9 files changed, 108 insertions, 38 deletions

diff --git a/debian/changelog b/debian/changelog
index 3eca41a..8560917 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wmii (3.9.2+debian-3) unstable; urgency=low
+wmii (3.9.2+debian-4) unstable; urgency=low
 
   * New maintainer (Closes: #606084).
   * Fix FTBFS with ld --no-add-needed (Closes: #606209).
diff --git a/debian/clean b/debian/clean
index bf519d7..729d023 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,4 @@
 man/*.1
+include/ixp.h
+include/ixp_srvutil.h
+libixp/*
diff --git a/debian/control b/debian/control
index 2abcb23..52f1c0a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: wmii
 Section: x11
 Priority: optional
 Maintainer: Andrew O. Shadoura <bugzilla@tut.by>
-Build-Depends: debhelper (>= 8), libx11-dev, libxext-dev, libixp, libxt-dev,
+Build-Depends: debhelper (>= 8), libx11-dev, libxext-dev, libixp-dev, libxt-dev,
  libxft-dev, libfreetype6-dev, libxrandr-dev, libxinerama-dev, txt2tags
 Standards-Version: 3.9.2
 Homepage: http://www.suckless.org/
diff --git a/debian/patches/07-fix-libraries.patch b/debian/patches/07-fix-libraries.patch
deleted file mode 100644
index 5917d07..0000000
--- a/debian/patches/07-fix-libraries.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix wrong library link options
- This fixes warnings issued by dpkg-shlibdeps that symbols found in none of the libraries.
-Author: Andrew O. Shadoura <bugzilla@tut.by>
-
---- wmii-3.9.2+debian.orig/libwmii_hack/Makefile
-+++ wmii-3.9.2+debian/libwmii_hack/Makefile
-@@ -5,6 +5,7 @@ hack.o hack.o_pic: util.c x11.c hack.h x
- 
- CFLAGS += $(INCX11)
- SOLDFLAGS += $(LIBX11)
-+LIBS += -ldl -lX11
- 
- TARG =	libwmii_hack
- OBJ =	hack
diff --git a/debian/patches/12-fix-spelling-libixp.patch b/debian/patches/12-fix-spelling-libixp.patch
deleted file mode 100644
index 9301377..0000000
--- a/debian/patches/12-fix-spelling-libixp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix spelling in libixp.
-Author: Andrew O. Shadoura <bugzilla@tut.by>
-
---- a/libixp/rpc.c
-+++ b/libixp/rpc.c
-@@ -108,12 +108,12 @@
- 	thread->lock(&mux->lk);
- 	/* hand packet to correct sleeper */
- 	if(tag < 0 || tag >= mux->mwait) {
--		fprintf(stderr, "libixp: recieved unfeasible tag: %d (min: %d, max: %d)\n", f->hdr.tag, mux->mintag, mux->mintag+mux->mwait);
-+		fprintf(stderr, "libixp: received unfeasible tag: %d (min: %d, max: %d)\n", f->hdr.tag, mux->mintag, mux->mintag+mux->mwait);
- 		goto fail;
- 	}
- 	r2 = mux->wait[tag];
- 	if(r2 == nil || r2->prev == nil) {
--		fprintf(stderr, "libixp: recieved message with bad tag\n");
-+		fprintf(stderr, "libixp: received message with bad tag\n");
- 		goto fail;
- 	}
- 	r2->p = f;
-
diff --git a/debian/patches/14-enable-different-cc.patch b/debian/patches/14-enable-different-cc.patch
new file mode 100644
index 0000000..52b273b
--- /dev/null
+++ b/debian/patches/14-enable-different-cc.patch
@@ -0,0 +1,15 @@
+Description: Enable using different CC, e.g. ccache
+Author: Andrew O. Shadoura <bugzilla@tut.by>
+
+--- a/config.mk
++++ b/config.mk
+@@ -24,7 +24,8 @@
+ STATIC = -static
+ 
+ # Compiler, Linker. Linker should usually *not* be ld.
+-CC = cc -c
++CC ?= cc
++CC += -c
+ LD = cc
+ # Archiver
+ AR = ar crs
diff --git a/debian/patches/15-update-to-the-newest-libixp.patch b/debian/patches/15-update-to-the-newest-libixp.patch
new file mode 100644
index 0000000..1790bab
--- /dev/null
+++ b/debian/patches/15-update-to-the-newest-libixp.patch
@@ -0,0 +1,83 @@
+Description: Update to the newest libixp
+Author: Andrew O. Shadoura <bugzilla@tut.by>
+
+--- wmii-3.9.2+debian.orig/config.mk
++++ wmii-3.9.2+debian/config.mk
+@@ -33,7 +33,7 @@ AR = ar crs
+ X11PACKAGES = xft
+ INCX11 = $$(pkg-config --cflags $(X11PACKAGES))
+ LIBICONV = # Leave blank if your libc includes iconv (glibc does)
+-LIBIXP = $(ROOT)/lib/libixp.a
++LIBIXP = /usr/lib/libixp.a
+ 
+ # Your make shell. By default, the first found of /bin/dash, /bin/ksh,
+ # /bin/sh. Except with bsdmake, which assumes /bin/sh is sane. bash and zsh
+--- wmii-3.9.2+debian.orig/Makefile
++++ wmii-3.9.2+debian/Makefile
+@@ -15,7 +15,6 @@ DIRS =	\
+ 	libfmt	  \
+ 	libregexp \
+ 	libutf	  \
+-	libixp	  \
+ 	$(PDIRS)
+ 
+ DOCS = README \
+--- wmii-3.9.2+debian.orig/include/ixp_local.h
++++ wmii-3.9.2+debian/include/ixp_local.h
+@@ -1,8 +1,17 @@
+ #define IXP_NO_P9_
+-#define IXP_P9_STRUCTS
+ #include <ixp.h>
+ #include <stdbool.h>
+ 
++#undef ulong
++#define ulong _ixpulong
++typedef unsigned long ulong;
++
++#ifdef CPROTO
++# undef bool
++typedef int bool;
++typedef char* va_list;
++#endif
++
+ char *argv0;
+ #define ARGBEGIN \
+ 		int _argtmp=0, _inargv=0; char *_argv=nil; \
+@@ -66,25 +75,25 @@ struct IxpMap {
+ };
+ 
+ struct IxpTimer {
+-	Timer*	link;
+-	long	msec;
+-	long	id;
+-	void	(*fn)(long, void*);
+-	void*	aux;
++	Timer*		link;
++	uint32_t	msec;
++	long		id;
++	void		(*fn)(long, void*);
++	void*		aux;
+ };
+ 
+ /* map.c */
+-void	ixp_mapfree(Map*, void(*)(void*));
+-void	ixp_mapexec(Map*, void(*)(void*, void*), void*);
+-void	ixp_mapinit(Map*, MapEnt**, int);
+-bool	ixp_mapinsert(Map*, ulong, void*, bool);
+-void*	ixp_mapget(Map*, ulong);
+-void*	ixp_maprm(Map*, ulong);
++void	ixp_mapfree(IxpMap*, void(*)(void*));
++void	ixp_mapexec(IxpMap*, void(*)(void*, void*), void*);
++void	ixp_mapinit(IxpMap*, MapEnt**, int);
++bool	ixp_mapinsert(IxpMap*, ulong, void*, bool);
++void*	ixp_mapget(IxpMap*, ulong);
++void*	ixp_maprm(IxpMap*, ulong);
+ 
+ /* mux.c */
+ void	muxfree(IxpClient*);
+ void	muxinit(IxpClient*);
+-Fcall*	muxrpc(IxpClient*, Fcall*);
++IxpFcall*	muxrpc(IxpClient*, IxpFcall*);
+ 
+ /* timer.c */
+ long	ixp_nexttimer(IxpServer*);
diff --git a/debian/patches/series b/debian/patches/series
index 482b3d9..bf006f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,9 +4,10 @@
 04-manpage.patch
 05-fix-xrandr-crash.patch
 06-ld-no-add-needed.patch
-07-fix-libraries.patch
 08-manpages-markup.patch
 09-wihack-ld-preload.patch
 10-wihack-manpage.patch
 11-sync-libs-with-plan9port.patch
 13-fix-spelling-manpages.patch
+14-enable-different-cc.patch
+15-update-to-the-newest-libixp.patch
diff --git a/debian/rules b/debian/rules
index 0af1038..49d6633 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ override_dh_auto_clean:
 override_dh_auto_build:
 	CFLAGS="$(CFLAGS)" $(MAKE) PREFIX=/usr ETC=/etc/X11 LIBIXP=/usr/lib/libixp.a STATIC=""
 
+override_dh_shlibdeps:
+	dh_shlibdeps -Xlibwmii_hack
+
 override_dh_auto_install:
 	$(MAKE) PREFIX=$(CURDIR)/debian/wmii/usr ETC=$(CURDIR)/debian/wmii/etc/X11 LIBIXP=/usr/lib/libixp.a install