[Pkg-wmaker-commits] [wmbatppc] 21/35: debian/patches: (remove_X11R_dir.patch) Fix FTBFS on mips* (Closes: #722867).

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbatppc.

commit 5bba002e33bfe0a7f48f05f4cccade32ec49bc75
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Wed Dec 31 08:04:15 2014 -0600

    debian/patches: (remove_X11R_dir.patch) Fix FTBFS on mips* (Closes: #722867).
---
 debian/patches/remove_X11R6_dir.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/remove_X11R6_dir.patch b/debian/patches/remove_X11R6_dir.patch
new file mode 100644
index 0000000..82d26c1
--- /dev/null
+++ b/debian/patches/remove_X11R6_dir.patch
@@ -0,0 +1,34 @@
+Description: Remove references to deprecated X11R6 directories.
+ In particular, use the default search path for linking, which fixes a FTBFS
+ on mips* systems.
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722867
+Last-Update: 2014-12-31
+
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,6 @@
+ PREFIX= $(DESTDIR)/usr
+ CC = /usr/bin/gcc
+ INSTALL = /usr/bin/install
+-LIBDIR = -L/usr/X11R6/lib
+ LIBS = -lXpm -lXext -lX11 -lm $(shell /usr/bin/xosd-config --libs)
+ FLAGS = -O2 -DENABLE_XOSD $(shell /usr/bin/xosd-config --cflags)
+ OBJS = wmgeneral.o
+@@ -12,13 +11,13 @@
+ default:all
+ 
+ .c.o:
+-	$(CC) -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o
++	$(CC) $(FLAGS) -c -Wall $< -o $*.o
+ 
+ wmbatppc.o: wmbatppc.c wmbatppc-master.xpm
+-	$(CC) -I/usr/X11R6/share/include $(FLAGS) -c -Wall wmbatppc.c -o $*.o
++	$(CC) $(FLAGS) -c -Wall wmbatppc.c -o $*.o
+ 
+ wmbatppc: $(OBJS) wmbatppc.o
+-	$(CC) $(FLAGS) -o wmbatppc wmbatppc.o $(OBJS) -lXext $(LIBDIR) $(LIBS)
++	$(CC) $(FLAGS) -o wmbatppc wmbatppc.o $(OBJS) -lXext $(LIBS)
+ 
+ all:: wmbatppc
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7558707..0d320cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_link_order.patch
+remove_X11R6_dir.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbatppc.git