diff options
| author | obache <obache@pkgsrc.org> | 2010-12-27 14:28:38 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2010-12-27 14:28:38 +0000 |
| commit | e192ced5174a242ae7b6ac7a434978925f6cd22e (patch) | |
| tree | 476edd230773cfcd0e7ef3e3eec06b9ac89d00f2 /wm | |
| parent | 3205510524fd4cd0925e23fd49c7ab959d93f361 (diff) | |
| download | pkgsrc-e192ced5174a242ae7b6ac7a434978925f6cd22e.tar.gz | |
Change patch-a{e,g} to same as patch-ad, to use native fmax/fmin will be used
if available on NetBSD/DragonFly.
(It should be done at same time).
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/metisse/distinfo | 6 | ||||
| -rw-r--r-- | wm/metisse/patches/patch-ae | 13 | ||||
| -rw-r--r-- | wm/metisse/patches/patch-ag | 13 |
3 files changed, 17 insertions, 15 deletions
diff --git a/wm/metisse/distinfo b/wm/metisse/distinfo index 3f05b5c01cd..eb920a18054 100644 --- a/wm/metisse/distinfo +++ b/wm/metisse/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2010/10/22 17:55:28 drochner Exp $ +$NetBSD: distinfo,v 1.8 2010/12/27 14:28:38 obache Exp $ SHA1 (metisse-0.4.1.tar.bz2) = acf97b125905d91988955560a9b14b06a530eed6 RMD160 (metisse-0.4.1.tar.bz2) = 7487322f22a3655d756b5d3d3cc59afbf277d137 @@ -7,7 +7,7 @@ SHA1 (patch-aa) = 4dc24324dfaa54f5fbd0b6732707245c79047c6c SHA1 (patch-ab) = 8fa77eaed337a617b8f14d75de0d92b0dc1529df SHA1 (patch-ac) = 2ed1d666d535ee2003cb3d11e58188ff9cff7de9 SHA1 (patch-ad) = 1a3fc39d5ce20be56b0331b6f426ab3a78a742fb -SHA1 (patch-ae) = 3e938fd03995b6990768067de02ab6bd661ffc5c +SHA1 (patch-ae) = 356b60c73fc85a87dbc6bf832035e29f0ccc614b SHA1 (patch-af) = 45cf852490bd30d17cac341916d83b0688f7bce0 -SHA1 (patch-ag) = e3d817a40a85dca1147f7d47a7adcb0596097494 +SHA1 (patch-ag) = ec2cfd9c8602e440faba1a1722b6d1f05451a7fe SHA1 (patch-ah) = 6afe0c047a67f83149a4130b4eae55612e437ad0 diff --git a/wm/metisse/patches/patch-ae b/wm/metisse/patches/patch-ae index a335007716f..68059a08249 100644 --- a/wm/metisse/patches/patch-ae +++ b/wm/metisse/patches/patch-ae @@ -1,25 +1,26 @@ -$NetBSD: patch-ae,v 1.4 2010/10/22 17:55:28 drochner Exp $ +$NetBSD: patch-ae,v 1.5 2010/12/27 14:28:38 obache Exp $ --- FvwmCompositor/main/LayerManager.cxx.orig 2008-08-25 13:54:44.000000000 +0000 +++ FvwmCompositor/main/LayerManager.cxx -@@ -25,6 +25,22 @@ +@@ -25,6 +25,23 @@ using namespace std; // -------------------------------------------------------------------- +#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 -+xxxfmin(double x, double y) ++fmin(double x, double y) +{ + return (x < y) ? x : y; +} + +static inline double -+xxxfmax(double x, double y) ++fmax(double x, double y) +{ + return (x > y) ? x : y; +} -+#define fmin xxxfmin -+#define fmax xxxfmax ++#endif +#endif + diff --git a/wm/metisse/patches/patch-ag b/wm/metisse/patches/patch-ag index e4b0210a2be..610c2194adc 100644 --- a/wm/metisse/patches/patch-ag +++ b/wm/metisse/patches/patch-ag @@ -1,25 +1,26 @@ -$NetBSD: patch-ag,v 1.2 2010/10/22 17:55:28 drochner Exp $ +$NetBSD: patch-ag,v 1.3 2010/12/27 14:28:39 obache Exp $ --- FvwmCompositor/renderer/goodies.cxx.orig 2008-06-26 12:32:30.000000000 +0000 +++ FvwmCompositor/renderer/goodies.cxx -@@ -22,6 +22,22 @@ +@@ -22,6 +22,23 @@ #include "FoldablePolygon.H" #include "desktop/MetisseWindow.H" +#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 -+xxxfmin(double x, double y) ++fmin(double x, double y) +{ + return (x < y) ? x : y; +} + +static inline double -+xxxfmax(double x, double y) ++fmax(double x, double y) +{ + return (x > y) ? x : y; +} -+#define fmin xxxfmin -+#define fmax xxxfmax ++#endif +#endif + void goodies_marcking_feedback( |