Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9935
Modified Files:
fontforge.info
Log Message:
New upstream version. Now uses libspiro0 and builds private shlibs for when the
python extension works.
Index: fontforge.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- fontforge.info 7 Oct 2007 19:36:53 -0000 1.24
+++ fontforge.info 16 Nov 2007 12:49:43 -0000 1.25
@@ -1,5 +1,5 @@
Package: fontforge
-Version: 20071002
+Version: 20071110
Revision: 1
License: BSD
Description: Outline font editor
@@ -16,17 +16,18 @@
Makefile ignores CPPFLAGS and LDFLAGS so we use CFLAGS instead.
Had to remove setting of DYLD_LIBRARY_PATH in start.c.
Caused ImageIO problems. Yuck.
- Enabled python scripting. Uses system python.
+ Enabled python scripting. Uses system's python.
Patched Makefile.in's to remove useless -I and reorder flags.
+ Reenabled building shared libs; put them into %p/lib/%n.
<<
Homepage: http://fontforge.sourceforge.net/
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: 0f4090b9035e50befee39d1b8c16cff2
+Source-MD5: 79e0663867ed7a50ad901024ebd82a0f
SourceDirectory: %n-%v
-Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2
-Source2-MD5: bc0be7d21cf039e6a24c81b65b3f30d9
+Source2: mirror:sourceforge:%n/%n_htdocs-20071109.tar.bz2
+Source2-MD5: ef2746373eacf71a0f13467a0e8c3856
Source2ExtractDir: %n-%v/htdocs
Depends: <<
@@ -36,6 +37,7 @@
libiconv,
libjpeg-shlibs,
libpng3-shlibs,
+ libspiro0-shlibs,
libtiff-shlibs,
libuninameslist1-shlibs,
libxml2-shlibs,
@@ -50,6 +52,7 @@
libiconv-dev,
libjpeg,
libpng3,
+ libspiro0,
libtiff,
libuninameslist1,
libxml2,
@@ -65,23 +68,30 @@
PatchFile-MD5: 45662f7899565421e5bda7cb67eaa776
PatchScript: <<
patch -p1 <%{PatchFile}
+ #Use System's python for the embedded python interpreter.
perl -pi -e 's,python -c,/usr/bin/python -c,g' configure
+ #Use Fink's python2.5 to build the python extension and install in
proper dir.
+ #perl -pi -e 's,python setup.py install,%p/bin/python2.5 setup.py
install --root=%d,' Makefile.dynamic.in
+ #Make extension look for private libs in %p/lib/%n
+ #perl -pi -e 's,/lib/,/lib/%n/,g' pyhook/loadfontforge.h
<<
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
NoSetCPPFLAGS: True
NoSetLDFLAGS: True
-SetCFLAGS: -I%p/include/libxml2
+SetCFLAGS: -Os -I%p/include/libxml2
SetLIBRARY_PATH: %p/lib/freetype219/lib:/usr/X11R6/lib:%p/lib
ConfigureParams: <<
--mandir='${prefix}/share/man'\
+ --libdir='${prefix}/lib/%n'\
--with-x\
--with-regular-link\
--with-devicetables\
--with-python\
- --enable-shared=no\
- --enable-static=yes\
+ --enable-shared=yes\
+ --enable-static=no\
+ --enable-libff\
--disable-pyextension\
--without-freetype-src
<<
@@ -92,11 +102,17 @@
export PATH="%p/lib/freetype219/bin:$PATH"
./configure %c
- make STATIC_LIBS="-L%p/lib -L%p/lib/freetype219/lib -lgif -lpng -lz
-ltiff -ljpeg -lxml2 -luninameslist -lfreetype -lintl"
+ make STATIC_LIBS="-L%p/lib -L%p/lib/freetype219/lib -lgif -lpng -lz
-ltiff -ljpeg -lxml2 -luninameslist -lfreetype -lintl -lspiro"
<<
InstallScript: <<
/bin/mkdir cidmap
tar -xz -C cidmap -f htdocs/cidmaps.tgz
make install prefix=%i
- /bin/rm -R %i/lib
<<
+
+#Private libs. Validator is still rejecting it though. Maybe I misunderstand
the syntax?
+#Shlibs: <<
+# !%p/lib/%n/libfontforge.1.0.0.dylib
+# !%p/lib/%n/libgdraw.2.0.3.dylib
+# !%p/lib/%n/libgunicode.3.0.0.dylib
+#<<
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
