Drop nowings patch that I accidentially enabled, this should make the as-needed patch obsolete, and fix bug #199414. Retained Harald's math.h fixes by splitting it off in a new patch.

(Portage version: 2.1.3.19)

5 files changed, 38 insertions, 64 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 11f17258c1ad..f4e3a6cb9667 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.90 2007/11/18 15:22:27 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.91 2007/11/21 19:54:40 grobian Exp $
+
+*windowmaker-0.92.0-r6 (21 Nov 2007)
+
+  21 Nov 2007; Fabian Groffen <grobian@gentoo.org>
+  -files/0.92.0/windowmaker-0.92.0-as-needed.patch,
+  +files/0.92.0/windowmaker-0.92.0-math_h.patch,
+  -windowmaker-0.92.0-r5.ebuild, +windowmaker-0.92.0-r6.ebuild:
+  Drop nowings patch that I accidentially enabled, this should make the
+  as-needed patch obsolete, and fix bug #199414. Retained Harald's math.h
+  fixes by splitting it off in a new patch.
 
   18 Nov 2007; Harald van Dijk <truedfx@gentoo.org>
   +files/0.92.0/windowmaker-0.92.0-as-needed.patch,
diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-as-needed.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-as-needed.patch
deleted file mode 100644
index 5b370d10a374..000000000000
--- a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-as-needed.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-
-  Fix building with --as-needed (bug #199520), make sure libWINGs gets
-  installed, and add a missing #include <math.h>.
-
---- WindowMaker-0.92.0/configure.ac
-+++ WindowMaker-0.92.0/configure.ac
-@@ -78,7 +78,8 @@
- [  --with-incs-from        pass compiler flags to look for header files],
- 	[inc_search_path="$withval $inc_search_path"])
- 
--
-+AC_CHECK_LIBM
-+AC_SUBST([LIBM])
- 
- dnl Checks for library functions.
- dnl ============================
---- WindowMaker-0.92.0/src/placement.c
-+++ WindowMaker-0.92.0/src/placement.c
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <limits.h>
-+#include <math.h>
- 
- #include "WindowMaker.h"
- #include "wcore.h"
---- WindowMaker-0.92.0/WINGs/Extras/Makefile.am
-+++ WindowMaker-0.92.0/WINGs/Extras/Makefile.am
-@@ -31,5 +31,6 @@
- 	$(top_builddir)/WINGs/libWUtil.la \
- 	@XFTLIBS@ @INTLIBS@
- 
-+libExtraWINGs_la_LIBADD = $(LDADD)
- test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
- 
---- WindowMaker-0.92.0/WINGs/Makefile.am
-+++ WindowMaker-0.92.0/WINGs/Makefile.am
-@@ -6,6 +6,10 @@
- 
- 
- 
-+libWINGs_la_DEPENDENCIES = libWUtil.la
-+libWINGs_la_LIBADD = libWUtil.la \
-+	$(top_builddir)/wrlib/libwraster.la \
-+	@LIBM@ @XLIBS@ @XFTLIBS@
- libWINGs_la_LDFLAGS = -version-info 2:1:0
- libWUtil_la_LDFLAGS = -version-info 1:2:0
- 
---- WindowMaker-0.92.0/wmlib/Makefile.am
-+++ WindowMaker-0.92.0/wmlib/Makefile.am
-@@ -8,6 +8,7 @@
- 
- INCLUDES = $(DFLAGS) @XCFLAGS@
- 
-+libWMaker_la_LIBADD = @XLIBS@
- libWMaker_la_SOURCES = 	\
- 	menu.c 		\
- 	app.c 		\
diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch
new file mode 100644
index 000000000000..8c83d4da2c5c
--- /dev/null
+++ b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch
@@ -0,0 +1,25 @@
+
+  Add a missing #include <math.h>.
+
+--- WindowMaker-0.92.0/configure.ac
++++ WindowMaker-0.92.0/configure.ac
+@@ -78,7 +78,8 @@
+ [  --with-incs-from        pass compiler flags to look for header files],
+ 	[inc_search_path="$withval $inc_search_path"])
+ 
+-
++AC_CHECK_LIBM
++AC_SUBST([LIBM])
+ 
+ dnl Checks for library functions.
+ dnl ============================
+--- WindowMaker-0.92.0/src/placement.c
++++ WindowMaker-0.92.0/src/placement.c
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <limits.h>
++#include <math.h>
+ 
+ #include "WindowMaker.h"
+ #include "wcore.h"
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r5 b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r6
index b17f3551cfd5..b17f3551cfd5 100644
--- a/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r5
+++ b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r6
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r6.ebuild
index df2ac19df4f2..38b83d13947c 100644
--- a/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild,v 1.2 2007/11/18 15:22:27 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r6.ebuild,v 1.1 2007/11/21 19:54:40 grobian Exp $
 
 inherit autotools eutils gnustep-base flag-o-matic
 
@@ -44,9 +44,9 @@ src_unpack() {
 	epatch "${psd}"/WindowMaker-0.92.0-cvs-gcc41.patch
 	epatch "${FILESDIR}"/${PV/0.92/0.91}/wlist-0.9x.patch
 	epatch "${FILESDIR}"/${PV}/${P}-gif-before-ungif.patch
+	epatch "${FILESDIR}"/${PV}/${P}-math_h.patch
 
 	# Patches from altlinux
-	epatch "${psd}"/WindowMaker-0.91.0-alt-sowings.patch
 	epatch "${psd}"/WindowMaker-0.91.0-alt-session.patch
 	epatch "${psd}"/WindowMaker-0.91.0-alt-restartscrpt.patch
 	epatch "${psd}"/WindowMaker-0.91.0-alt-menutrans.patch
@@ -71,9 +71,6 @@ src_unpack() {
 	epatch "${psd}"/WindowMaker-0.91.0-sga-swpanel-customization.patch
 	epatch "${psd}"/WindowMaker-0.92.0-alt-newpo.patch
 
-	# Bug 199520
-	epatch "${FILESDIR}"/${PV}/${P}-as-needed.patch
-
 	# Add UK localisation
 	cp "${psd}"/WindowMaker-uk.po po/uk.po
 	cp "${psd}"/WPrefs-uk.po WPrefs.app/po/uk.po