Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25420
Modified Files:
libotf.info libotf.patch
Log Message:
new version that fixes x11 detection portably and improves propagation of ft
flags
Index: libotf.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libotf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libotf.patch 28 Aug 2011 23:50:01 -0000 1.1
+++ libotf.patch 10 Jun 2013 19:00:49 -0000 1.2
@@ -1,7 +1,27 @@
-diff -Naur libotf-0.9.12.orig/example/Makefile.in
libotf-0.9.12/example/Makefile.in
---- libotf-0.9.12.orig/example/Makefile.in 2010-09-22 12:44:36.000000000
+0900
-+++ libotf-0.9.12/example/Makefile.in 2011-03-15 18:00:09.000000000 +0900
-@@ -83,8 +83,8 @@
+diff -Naur libotf-0.9.13.orig/configure libotf-0.9.13/configure
+--- libotf-0.9.13.orig/configure 2012-09-07 09:54:17.000000000 -0400
++++ libotf-0.9.13/configure 2013-06-10 14:56:06.000000000 -0400
+@@ -12147,6 +12147,8 @@
+ done
+
+
++save_cppflags=$CPPFLAGS
++CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ for ac_header in X11/Xaw/Command.h
+ do :
+ ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw/Command.h"
"ac_cv_header_X11_Xaw_Command_h" "$ac_includes_default"
+@@ -12157,6 +12159,7 @@
+
+ else
+ no_x=yes
++ CPPFLAGS=$save_cppflags
+ fi
+
+ done
+diff -Naur libotf-0.9.13.orig/example/Makefile.in
libotf-0.9.13/example/Makefile.in
+--- libotf-0.9.13.orig/example/Makefile.in 2012-09-07 09:54:16.000000000
-0400
++++ libotf-0.9.13/example/Makefile.in 2013-06-10 14:42:14.000000000 -0400
+@@ -85,8 +85,8 @@
otfview_OBJECTS = otfview.$(OBJEXT)
otfview_DEPENDENCIES = $(CommonLDADD)
otfview_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -12,3 +32,14 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
+diff -Naur libotf-0.9.13.orig/libotf.pc.in libotf-0.9.13/libotf.pc.in
+--- libotf-0.9.13.orig/libotf.pc.in 2006-07-19 01:17:27.000000000 -0400
++++ libotf-0.9.13/libotf.pc.in 2013-06-10 14:42:34.000000000 -0400
+@@ -7,5 +7,5 @@
+ Description: OpenType font library
+ Version: @PACKAGE_VERSION@
+ Requires: freetype2
+-Libs: @FREETYPE_LD_FLAGS@ -L${libdir} -lotf
+-Cflags: @FREETYPE_INC@ -I${includedir}
++Libs: -L${libdir} -lotf
++Cflags: -I${includedir}
Index: libotf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libotf.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libotf.info 28 Aug 2011 23:50:01 -0000 1.1
+++ libotf.info 10 Jun 2013 19:00:49 -0000 1.2
@@ -1,31 +1,29 @@
Package: libotf
-Version: 0.9.12
+Version: 0.9.13
Revision: 1
Depends: %N-shlibs (= %v-%r)
-BuildDepends: x11, freetype219, xmkmf (>= 1.0.2-3), fink (>= 0.24.12-1)
-Source: http://www.m17n.org/%n/%n-%v.tar.gz
-Source-MD5: 630a0556af3be60360e8a75e59561eda
+BuildDepends: x11, freetype219 (>= 2.4.11-1)
+Source: http://download.savannah.gnu.org/releases/m17n/%n-%v.tar.gz
+Source-MD5: 99ca3857016e0bb8944776cfa16e6b2d
PatchFile: %n.patch
-PatchFile-MD5: ccaa088bd3395d3fcf79a33a81b4d08e
+PatchFile-MD5: 33f710db91e4d5f852d8c31604a4594a
DocFiles: AUTHORS COPYING NEWS README
BuildDependsOnly: True
-SetLDFLAGS: -L%p/lib/freetype219/lib
CompileScript: <<
#!/bin/sh -ev
- export PATH=%p/lib/xmkmf/bin:$PATH
- PATH=%p/lib/freetype219/bin:$PATH ./configure %c
+ ./configure %c
make
<<
SplitOff: <<
Package: %N-shlibs
- Depends: freetype219-shlibs
+ Depends: freetype219-shlibs (>= 2.4.11-1)
Files: lib/libotf.*.dylib
Shlibs: %p/lib/libotf.0.dylib 1.0.0 %n (>= 0.9.5-2)
DocFiles: AUTHORS COPYING NEWS README
<<
SplitOff2: <<
Package: %N-bin
- Depends: %N-shlibs (>= %v-%r), x11, freetype219-shlibs
+ Depends: %N-shlibs (>= %v-%r), x11, freetype219-shlibs (>= 2.4.11-1)
Files: bin/otf*
DocFiles: AUTHORS COPYING NEWS README
<<
@@ -34,7 +32,12 @@
Any package which BuildDepends on this one must also BuildDepend on:
freetype219
Originally packaged by Etsushi Kato <ek...@ees.hokudai.ac.jp>
+
+ dmacks: let freetype2 propagate its own flags in .pc
+
+ dmacks: fix Xaw detection (remember to use detected -I for X11
+ during detection and compiling!)
<<
License: LGPL
Maintainer: Todai Fink Team <f...@sodan.ecc.u-tokyo.ac.jp>
-Homepage: http://www.m17n.org/libotf/
+Homepage: http://www.nognu.org/m17n
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
