diff options
author | chuck <chuck@pkgsrc.org> | 2010-12-22 19:44:24 +0000 |
---|---|---|
committer | chuck <chuck@pkgsrc.org> | 2010-12-22 19:44:24 +0000 |
commit | 5fa69411c730450e792de1a81549354fd7266d9f (patch) | |
tree | e123a4dd4ae49ccd9b111aead0b879209e93f300 /x11/wxGTK24 | |
parent | a0c5950d8db0eb073ab6bc4750654c8b7b0abd39 (diff) | |
download | pkgsrc-5fa69411c730450e792de1a81549354fd7266d9f.tar.gz |
make it compile on i386 macox (missing case in configure, cast in dynlib.cpp)
Diffstat (limited to 'x11/wxGTK24')
-rw-r--r-- | x11/wxGTK24/distinfo | 5 | ||||
-rw-r--r-- | x11/wxGTK24/patches/patch-aa | 50 | ||||
-rw-r--r-- | x11/wxGTK24/patches/patch-aq | 13 |
3 files changed, 52 insertions, 16 deletions
diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo index 3af800c6547..60ca805ca02 100644 --- a/x11/wxGTK24/distinfo +++ b/x11/wxGTK24/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.12 2010/08/18 10:05:08 obache Exp $ +$NetBSD: distinfo,v 1.13 2010/12/22 19:44:24 chuck Exp $ SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes -SHA1 (patch-aa) = a3950686ec1b71ad42aa324892739408b780b3da +SHA1 (patch-aa) = c454f9b06b64b11ef5d39879ea255c0fd8a09940 SHA1 (patch-ab) = bab52051778a93439cfd3144f052bdbcc7024e30 SHA1 (patch-ac) = 06a047a28260d30516b87d85a4dd4d5a6c18cfc4 SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf @@ -19,3 +19,4 @@ SHA1 (patch-am) = 445ae223a6fd88b86efafa7c13dbcf3f359f364f SHA1 (patch-an) = a9d276244cac87fa00a3c3338179e68084b72b1d SHA1 (patch-ao) = 7fb559c8662b20a61d39b308d3b6723b0dde6673 SHA1 (patch-ap) = b1217506bfffe9ed7a282c960a99921c61d76dbd +SHA1 (patch-aq) = 72cc09c94ca6911859f3b40f01e13f0f95d07141 diff --git a/x11/wxGTK24/patches/patch-aa b/x11/wxGTK24/patches/patch-aa index 502479531df..adb6a68e4c9 100644 --- a/x11/wxGTK24/patches/patch-aa +++ b/x11/wxGTK24/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $ +$NetBSD: patch-aa,v 1.7 2010/12/22 19:44:24 chuck Exp $ ---- configure.orig 2003-09-21 11:31:30.000000000 +0000 -+++ configure -@@ -1247,7 +1247,7 @@ EOF +--- configure.orig 2003-09-21 07:31:30.000000000 -0400 ++++ configure 2010-12-22 13:41:03.000000000 -0500 +@@ -1247,7 +1247,7 @@ DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; @@ -11,7 +11,29 @@ $NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $ USE_BSD=1 USE_FREEBSD=1 cat >> confdefs.h <<\EOF -@@ -11436,6 +11436,7 @@ EOF +@@ -1396,6 +1396,21 @@ + DEFAULT_DEFAULT_wxUSE_MAC=1 + ;; + ++ i386-*-darwin* ) ++ USE_BSD=1 ++ USE_DARWIN=1 ++ SO_SUFFIX=dylib ++ cat >> confdefs.h <<\EOF ++#define __BSD__ 1 ++EOF ++ ++ cat >> confdefs.h <<\EOF ++#define __DARWIN__ 1 ++EOF ++ ++ DEFAULT_DEFAULT_wxUSE_MAC=1 ++ ;; ++ + *-*-beos* ) + USE_BEOS=1 + cat >> confdefs.h <<\EOF +@@ -11436,6 +11451,7 @@ SEARCH_INCLUDE="\ @@ -19,7 +41,7 @@ $NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $ /usr/local/include \ \ /usr/Motif-1.2/include \ -@@ -11500,7 +11501,7 @@ SEARCH_INCLUDE="\ +@@ -11500,7 +11516,7 @@ \ /usr/openwin/share/include" @@ -28,7 +50,7 @@ $NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $ cat > confcache <<\EOF -@@ -11972,9 +11973,9 @@ fi +@@ -11972,9 +11988,9 @@ echo "$ac_t""$ac_cv_header_png_h" 1>&6 if test "$ac_cv_header_png_h" = "yes"; then @@ -41,7 +63,7 @@ $NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -11986,10 +11987,10 @@ cat > conftest.$ac_ext <<EOF +@@ -11986,10 +12002,10 @@ /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -54,7 +76,7 @@ $NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $ ; return 0; } EOF if { (eval echo configure:11996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -13381,6 +13382,101 @@ echo "configure:13351: checking PANGOFT2 +@@ -13381,6 +13397,101 @@ fi fi @@ -156,7 +178,7 @@ $NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $ else if test "$wxUSE_UNICODE" = "yes"; then echo "configure: warning: Unicode configuration not supported with GTK+ 1.x" 1>&2 -@@ -16104,8 +16200,8 @@ esac +@@ -16104,8 +16215,8 @@ WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a" @@ -167,7 +189,7 @@ $NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $ if test "$wxUSE_OPENGL" = "yes"; then WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}" -@@ -16331,7 +16427,7 @@ fi +@@ -16331,7 +16442,7 @@ *-*-sunos4* | \ *-*-osf* | \ *-*-dgux5* | \ @@ -176,7 +198,7 @@ $NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $ ;; *) -@@ -18668,6 +18764,9 @@ if test "$TOOLKIT" != "MSW" -a "$TOOLKIT +@@ -18668,6 +18779,9 @@ THREAD_OPTS="-mt $THREAD_OPTS" fi ;; @@ -186,7 +208,7 @@ $NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $ *-*-freebsd*) THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r" ;; -@@ -18751,7 +18850,7 @@ echo "configure:18748: checking if more +@@ -18751,7 +18865,7 @@ LDFLAGS="-L/usr/lib/threads $LDFLAGS" flag="-D_THREAD_SAFE" ;; @@ -195,7 +217,7 @@ $NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $ flag="-D_THREAD_SAFE" ;; *-hp-hpux* ) -@@ -22777,6 +22876,7 @@ s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER +@@ -22777,6 +22891,7 @@ s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g diff --git a/x11/wxGTK24/patches/patch-aq b/x11/wxGTK24/patches/patch-aq new file mode 100644 index 00000000000..f15f71c79bc --- /dev/null +++ b/x11/wxGTK24/patches/patch-aq @@ -0,0 +1,13 @@ +$NetBSD: patch-aq,v 1.1 2010/12/22 19:44:24 chuck Exp $ + +--- src/common/dynlib.cpp.orig 2010-12-22 14:19:31.000000000 -0500 ++++ src/common/dynlib.cpp 2010-12-22 14:23:41.000000000 -0500 +@@ -480,7 +480,7 @@ + + int dlclose(void *handle) + { +- NSUnLinkModule( handle, NSUNLINKMODULE_OPTION_NONE); ++ NSUnLinkModule((NSModule)handle, NSUNLINKMODULE_OPTION_NONE); + return 0; + } + |