diff options
Diffstat (limited to 'wm/fvwm/patches')
-rw-r--r-- | wm/fvwm/patches/patch-ab | 15 | ||||
-rw-r--r-- | wm/fvwm/patches/patch-ad | 14 | ||||
-rw-r--r-- | wm/fvwm/patches/patch-configure | 19 |
3 files changed, 41 insertions, 7 deletions
diff --git a/wm/fvwm/patches/patch-ab b/wm/fvwm/patches/patch-ab index f00f2118d7f..bb651979687 100644 --- a/wm/fvwm/patches/patch-ab +++ b/wm/fvwm/patches/patch-ab @@ -1,13 +1,18 @@ -$NetBSD: patch-ab,v 1.2 2006/12/12 06:57:59 martti Exp $ +$NetBSD: patch-ab,v 1.3 2013/01/20 06:53:53 mef Exp $ ---- configure.orig 2006-12-09 11:54:30.000000000 +0000 -+++ configure 2006-12-12 08:51:55.000000000 +0000 -@@ -2121,7 +2121,7 @@ +Convert install path from fvwm to fvwm2 +This can not be done with +CONFIGURE_ARGS+= --datarootdir=${PREFIX:Q}/share/fvwm2 +this will install fvwm2/fvwm. + +--- configure.orig 2013-01-06 10:03:11.000000000 +0900 ++++ configure 2013-01-06 10:08:01.000000000 +0900 +@@ -3179,7 +3179,7 @@ fi # Define the identity of the package. - PACKAGE=fvwm + PACKAGE=fvwm2 - VERSION=2.4.20 + VERSION=${version} diff --git a/wm/fvwm/patches/patch-ad b/wm/fvwm/patches/patch-ad index 812d1898eb8..6691fa8d89a 100644 --- a/wm/fvwm/patches/patch-ad +++ b/wm/fvwm/patches/patch-ad @@ -1,4 +1,14 @@ -$NetBSD: patch-ad,v 1.2 2006/12/12 06:57:59 martti Exp $ +$NetBSD: patch-ad,v 1.3 2013/01/20 06:53:53 mef Exp $ + +Avoid following problem: + ---- +In file included from gravity.c:19:0: +../config.h:562:9: warning: conflicting types for built-in function 'alloca' +In file included from ../config.h:577:0, + from gravity.c:19: +/usr/include/stdlib.h:250:7: error: conflicting types for 'alloca' +../config.h:562:9: note: previous declaration of 'alloca' was here + ---- --- config.h.in.orig 2006-12-09 11:54:06.000000000 +0000 +++ config.h.in 2006-12-12 08:52:22.000000000 +0000 @@ -10,4 +20,4 @@ $NetBSD: patch-ad,v 1.2 2006/12/12 06:57:59 martti Exp $ +# include <stdlib.h> # else # ifndef alloca /* predefined by HP cc +Olibcalls */ - char *alloca (); + char *alloca (); diff --git a/wm/fvwm/patches/patch-configure b/wm/fvwm/patches/patch-configure new file mode 100644 index 00000000000..7057e7d54b2 --- /dev/null +++ b/wm/fvwm/patches/patch-configure @@ -0,0 +1,19 @@ +$NetBSD: patch-configure,v 1.1 2013/01/20 06:53:53 mef Exp $ +Avoid following problem on NetBSD/amd64 6.99.16 with clang ++----------------- +| conftest.c:38:3: error: non-void function 'main' should return a value [-Wreturn-type] +| return; +| ^ ++----------------- + +--- configure.orig 2013-01-15 09:54:13.000000000 +0900 ++++ configure 2013-01-15 10:04:58.000000000 +0900 +@@ -6492,7 +6492,7 @@ int i; static j; int *p; char *c; + switch (*p = p = *c) { case 0: printf("%Q", c, p); } + *c = &i; c = p; + while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1)); +- return; ++ return -1; + ; + return 0; + } |