Apply Debian patch fixing multiple build issues, including bug #470148

(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 228 insertions, 2 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 718b90c18281..0529b1152b7f 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.152 2013/09/21 13:18:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.153 2013/09/22 09:17:10 pacho Exp $
+
+  22 Sep 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/icewm-1.3.7-build-fixes.patch, icewm-1.3.7-r1.ebuild:
+  Apply Debian patch fixing multiple build issues, including bug #470148
 
   21 Sep 2013; Pacho Ramos <pacho@gentoo.org> icewm-1.3.7-r1.ebuild:
   Fix automagic dep on fribidi (#485562 by Agostino Sarubbo)
diff --git a/x11-wm/icewm/files/icewm-1.3.7-build-fixes.patch b/x11-wm/icewm/files/icewm-1.3.7-build-fixes.patch
new file mode 100755
index 000000000000..0dd4b6dc0e76
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-build-fixes.patch
@@ -0,0 +1,219 @@
+Index: icewm-1.3.7/po/Makefile.in
+===================================================================
+--- icewm-1.3.7.orig/po/Makefile.in	2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/po/Makefile.in	2013-06-28 18:46:58.940864492 +0200
+@@ -20,6 +20,7 @@
+ XGETTEXT =	@XGETTEXT@
+ MSGMERGE =	@MSGMERGE@
+ MSGFMT =	@MSGFMT@
++VPATH = .:po:@srcdir@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .po .mo
+Index: icewm-1.3.7/src/WinMgr.h
+===================================================================
+--- icewm-1.3.7.orig/src/WinMgr.h	2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/src/WinMgr.h	2013-06-28 18:46:58.940864492 +0200
+@@ -128,7 +128,7 @@
+  * this where WIN_WORKSPACE_COUNT comes into play.
+  */
+ 
+-#define WinWorkspaceInvalid    (-1L)
++#define WinWorkspaceInvalid    ((unsigned long)-1)
+ 
+ /* workspaces */
+ #define XA_WIN_WORKSPACES "_WIN_WORKSPACES"
+Index: icewm-1.3.7/src/yfont.cc
+===================================================================
+--- icewm-1.3.7.orig/src/yfont.cc	2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/src/yfont.cc	2013-06-28 18:46:58.940864492 +0200
+@@ -12,7 +12,7 @@
+ 
+ extern ref<YFont> getXftFont(ustring name, bool antialias);
+ extern ref<YFont> getXftFontXlfd(ustring name, bool antialias);
+-extern ref<YFont> getCoreFont(ustring name);
++extern ref<YFont> getCoreFont(const char*);
+ 
+ #ifdef CONFIG_XFREETYPE
+ ref<YFont> YFont::getFont(ustring name, ustring xftFont, bool antialias) {
+@@ -46,7 +46,9 @@
+ #endif
+ 
+ #ifdef CONFIG_COREFONTS
+-    return getCoreFont(name);
++    char tmp[4096]; // XXX: such things should go into getCoreFont directly
++    name.copy(tmp, sizeof(tmp));
++    return getCoreFont(tmp);
+ #else
+     return null;
+ #endif
+Index: icewm-1.3.7/src/yapp.cc
+===================================================================
+--- icewm-1.3.7.orig/src/yapp.cc	2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/src/yapp.cc	2013-06-28 18:46:58.944864245 +0200
+@@ -269,7 +269,7 @@
+         }
+ #endif
+ 
+-        {
++        if(measure_latency) {
+             struct timeval difftime;
+             struct timeval curtime;
+             gettimeofday(&curtime, 0);
+Index: icewm-1.3.7/src/Makefile.in
+===================================================================
+--- icewm-1.3.7.orig/src/Makefile.in	2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/src/Makefile.in	2013-06-28 18:46:58.944864245 +0200
+@@ -11,7 +11,7 @@
+ 
+ CXX =           @CXX@
+ HOSTCXX =       @HOSTCXX@
+-LD =            @CXX_LINK@
++LD =            gcc
+ HOSTLD =        @HOSTCXX_LINK@
+ EXEEXT =        @EXEEXT@
+ 
+@@ -32,12 +32,12 @@
+                 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
+                 -DICESMEXE='"icewm-session$(EXEEXT)"' \
+                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
+-                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
++                -DICEHELPIDX='"$(DOCDIR)/icewm-common/icewm.html"'
+ 
+ CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
+-	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
++	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ -I. # `fc-config --cflags`
+ LFLAGS =	@LDFLAGS@ 
+-LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` 
++LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -lfontconfig -lm -lsupc++
+ 
+ CORE_LIBS =     @CORE_LIBS@ # `fc-config --libs`
+ IMAGE_LIBS =    @IMAGE_LIBS@
+@@ -192,6 +192,8 @@
+ TESTCASES = @TESTCASES@
+ OBJECTS = @BASEOBJS@ @TESTOBJS@
+ BINARIES = @BASEBINS@ @TESTBINS@
++BASEOBJS = @BASEOBJS@
++VPATH = .:@srcdir@
+ 
+ ################################################################################
+ 
+@@ -209,7 +211,8 @@
+ 	@echo "  CXX     " $@
+ 	@$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
+ 
+-$(BINARIES):
++$(BINARIES): $(BASEOBJS)
++#	@$(MAKE) --no-print-directory build-dep DEPLIST="$($(@:$(EXEEXT)=)_OBJS)"
+ 	@echo "  LD      " $@
+ 	@$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
+ 
+@@ -245,6 +248,8 @@
+ 
+ genpref$(EXEEXT): $(genpref_OBJS)
+ 
++build-dep: $(DEPLIST)
++
+ ################################################################################
+ 
+ check:	all tests
+Index: icewm-1.3.7/Makefile.in
+===================================================================
+--- icewm-1.3.7.orig/Makefile.in	2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/Makefile.in	2013-06-28 18:46:58.944864245 +0200
+@@ -4,6 +4,8 @@
+ # Please run 'configure' first (generate it with autogen.sh)
+ ################################################################################
+ 
++SHELL=/bin/bash
++
+ srcdir     = @srcdir@
+ top_srcdir = @top_srcdir@
+ 
+@@ -33,7 +35,7 @@
+ 
+ ################################################################################
+ 
+-BINFILES    = @BINFILES@ icewm-set-gnomewm
++BINFILES    = @BINFILES@ "$(srcdir)/icewm-set-gnomewm"
+ LIBFILES    = lib/preferences lib/winoptions lib/keys \
+               lib/menu lib/toolbar # lib/programs
+ DOCFILES    = README BUGS CHANGES COPYING AUTHORS INSTALL VERSION icewm.lsm
+@@ -46,21 +48,22 @@
+ install:	@TARGETS_INSTALL@
+ 
+ base icesound icehelp:
+-	@cd src; $(MAKE) $@
++	@cd src && $(MAKE) $@
+ 
+ docs:
+-	@cd doc; $(MAKE) all
++	@cd doc && $(MAKE) all
+ 
+ nls:
+-	@cd po; $(MAKE) all
++	@cd po && $(MAKE) all
+ 
+ srcclean:
+-	@cd src; $(MAKE) clean
++	@cd src && $(MAKE) clean
+ 
+ clean:  srcclean
+-	@cd doc; $(MAKE) clean
++	@cd doc && $(MAKE) clean
+ 
+-distclean: clean
++distclean:
++	@-$(MAKE) clean
+ 	rm -f *~ config.cache config.log config.status install.inc \
+ 	sysdep.inc src/config.h \
+ 	lib/preferences \
+@@ -68,10 +71,10 @@
+ 
+ maintainer-clean: distclean
+ 	rm -f icewm.spec icewm.lsm Makefile configure src/config.h.in
+-	@cd doc; $(MAKE) maintainer-clean
++	@cd doc && $(MAKE) maintainer-clean
+ 
+ check:
+-	@cd src ; $(MAKE) check >/dev/null
++	@cd src && $(MAKE) check >/dev/null
+ 
+ dist:	distclean docs configure
+ 
+@@ -80,21 +83,23 @@
+ 	@echo ------------------------------------------
+ 	@echo "Installing binaries in $(DESTDIR)$(BINDIR)"
+ 	@$(INSTALLDIR) "$(DESTDIR)$(BINDIR)"
++#generated files, relative to the build directory
+ 	@for bin in $(BINFILES); do \
+              $(INSTALLBIN) "$${bin}" "$(DESTDIR)$(BINDIR)"; \
+          done
+ 	
+ 	@echo "Installing presets and icons in $(DESTDIR)$(LIBDIR)"
+ 	@$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)"
++# data files from the source directory
+ 	#-@$(INSTALLDIR) "$(DESTDIR)$(CFGDIR)"
+ 	@for lib in $(LIBFILES); do \
+-             $(INSTALLLIB) "$${lib}" "$(DESTDIR)$(LIBDIR)"; \
++             $(INSTALLLIB) "$(top_srcdir)/$${lib}" "$(DESTDIR)$(LIBDIR)"; \
+          done
+ 
+ 	@for xpmdir in $(XPMDIRS); do \
+-	     if test -d "lib/$${xpmdir}"; then \
++	     if test -d "$(top_srcdir)/lib/$${xpmdir}"; then \
+ 		$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
+-		for pixmap in "lib/$${xpmdir}/"*.xpm; do \
++		for pixmap in "$(top_srcdir)/lib/$${xpmdir}/"*.xpm; do \
+ 		    $(INSTALLLIB) "$${pixmap}" "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
+ 		done; \
+ 	    fi; \
+@@ -126,7 +131,7 @@
+ 
+ install-nls: nls
+ 	@echo ------------------------------------------
+-	@cd po; $(MAKE) install
++	@cd po && $(MAKE) install
+ 	@echo ------------------------------------------
+ 
+ install-man:
diff --git a/x11-wm/icewm/icewm-1.3.7-r1.ebuild b/x11-wm/icewm/icewm-1.3.7-r1.ebuild
index 78c25f07f0e6..a2e48a242677 100644
--- a/x11-wm/icewm/icewm-1.3.7-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.3.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7-r1.ebuild,v 1.2 2013/09/21 13:18:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7-r1.ebuild,v 1.3 2013/09/22 09:17:10 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -78,6 +78,9 @@ src_prepare() {
 	# Get thermal info from proper locations, bug #452730
 	epatch "${FILESDIR}"/${PN}-1.3.7-thermal.patch
 
+	# Debian patch fixing multiple build issues, like bug #470148
+	epatch "${FILESDIR}"/${PN}-1.3.7-build-fixes.patch
+
 	cd "${S}/src"
 	use uclibc && epatch "${FILESDIR}/${PN}-uclibc.patch"