diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-core/console-tools/console-tools-0.3.2 | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-core/console-tools/console-tools-0.3.2')
10 files changed, 344 insertions, 0 deletions
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars b/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars new file mode 100644 index 0000000000..32692ab4b9 --- /dev/null +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars | |||
@@ -0,0 +1,41 @@ | |||
1 | # Makefile variables for PO directory in any package using GNU gettext. | ||
2 | |||
3 | # Usually the message domain is the same as the package name. | ||
4 | DOMAIN = $(PACKAGE) | ||
5 | |||
6 | # These two variables depend on the location of this directory. | ||
7 | subdir = po | ||
8 | top_builddir = .. | ||
9 | |||
10 | # These options get passed to xgettext. | ||
11 | XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ | ||
12 | |||
13 | # This is the copyright holder that gets inserted into the header of the | ||
14 | # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding | ||
15 | # package. (Note that the msgstr strings, extracted from the package's | ||
16 | # sources, belong to the copyright holder of the package.) Translators are | ||
17 | # expected to transfer the copyright for their translations to this person | ||
18 | # or entity, or to disclaim their copyright. The empty string stands for | ||
19 | # the public domain; in this case the translators are expected to disclaim | ||
20 | # their copyright. | ||
21 | COPYRIGHT_HOLDER = Free Software Foundation, Inc. | ||
22 | |||
23 | # This is the email address or URL to which the translators shall report | ||
24 | # bugs in the untranslated strings: | ||
25 | # - Strings which are not entire sentences, see the maintainer guidelines | ||
26 | # in the GNU gettext documentation, section 'Preparing Strings'. | ||
27 | # - Strings which use unclear terms or require additional context to be | ||
28 | # understood. | ||
29 | # - Strings which make invalid assumptions about notation of date, time or | ||
30 | # money. | ||
31 | # - Pluralisation problems. | ||
32 | # - Incorrect English spelling. | ||
33 | # - Incorrect formatting. | ||
34 | # It can be your email address, or a mailing list address where translators | ||
35 | # can write to without being subscribed, or the URL of a web page through | ||
36 | # which the translators can contact you. | ||
37 | MSGID_BUGS_ADDRESS = | ||
38 | |||
39 | # This is the list of locale categories, beyond LC_MESSAGES, for which the | ||
40 | # message catalogs shall be used. It is usually empty. | ||
41 | EXTRA_LOCALE_CATEGORIES = | ||
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch new file mode 100644 index 0000000000..c287014767 --- /dev/null +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | # | ||
4 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
5 | # | ||
6 | |||
7 | --- console-tools-0.3.2/contrib/codepage.c~codepage | ||
8 | +++ console-tools-0.3.2/contrib/codepage.c | ||
9 | @@ -229,7 +229,7 @@ | ||
10 | return 0; | ||
11 | |||
12 | fprintf(stderr, "\ | ||
13 | -Warning: CP format is a hack!\n | ||
14 | +Warning: CP format is a hack!\n\ | ||
15 | The files produced may or may not be usable!\n"); | ||
16 | |||
17 | sprintf(outfile, "%d.cp", CPEntryHeader.codepage); | ||
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch new file mode 100644 index 0000000000..c93f511950 --- /dev/null +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- console-tools-0.3.2/kbdtools/showkey.c~compile 1999-08-25 17:20:08.000000000 -0400 | ||
4 | +++ console-tools-0.3.2/kbdtools/showkey.c 2004-05-09 03:03:23.000000000 -0400 | ||
5 | @@ -264,7 +264,6 @@ | ||
6 | break; | ||
7 | case cmd_keymap: | ||
8 | printf(")\n"); | ||
9 | - default: | ||
10 | } | ||
11 | } | ||
12 | |||
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch new file mode 100644 index 0000000000..15c100c908 --- /dev/null +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- console-tools-0.3.2/configure.in~configure | ||
4 | +++ console-tools-0.3.2/configure.in | ||
5 | @@ -2,13 +2,14 @@ | ||
6 | dnl Process this file with autoconf to produce a configure script. | ||
7 | |||
8 | # Initialize | ||
9 | -AC_INIT(kbdtools/loadkeys.y) | ||
10 | +AC_INIT | ||
11 | +AC_CONFIG_SRCDIR([kbdtools/loadkeys.y]) | ||
12 | |||
13 | define(ct_unicodedata_default,/usr/share/unidata/UnicodeData-2.txt) | ||
14 | ct_localdatadir_default=/usr/local/share # iff --enable-localdatadir without specific dir | ||
15 | |||
16 | #AC_CONFIG_AUX_DIR(autoconf) | ||
17 | -AC_CANONICAL_SYSTEM | ||
18 | +AC_CANONICAL_TARGET([]) | ||
19 | AM_INIT_AUTOMAKE(console-tools, 0.3.2) | ||
20 | |||
21 | # Defaults | ||
22 | @@ -25,7 +26,6 @@ | ||
23 | # i18n stuff | ||
24 | ALL_LINGUAS="cs de ru ga fr" | ||
25 | AM_GNU_GETTEXT | ||
26 | -AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) | ||
27 | |||
28 | AC_DEFINE_UNQUOTED(LOCALEDIR, "/usr/share/locale") | ||
29 | |||
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch new file mode 100644 index 0000000000..be61eb846b --- /dev/null +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | Fix the following error detected with i586-pokymllib32-linux-gcc (the | ||
2 | multilib x86-64 lib32 compiler): | ||
3 | ../lib/ctutils/.libs/libctutils.so: undefined reference to `get_kernel_sfm' | ||
4 | collect2: error: ld returned 1 exit status | ||
5 | |||
6 | It seems that libctutils.so (the library that uses get_kernel_sfm) must | ||
7 | be stated before libconsole.so (the library that exports the function) when | ||
8 | using multilib gcc | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
12 | |||
13 | Index: console-tools-0.3.2/fontfiletools/Makefile.am | ||
14 | =================================================================== | ||
15 | --- console-tools-0.3.2.orig/fontfiletools/Makefile.am | ||
16 | +++ console-tools-0.3.2/fontfiletools/Makefile.am | ||
17 | @@ -10,5 +10,5 @@ EXTRA_DIST = fonts2virfont.c virfont.h | ||
18 | |||
19 | # libconsole is needed by ctutils | ||
20 | LDADD = ../lib/ctlocal/libctlocal.a ../lib/cfont/libcfont.la \ | ||
21 | - ../lib/console/libconsole.la \ | ||
22 | - ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la | ||
23 | + ../lib/ctutils/libctutils.la \ | ||
24 | + ../lib/console/libconsole.la ../lib/generic/libctgeneric.la | ||
25 | Index: console-tools-0.3.2/vttools/Makefile.am | ||
26 | =================================================================== | ||
27 | --- console-tools-0.3.2.orig/vttools/Makefile.am | ||
28 | +++ console-tools-0.3.2/vttools/Makefile.am | ||
29 | @@ -7,9 +7,9 @@ bin_PROGRAMS = chvt deallocvt writevt fg | ||
30 | vcstime vt-is-UTF8 openvt @RESIZECONS@ | ||
31 | EXTRA_PROGRAMS = resizecons | ||
32 | |||
33 | -LDADD = ../lib/ctlocal/libctlocal.a ../lib/console/libconsole.la \ | ||
34 | +LDADD = ../lib/ctlocal/libctlocal.a ../lib/ctutils/libctutils.la \ | ||
35 | ../lib/cfont/libcfont.la \ | ||
36 | - ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la | ||
37 | + ../lib/console/libconsole.la ../lib/generic/libctgeneric.la | ||
38 | |||
39 | vcstime_LDADD = ../lib/ctlocal/libctlocal.a | ||
40 | screendump_LDADD = ../lib/ctlocal/libctlocal.a | ||
41 | Index: console-tools-0.3.2/kbdtools/Makefile.am | ||
42 | =================================================================== | ||
43 | --- console-tools-0.3.2.orig/kbdtools/Makefile.am | ||
44 | +++ console-tools-0.3.2/kbdtools/Makefile.am | ||
45 | @@ -15,9 +15,9 @@ EXTRA_PROGRAMS = getkeycodes setkeycodes | ||
46 | loadkeys_SOURCES = loadkeys.y analyze.l | ||
47 | |||
48 | YFLAGS = -d | ||
49 | -LDADD = ../lib/ctlocal/libctlocal.a ../lib/console/libconsole.la \ | ||
50 | +LDADD = ../lib/ctlocal/libctlocal.a ../lib/ctutils/libctutils.la \ | ||
51 | ../lib/cfont/libcfont.la \ | ||
52 | - ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la | ||
53 | + ../lib/console/libconsole.la ../lib/generic/libctgeneric.la | ||
54 | |||
55 | loadkeys_LDADD = $(LDADD) @LEXLIB@ | ||
56 | |||
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch new file mode 100644 index 0000000000..f370be8592 --- /dev/null +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch | |||
@@ -0,0 +1,75 @@ | |||
1 | Patch from Matthias Goebl <oe@m.goebl.net> | ||
2 | Added via OE bugtracker: bug #478 | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | --- console-tools-0.3.2/kbdtools/kbd_mode.c.orig | ||
7 | +++ console-tools-0.3.2/kbdtools/kbd_mode.c | ||
8 | @@ -29,11 +29,16 @@ | ||
9 | OPT("-u --unicode ", _("UTF-8 mode (UNICODE)")); | ||
10 | OPT("-s --scancode ", _("scancode mode (RAW)")); | ||
11 | OPT(" --mode={8bit,keycode,unicode,scancode} ", _("set mode")); | ||
12 | + OPT("-r --rate=RATE ", _("set repeat rate (default: 33)")); | ||
13 | + OPT("-d --delay=DELAY ", _("set repeat delay (default: 250)")); | ||
14 | |||
15 | OPT("-h --help ", HELPDESC); | ||
16 | OPT("-V --version ", VERSIONDESC); | ||
17 | } | ||
18 | |||
19 | +int rate=-1; | ||
20 | +int delay=-1; | ||
21 | + | ||
22 | static int parse_cmdline (int argc, char *argv[]) | ||
23 | { | ||
24 | int mode = -1; | ||
25 | @@ -46,11 +51,13 @@ | ||
26 | { "mode" , required_argument, NULL, 'm' }, | ||
27 | { "scancode" , no_argument, NULL, 's' }, | ||
28 | { "unicode" , no_argument, NULL, 'u' }, | ||
29 | + { "rate" , required_argument, NULL, 'r' }, | ||
30 | + { "delay" , required_argument, NULL, 'd' }, | ||
31 | { NULL, 0, NULL, 0 } | ||
32 | }; | ||
33 | int c; | ||
34 | |||
35 | - while ( (c = getopt_long (argc, argv, "Vhaksu", long_opts, NULL)) != EOF) | ||
36 | + while ( (c = getopt_long (argc, argv, "Vhaksur:d:", long_opts, NULL)) != EOF) | ||
37 | switch (c) { | ||
38 | case 'h': | ||
39 | usage (); | ||
40 | @@ -58,6 +65,14 @@ | ||
41 | case 'V': | ||
42 | version (); | ||
43 | exit(0); | ||
44 | + case 'r': | ||
45 | + rate = atoi(optarg); | ||
46 | + mode = -2; | ||
47 | + break; | ||
48 | + case 'd': | ||
49 | + delay = atoi(optarg); | ||
50 | + mode = -2; | ||
51 | + break; | ||
52 | case 'a': | ||
53 | mode = K_XLATE; | ||
54 | break; | ||
55 | @@ -129,6 +144,20 @@ | ||
56 | exit(0); | ||
57 | } | ||
58 | |||
59 | + if ( rate != -1 || delay != -1 ) | ||
60 | + { | ||
61 | + struct kbd_repeat kbd_rep; | ||
62 | + kbd_rep.delay = delay; | ||
63 | + kbd_rep.period = rate; | ||
64 | + if (ioctl(fd, KDKBDREP, &kbd_rep)) | ||
65 | + { | ||
66 | + fprintf(stderr, progname); | ||
67 | + perror(_(": error setting keyboard repeat mode\n")); | ||
68 | + exit(1); | ||
69 | + } | ||
70 | + if(mode==-2) exit(0); | ||
71 | + } | ||
72 | + | ||
73 | if (ioctl(fd, KDSKBMODE, mode)) | ||
74 | { | ||
75 | fprintf(stderr, progname); | ||
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4 new file mode 100644 index 0000000000..18d47a94f7 --- /dev/null +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4 | |||
@@ -0,0 +1,24 @@ | |||
1 | # Check whether LC_MESSAGES is available in <locale.h>. | ||
2 | # Ulrich Drepper <drepper@cygnus.com>, 1995. | ||
3 | # | ||
4 | # This file can be copied and used freely without restrictions. It can | ||
5 | # be used in projects which are not available under the GNU General Public | ||
6 | # License or the GNU Library General Public License but which still want | ||
7 | # to provide support for the GNU gettext functionality. | ||
8 | # Please note that the actual code of the GNU gettext library is covered | ||
9 | # by the GNU Library General Public License, and the rest of the GNU | ||
10 | # gettext package package is covered by the GNU General Public License. | ||
11 | # They are *not* in the public domain. | ||
12 | |||
13 | # serial 2 | ||
14 | |||
15 | AC_DEFUN([AM_LC_MESSAGES], | ||
16 | [if test $ac_cv_header_locale_h = yes; then | ||
17 | AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, | ||
18 | [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], | ||
19 | am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) | ||
20 | if test $am_cv_val_LC_MESSAGES = yes; then | ||
21 | AC_DEFINE(HAVE_LC_MESSAGES, 1, | ||
22 | [Define if your <locale.h> file defines LC_MESSAGES.]) | ||
23 | fi | ||
24 | fi]) | ||
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch new file mode 100644 index 0000000000..a6735a53ff --- /dev/null +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | No reason to link with libfl since 'loadkeys' implements | ||
2 | its own yywrap()/yylex() functions. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> | ||
6 | |||
7 | Index: console-tools-0.3.2/kbdtools/Makefile.am | ||
8 | =================================================================== | ||
9 | --- console-tools-0.3.2.orig/kbdtools/Makefile.am | ||
10 | +++ console-tools-0.3.2/kbdtools/Makefile.am | ||
11 | @@ -19,8 +19,6 @@ LDADD = ../lib/ctlocal/libctlocal.a ../l | ||
12 | ../lib/cfont/libcfont.la \ | ||
13 | ../lib/console/libconsole.la ../lib/generic/libctgeneric.la | ||
14 | |||
15 | -loadkeys_LDADD = $(LDADD) @LEXLIB@ | ||
16 | - | ||
17 | bin_SCRIPTS = mk_modmap | ||
18 | |||
19 | noinst_HEADERS = loadkeys.h | ||
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch new file mode 100644 index 0000000000..2ed609219c --- /dev/null +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | The docs need tools we don't have to build so disable them. | ||
2 | |||
3 | Also remove intl since the Makefile doesn't work with 3.82 and we | ||
4 | don't want to build libintl anyway. | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | RP 2012/10/17 | ||
8 | |||
9 | Index: console-tools-0.3.2/Makefile.am | ||
10 | =================================================================== | ||
11 | --- console-tools-0.3.2.orig/Makefile.am 1999-04-15 01:33:24.000000000 +0000 | ||
12 | +++ console-tools-0.3.2/Makefile.am 2012-10-17 11:48:14.107069145 +0000 | ||
13 | @@ -1,7 +1,7 @@ | ||
14 | # -*- makefile -*- | ||
15 | AUTOMAKE_OPTIONS = foreign | ||
16 | |||
17 | -SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib doc \ | ||
18 | - compat include examples po intl | ||
19 | +SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib \ | ||
20 | + compat include examples po | ||
21 | |||
22 | EXTRA_DIST = BUGS RELEASE CREDITS COPYING.kbd local-scripts/* debian/* *.lsm | ||
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch new file mode 100644 index 0000000000..0c95068a36 --- /dev/null +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | Fixing the locale issues isn't enough, console-tools also does a couple of | ||
2 | other pretty stupid things (like FILE *f; f->_fileno instead of fileno(f)), | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | --- console-tools-0.3.2/lib/cfont/fontstruct.c.ark 2005-05-22 19:12:38.000000000 +0000 | ||
7 | +++ console-tools-0.3.2/lib/cfont/fontstruct.c 2005-05-22 19:13:23.000000000 +0000 | ||
8 | @@ -50,8 +50,7 @@ | ||
9 | * get filesize | ||
10 | */ | ||
11 | |||
12 | - /* FIXME: should not use _fileno ! */ | ||
13 | - if (fstat(fontfile->_fileno, &stbuf) == -1) | ||
14 | + if (fstat(fileno(fontfile), &stbuf) == -1) | ||
15 | goto rsf_return_error; | ||
16 | |||
17 | if (S_ISREG(stbuf.st_mode)) | ||
18 | @@ -211,8 +210,7 @@ | ||
19 | * get filesize | ||
20 | */ | ||
21 | |||
22 | - /* FIXME: should not use _fileno ! */ | ||
23 | - if (fstat(fontfile->_fileno, &stbuf) == -1) | ||
24 | + if (fstat(fileno(fontfile), &stbuf) == -1) | ||
25 | goto rfg_return_error; | ||
26 | |||
27 | if (S_ISREG(stbuf.st_mode)) | ||
28 | --- console-tools-0.3.2/lib/console/acm.c.ark 2005-05-22 19:17:15.000000000 +0000 | ||
29 | +++ console-tools-0.3.2/lib/console/acm.c 2005-05-22 19:17:23.000000000 +0000 | ||
30 | @@ -30,7 +30,7 @@ | ||
31 | lct_boolean parse_failed = False; | ||
32 | lct_boolean is_unicode; | ||
33 | |||
34 | - if (fstat(fp->_fileno, &stbuf)) | ||
35 | + if (fstat(fileno(fp), &stbuf)) | ||
36 | perror(_("Cannot stat ACM file")), exit(1); | ||
37 | |||
38 | /* first try a wg15-charmap (glibc) file format */ | ||
39 | --- console-tools-0.3.2/include/lct/local.h.ark 2005-05-22 19:08:54.000000000 +0000 | ||
40 | +++ console-tools-0.3.2/include/lct/local.h 2005-05-22 19:09:12.000000000 +0000 | ||
41 | @@ -8,7 +8,7 @@ | ||
42 | #include <locale.h> | ||
43 | |||
44 | |||
45 | -#ifdef HAVE_LOCALE_H | ||
46 | +#if defined(HAVE_LOCALE_H) && defined(HAVE_LIBINTL_H) | ||
47 | # include <libintl.h> | ||
48 | # define _(String) gettext (String) | ||
49 | # ifdef gettext_noop | ||