Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19118
Modified Files:
fontforge-10.5.info fontforge.info fontforge.patch
Log Message:
New upstream version.
Index: fontforge.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- fontforge.info 28 Aug 2008 14:14:42 -0000 1.38
+++ fontforge.info 29 Sep 2008 06:36:47 -0000 1.39
@@ -1,6 +1,6 @@
Info2: <<
Package: fontforge
-Version: 20080828
+Version: 20080927
Revision: 1
Type: python (2.3)
Distribution: 10.4
@@ -32,15 +32,16 @@
Patched Makefile.in's to remove useless -I and reorder flags.
Reenabled building shared libs; put them into %p/lib/%n.
Now installs a .app wrapper bundle at %p/Applications/FontForge.app
+ Install desktop and mime files for KDE and Gnome.
<<
Homepage: http://fontforge.sourceforge.net/
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: 3c232a6e412d8b443b0b881332dbc26c
+Source-MD5: 8866595d4dac77c0c093ed1e104515d3
SourceDirectory: %n-%v
-Source2: mirror:sourceforge:%n/%n_htdocs-20080824.tar.bz2
-Source2-MD5: 5eee3058485b52208dfca1d46aeb96aa
+Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2
+Source2-MD5: cc3e292e75250e8318cb098c1552c98e
Source2ExtractDir: %n-%v/htdocs
Source3: http://fontforge.sourceforge.net/cidmaps.tgz
Source3-MD5: 5f00607e4bbe014cdfd5b23bb0943666
@@ -48,7 +49,8 @@
Source3ExtractDir: %n-%v/cidmap
Depends: <<
- freetype219-shlibs,
+ desktop-file-utils,
+ freetype219-shlibs (>= 2.3.7-4),
giflib-shlibs,
libgettext3-shlibs,
libiconv,
@@ -58,11 +60,12 @@
libtiff-shlibs,
libuninameslist1-shlibs,
libxml2-shlibs,
+ shared-mime-info,
x11
<<
BuildDepends: <<
fink (>= 0.28.0),
- freetype219,
+ freetype219 (>= 2.3.7-4),
gettext-tools,
giflib,
libgettext3-dev,
@@ -82,7 +85,7 @@
DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION
PatchFile: %n.patch
-PatchFile-MD5: b4607474cc4ec45937948b74a8127151
+PatchFile-MD5: e305c93bc7a7c400ceae3bfe7313f9ab
PatchScript: <<
patch -p1 <%{PatchFile}
#Use system's python to build the python extension.
@@ -91,6 +94,8 @@
perl -pi -e 's,python setup.py install,env ARCHFLAGS=''
/usr/bin/python%type_raw[python] setup.py install
--install-lib=%p/lib/system-python%type_raw[python]/site-packages,'
Makefile.dynamic.in
#Make extension look for private libs in %p/lib/%n
perl -pi -e 's,/lib/,/lib/%n/,g' pyhook/loadfontforge.h
+ #Fix path to fontforge.png in fontforge.desktop
+ perl -pi -e 's,fontforge.png,%p/share/fontforge/fontforge.png,'
Packaging/fontforge.desktop
<<
NoSetMAKEFLAGS: true
@@ -98,8 +103,8 @@
NoSetCPPFLAGS: True
NoSetLDFLAGS: True
SetCFLAGS: -Os -I%p/include/libxml2
-SetLIBRARY_PATH: %p/lib/freetype219/lib:%p/lib:/usr/X11R6/lib
-SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib -L/usr/X11R6/lib
+SetLIBRARY_PATH: %p/lib:/usr/X11R6/lib
+SetLDFLAGS: -L%p/lib -L/usr/X11R6/lib
ConfigureParams: <<
--mandir='${prefix}/share/man'\
--libdir='${prefix}/lib/%n'\
@@ -122,17 +127,33 @@
CompileScript: <<
#!/bin/bash -ev
- export CPATH="%p/lib/freetype219/include:%p/include"
- export PATH="%p/lib/freetype219/bin:$PATH"
+ export CPATH="%p/include"
+ #export PATH="%p/lib/freetype219/bin:$PATH"
export F77=no
./configure %c
- make STATIC_LIBS="-L%p/lib -L%p/lib/freetype219/lib -lgif -lpng -lz
-ltiff -ljpeg -lxml2 -luninameslist -lfreetype -lintl -lspiro"
+ make STATIC_LIBS="-L%p/lib -lgif -lpng -lz -ltiff -ljpeg -lxml2
-luninameslist -lfreetype -lintl -lspiro"
<<
InstallScript: <<
make install prefix=%i
/bin/rm -rf %i/include
/bin/ln -s %p/bin/fontforge
fontforge/FontForge.app/Contents/MacOS/FontForge
+ /bin/mkdir -p %i/share/applications
+ /bin/mkdir -p %i/share/fontforge
+ /bin/mkdir -p %i/share/mime/packages
+ /bin/cp Packaging/fontforge.desktop %i/share/applications
+ /bin/cp Packaging/fontforge.png %i/share/fontforge
+ /bin/cp Packaging/fontforge.xml %i/share/mime/packages
+<<
+
+PostInstScript: <<
+ [ -x %p/bin/update-mime-database ] && update-mime-database
%p/share/mime > /dev/null 2>&1 || :
+ [ -x %p/bin/update-desktop-database ] && update-desktop-database -q
%p/share/applications || :
+<<
+
+PostRmScript: <<
+ [ -x %p/bin/update-mime-database ] && update-mime-database
%p/share/mime > /dev/null 2>&1 || :
+ [ -x %p/bin/update-desktop-database ] && update-desktop-database -q
%p/share/applications || :
<<
AppBundles: fontforge/FontForge.app
Index: fontforge-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge-10.5.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fontforge-10.5.info 28 Aug 2008 14:14:42 -0000 1.11
+++ fontforge-10.5.info 29 Sep 2008 06:36:47 -0000 1.12
@@ -1,6 +1,6 @@
Info2: <<
Package: fontforge
-Version: 20080828
+Version: 20080927
Revision: 101
Type: python (2.5)
Distribution: 10.5
@@ -32,15 +32,16 @@
Patched Makefile.in's to remove useless -I and reorder flags.
Reenabled building shared libs; put them into %p/lib/%n.
Now installs a .app wrapper bundle at %p/Applications/FontForge.app
+ Install desktop and mime files for KDE and Gnome.
<<
Homepage: http://fontforge.sourceforge.net/
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: 3c232a6e412d8b443b0b881332dbc26c
+Source-MD5: 8866595d4dac77c0c093ed1e104515d3
SourceDirectory: %n-%v
-Source2: mirror:sourceforge:%n/%n_htdocs-20080824.tar.bz2
-Source2-MD5: 5eee3058485b52208dfca1d46aeb96aa
+Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2
+Source2-MD5: cc3e292e75250e8318cb098c1552c98e
Source2ExtractDir: %n-%v/htdocs
Source3: http://fontforge.sourceforge.net/cidmaps.tgz
Source3-MD5: 5f00607e4bbe014cdfd5b23bb0943666
@@ -48,7 +49,8 @@
Source3ExtractDir: %n-%v/cidmap
Depends: <<
- freetype219-shlibs,
+ desktop-file-utils,
+ freetype219-shlibs (>= 2.3.7-4),
giflib-shlibs,
libgettext3-shlibs,
libiconv,
@@ -58,11 +60,12 @@
libtiff-shlibs,
libuninameslist1-shlibs,
libxml2-shlibs,
+ shared-mime-info,
x11
<<
BuildDepends: <<
fink (>= 0.28.0),
- freetype219,
+ freetype219 (>= 2.3.7-4),
gettext-tools,
giflib,
libgettext3-dev,
@@ -82,7 +85,7 @@
DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION
PatchFile: %n.patch
-PatchFile-MD5: b4607474cc4ec45937948b74a8127151
+PatchFile-MD5: e305c93bc7a7c400ceae3bfe7313f9ab
PatchScript: <<
patch -p1 <%{PatchFile}
#Use system's python to build the python extension.
@@ -91,6 +94,8 @@
perl -pi -e 's,python setup.py install,env ARCHFLAGS=''
/usr/bin/python%type_raw[python] setup.py install
--install-lib=%p/lib/system-python%type_raw[python]/site-packages,'
Makefile.dynamic.in
#Make extension look for private libs in %p/lib/%n
perl -pi -e 's,/lib/,/lib/%n/,g' pyhook/loadfontforge.h
+ #Fix path to fontforge.png in fontforge.desktop
+ perl -pi -e 's,fontforge.png,%p/share/fontforge/fontforge.png,'
Packaging/fontforge.desktop
<<
NoSetMAKEFLAGS: true
@@ -98,8 +103,8 @@
NoSetCPPFLAGS: True
NoSetLDFLAGS: True
SetCFLAGS: -Os -I%p/include/libxml2
-SetLIBRARY_PATH: %p/lib/freetype219/lib:%p/lib:/usr/X11R6/lib
-SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib -L/usr/X11R6/lib
+SetLIBRARY_PATH: %p/lib:/usr/X11R6/lib
+SetLDFLAGS: -L%p/lib -L/usr/X11R6/lib
ConfigureParams: <<
--mandir='${prefix}/share/man'\
--libdir='${prefix}/lib/%n'\
@@ -122,17 +127,33 @@
CompileScript: <<
#!/bin/bash -ev
- export CPATH="%p/lib/freetype219/include:%p/include"
- export PATH="%p/lib/freetype219/bin:$PATH"
+ export CPATH="%p/include"
+ #export PATH="%p/lib/freetype219/bin:$PATH"
export F77=no
./configure %c
- make STATIC_LIBS="-L%p/lib -L%p/lib/freetype219/lib -lgif -lpng -lz
-ltiff -ljpeg -lxml2 -luninameslist -lfreetype -lintl -lspiro"
+ make STATIC_LIBS="-L%p/lib -lgif -lpng -lz -ltiff -ljpeg -lxml2
-luninameslist -lfreetype -lintl -lspiro"
<<
InstallScript: <<
make install prefix=%i
/bin/rm -rf %i/include
/bin/ln -s %p/bin/fontforge
fontforge/FontForge.app/Contents/MacOS/FontForge
+ /bin/mkdir -p %i/share/applications
+ /bin/mkdir -p %i/share/fontforge
+ /bin/mkdir -p %i/share/mime/packages
+ /bin/cp Packaging/fontforge.desktop %i/share/applications
+ /bin/cp Packaging/fontforge.png %i/share/fontforge
+ /bin/cp Packaging/fontforge.xml %i/share/mime/packages
+<<
+
+PostInstScript: <<
+ [ -x %p/bin/update-mime-database ] && update-mime-database
%p/share/mime > /dev/null 2>&1 || :
+ [ -x %p/bin/update-desktop-database ] && update-desktop-database -q
%p/share/applications || :
+<<
+
+PostRmScript: <<
+ [ -x %p/bin/update-mime-database ] && update-mime-database
%p/share/mime > /dev/null 2>&1 || :
+ [ -x %p/bin/update-desktop-database ] && update-desktop-database -q
%p/share/applications || :
<<
AppBundles: fontforge/FontForge.app
Index: fontforge.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- fontforge.patch 24 Aug 2008 17:46:18 -0000 1.17
+++ fontforge.patch 29 Sep 2008 06:36:47 -0000 1.18
@@ -1,6 +1,6 @@
-diff -ru fontforge-20080824.orig/Makefile.dynamic.in
fontforge-20080824/Makefile.dynamic.in
---- fontforge-20080824.orig/Makefile.dynamic.in 2008-07-28
20:01:36.000000000 -0400
-+++ fontforge-20080824/Makefile.dynamic.in 2008-08-24 13:22:19.000000000
-0400
+diff -ru fontforge-20080927.orig/Makefile.dynamic.in
fontforge-20080927/Makefile.dynamic.in
+--- fontforge-20080927.orig/Makefile.dynamic.in 2008-07-28
20:01:36.000000000 -0400
++++ fontforge-20080927/Makefile.dynamic.in 2008-09-29 01:41:44.000000000
-0400
@@ -127,8 +127,8 @@
# You may need to be root to do the install
#explicit use of sh to make sure we don't invoke csh with different "if"
syntax
@@ -12,9 +12,21 @@
#we don't always create a setup.py
-(cd pyhook ; if test -r setup.py ; then python setup.py install
--prefix=$(prefix) --root=$(DESTDIR); for dir in * ; do if test -d $$dir ; then
rm -rf $$dir ; fi; done ; fi )
-diff -ru fontforge-20080824.orig/Unicode/Makefile.dynamic.in
fontforge-20080824/Unicode/Makefile.dynamic.in
---- fontforge-20080824.orig/Unicode/Makefile.dynamic.in 2007-12-09
15:37:16.000000000 -0500
-+++ fontforge-20080824/Unicode/Makefile.dynamic.in 2008-08-24
13:19:33.000000000 -0400
+diff -ru fontforge-20080927.orig/Packaging/fontforge.desktop
fontforge-20080927/Packaging/fontforge.desktop
+--- fontforge-20080927.orig/Packaging/fontforge.desktop 2008-09-05
14:44:21.000000000 -0400
++++ fontforge-20080927/Packaging/fontforge.desktop 2008-09-29
01:42:52.000000000 -0400
+@@ -11,6 +11,5 @@
+ Icon=fontforge.png
+ Terminal=false
+ Type=Application
+-Categories=Application;Graphics;
+-Encoding=UTF-8
+-MimeType=application/vnd.font-fontforge-sfd;application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;/x-font-tex;
++Categories=Graphics;
++MimeType=application/vnd.font-fontforge-sfd;application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-tex;
+diff -ru fontforge-20080927.orig/Unicode/Makefile.dynamic.in
fontforge-20080927/Unicode/Makefile.dynamic.in
+--- fontforge-20080927.orig/Unicode/Makefile.dynamic.in 2007-12-09
15:37:16.000000000 -0500
++++ fontforge-20080927/Unicode/Makefile.dynamic.in 2008-09-29
01:41:44.000000000 -0400
@@ -18,8 +18,8 @@
cjk.lo memory.lo ucharmap.lo unialt.lo ustring.lo utype.lo \
usprintf.lo gwwiconv.lo
@@ -26,9 +38,9 @@
../libgunicode.la: $(libgunicode_OBJECTS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -no-undefined @LDFLAGS@ -o
../libgunicode.la $(libgunicode_OBJECTS) \
-diff -ru fontforge-20080824.orig/Unicode/Makefile.static.in
fontforge-20080824/Unicode/Makefile.static.in
---- fontforge-20080824.orig/Unicode/Makefile.static.in 2007-12-09
15:37:16.000000000 -0500
-+++ fontforge-20080824/Unicode/Makefile.static.in 2008-08-24
13:19:33.000000000 -0400
+diff -ru fontforge-20080927.orig/Unicode/Makefile.static.in
fontforge-20080927/Unicode/Makefile.static.in
+--- fontforge-20080927.orig/Unicode/Makefile.static.in 2007-12-09
15:37:16.000000000 -0500
++++ fontforge-20080927/Unicode/Makefile.static.in 2008-09-29
01:41:44.000000000 -0400
@@ -12,8 +12,8 @@
libgunicode_OBJECTS = ArabicForms.o alphabet.o backtrns.o char.o \
cjk.o memory.o ucharmap.o unialt.o ustring.o utype.o usprintf.o gwwiconv.o
@@ -40,9 +52,9 @@
all: ../libs/libgunicode.a
-diff -ru fontforge-20080824.orig/configure fontforge-20080824/configure
---- fontforge-20080824.orig/configure 2008-07-28 19:30:54.000000000 -0400
-+++ fontforge-20080824/configure 2008-08-24 13:23:44.000000000 -0400
+diff -ru fontforge-20080927.orig/configure fontforge-20080927/configure
+--- fontforge-20080927.orig/configure 2008-09-14 19:31:08.000000000 -0400
++++ fontforge-20080927/configure 2008-09-29 01:41:44.000000000 -0400
@@ -2684,7 +2684,7 @@
fi;
@@ -91,9 +103,9 @@
else
cat >>confdefs.h <<\_ACEOF
#define _NO_LIBXML 1
-diff -ru fontforge-20080824.orig/fontforge/Makefile.dynamic.in
fontforge-20080824/fontforge/Makefile.dynamic.in
---- fontforge-20080824.orig/fontforge/Makefile.dynamic.in 2008-08-20
17:32:06.000000000 -0400
-+++ fontforge-20080824/fontforge/Makefile.dynamic.in 2008-08-24
13:19:33.000000000 -0400
+diff -ru fontforge-20080927.orig/fontforge/Makefile.dynamic.in
fontforge-20080927/fontforge/Makefile.dynamic.in
+--- fontforge-20080927.orig/fontforge/Makefile.dynamic.in 2008-09-14
18:27:24.000000000 -0400
++++ fontforge-20080927/fontforge/Makefile.dynamic.in 2008-09-29
01:41:44.000000000 -0400
@@ -66,12 +66,12 @@
#I used to include -L/usr/lib explicitly after static_libs. Not sure why.
Should be implied & breaks 64bit compiles
@@ -112,9 +124,9 @@
all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint
-diff -ru fontforge-20080824.orig/fontforge/start.c
fontforge-20080824/fontforge/start.c
---- fontforge-20080824.orig/fontforge/start.c 2008-02-04 08:56:47.000000000
-0500
-+++ fontforge-20080824/fontforge/start.c 2008-08-24 13:19:33.000000000
-0400
+diff -ru fontforge-20080927.orig/fontforge/start.c
fontforge-20080927/fontforge/start.c
+--- fontforge-20080927.orig/fontforge/start.c 2008-02-04 08:56:47.000000000
-0500
++++ fontforge-20080927/fontforge/start.c 2008-09-29 01:41:44.000000000
-0400
@@ -125,7 +125,6 @@
/* install image libs. For some reason fink installs in a place */
/* the dynamic loader doesn't find */
@@ -123,9 +135,9 @@
#endif
}
-diff -ru fontforge-20080824.orig/gdraw/Makefile.dynamic.in
fontforge-20080824/gdraw/Makefile.dynamic.in
---- fontforge-20080824.orig/gdraw/Makefile.dynamic.in 2008-08-22
22:00:11.000000000 -0400
-+++ fontforge-20080824/gdraw/Makefile.dynamic.in 2008-08-24
13:19:33.000000000 -0400
+diff -ru fontforge-20080927.orig/gdraw/Makefile.dynamic.in
fontforge-20080927/gdraw/Makefile.dynamic.in
+--- fontforge-20080927.orig/gdraw/Makefile.dynamic.in 2008-08-27
10:39:23.000000000 -0400
++++ fontforge-20080927/gdraw/Makefile.dynamic.in 2008-09-29
01:41:44.000000000 -0400
@@ -34,8 +34,8 @@
gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo \
ghvbox.lo gmatrixedit.lo gdrawable.lo gspacer.lo xkeysyms_unicode.lo
@@ -137,9 +149,9 @@
../libgdraw.la: $(libgdraw_OBJECTS)
$(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) @LDFLAGS@ -o
../libgdraw.la $(libgdraw_OBJECTS) \
-diff -ru fontforge-20080824.orig/gdraw/Makefile.static.in
fontforge-20080824/gdraw/Makefile.static.in
---- fontforge-20080824.orig/gdraw/Makefile.static.in 2008-08-22
19:26:49.000000000 -0400
-+++ fontforge-20080824/gdraw/Makefile.static.in 2008-08-24
13:19:33.000000000 -0400
+diff -ru fontforge-20080927.orig/gdraw/Makefile.static.in
fontforge-20080927/gdraw/Makefile.static.in
+--- fontforge-20080927.orig/gdraw/Makefile.static.in 2008-08-27
10:39:23.000000000 -0400
++++ fontforge-20080927/gdraw/Makefile.static.in 2008-09-29
01:41:44.000000000 -0400
@@ -24,8 +24,8 @@
gtextfield.o gtextinfo.o gwidgets.o gxdraw.o \
ghvbox.o gmatrixedit.o gdrawable.o gspacer.o xkeysyms_unicode.o
@@ -151,9 +163,9 @@
all: ../libs/libgdraw.a
-diff -ru fontforge-20080824.orig/gutils/Makefile.dynamic.in
fontforge-20080824/gutils/Makefile.dynamic.in
---- fontforge-20080824.orig/gutils/Makefile.dynamic.in 2008-08-20
16:50:24.000000000 -0400
-+++ fontforge-20080824/gutils/Makefile.dynamic.in 2008-08-24
13:19:33.000000000 -0400
+diff -ru fontforge-20080927.orig/gutils/Makefile.dynamic.in
fontforge-20080927/gutils/Makefile.dynamic.in
+--- fontforge-20080927.orig/gutils/Makefile.dynamic.in 2008-08-20
16:50:24.000000000 -0400
++++ fontforge-20080927/gutils/Makefile.dynamic.in 2008-09-29
01:41:44.000000000 -0400
@@ -35,21 +35,19 @@
gio.lo giofile.lo giohosts.lo giomime.lo giothread.lo giotrans.lo
libgioftp_OBJECTS = gioftp.lo
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
