diff options
| author | dbj <dbj@pkgsrc.org> | 2016-01-19 03:44:03 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2016-01-19 03:44:03 +0000 |
| commit | 7872c0f884a43841c61752b57e571fce385ec90a (patch) | |
| tree | b1765dcd9a5a4dcf73c65e31b50e46a1dab5e8bb /x11/wxGTK28 | |
| parent | 5a0306763208a284a613a0bc94021a5abc01ad3c (diff) | |
| download | pkgsrc-7872c0f884a43841c61752b57e571fce385ec90a.tar.gz | |
Darwin build fixes
Diffstat (limited to 'x11/wxGTK28')
| -rw-r--r-- | x11/wxGTK28/patches/patch-aa | 15 | ||||
| -rw-r--r-- | x11/wxGTK28/patches/patch-setup.h.in | 15 |
2 files changed, 29 insertions, 1 deletions
diff --git a/x11/wxGTK28/patches/patch-aa b/x11/wxGTK28/patches/patch-aa index a2b5dd41f4c..bcd15b71eb8 100644 --- a/x11/wxGTK28/patches/patch-aa +++ b/x11/wxGTK28/patches/patch-aa @@ -1,4 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2013/06/15 02:30:57 ryoon Exp $ +$NetBSD: patch-aa,v 1.7 2016/01/19 03:44:03 dbj Exp $ + +Support for dragonfly +Shell portability fixes +Use X11 and OpenGL Libs on Darwin --- configure.orig 2011-03-22 12:16:57.000000000 +0000 +++ configure @@ -51,6 +55,15 @@ $NetBSD: patch-aa,v 1.6 2013/06/15 02:30:57 ryoon Exp $ if test "$build" != "$host" -a "$GCC" = yes; then if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then +@@ -33191,7 +33193,7 @@ echo "$as_me: WARNING: wxGLCanvas not im + elif test "$wxUSE_MSW" = 1; then + OPENGL_LIBS="-lopengl32 -lglu32" + elif test "$USE_DARWIN" = 1; then +- OPENGL_LIBS="" ++ OPENGL_LIBS="-L/usr/X11/lib -lGL -lGLU" + else + echo "$as_me:$LINENO: checking for OpenGL headers" >&5 + echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6 @@ -39590,6 +39592,9 @@ echo "$as_me: WARNING: BeOS threads are THREAD_OPTS="-mt $THREAD_OPTS" fi diff --git a/x11/wxGTK28/patches/patch-setup.h.in b/x11/wxGTK28/patches/patch-setup.h.in new file mode 100644 index 00000000000..3366a7562be --- /dev/null +++ b/x11/wxGTK28/patches/patch-setup.h.in @@ -0,0 +1,15 @@ +$NetBSD: patch-setup.h.in,v 1.1 2016/01/19 03:44:03 dbj Exp $ + +Don't assume native interfaces on __APPLE__ + +--- setup.h.in.orig 2011-03-22 12:16:57.000000000 +0000 ++++ setup.h.in +@@ -552,7 +552,7 @@ + #define wxUSE_RICHEDIT2 0 + #endif + +-#if !defined(__WIN32__) && !defined(__APPLE__) ++#if !defined(__WIN32__) && !defined(__WXMAC__) && !defined(__WXCOCOA__) + #define wxUSE_CAIRO 1 + #else + #define wxUSE_CAIRO 0 |