rpms/alevt/devel alevt-1.6.2-rus-greek.patch, NONE, 1.1 alevt-1.6.2-doublefont.patch, 1.1, 1.2 alevt.spec, 1.5, 1.6
Lucian Langa
lucilanga at fedoraproject.org
Fri Apr 10 12:48:42 UTC 2009
- Previous message (by thread): rpms/roundcubemail/devel .cvsignore, 1.10, 1.11 roundcubemail.spec, 1.21, 1.22 sources, 1.11, 1.12
- Next message (by thread): rpms/thttpd/devel thttpd-2.25b-CVE-2005-3124.patch, 1.2, 1.3 thttpd-2.25b-fixes.patch, 1.2, 1.3 thttpd.init, 1.3, 1.4 thttpd.logrotate, 1.1, 1.2 thttpd.spec, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lucilanga
Update of /cvs/pkgs/rpms/alevt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22902
Modified Files:
alevt-1.6.2-doublefont.patch alevt.spec
Added Files:
alevt-1.6.2-rus-greek.patch
Log Message:
* Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-10
- new patch for chrilic fonts from Alexey Loukianov (mooroon2 at mail.ru)
- updated doublefont patch
alevt-1.6.2-rus-greek.patch:
--- NEW FILE alevt-1.6.2-rus-greek.patch ---
diff -Nur alevt-1.6.2/alevt.1x.in alevt-1.6.2.rus+greek/alevt.1x.in
--- alevt-1.6.2/alevt.1x.in 2007-12-03 08:52:12.000000000 +0300
+++ alevt-1.6.2.rus+greek/alevt.1x.in 2009-04-10 06:59:25.000000000 +0400
@@ -62,7 +62,7 @@
.BR \-bell / \-nobell
Enables/disables the error bell. Normally enabled.
.TP
-.BI \-charset \ latin-1\||latin-2
+.BI \-charset \ latin-1\||latin-2\||russian\||iso8859-7
Selects the character set to use. Characters not present
in the selected set are replaced by similar looking symbols.
(default: latin-1)
diff -Nur alevt-1.6.2/alevt-cap.1.in alevt-1.6.2.rus+greek/alevt-cap.1.in
--- alevt-1.6.2/alevt-cap.1.in 2007-12-03 09:05:59.000000000 +0300
+++ alevt-1.6.2.rus+greek/alevt-cap.1.in 2009-04-10 06:59:25.000000000 +0400
@@ -45,7 +45,7 @@
the program terminates with exit status 1 after saving
the already captured pages. The default is to wait forever.
.TP
-.BI \-charset \ latin-1\||latin-2
+.BI \-charset \ latin-1\||latin-2\||russian
Selects the character set to use. Characters not present
in the selected set are replaced by similar looking symbols.
(default: latin-1)
diff -Nur alevt-1.6.2/alevt-cap.c alevt-1.6.2.rus+greek/alevt-cap.c
--- alevt-1.6.2/alevt-cap.c 2007-12-03 09:12:22.000000000 +0300
+++ alevt-1.6.2.rus+greek/alevt-cap.c 2009-04-10 07:02:48.000000000 +0400
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
+#include <locale.h>
#include <string.h>
#include <signal.h>
#include <unistd.h>
@@ -33,16 +34,16 @@
fprintf(fp, "\nUsage: %s [options] ppp[.ss]...\n", prgname);
fprintf(fp,
"\n"
- " Valid options:\t\tDefault:\n"
+ " Valid options:\t\t\t\tDefault:\n"
" --help\n"
" --version\n"
- " -vbi <vbidev>\t\t/dev/vbi0\n"
- " -finetune <-4..4|auto>\t0\n"
- //" -oldbttv\t\t\t(for bttv <0.5.20)\n"
- " -charset latin-1/2\t\tlatin-1\n"
- " -timeout <secs>\t\tnone\n"
- " -name <filename>\t\tttext-%%s.%%e\n"
- " -format <fmt[,options]>\tascii\n"
+ " -vbi <vbidev>\t\t\t\t/dev/vbi0\n"
+ " -finetune <-4..4|auto>\t\t\t0\n"
+ //" -oldbttv\t\t\t\t\t(for bttv <0.5.20)\n"
+ " -charset latin-1/latin-2/russian\t\tlatin-1\n"
+ " -timeout <secs>\t\t\t\tnone\n"
+ " -name <filename>\t\t\t\tttext-%%s.%%e\n"
+ " -format <fmt[,options]>\t\t\tascii\n"
" -format help\n"
"\n"
" ppp[.ss] stands for a page number and an\n"
@@ -205,6 +206,7 @@
struct req *req;
struct dl_head reqs[2]; // simple linear lists of requests & captures
+ setlocale (LC_CTYPE, "");
setprgname(argv[0]);
fdset_init(fds);
@@ -247,8 +249,12 @@
latin1 = 1;
else if (streq(arg, "latin-2") || streq(arg, "2"))
latin1 = 0;
+ else if (streq(arg, "russian") || streq(arg, "rus"))
+ latin1 = KOI8;
+ else if (streq(arg, "iso8859-7") || streq(arg, "el"))
+ latin1 = GREEK;
else
- fatal("bad charset (not latin-1/2)");
+ fatal("bad charset (not latin-1/2/russian/iso8859-7)");
break;
case 10: // format
if (streq(arg, "help") || streq(arg, "?") || streq(arg, "list"))
diff -Nur alevt-1.6.2/exp-gfx.c alevt-1.6.2.rus+greek/exp-gfx.c
--- alevt-1.6.2/exp-gfx.c 2007-12-03 05:56:06.000000000 +0300
+++ alevt-1.6.2.rus+greek/exp-gfx.c 2009-04-10 06:59:25.000000000 +0400
@@ -21,7 +21,7 @@
int sep)
{
int x,y;
- unsigned char* src= (latin1 ? font1_bits : font2_bits);
+ unsigned char* src= (latin1==LATIN1 ? font1_bits : font2_bits);
int dest_x=_x*CW;
int dest_y=_y*CH;
diff -Nur alevt-1.6.2/exp-html.c alevt-1.6.2.rus+greek/exp-html.c
--- alevt-1.6.2/exp-html.c 2007-12-03 05:55:17.000000000 +0300
+++ alevt-1.6.2.rus+greek/exp-html.c 2009-04-10 06:59:25.000000000 +0400
@@ -111,12 +111,22 @@
HTML_NL
#ifndef STRIPPED_HTML
fputs("<meta http-equiv=\"Content-Type\" content=\"text/html;",fp);
- fprintf(fp,"charset=iso-8859-%d\">",(latin1 ? 1 : 2));
+ switch(latin1) {
+ case LATIN1: fprintf(fp,"charset=iso-8859-1\">"); break;
+ case LATIN2: fprintf(fp,"charset=iso-8859-2\">"); break;
+ case KOI8: fprintf(fp,"charset=koi8-r\">"); break;
+ case GREEK: fprintf(fp,"charset=iso-8859-7\">"); break;
+ }
HTML_NL
fputs("<meta name=\"GENERATOR\" content=\"alevt-cap\">",fp);
HTML_NL
#else
- fprintf(fp,"<meta charset=\"iso-8859-%d\">",(latin1 ? 1 : 2));
+ switch(latin1) {
+ case LATIN1: fprintf(fp,"<meta charset=iso-8859-1\">"); break;
+ case LATIN2: fprintf(fp,"<meta charset=iso-8859-2\">"); break;
+ case KOI8: fprintf(fp,"<meta charset=koi8-r\">"); break;
+ case GREEK: fprintf(fp,"<meta charset=iso-8859-7\">"); break;
+ }
HTML_NL
#endif
fputs("</head>",fp);
diff -Nur alevt-1.6.2/font.c alevt-1.6.2.rus+greek/font.c
--- alevt-1.6.2/font.c 1999-10-08 02:20:00.000000000 +0400
+++ alevt-1.6.2.rus+greek/font.c 2009-04-10 06:59:25.000000000 +0400
@@ -1,3 +1,7 @@
#define static /* I want them global */
#include "font1.xbm"
#include "font2.xbm"
+#include "font3.xbm"
+#include "font4.xbm"
+
+
diff -Nur alevt-1.6.2/font.h alevt-1.6.2.rus+greek/font.h
--- alevt-1.6.2/font.h 1999-10-08 02:24:02.000000000 +0400
+++ alevt-1.6.2.rus+greek/font.h 2009-04-10 06:59:25.000000000 +0400
@@ -9,6 +9,8 @@
extern unsigned char font1_bits[];
extern unsigned char font2_bits[];
+extern unsigned char font3_bits[];
+extern unsigned char font4_bits[];
#define font_width font1_width
#define font_height font1_height
diff -Nur alevt-1.6.2/lang.c alevt-1.6.2.rus+greek/lang.c
--- alevt-1.6.2/lang.c 1999-07-18 19:23:48.000000000 +0400
+++ alevt-1.6.2.rus+greek/lang.c 2009-04-10 06:59:25.000000000 +0400
@@ -1,4 +1,5 @@
#include <string.h>
+#include <ctype.h>
#include "misc.h"
#include "vt.h"
#include "lang.h"
@@ -145,22 +146,175 @@
void
conv2latin(u8 *p, int n, int lang)
{
- int c, gfx = 0;
+ int c, gfx = 0, lat=0;
+ if ((latin1 == KOI8) && lang==12) { /* russian */
+ while (n--) {
+ c=*p;
+
+ if(c==0x1b) lat = !lat; /* ESC switches languages inside page */
+
+ if ( is_koi(c)) {
+ if (not gfx || (c & 0xa0) != 0x20) {
+ if(!lat) conv2koi8(p);
+ }
+ }
+ else if ((c & 0xe8) == 0)
+ gfx = c & 0x10;
+ p++;
+ }
+ }
+else if ((latin1 == GREEK) && lang==15) { /* Hellas */
+ while (n--) {
+ c=*p;
+
+ if(c==0x1b) lat = !lat; /* ESC switches languages inside page */
+
+ if ( is_greek(c)) {
+ if (not gfx || (c & 0xa0) != 0x20) {
+ if(!lat) conv2greek(p);
+ }
+ }
+ else if ((c & 0xe8) == 0)
+ gfx = c & 0x10;
+ p++;
+ }
+ }
+
+ else {
while (n--)
{
if (lang_char[c = *p])
{
- if (not gfx || (c & 0xa0) != 0x20)
[...11868 lines suppressed...]
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char155
+ENCODING 249
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+C300
+C300
+C300
+C300
+F300
+DB00
+DB00
+DB00
+DB00
+F300
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char135
+ENCODING 250
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+7C00
+C600
+0600
+0600
+3C00
+0600
+0600
+0600
+C600
+7C00
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char152
+ENCODING 251
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+FF00
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char157
+ENCODING 252
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+7C00
+C600
+0600
+2600
+3E00
+2600
+0600
+0600
+C600
+7C00
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char153
+ENCODING 253
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+FF00
+0300
+0300
+0000
+0000
+ENDCHAR
+STARTCHAR char151
+ENCODING 254
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+C600
+C600
+C600
+C600
+C600
+7E00
+0600
+0600
+0600
+0600
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char154
+ENCODING 255
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+F800
+B000
+3000
+3000
+3C00
+3600
+3600
+3600
+3600
+7C00
+0000
+0000
+0000
+0000
+ENDCHAR
+ENDFONT
diff -Nur alevt-1.6.2/xio.c alevt-1.6.2.rus+greek/xio.c
--- alevt-1.6.2/xio.c 2007-12-03 09:18:04.000000000 +0300
+++ alevt-1.6.2.rus+greek/xio.c 2009-04-10 06:59:25.000000000 +0400
@@ -128,10 +128,18 @@
{
GC gc;
int i;
+ unsigned char *font_bits;
+
+ switch(latin1) {
+ case LATIN1: font_bits=font1_bits; break;
+ case LATIN2: font_bits=font2_bits; break;
+ case KOI8: font_bits=font3_bits; break;
+ case GREEK: font_bits=font4_bits; break;
+ default: font_bits=font1_bits; break;
+ }
xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,
- latin1 ? font1_bits : font2_bits,
- font_width, font_height);
+ font_bits, font_width, font_height);
xio->font[1] = XCreatePixmap(xio->dpy, xio->root,
font_width, font_height*2, 1);
gc = XCreateGC(xio->dpy, xio->font[0], 0, 0);
@@ -610,6 +618,7 @@
case 0x0e: /* SO (reserved, double width) */
case 0x0f: /* SI (reserved, double size) */
+ c= ' '; break;
case 0x1b: /* ESC (reserved) */
c = ' ';
break;
alevt-1.6.2-doublefont.patch:
Index: alevt-1.6.2-doublefont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/devel/alevt-1.6.2-doublefont.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alevt-1.6.2-doublefont.patch 5 Dec 2008 08:16:33 -0000 1.1
+++ alevt-1.6.2-doublefont.patch 10 Apr 2009 12:48:12 -0000 1.2
@@ -1,76 +1,122 @@
-diff -Naur alevt-1.6.2/exp-gfx.c alevt-1.6.2-mod/exp-gfx.c
---- alevt-1.6.2/exp-gfx.c 2007-12-03 04:56:06.000000000 +0200
-+++ alevt-1.6.2-mod/exp-gfx.c 2008-12-03 22:32:16.000000000 +0200
-@@ -21,7 +21,9 @@
+diff -Nur alevt-1.6.2.rus+greek/alevt.1x.in alevt-1.6.2.doublefont/alevt.1x.in
+--- alevt-1.6.2.rus+greek/alevt.1x.in 2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/alevt.1x.in 2009-04-10 07:26:06.000000000 +0400
+@@ -67,6 +67,9 @@
+ in the selected set are replaced by similar looking symbols.
+ (default: latin-1)
+ .TP
++.BR \-doublefont / \-df
++Instructs alevt to use double sized fonts.
++.TP
+ .B \-\-help
+ Show summary of options.
+ .TP
+diff -Nur alevt-1.6.2.rus+greek/exp-gfx.c alevt-1.6.2.doublefont/exp-gfx.c
+--- alevt-1.6.2.rus+greek/exp-gfx.c 2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/exp-gfx.c 2009-04-10 07:28:15.000000000 +0400
+@@ -21,7 +21,16 @@
int sep)
{
int x,y;
-- unsigned char* src= (latin1 ? font1_bits : font2_bits);
-+ unsigned char* src= double_font?
-+ (latin1? font3_bits : font4_bits) :
-+ (latin1? font1_bits : font2_bits);
+- unsigned char* src= (latin1==LATIN1 ? font1_bits : font2_bits);
++ unsigned char* src = double_font ?
++ ( (latin1==LATIN1) ? font1_bits :
++ ( (latin1==LATIN2) ? font2_bits :
++ ( (latin1==KOI8) ? font3_bits :
++ ( (latin1==GREEK) ? font4_bits : /* fallback */ font1_bits) ) ) )
++ :
++ ( (latin1==LATIN1) ? font1d_bits :
++ ( (latin1==LATIN2) ? font2d_bits :
++ ( (latin1==KOI8) ? font3d_bits :
++ ( (latin1==GREEK) ? font4d_bits : /* fallback */ font1d_bits) ) ) );
int dest_x=_x*CW;
int dest_y=_y*CH;
-diff -Naur alevt-1.6.2/font.c alevt-1.6.2-mod/font.c
---- alevt-1.6.2/font.c 1999-10-08 01:20:00.000000000 +0300
-+++ alevt-1.6.2-mod/font.c 2008-12-03 21:26:36.000000000 +0200
-@@ -1,3 +1,5 @@
- #define static /* I want them global */
- #include "font1.xbm"
- #include "font2.xbm"
-+#include "font3.xbm"
-+#include "font4.xbm"
-diff -Naur alevt-1.6.2/font.h alevt-1.6.2-mod/font.h
---- alevt-1.6.2/font.h 1999-10-08 01:24:02.000000000 +0300
-+++ alevt-1.6.2-mod/font.h 2008-12-03 22:30:02.000000000 +0200
-@@ -9,10 +9,18 @@
+diff -Nur alevt-1.6.2.rus+greek/font.c alevt-1.6.2.doublefont/font.c
+--- alevt-1.6.2.rus+greek/font.c 2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/font.c 2009-04-10 07:28:15.000000000 +0400
+@@ -4,4 +4,13 @@
+ #include "font3.xbm"
+ #include "font4.xbm"
+
++#include "font1d.xbm"
++#include "font2d.xbm"
++#include "font3d.xbm"
++#include "font4d.xbm"
+
++int CW;
++int CH;
++int double_font = 0;
++int font_width;
++int font_height;
+diff -Nur alevt-1.6.2.rus+greek/font.h alevt-1.6.2.doublefont/font.h
+--- alevt-1.6.2.rus+greek/font.h 2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/font.h 2009-04-10 07:28:15.000000000 +0400
+@@ -1,20 +1,31 @@
+ #ifndef FONT_H
+ #define FONT_H
+
+-#include "fontsize.h" /* the #defines from font?.xbm */
++// #include "fontsize.h" /* the #defines from font?.xbm */
+
+-#if font1_width != font2_width || font1_height != font2_height
+-#error different font sizes.
+-#endif
++//#if font1_width != font2_width || font1_height != font2_height
++//#error different font sizes.
++//#endif
extern unsigned char font1_bits[];
extern unsigned char font2_bits[];
-+extern unsigned char font3_bits[];
-+extern unsigned char font4_bits[];
+ extern unsigned char font3_bits[];
+ extern unsigned char font4_bits[];
-#define font_width font1_width
-#define font_height font1_height
-#define CW (font_width/32) /* pixel width of a character */
-#define CH (font_height/8) /* pixel height of a character */
++extern unsigned char font1d_bits[];
++extern unsigned char font2d_bits[];
++extern unsigned char font3d_bits[];
++extern unsigned char font4d_bits[];
+
+//#define font_width font1_width
+//#define font_height font1_height
+//#define CW (font_width/32) /* pixel width of a character */
-+//externint CW = (font_width/32); /* pixel width of a character */
-+int CW;
-+int CH;
-+int font_width;
-+int font_height;
-+int double_font;
++//#define CH (font_height/8) /* pixel height of a character */
++
++extern int CW;
++extern int CH;
++extern int double_font;
++extern int font_width;
++extern int font_height;
#endif
-diff -Naur alevt-1.6.2/main.c alevt-1.6.2-mod/main.c
---- alevt-1.6.2/main.c 2007-12-03 05:45:29.000000000 +0200
-+++ alevt-1.6.2-mod/main.c 2008-12-04 08:16:13.000000000 +0200
-@@ -22,6 +22,11 @@
- static int fine_tune = 1; // auto = 999;
+diff -Nur alevt-1.6.2.rus+greek/main.c alevt-1.6.2.doublefont/main.c
+--- alevt-1.6.2.rus+greek/main.c 2009-04-10 07:16:37.000000000 +0400
++++ alevt-1.6.2.doublefont/main.c 2009-04-10 07:28:15.000000000 +0400
+@@ -24,6 +24,12 @@
static int erc = 1;
static int newbttv = -1;
-+int double_font = 0;
-+int font_width = 288;
-+int font_height = 128;
-+int CW;
-+int CH;
++/* Double font size related variables */
++extern int double_font;
++extern int font_width;
++extern int font_height;
++extern int CW;
++extern int CH;
static void
-@@ -43,6 +48,7 @@
- " -[no]erc\t\t\tenabled\n"
- " -[no]bell\t\t\tenabled\n"
- " -charset latin-1/2\t\tlatin-1\n"
+ usage(FILE *fp, int exitval)
+@@ -44,6 +50,7 @@
+ " -[no]erc\t\t\t\t\tenabled\n"
+ " -[no]bell\t\t\t\t\tenabled\n"
+ " -charset latin-1/2/russian/iso8859-7\tlatin-1\n"
+ " -doublefont\n"
"\n"
" Order is important! Each page number\n"
" opens a new window with the previously\n"
-@@ -126,6 +132,7 @@
+@@ -127,6 +134,7 @@
{ "-bell", "-b", 0 },
{ "-nobell", "-nb", 0 },
{ "-charset", "-latin", 1 },
@@ -78,70 +124,114 @@
};
int i;
-@@ -163,6 +170,9 @@
+@@ -164,7 +172,7 @@
int opt, ind;
char *arg;
-+ CW = (font_width/32);
-+ CH = (font_height/8);
-+
+-setlocale (LC_CTYPE, "");
++ setlocale (LC_CTYPE, "");
+
setprgname(argv[0]);
- fdset_init(fds);
-@@ -235,6 +245,13 @@
+@@ -242,6 +250,9 @@
else
- fatal("bad charset (not latin-1/2)");
+ fatal("bad charset (not latin-1/2/russian/iso8859-7)");
break;
-+ case 19: // double font size
++ case 19: // Doublefont
+ double_font = 1;
-+ font_width=576;
-+ font_height=256;
-+ CW = (font_width/32);
-+ CH = (font_height/8);
+ break;
case 12: // debug
debug++;
break;
-diff -Naur alevt-1.6.2/Makefile alevt-1.6.2-mod/Makefile
---- alevt-1.6.2/Makefile 2007-12-03 07:19:54.000000000 +0200
-+++ alevt-1.6.2-mod/Makefile 2008-12-03 22:38:58.000000000 +0200
-@@ -33,8 +33,8 @@
+@@ -253,6 +264,14 @@
+ break;
+ }
+
++ /* Font caps inits */
++
++ font_width = (double_font==0) ? 288 : 576;
++ font_height = (double_font==0) ? 128 : 256;
++
++ CW = (font_width/32);
++ CH = (font_height/8);
++
+ if (parent == 0)
+ start(argc, argv, 0, 0x900, ANY_SUB);
+
+diff -Nur alevt-1.6.2.rus+greek/Makefile alevt-1.6.2.doublefont/Makefile
+--- alevt-1.6.2.rus+greek/Makefile 2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/Makefile 2009-04-10 07:28:15.000000000 +0400
+@@ -33,9 +33,10 @@
alevt-cap: $(COBJS)
$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
--font.o: font1.xbm font2.xbm
--fontsize.h: font1.xbm font2.xbm
-+font.o: font1.xbm font2.xbm font3.xbm font4.xbm
-+fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm
- fgrep -h "#define" font1.xbm font2.xbm >fontsize.h
+-font.o: font1.xbm font2.xbm font3.xbm font4.xbm
+-fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm
++font.o: font1.xbm font2.xbm font3.xbm font4.xbm font1d.xbm font2d.xbm font3d.xbm font4d.xbm
++fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm font1d.xbm font2d.xbm font3d.xbm font4d.xbm
+ fgrep -h "#define" font1.xbm font2.xbm font3.xbm font4.xbm >fontsize.h
++ fgrep -h "#define" font1d.xbm font2d.xbm font3d.xbm font4d.xbm >> fontsize.h
font1.xbm: bdf2xbm $(FONT)-latin-1.bdf
-@@ -43,6 +43,14 @@
- font2.xbm: bdf2xbm $(FONT)-latin-2.bdf
- ./bdf2xbm font2 <$(FONT)-latin-2.bdf >font2.xbm
-
-+font3.xbm: bdf2xbm $(FONT)-latin-1.bdf
-+ ./bdf2xbm font1 <$(FONT)-latin-1.bdf >font3.xbm
-+ /usr/bin/convert -filter Point -resize 200% font1.xbm font3.xbm
-+
-+font4.xbm: bdf2xbm $(FONT)-latin-2.bdf
-+ ./bdf2xbm font1 <$(FONT)-latin-1.bdf >font4.xbm
-+ /usr/bin/convert -filter Point -resize 200% font2.xbm font4.xbm
+ ./bdf2xbm font1 <$(FONT)-latin-1.bdf >font1.xbm
+@@ -49,6 +50,18 @@
+ font4.xbm: bdf2xbm vtxt-iso8859-7.bdf
+ ./bdf2xbm font4 <vtxt-iso8859-7.bdf >font4.xbm
+
++font1d.xbm: font1.xbm
++ /usr/bin/convert -filter Point -resize 200% font1.xbm font1d.xbm
++
++font2d.xbm: font2.xbm
++ /usr/bin/convert -filter Point -resize 200% font2.xbm font2d.xbm
++
++font3d.xbm: font3.xbm
++ /usr/bin/convert -filter Point -resize 200% font3.xbm font3d.xbm
++
++font4d.xbm: font4.xbm
++ /usr/bin/convert -filter Point -resize 200% font4.xbm font4d.xbm
+
bdf2xbm: bdf2xbm.c
$(HOSTCC) bdf2xbm.c -o bdf2xbm
-diff -Naur alevt-1.6.2/xio.c alevt-1.6.2-mod/xio.c
---- alevt-1.6.2/xio.c 2007-12-03 08:18:04.000000000 +0200
-+++ alevt-1.6.2-mod/xio.c 2008-12-03 22:33:06.000000000 +0200
-@@ -130,7 +130,9 @@
+@@ -62,7 +75,7 @@
+ sed s/VERSION/$(VER)/g <alevt-cap.1.in >alevt-cap.1
+
+ clean:
+- rm -f *.o page*.txt a.out core bdf2xbm font?.xbm fontsize.h Makefile.bak
++ rm -f *.o page*.txt a.out core bdf2xbm font?.xbm font?d.xbm fontsize.h Makefile.bak
+ rm -f alevt alevt-date alevt-cap
+ rm -f alevt.1x alevt-date.1 alevt-cap.1
+ rm -f contrib/a.out ttext-*.*
+diff -Nur alevt-1.6.2.rus+greek/xio.c alevt-1.6.2.doublefont/xio.c
+--- alevt-1.6.2.rus+greek/xio.c 2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/xio.c 2009-04-10 07:28:15.000000000 +0400
+@@ -130,12 +130,22 @@
int i;
+ unsigned char *font_bits;
+
+- switch(latin1) {
+- case LATIN1: font_bits=font1_bits; break;
+- case LATIN2: font_bits=font2_bits; break;
+- case KOI8: font_bits=font3_bits; break;
+- case GREEK: font_bits=font4_bits; break;
+- default: font_bits=font1_bits; break;
++ if(!double_font) {
++ switch(latin1) {
++ case LATIN1: font_bits=font1_bits; break;
++ case LATIN2: font_bits=font2_bits; break;
++ case KOI8: font_bits=font3_bits; break;
++ case GREEK: font_bits=font4_bits; break;
++ default: font_bits=font1_bits; break;
++ }
++ } else {
++ switch(latin1) {
++ case LATIN1: font_bits=font1d_bits; break;
++ case LATIN2: font_bits=font2d_bits; break;
++ case KOI8: font_bits=font3d_bits; break;
++ case GREEK: font_bits=font4d_bits; break;
++ default: font_bits=font1d_bits; break;
++ }
+ }
xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,
-- latin1 ? font1_bits : font2_bits,
-+ double_font?
-+ (latin1 ? font3_bits : font1_bits) :
-+ (latin1 ? font1_bits : font2_bits),
- font_width, font_height);
- xio->font[1] = XCreatePixmap(xio->dpy, xio->root,
- font_width, font_height*2, 1);
+
Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/devel/alevt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- alevt.spec 24 Feb 2009 00:30:04 -0000 1.5
+++ alevt.spec 10 Apr 2009 12:48:12 -0000 1.6
@@ -1,15 +1,16 @@
Name: alevt
Version: 1.6.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Teletext decoder/browser
-Group: Applications/Multimedia
+Group: Applications/Multimedia
License: GPLv2
URL: http://goron.de/~froese
Source: http://goron.de/~froese/%{name}/%{name}-%{version}.tar.gz
Source1: alevt.desktop
Patch0: alevt-1.6.2-pixmap.patch
Patch1: alevt-1.6.2-manpath.patch
-Patch2: alevt-1.6.2-doublefont.patch
+Patch2: alevt-1.6.2-rus-greek.patch
+Patch3: alevt-1.6.2-doublefont.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libX11-devel
BuildRequires: libpng-devel
@@ -29,6 +30,7 @@
%patch0 -p1 -b .pixmap
%patch1 -p1 -b .manpath
%patch2 -p1 -b .doublefont
+%patch3 -p1 -b .rusgreek
%build
# alevt does not have standard build system, so we populate OPT,
@@ -61,6 +63,10 @@
%doc README CHANGELOG COPYRIGHT
%changelog
+* Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-10
+- new patch for chrilic fonts from Alexey Loukianov (mooroon2 at mail.ru)
+- updated doublefont patch
+
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
- Previous message (by thread): rpms/roundcubemail/devel .cvsignore, 1.10, 1.11 roundcubemail.spec, 1.21, 1.22 sources, 1.11, 1.12
- Next message (by thread): rpms/thttpd/devel thttpd-2.25b-CVE-2005-3124.patch, 1.2, 1.3 thttpd-2.25b-fixes.patch, 1.2, 1.3 thttpd.init, 1.3, 1.4 thttpd.logrotate, 1.1, 1.2 thttpd.spec, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list