Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=c03c63dd443c1f9187a6a52783305549a01dc61a
commit c03c63dd443c1f9187a6a52783305549a01dc61a Author: bouleetbil <bouleet...@frogdev.info> Date: Wed Jun 17 16:13:35 2009 +0200 graphviz-2.20.3-3-i686 *rebuild with new xorg *added build fix diff --git a/source/xapps-extra/graphviz/FrugalBuild b/source/xapps-extra/graphviz/FrugalBuild index da8fe73..7f53cff 100644 --- a/source/xapps-extra/graphviz/FrugalBuild +++ b/source/xapps-extra/graphviz/FrugalBuild @@ -3,20 +3,21 @@ pkgname=graphviz pkgver=2.20.3 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source Graph Visualization Software" url="http://www.graphviz.org/" -depends=('fontconfig' 'python' 'libjpeg' 'libpng' 'ruby' 'libtool' 'tk' 'guile' 'ocaml' 'libxaw' 'libstdc++' 'pango' 'cairo') -makedepends=('tcl' 'tk' 'swig') +depends=('fontconfig' 'python' 'libjpeg' 'libpng' 'ruby' 'libtool' 'tk' 'guile' 'ocaml' 'libxaw>=1.0.5' 'libstdc++' 'pango>=1.24.2-2' 'cairo>=1.8.6-3') +makedepends=('tcl' 'tk' 'swig>=1.3.39') groups=('xapps-extra') archs=('x86_64' 'i686' 'ppc') options=('scriptlet') up2date="lynx -dump http://www.graphviz.org/pub/graphviz/ARCHIVE/|grep 'graphviz-[0-9\.]*.tar.gz$'|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" -source=(http://www.graphviz.org/pub/graphviz/ARCHIVE/$pkgname-$pkgver.tar.gz) -sha1sums=('63ae6bdb6b410387477d339225cc4f61c2bc7322') +source=(http://www.graphviz.org/pub/graphviz/ARCHIVE/$pkgname-$pkgver.tar.gz \ + gv.i.patch) +sha1sums=('63ae6bdb6b410387477d339225cc4f61c2bc7322' \ + '834200772ccf3313a625aa15de47b16c6283f165') build() { - Fbuild --enable-static \ --with-x \ --disable-dependency-tracking \ diff --git a/source/xapps-extra/graphviz/gv.i.patch b/source/xapps-extra/graphviz/gv.i.patch new file mode 100644 index 0000000..e783b71 --- /dev/null +++ b/source/xapps-extra/graphviz/gv.i.patch @@ -0,0 +1,46 @@ +--- graphviz-2.20.3/tclpkg/gv/gv.i.orig 2009-02-25 13:44:36.000000000 -0500 ++++ graphviz-2.20.3/tclpkg/gv/gv.i 2009-02-25 13:46:29.000000000 -0500 +@@ -15,8 +15,22 @@ + **********************************************************/ + + %module gv +-%{ + ++#ifdef SWIGTCL ++// A typemap telling SWIG to ignore an argument for input ++// However, we still need to pass a pointer to the C function ++%typemap(in,numinputs=0) char *outdata (char *temp) { ++ $1 = &temp; ++} ++// A typemap defining how to return an argument by appending it to the result ++%typemap(argout) char *outdata { ++ Tcl_Obj *o = Tcl_NewStringObj($1); ++ Tcl_ListObjAppendElement(interp,$result,o); ++} ++#endif ++ ++ ++%{ + /* some language headers (e.g. php.h, ruby.h) leave these defined */ + #undef PACKAGE_BUGREPORT + #undef PACKAGE_STRING +@@ -371,18 +385,4 @@ + extern bool write(Agraph_t *g, char *filename); + extern bool write(Agraph_t *g, FILE *f); + +- +-#ifdef SWIGTCL +-// A typemap telling SWIG to ignore an argument for input +-// However, we still need to pass a pointer to the C function +-%typemap(in,numinputs=0) char *outdata (char *temp) { +- $1 = &temp; +-} +-// A typemap defining how to return an argument by appending it to the result +-%typemap(argout) char *outdata { +- Tcl_Obj *o = Tcl_NewStringObj($1); +- Tcl_ListObjAppendElement(interp,$result,o); +-} +-#endif +- + %} + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git