summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-08-12 15:06:36 +0300
committerKhem Raj <raj.khem@gmail.com>2019-08-12 09:11:01 -0700
commit2d34bda222b1186bcf2fab6508ff11d6ee4833de (patch)
tree6be17559d0490927dd090ab937c21e83409a8d57 /meta-oe/recipes-extended
parent42d2034f97f8f98d26cbe0affb357703bf3f58ea (diff)
downloadmeta-openembedded-2d34bda222b1186bcf2fab6508ff11d6ee4833de.tar.gz
t1lib: Remove, gtkmathview was the last user
Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
-rw-r--r--meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch141
-rw-r--r--meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch58
-rw-r--r--meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch144
-rw-r--r--meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb29
4 files changed, 0 insertions, 372 deletions
diff --git a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch
deleted file mode 100644
index 976e0380e..000000000
--- a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch
+++ /dev/null
@@ -1,141 +0,0 @@
1From 81c1ba940415595584a837ab1078c64855072f0c Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Mon, 21 Nov 2011 12:00:54 +0100
4Subject: [PATCH] t1lib: add 5.1.2
5
6#
7# Patch managed by http://www.holgerschurig.de/patcher.html
8#
9
10---
11 configure.in | 95 ++++++++++++++++++++++++------------------------------------
12 1 file changed, 38 insertions(+), 57 deletions(-)
13
14diff --git a/configure.in b/configure.in
15index eade4c0..e649ea9 100644
16--- a/configure.in
17+++ b/configure.in
18@@ -74,9 +74,9 @@ T1LIB_PATCHLEVEL=builtin(eval, MACRO_T1LIB_LT_REVISION)
19 T1LIB_VERSIONSTRING=\"MACRO_T1LIB_IDENTIFIER\"
20
21
22-dnl We use this file by Andreas Zeller to check for libXaw
23-builtin(include, ac-tools/ice_find_athena.m4)
24-builtin(include, ac-tools/aclocal.m4)
25+#dnl We use this file by Andreas Zeller to check for libXaw
26+#builtin(include, ac-tools/ice_find_athena.m4)
27+#builtin(include, ac-tools/aclocal.m4)
28
29 dnl We want these before the checks, so the checks can modify their values.
30 test -z "$LDLIBS" && LDLIBS=-lm AC_SUBST(LDLIBS)
31@@ -162,6 +162,7 @@ fi
32
33 dnl **** Check for underscore on external symbols ****
34
35+AH_TEMPLATE([NEED_UNDERSCORE_PREFIX], [Define if external symbols need an underscore prefix])
36 AC_CACHE_CHECK("whether external symbols need an underscore prefix",
37 ac_cv_c_extern_prefix,
38 [saved_libs=$LIBS
39@@ -179,68 +180,48 @@ then
40 AC_DEFINE(NEED_UNDERSCORE_PREFIX)
41 fi
42
43-dnl **** Check which ANSI integer type is 16 bit
44-
45-AC_CACHE_CHECK( "which ANSI integer type is 16 bit", ac_16bit_type,
46- AC_TRY_RUN([
47-int main(void) {
48- if (sizeof(short)==2)
49- return(0);
50- else if (sizeof(int)==2)
51- return(1);
52- else
53- return(2);
54-}], ac_16bit_type="short", ac_16bit_type="int", ac_16bit_type=))
55-if test "$ac_16bit_type" = "short"
56-then
57- T1_AA_TYPE16="-DT1_AA_TYPE16=short"
58- T1_INT16="short"
59-else
60- T1_AA_TYPE16="-DT1_AA_TYPE16=int"
61- T1_INT16="int"
62+dnl **** Check which ANSI integer type is 16 bit
63+T1_AA_TYPE16=""
64+for type in short int; do
65+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then
66+ T1_AA_TYPE16="-DT1_AA_TYPE16=$type"
67+ T1_INT16="$type"
68+ break
69+ fi
70+done
71+
72+if test x"$T1_AA_TYPE16" = "x"; then
73+ AC_MSG_ERROR("Unable to determine which integer type is 16 bit.")
74 fi
75
76-
77 dnl **** Check which ANSI integer type is 32 bit
78-
79-AC_CACHE_CHECK( "which ANSI integer type is 32 bit", ac_32bit_type,
80- AC_TRY_RUN([
81-int main(void) {
82- if (sizeof(int)==4)
83- return(0);
84- else if (sizeof(long)==4)
85- return(1);
86- else
87- return(2);
88-}], ac_32bit_type="int", ac_32bit_type="long", ac_32bit_type=))
89-if test "$ac_32bit_type" = "int"
90-then
91- T1_AA_TYPE32="-DT1_AA_TYPE32=int"
92- T1_INT32="int"
93-else
94- T1_AA_TYPE32="-DT1_AA_TYPE32=long"
95- T1_INT32="long"
96+T1_AA_TYPE32=""
97+for type in int long; do
98+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then
99+ T1_AA_TYPE32="-DT1_AA_TYPE32=$type"
100+ T1_INT32="$type"
101+ break
102+ fi
103+done
104+
105+if test x"$T1_AA_TYPE32" = "x"; then
106+ AC_MSG_ERROR("Unable to determine which integer type is 32 bit.")
107 fi
108
109-
110 dnl **** Check which ANSI integer type is 64 bit
111-
112-AC_CACHE_CHECK( "which ANSI integer type is 64 bit", ac_64bit_type,
113- AC_TRY_RUN([
114-int main(void) {
115- if (sizeof(long)==8)
116- return(0);
117- else
118- return(1);
119-}], ac_64bit_type="long", ac_64bit_type="<none>"))
120-if test "$ac_64bit_type" = "long"
121-then
122- T1_AA_TYPE64="-DT1_AA_TYPE64=long"
123-else
124- T1_AA_TYPE64=
125+T1_AA_TYPE64=""
126+for type in long long_long; do
127+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then
128+ AC_MSG_WARN("$type is 64 bit")
129+ T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\""
130+ break
131+ fi
132+done
133+
134+if test x"$T1_AA_TYPE64" = "x"; then
135+ AC_MSG_ERROR("Unable to determine which integer type is 64 bit.")
136 fi
137
138-
139 CFLAGS="${CFLAGS} -DT1LIB_IDENT=\"\\\"${T1LIB_IDENTIFIER}\\\"\" -DGLOBAL_CONFIG_DIR=\"\\\"${T1LIB_DATA_DIR}\\\"\""
140
141 dnl **** Check for functions and header files ****
diff --git a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch
deleted file mode 100644
index bc2476bfc..000000000
--- a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From cea83003de3ffebde92becd1e599fe3b28f0a7c4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Mar 2017 23:13:36 -0800
4Subject: [PATCH] t1lib: Fix printf format string errors
5
6Fix printf formats to use format qualifiers
7fixes
8
9error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Upstream-Status: Pending
13
14---
15 lib/t1lib/t1subset.c | 2 +-
16 lib/type1/objects.c | 2 +-
17 lib/type1/objects.h | 2 +-
18 3 files changed, 3 insertions(+), 3 deletions(-)
19
20diff --git a/lib/t1lib/t1subset.c b/lib/t1lib/t1subset.c
21index da427b2..e76974f 100644
22--- a/lib/t1lib/t1subset.c
23+++ b/lib/t1lib/t1subset.c
24@@ -759,7 +759,7 @@ char *T1_SubsetFont( int FontID,
25 tr_len);
26 T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf,
27 T1LOG_DEBUG);
28- l+=sprintf( &(trailerbuf[l]), linebuf); /* contains the PostScript trailer */
29+ l+=sprintf( &(trailerbuf[l]), "%s", linebuf); /* contains the PostScript trailer */
30 }
31
32 /* compute size of output file */
33diff --git a/lib/type1/objects.c b/lib/type1/objects.c
34index c413a0f..f828e6a 100644
35--- a/lib/type1/objects.c
36+++ b/lib/type1/objects.c
37@@ -957,7 +957,7 @@ struct xobject *TypeErr(name, obj, expect, ret) /* non-ANSI avoids overly strict
38
39 sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n",
40 name, TypeFmt(expect), TypeFmt(obj->type));
41- IfTrace0(TRUE,typemsg);
42+ IfTrace1(TRUE, "%s", typemsg);
43
44 ObjectPostMortem(obj);
45
46diff --git a/lib/type1/objects.h b/lib/type1/objects.h
47index 13cbae7..3a1d337 100644
48--- a/lib/type1/objects.h
49+++ b/lib/type1/objects.h
50@@ -214,7 +214,7 @@ struct xobject {
51 /*SHARED*/
52 /* NDW: personally, I want to see status and error messages! */
53 #define IfTrace0(condition,model) \
54- {if (condition) printf(model);}
55+ {if (condition) fputs(model,stdout);}
56 #define IfTrace1(condition,model,arg0) \
57 {if (condition) printf(model,arg0);}
58 #define IfTrace2(condition,model,arg0,arg1) \
diff --git a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch
deleted file mode 100644
index da54f87ab..000000000
--- a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch
+++ /dev/null
@@ -1,144 +0,0 @@
1From bab41f5e1fc1fc809da1371e6a0222e0eb21e5f0 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Mon, 21 Nov 2011 12:00:54 +0100
4Subject: [PATCH] t1lib: add 5.1.2
5
6#
7# Patch managed by http://www.holgerschurig.de/patcher.html
8#
9
10---
11 Makefile.in | 5 +++--
12 examples/Makefile.in | 5 +++--
13 lib/Makefile.in | 6 ++++--
14 lib/t1lib/Makefile.in | 6 ++++--
15 lib/type1/Makefile.in | 6 ++++--
16 type1afm/Makefile.in | 6 ++++--
17 xglyph/Makefile.in | 6 ++++--
18 7 files changed, 26 insertions(+), 14 deletions(-)
19
20diff --git a/Makefile.in b/Makefile.in
21index 29c3468..396c020 100644
22--- a/Makefile.in
23+++ b/Makefile.in
24@@ -18,7 +18,8 @@
25 # Last modified: 2005-05-01
26 #
27
28-SHELL = /bin/sh
29+SHELL = @SHELL@
30+LIBTOOL = @LIBTOOL@
31 CC = @CC@
32 CPP = @CPP@
33 CFLAGS = @CFLAGS@
34@@ -149,7 +150,7 @@ distclean: clean
35 $(RM) examples/Makefile
36 $(RM) xglyph/Makefile
37 $(RM) doc/Makefile
38- $(RM) libtool
39+ $(RM) $(LIBTOOL)
40
41
42 # The following two targets are for building and cleaning the python-
43diff --git a/examples/Makefile.in b/examples/Makefile.in
44index b301db5..7a6a514 100644
45--- a/examples/Makefile.in
46+++ b/examples/Makefile.in
47@@ -14,9 +14,10 @@
48 # Last modified: 2001-04-01
49 #
50
51+top_builddir = @top_builddir@
52
53-LIBTOOL = ../libtool
54-SHELL = /bin/sh
55+LIBTOOL = @LIBTOOL@
56+SHELL = @SHELL@
57 CC = @CC@
58 CPP = @CPP@
59 CFLAGS = @CFLAGS@
60diff --git a/lib/Makefile.in b/lib/Makefile.in
61index 89e5e86..6e0f960 100644
62--- a/lib/Makefile.in
63+++ b/lib/Makefile.in
64@@ -15,8 +15,10 @@
65 #
66 # Contributions by H.Kakugawa to use libtool!
67
68-LIBTOOL = ../libtool
69-SHELL = /bin/sh
70+top_builddir = @top_builddir@
71+
72+LIBTOOL = @LIBTOOL@
73+SHELL = @SHELL@
74 CC = @CC@
75 CPP = @CPP@
76 CFLAGS = @CFLAGS@
77diff --git a/lib/t1lib/Makefile.in b/lib/t1lib/Makefile.in
78index a6c2478..32434b3 100644
79--- a/lib/t1lib/Makefile.in
80+++ b/lib/t1lib/Makefile.in
81@@ -14,8 +14,10 @@
82 #
83 # Modified by H.Kakugawa to use libtool
84
85-LIBTOOL = ../../libtool
86-SHELL = /bin/sh
87+top_builddir = @top_builddir@
88+
89+LIBTOOL = @LIBTOOL@
90+SHELL = @SHELL@
91 CC = @CC@
92 CPP = @CPP@
93 CFLAGS = @CFLAGS@
94diff --git a/lib/type1/Makefile.in b/lib/type1/Makefile.in
95index 241f124..42efa94 100644
96--- a/lib/type1/Makefile.in
97+++ b/lib/type1/Makefile.in
98@@ -14,8 +14,10 @@
99 #
100 # Modified by H.Kakugawa to use libtool
101
102-LIBTOOL = ../../libtool
103-SHELL = /bin/sh
104+top_builddir = @top_builddir@
105+
106+LIBTOOL = @LIBTOOL@
107+SHELL = @SHELL@
108 CC = @CC@
109 CPP = @CPP@
110 CFLAGS = @CFLAGS@
111diff --git a/type1afm/Makefile.in b/type1afm/Makefile.in
112index 61611e1..9b51406 100644
113--- a/type1afm/Makefile.in
114+++ b/type1afm/Makefile.in
115@@ -15,8 +15,10 @@
116 #
117 # Modified by H.Kakugawa to use libtool
118
119-LIBTOOL = ../libtool
120-SHELL = /bin/sh
121+top_builddir = @top_builddir@
122+
123+LIBTOOL = @LIBTOOL@
124+SHELL = @SHELL@
125 CC = @CC@
126 CPP = @CPP@
127 CFLAGS = @CFLAGS@
128diff --git a/xglyph/Makefile.in b/xglyph/Makefile.in
129index 8da9b63..741334c 100644
130--- a/xglyph/Makefile.in
131+++ b/xglyph/Makefile.in
132@@ -15,8 +15,10 @@
133 #
134 # Modified by H.Kakugawa to use libtool
135
136-LIBTOOL = ../libtool
137-SHELL = /bin/sh
138+top_builddir = @top_builddir@
139+
140+LIBTOOL = @LIBTOOL@
141+SHELL = @SHELL@
142 CC = @CC@
143 CPP = @CPP@
144 CFLAGS = @CFLAGS@
diff --git a/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb b/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb
deleted file mode 100644
index 826dbda85..000000000
--- a/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb
+++ /dev/null
@@ -1,29 +0,0 @@
1SUMMARY = "A Type1 Font Rastering Library"
2SECTION = "libs"
3DEPENDS = "virtual/libx11 libxaw"
4
5LICENSE = "LGPLv2 & GPLv2"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b \
7 file://LGPL;md5=6e29c688d912da12b66b73e32b03d812 \
8"
9
10SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \
11 file://configure.patch \
12 file://libtool.patch \
13 file://format_security.patch"
14SRC_URI[md5sum] = "a5629b56b93134377718009df1435f3c"
15SRC_URI[sha256sum] = "821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59"
16
17inherit autotools-brokensep distro_features_check
18# depends on virtual/libx11
19REQUIRED_DISTRO_FEATURES = "x11"
20
21# Fix GNU_HASH problem
22TARGET_CC_ARCH += "${LDFLAGS}"
23
24EXTRA_OECONF = "--with-x --without-athena"
25EXTRA_OEMAKE = "without_doc"
26
27FILES_${PN} += " ${datadir}/t1lib/t1lib.config"
28FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf"
29