Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/graphics In directory vz-cvs-3.sog:/tmp/cvs-serv21936/10.4-EOL/graphics
Modified Files: graphviz-10.4.info graphviz.patch Log Message: fix accidental use of included libltdl, want installed libtool2-libltdl Index: graphviz.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/graphics/graphviz.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- graphviz.patch 11 Jul 2011 04:05:42 -0000 1.1 +++ graphviz.patch 26 Jul 2011 01:20:57 -0000 1.2 @@ -1,3 +1,23 @@ +--- graphviz-2.24.0/configure.orig 2010-01-26 08:01:10.000000000 -0800 ++++ graphviz-2.24.0/configure 2011-07-25 16:27:43.000000000 -0700 +@@ -22518,6 +22523,9 @@ + + + ++# AC_LIBLTDL_CONVENIENCE is clobbering the override to use installed ltdl ++if false ++then + case $enable_ltdl_convenience in + no) { { $as_echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5 + $as_echo "$as_me: error: this package needs a convenience libltdl" >&2;} +@@ -22528,6 +22536,7 @@ + LIBLTDL='${top_build_prefix}'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la" + LTDLDEPS=$LIBLTDL + LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}" ++fi + + + --- graphviz-2.24.0/plugin/quartz/gvplugin_quartz.h.orig 2009-12-11 16:19:44.000000000 -0800 +++ graphviz-2.24.0/plugin/quartz/gvplugin_quartz.h 2009-12-11 16:20:20.000000000 -0800 @@ -17,7 +17,10 @@ @@ -48,3 +68,29 @@ static CGFloat dashed[] = {6.0}; static CGFloat dotted[] = {2.0, 6.0}; +--- graphviz-2.24.0/lib/gvc/gvcext.h.orig 2011-07-25 17:05:11.000000000 -0700 ++++ graphviz-2.24.0/lib/gvc/gvcext.h 2011-07-25 17:09:51.000000000 -0700 +@@ -19,6 +19,8 @@ + #ifndef GVCEXT_H + #define GVCEXT_H + ++#include <ltdl.h> ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -58,10 +60,14 @@ + typedef struct GVJ_s GVJ_t; + typedef struct GVC_s GVC_t; + ++#if 0 + typedef struct { + const char *name; + void* address; + } lt_symlist_t; ++#else ++ typedef const lt_dlsymlist lt_symlist_t; // libtool2's ltdl.h ++#endif + + typedef struct gvplugin_available_s gvplugin_available_t; + Index: graphviz-10.4.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/graphics/graphviz-10.4.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- graphviz-10.4.info 25 Jul 2011 19:44:52 -0000 1.3 +++ graphviz-10.4.info 26 Jul 2011 01:20:57 -0000 1.4 @@ -2,7 +2,7 @@ Package: graphviz%type_pkg[var] Type: var (. -nox) Version: 2.26.3 -Revision: 4 +Revision: 5 Distribution: 10.4 License: OSI-Approved # License: Common Public License 1.0 @@ -18,14 +18,24 @@ SourceDirectory: graphviz-%v Source-MD5: 6f45946fa622770c45609778c0a982ee PatchFile: graphviz.patch -PatchFile-MD5: 57cf9d74eab1a71fcb0e58c9fb464095 -# PatchScript: << -# patch -p0 < %{PatchFile} -# << +PatchFile-MD5: e5d39e8e229fb8259becc6b7404741a2 +PatchScript: << + #!/bin/sh -ev + %{default_script} + sed -i.orig -e '/OCAML/s|/usr|%p|g' \ + -e '/framework/s|-\(framework\) |-Wl,-\1,|g' \ + configure + # don't bother with Makefile.am + for f in `grep -lr -e "-framework " macosx plugin | grep -v \.am` ; do + sed -i.orig -e '/framework/s|-\(framework\) |-Wl,-\1,|g' $f + done + sed -i.orig -e '/am__append_5/s|LIBLTDL|LTDLDEPS|' lib/gvc/Makefile.in +<< GCC: 4.0 Depends: << %N-shlibs (= %v-%r) << +BuildConflicts: tcltk-dev BuildDepends: << (%type_raw[var] = .) pkgconfig (>= 0.20-1), (%type_raw[var] = .) x11-dev, @@ -70,10 +80,12 @@ (%type_raw[var] = .) libglade2 (>= 2.6.2-2), libming1-dev << -# TODO: --with-quartz ConfigureParams: << --mandir=%p/share/man \ --disable-static \ + --with-included-ltdl=no \ + --with-ltdl-include=%p/include \ + --with-ltdl-lib=%p/lib \ --with-extraincludedir=%p/include \ --with-extralibdir=%p/lib \ --with-tcl=/usr/bin/tclsh \ @@ -127,16 +139,6 @@ UseMaxBuildJobs: true CompileScript: << #!/bin/sh -ev - mv configure configure.orig - sed -e '/OCAML/s|/usr|%p|g' \ - -e '/framework/s|-\(framework\) |-Wl,-\1,|g' \ - configure.orig > configure - chmod +x configure - # don't bother with Makefile.am - for f in `grep -lr -e "-framework " macosx plugin | grep -v \.am` ; do - mv $f $f.orig - sed -e '/framework/s|-\(framework\) |-Wl,-\1,|g' $f.orig > $f - done ruby_h_path=`find /usr/lib/ruby -name ruby.h | head -n 1` test -f "$ruby_h_path" || ruby_h_path=`find /System/Library/Frameworks -name ruby.h | head -n 1` test -f "$ruby_h_path" && echo "Found ruby.h as $ruby_h_path, using its dirname..." @@ -293,6 +295,8 @@ Matthias Neeracher <neerac...@mac.com> << DescPackaging: << +patch: configure patched to remove call to AC_LIBLTDL_CONVENIENCE +which was clobbering the override to use the installed libltdl. Use libiconv from fink postinstall 'dot -c' updates config file with list of built plugins. Links with libtool2's libltdl.dylib, therefore need build-depend on libtool2 ------------------------------------------------------------------------------ Magic Quadrant for Content-Aware Data Loss Prevention Research study explores the data loss prevention market. Includes in-depth analysis on the changes within the DLP market, and the criteria used to evaluate the strengths and weaknesses of these DLP solutions. http://www.accelacomm.com/jaw/sfnl/114/51385063/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs