Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci
In directory 
vz-cvs-3.sog:/tmp/cvs-serv19924/10.4/unstable/main/finkinfo/10.4-EOL/sci

Modified Files:
        drawtiming.info 
Added Files:
        drawtiming.patch 
Log Message:
Add drawtiming to 10.7.
Fix runtime issue on other OS versions (thanks, danielj!).
Update dependencies and DescPackaging on 10.4, 10.5, 10.6.

--- NEW FILE: drawtiming.patch ---
--- drawtiming-0.7/src/main.cc  2008-05-17 20:09:54.000000000 -0400
+++ drawtiming-0.7.patched/src/main.cc  2011-07-29 02:15:34.000000000 -0400
@@ -93,6 +93,8 @@
   int flags = 0;
 
   int k, c;
+  // Initialize GraphicsMagick
+  InitializeMagick(*argv);
   while ((c = getopt_long (argc, argv, "ac:f:hl:o:p:vVw:x:", opts, &k)) != -1)
     switch (c) {
     case 'a':

Index: drawtiming.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/drawtiming.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- drawtiming.info     11 Jul 2011 04:05:48 -0000      1.1
+++ drawtiming.info     29 Jul 2011 06:58:44 -0000      1.2
@@ -1,47 +1,49 @@
 Package: drawtiming
 Version: 0.7
-Revision: 2
+Revision: 3
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 Description: Program to generate circuit timing diagrams
-Source: mirror:sourceforge:%{ni}/%{ni}-%v.tar.gz
+Source: mirror:sourceforge:%n/%n-%v.tar.gz
 Source-MD5: 6ef094ec2290499c367d9bd26d248b15 
-SourceDirectory:%{ni}-%v
+SourceDirectory:%n-%v
 GCC: 4.0
 Depends: <<
 bzip2-shlibs, 
 libtiff-shlibs,
-libpng3-shlibs,
-libjpeg-shlibs, 
+libpng14-shlibs,
+libjpeg8-shlibs, 
 libxml2-shlibs, 
 lcms-shlibs,
-freetype219-shlibs,
+freetype219-shlibs (>= 2.3.12-1),
 graphicsmagick-shlibs (>= 1.3.7-2),
 ghostscript,
 x11
 <<
 BuildDepends: <<
 bzip2-dev,
-lcms,libtiff,libjpeg,
-libpng3,
+lcms,libtiff,libjpeg8,
+libpng14,
 libxml2,
-freetype219,
+freetype219 (>= 2.3.12-1),
 graphicsmagick-dev (>= 1.3.7-2),
 x11-dev
 <<
-Conflicts: %{ni}, %{ni}-nox
-Replaces: %{ni}, %{ni}-nox
+Conflicts: %n, %n-nox
+Replaces: %n, %n-nox
+PatchFile: %n.patch
+PatchFile-MD5: cfc60f9ee0fb183274434c79ae97d51c
 PatchScript: <<
-#!/bin/sh -ev
-perl -pi -e 's/-lgnugetopt//g' configure
-perl -pi -e 's/Magick/GraphicsMagick/g' configure
+       #!/bin/sh -ev
+       %{default_script}
+       perl -pi -e 's/-lgnugetopt//g' configure
+       perl -pi -e 's/Magick/GraphicsMagick/g' configure
 <<
-SetCXXFLAGS: -L%p/lib/freetype219/lib
 InstallScript: <<
-#!/bin/sh -ev
-make install DESTDIR=%d
-install -d %i/share/%n
-install -d %i/share/%n/samples
-install samples/* %i/share/%n/samples
+       #!/bin/sh -ev
+       make install DESTDIR=%d
+       install -d %i/share/%n
+       install -d %i/share/%n/samples
+       install samples/* %i/share/%n/samples
 <<
 License: GPL
 ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
@@ -56,11 +58,12 @@
 Use the -nox variant if you don't require X11 support.
 << 
 DescPackaging: <<
-The -nox splitoff uses ghostscript-nox and imagemagick-nox.
-The non-obvious dependencies came from running 'otool -L' on the executable.
-0.6.2 and later--install samples.
+Patch to use graphicsmagick rather than imagemagick.
+
+Graphicsmagick now requires that the API be initialized before use, but 
+the upstream source doesn't do that, so we patch the main loop.  Thanks to
+Daniel Johnson for finding this out.
 
 libSystem has getopt_long, so no need to autodetect fink's libgnugetopt
 << 
 HomePage: http://drawtiming.sourceforge.net
-


------------------------------------------------------------------------------
Got Input?   Slashdot Needs You.
Take our quick survey online.  Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to