Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24471
Modified Files:
emacs23.info
Log Message:
fix libXft crashy
Index: emacs23.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/emacs23.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- emacs23.info 27 Aug 2009 03:56:37 -0000 1.1
+++ emacs23.info 27 Aug 2009 04:01:35 -0000 1.2
@@ -1,7 +1,7 @@
Info2: <<
Package: emacs23%type_pkg[uitype]
Version: 23.1
-Revision: 1
+Revision: 1.1
Type: uitype (. -nox)
Description: Flexible real-time text editor
License: GPL
@@ -49,7 +49,8 @@
(%type_raw[uitype] = .) pango1-xft2-ft219-dev (>= 1.18.4-4),
(%type_raw[uitype] = .) pixman (>= 0.10.0-1),
(%type_raw[uitype] = .) pkgconfig (>= 0.21-1),
- (%type_raw[uitype] = .) x11-dev
+ (%type_raw[uitype] = .) x11-dev,
+ (%type_raw[uitype] = .) xft2-dev (>= 2.1.2-5)
<<
Conflicts: emacs23, emacs23-nox
Replaces: emacs23, emacs23-nox
@@ -59,12 +60,12 @@
PatchFile-MD5: e4aa0f4c5511619fcfed690e4a1a8f80
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
-SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
+SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/lib/xft2/include
NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib -L%p/lib/xft2/lib -Wl,-search_paths_first
SetLIBS: -L%p/lib
SetCFLAGS: -Os -pipe
-ConfigureParams: --disable-dependency-tracking
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib'
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ConfigureParams: --disable-dependency-tracking
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib'
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
CompileScript: <<
#!/bin/bash -ev
if [ $UID -ne 0 ]; then echo "%n cannot be built with --build-as-nobody";
exit 1; fi
@@ -198,6 +199,13 @@
DescPort: <<
The patchfile modifies startup.el, and brings in the scripts fix-info
and mangle-info, in order to implement our emacs packaging system.
+
+ Crash (at least on 10.4) if uses libXft from apple's x11, so
+ make sure we get fink's Xft (use versioned dep on xft2-dev to
+ make sure we get the actual fink pkg, not the one that is
+ Provides: by various x11-dev). Fink's libXft is static-only,
+ so need -search_paths_first to make sure linker doesn't choose
+ x11's shared lib.
<<
Homepage: http://www.gnu.org/software/emacs/
<<
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
