From 92c37c67497d7d8b42b4785f9d427d373f1505fe Mon Sep 17 00:00:00 2001
From: kristerw <kristerw@pkgsrc.org>
Date: Sat, 31 Jul 2004 01:25:33 +0000
Subject: Fix a build problem seen on OS X.

The Apple toolchain has some quirks with common symbols in archives
which makes it fail to pull in a file into a binary if only common
symbols are needed from that file.  Work around this by initializing
one of the variables.
---
 wm/fvwm2/distinfo         |  3 ++-
 wm/fvwm2/patches/patch-ac | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 wm/fvwm2/patches/patch-ac

(limited to 'wm')

diff --git a/wm/fvwm2/distinfo b/wm/fvwm2/distinfo
index 97a79924f44..b798e0d5612 100644
--- a/wm/fvwm2/distinfo
+++ b/wm/fvwm2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2004/03/22 08:26:44 martti Exp $
+$NetBSD: distinfo,v 1.23 2004/07/31 01:25:33 kristerw Exp $
 
 SHA1 (fvwm-2.4.18.tar.gz) = 03360e859dfc8c4def08adec6f57408ad02dc7a7
 Size (fvwm-2.4.18.tar.gz) = 1792978 bytes
@@ -6,3 +6,4 @@ SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
 Size (fvwm_icons.tgz) = 363406 bytes
 SHA1 (patch-aa) = 6721d48d720a242ec80dd7b50aa934f13ff26ddf
 SHA1 (patch-ab) = 7c1111f4d6d405edb0ffc91ea25704a13e2ab0d3
+SHA1 (patch-ac) = b9009cad82a5f286e54964fc770c8281cefc35d8
diff --git a/wm/fvwm2/patches/patch-ac b/wm/fvwm2/patches/patch-ac
new file mode 100644
index 00000000000..4630118c099
--- /dev/null
+++ b/wm/fvwm2/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.3 2004/07/31 01:25:33 kristerw Exp $
+
+--- libs/Picture.c.orig	Sat Jul 31 02:18:29 2004
++++ libs/Picture.c	Sat Jul 31 02:27:44 2004
+@@ -75,7 +75,15 @@
+ Bool Pdefault;
+ Visual *Pvisual;
+ static Visual *FvwmVisual;
++#ifdef __APPLE__
++/* The Apple toolchain has some quirks with common symbols in archives
++ * which makes it fail to pull in a file into a binary if only common
++ * symbols are needed from that file.  Work around this by initializing
++ * one of the variables. */
++Colormap Pcmap = {0};
++#else
+ Colormap Pcmap;
++#endif
+ static Colormap FvwmCmap;
+ unsigned int Pdepth;
+ static unsigned int FvwmDepth;
-- 
cgit v1.2.3