diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-09-29 12:15:00 +0400 |
---|---|---|
committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-09-29 12:15:00 +0400 |
commit | a0fcaa97deeababd62ad96ec4651293604f99081 (patch) | |
tree | 71d7a0f1f4b2beaa91a55db304b32ebf982993d3 /recipes/t1lib | |
parent | 4ae02b5b270b32d203672888ea03e357ce6ec4c6 (diff) | |
download | openembedded-a0fcaa97deeababd62ad96ec4651293604f99081.tar.gz |
t1lib: update to 5.1.2
t1lib 5.0.2 is so old, it was removed from main Debian mirrors. Update
to current t1lib.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Diffstat (limited to 'recipes/t1lib')
-rw-r--r-- | recipes/t1lib/t1lib-5.0.2/install.patch | 163 | ||||
-rw-r--r-- | recipes/t1lib/t1lib-5.1.2/configure.patch (renamed from recipes/t1lib/t1lib-5.0.2/configure.patch) | 8 | ||||
-rw-r--r-- | recipes/t1lib/t1lib-5.1.2/libtool.patch (renamed from recipes/t1lib/t1lib-5.0.2/libtool.patch) | 0 | ||||
-rw-r--r-- | recipes/t1lib/t1lib_5.1.2.bb (renamed from recipes/t1lib/t1lib_5.0.2.bb) | 5 |
4 files changed, 9 insertions, 167 deletions
diff --git a/recipes/t1lib/t1lib-5.0.2/install.patch b/recipes/t1lib/t1lib-5.0.2/install.patch deleted file mode 100644 index 3d8843861c..0000000000 --- a/recipes/t1lib/t1lib-5.0.2/install.patch +++ /dev/null @@ -1,163 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- t1lib-5.0.1/Makefile.in~install 2001-01-15 17:37:11.000000000 -0500 -+++ t1lib-5.0.1/Makefile.in 2004-02-13 12:29:21.000000000 -0500 -@@ -44,6 +44,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS = @top_srcdir@/ac-tools/mkinstalldirs -+DESTDIR = @DESTDIR@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - includedir = @includedir@ ---- t1lib-5.0.1/doc/Makefile.in~install 2001-12-15 14:10:46.000000000 -0500 -+++ t1lib-5.0.1/doc/Makefile.in 2004-02-13 12:29:28.000000000 -0500 -@@ -43,6 +43,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS = @top_srcdir@/ac-tools/mkinstalldirs -+DESTDIR = @DESTDIR@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - includedir = @includedir@ -@@ -91,18 +92,18 @@ - install: dummy - if (test -f t1lib_doc.ps) \ - then \ -- $(MKINSTALLDIRS) @T1LIB_DATA_DIR@/doc; \ -- $(INSTALL_DATA) t1lib_doc.ps @T1LIB_DATA_DIR@/doc; \ -+ $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -+ $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ - fi; - if (test -f t1lib_doc.pdf) \ - then \ -- $(MKINSTALLDIRS) @T1LIB_DATA_DIR@/doc; \ -- $(INSTALL_DATA) t1lib_doc.pdf @T1LIB_DATA_DIR@/doc; \ -+ $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -+ $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ - fi; - - - uninstall: dummy -- $(RM) -R @T1LIB_DATA_DIR@/doc -+ $(RM) -R $(DESTDIR)@T1LIB_DATA_DIR@/doc - - - dummy: ---- t1lib-5.0.1/examples/Makefile.in~install 2001-01-15 17:11:47.000000000 -0500 -+++ t1lib-5.0.1/examples/Makefile.in 2004-02-13 12:29:33.000000000 -0500 -@@ -40,6 +40,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS = @top_srcdir@/ac-tools/mkinstalldirs -+DESTDIR = @DESTDIR@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - includedir = @includedir@ ---- t1lib-5.0.1/lib/Makefile.in~install 2002-06-24 22:15:30.000000000 -0400 -+++ t1lib-5.0.1/lib/Makefile.in 2004-02-13 12:29:35.000000000 -0500 -@@ -40,6 +40,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS = @top_srcdir@/ac-tools/mkinstalldirs -+DESTDIR = @DESTDIR@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - includedir = @includedir@ -@@ -160,27 +161,27 @@ - - - install: dummy -- $(MKINSTALLDIRS) $(libdir) -- $(MKINSTALLDIRS) $(includedir) -- $(MKINSTALLDIRS) @T1LIB_DATA_DIR@ -+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) -+ $(MKINSTALLDIRS) $(DESTDIR)$(includedir) -+ $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@ - $(LIBTOOL) --mode=install \ -- $(INSTALL_DATA) $(MAIN_TARGET) $(libdir) -+ $(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir) - $(LIBTOOL) --mode=install \ -- $(INSTALL_DATA) $(MAIN_HEADER) $(includedir) -- if (test -f @T1LIB_DATA_DIR@/t1lib.config) \ -+ $(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir) -+ if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \ - then \ - echo "Alert: Global configuration file exists, installation skipped!"; \ - else \ -- $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config @T1LIB_DATA_DIR@; \ -+ $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \ - fi; - - - uninstall: dummy -- -$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/libt1.la -- -$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/libt1x.la -- -$(LIBTOOL) --mode=uninstall $(RM) $(includedir)/t1lib.h -- -$(LIBTOOL) --mode=uninstall $(RM) $(includedir)/t1libx.h -- -$(LIBTOOL) --mode=uninstall $(RM) @T1LIB_DATA_DIR@/t1lib.config -+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libt1.la -+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libt1x.la -+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1lib.h -+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1libx.h -+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config - - - dummy: ---- t1lib-5.0.1/type1afm/Makefile.in~install 2001-01-15 17:08:23.000000000 -0500 -+++ t1lib-5.0.1/type1afm/Makefile.in 2004-02-13 12:29:40.000000000 -0500 -@@ -42,6 +42,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS = @top_srcdir@/ac-tools/mkinstalldirs -+DESTDIR = @DESTDIR@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - includedir = @includedir@ -@@ -87,14 +88,14 @@ - -rmdir .libs - - install: dummy -- $(MKINSTALLDIRS) $(bindir) -+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir) - $(LIBTOOL) --mode=install \ -- $(INSTALL_PROGRAM) type1afm $(bindir)/type1afm -+ $(INSTALL_PROGRAM) type1afm $(DESTDIR)$(bindir)/type1afm - - - uninstall: dummy - $(LIBTOOL) --mode=uninstall \ -- $(RM) $(bindir)/type1afm -+ $(RM) $(DESTDIR)$(bindir)/type1afm - - - dummy: ---- t1lib-5.0.1/xglyph/Makefile.in~install 2001-01-15 17:06:53.000000000 -0500 -+++ t1lib-5.0.1/xglyph/Makefile.in 2004-02-13 12:29:44.000000000 -0500 -@@ -42,6 +42,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS = @top_srcdir@/ac-tools/mkinstalldirs -+DESTDIR = @DESTDIR@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - includedir = @includedir@ -@@ -94,12 +95,12 @@ - - - install: dummy -- $(MKINSTALLDIRS) $(bindir) -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xglyph $(bindir)/xglyph -+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir) -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xglyph $(DESTDIR)$(bindir)/xglyph - - - uninstall: dummy -- $(LIBTOOL) --mode=uninstall $(RM) -f $(bindir)/xglyph -+ $(LIBTOOL) --mode=uninstall $(RM) -f $(DESTDIR)$(bindir)/xglyph - - - dummy: diff --git a/recipes/t1lib/t1lib-5.0.2/configure.patch b/recipes/t1lib/t1lib-5.1.2/configure.patch index f2405c6bc7..8b98707cd7 100644 --- a/recipes/t1lib/t1lib-5.0.2/configure.patch +++ b/recipes/t1lib/t1lib-5.1.2/configure.patch @@ -26,7 +26,7 @@ AC_CACHE_CHECK("whether external symbols need an underscore prefix", ac_cv_c_extern_prefix, [saved_libs=$LIBS -@@ -178,64 +179,46 @@ +@@ -178,68 +179,48 @@ AC_DEFINE(NEED_UNDERSCORE_PREFIX) fi @@ -36,6 +36,7 @@ +for type in short int; do + if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then + T1_AA_TYPE16="-DT1_AA_TYPE16=$type" ++ T1_INT16="$type" + break + fi +done @@ -53,8 +54,10 @@ -if test "$ac_16bit_type" = "short" -then - T1_AA_TYPE16="-DT1_AA_TYPE16=short" +- T1_INT16="short" -else - T1_AA_TYPE16="-DT1_AA_TYPE16=int" +- T1_INT16="int" +if test x"$T1_AA_TYPE16" = "x"; then + AC_MSG_ERROR("Unable to determine which integer type is 16 bit.") fi @@ -65,6 +68,7 @@ +for type in int long; do + if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then + T1_AA_TYPE32="-DT1_AA_TYPE32=$type" ++ T1_INT32="$type" + break + fi +done @@ -82,8 +86,10 @@ -if test "$ac_32bit_type" = "int" -then - T1_AA_TYPE32="-DT1_AA_TYPE32=int" +- T1_INT32="int" -else - T1_AA_TYPE32="-DT1_AA_TYPE32=long" +- T1_INT32="long" +if test x"$T1_AA_TYPE32" = "x"; then + AC_MSG_ERROR("Unable to determine which integer type is 32 bit.") fi diff --git a/recipes/t1lib/t1lib-5.0.2/libtool.patch b/recipes/t1lib/t1lib-5.1.2/libtool.patch index e050025739..e050025739 100644 --- a/recipes/t1lib/t1lib-5.0.2/libtool.patch +++ b/recipes/t1lib/t1lib-5.1.2/libtool.patch diff --git a/recipes/t1lib/t1lib_5.0.2.bb b/recipes/t1lib/t1lib_5.1.2.bb index 923973406b..e2615bb7cf 100644 --- a/recipes/t1lib/t1lib_5.0.2.bb +++ b/recipes/t1lib/t1lib_5.1.2.bb @@ -8,7 +8,6 @@ PR = "r6" LICENSE = "LGPL GPL" SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \ file://configure.patch \ - file://install.patch \ file://libtool.patch" inherit autotools @@ -27,5 +26,5 @@ do_configure() { FILES_${PN} = "${bindir}/* ${libdir}/*.so* ${datadir}/t1lib/t1lib.config" FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf" -SRC_URI[md5sum] = "cc5d4130b25bb8a1c930488b78930e9b" -SRC_URI[sha256sum] = "34ff6a85d1dae64d06b5aca04fb17822dd26a734f40cd966e3dd980afa4a037a" +SRC_URI[md5sum] = "a5629b56b93134377718009df1435f3c" +SRC_URI[sha256sum] = "821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59" |