summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorobache <obache>2010-10-08 05:28:55 +0000
committerobache <obache>2010-10-08 05:28:55 +0000
commit9c30c2e328df30bae63063d21c41459dbfe9e014 (patch)
tree1cf9eb5628c4e96811fbb96699f8eab073387c1e /wm
parentc214a862c5559aa52b231dfdc43c0d586e024771 (diff)
downloadpkgsrc-9c30c2e328df30bae63063d21c41459dbfe9e014.tar.gz
Update patterns for fmax/fmin.
Diffstat (limited to 'wm')
-rw-r--r--wm/metisse/distinfo4
-rw-r--r--wm/metisse/patches/patch-ad7
2 files changed, 7 insertions, 4 deletions
diff --git a/wm/metisse/distinfo b/wm/metisse/distinfo
index 90c807ff1ed..1a377ed144c 100644
--- a/wm/metisse/distinfo
+++ b/wm/metisse/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2010/06/13 22:45:30 wiz Exp $
+$NetBSD: distinfo,v 1.6 2010/10/08 05:28:55 obache Exp $
SHA1 (metisse-0.4.1.tar.bz2) = acf97b125905d91988955560a9b14b06a530eed6
RMD160 (metisse-0.4.1.tar.bz2) = 7487322f22a3655d756b5d3d3cc59afbf277d137
@@ -6,7 +6,7 @@ Size (metisse-0.4.1.tar.bz2) = 6178680 bytes
SHA1 (patch-aa) = 4dc24324dfaa54f5fbd0b6732707245c79047c6c
SHA1 (patch-ab) = 8fa77eaed337a617b8f14d75de0d92b0dc1529df
SHA1 (patch-ac) = 2ed1d666d535ee2003cb3d11e58188ff9cff7de9
-SHA1 (patch-ad) = 6c8f66b54c96f18b3e835fea490d5eb444514b52
+SHA1 (patch-ad) = 1a3fc39d5ce20be56b0331b6f426ab3a78a742fb
SHA1 (patch-ae) = eab55e17f7e3518434d4ad42e7637c18cef5bf72
SHA1 (patch-af) = 45cf852490bd30d17cac341916d83b0688f7bce0
SHA1 (patch-ag) = b7159e56a1d1f1b5b12ea99ca60de0071bcf5294
diff --git a/wm/metisse/patches/patch-ad b/wm/metisse/patches/patch-ad
index 095cfcfb95a..887c9783dbe 100644
--- a/wm/metisse/patches/patch-ad
+++ b/wm/metisse/patches/patch-ad
@@ -1,12 +1,14 @@
-$NetBSD: patch-ad,v 1.3 2009/07/24 12:10:18 obache Exp $
+$NetBSD: patch-ad,v 1.4 2010/10/08 05:28:56 obache Exp $
--- FvwmCompositor/renderer/WindowRenderer.cxx.orig 2008-08-25 14:32:09.000000000 +0000
+++ FvwmCompositor/renderer/WindowRenderer.cxx
-@@ -51,6 +51,20 @@ float WindowRenderer::borderVisLens = 1.
+@@ -51,6 +51,23 @@ float WindowRenderer::borderVisLens = 1.
// ---------------------------------------------------------------------------
//
+#if defined(__NetBSD__) || defined(__DragonFly__)
++#include <sys/param.h>
++#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100 || (__NetBSD_Version__ >= 501000000 && __NetBSD_Version__ < 599000000)))
+static inline double
+fmin(double x, double y)
+{
@@ -19,6 +21,7 @@ $NetBSD: patch-ad,v 1.3 2009/07/24 12:10:18 obache Exp $
+ return (x > y) ? x : y;
+}
+#endif
++#endif
+
MetisseWindow * WindowRenderer::getWindow(void)
{