Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kbd/patches/kbd-1.12-debian.patch

    Annotation of /trunk/kbd/patches/kbd-1.12-debian.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 144 - (hide annotations) (download)
    Tue May 8 20:06:05 2007 UTC (17 years, 1 month ago) by niro
    File size: 2628 byte(s) 
    -import
    1 niro 144 diff -urNad /home/wart/Projects/debian/kbd/new/kbd-1.12/src/loadkeys.y kbd-1.12/src/loadkeys.y
    2     --- /home/wart/Projects/debian/kbd/new/kbd-1.12/src/loadkeys.y 2004-01-27 14:25:50.000000000 +0300
    3     +++ kbd-1.12/src/loadkeys.y 2004-01-27 14:37:01.000000000 +0300
    4     @@ -566,7 +566,7 @@
    5     }
    6    
    7     char *dirpath[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
    8     -char *suffixes[] = { "", ".map", 0 };
    9     +char *suffixes[] = { "", ".kmap", ".map", 0 };
    10     extern FILE *findfile(char *fnam, char **dirpath, char **suffixes);
    11    
    12     #undef yywrap
    13     diff -urNad /opt/tmp/kbd-1.12/src/loadunimap.c kbd-1.12/src/loadunimap.c
    14     --- /opt/tmp/kbd-1.12/src/loadunimap.c 2004-08-02 22:57:25.000000000 +0200
    15     +++ kbd-1.12/src/loadunimap.c 2004-08-02 22:57:44.000000000 +0200
    16     @@ -28,8 +28,8 @@
    17     extern char *progname;
    18     extern int force;
    19    
    20     -static char *unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 };
    21     -static char *unisuffixes[] = { "", ".uni", 0 };
    22     +static char *unidirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };
    23     +static char *unisuffixes[] = { "", ".sfm", ".uni", 0 };
    24    
    25     #ifdef MAIN
    26     #include "version.h"
    27     diff -urNad /opt/tmp/kbd-1.12/src/getunimap.c kbd-1.12/src/getunimap.c
    28     --- /opt/tmp/kbd-1.12/src/getunimap.c 2004-08-01 20:33:38.000000000 +0200
    29     +++ kbd-1.12/src/getunimap.c 2004-08-02 22:45:30.000000000 +0200
    30     @@ -62,7 +62,7 @@
    31     }
    32     }
    33    
    34     - if (argc != 1)
    35     + if (optind < argc)
    36     usage();
    37    
    38     fd = getfd(console);
    39     diff -urNad /opt/tmp/kbd-1.12/src/loadunimap.c kbd-1.12/src/loadunimap.c
    40     --- /opt/tmp/kbd-1.12/src/loadunimap.c 2004-08-02 22:45:06.000000000 +0200
    41     +++ kbd-1.12/src/loadunimap.c 2004-08-02 22:46:39.000000000 +0200
    42     @@ -73,18 +73,18 @@
    43     }
    44     }
    45    
    46     - if (argc > 2 || (argc == 1 && !outfnam))
    47     + if (argc > optind+1 || (argc == optind && !outfnam))
    48     usage();
    49    
    50     fd = getfd(console);
    51    
    52     if (outfnam) {
    53     saveunicodemap(fd, outfnam);
    54     - if (argc == 1)
    55     + if (argc == optind)
    56     exit(0);
    57     }
    58    
    59     - if (argc == 2)
    60     + if (argc == optind+1)
    61     infnam = argv[optind];
    62     loadunicodemap(fd, infnam);
    63     exit(0);
    64     diff -urNad /opt/tmp/kbd-1.12/src/showconsolefont.c kbd-1.12/src/showconsolefont.c
    65     --- /opt/tmp/kbd-1.12/src/showconsolefont.c 2004-08-02 22:44:30.000000000 +0200
    66     +++ kbd-1.12/src/showconsolefont.c 2004-08-02 22:47:07.000000000 +0200
    67     @@ -135,7 +135,7 @@
    68     }
    69     }
    70    
    71     - if (argc != 1)
    72     + if (optind < argc)
    73     usage();
    74    
    75     fd = getfd(console);
    76     --- kbd-1.12.orig/src/kbdrate.c
    77     +++ kbd-1.12/src/kbdrate.c
    78     @@ -112,7 +112,7 @@
    79     kbdrep_s.period = -1;
    80     kbdrep_s.delay = -1;
    81     if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
    82     - if (errno == EINVAL)
    83     + if (errno == EINVAL || errno == ENOTTY)
    84     return 0;
    85     perror( "ioctl(KDKBDREP)" );
    86     exit( 1 );