rpms/alevt/F-10 alevt-1.6.2-doublefont.patch, 1.3, 1.4 alevt.spec, 1.8, 1.9
Lucian Langa
lucilanga at fedoraproject.org
Sat May 30 17:30:53 UTC 2009
Author: lucilanga
Update of /cvs/pkgs/rpms/alevt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17867
Modified Files:
alevt-1.6.2-doublefont.patch alevt.spec
Log Message:
fix bug #498775 - direct teletext page access
alevt-1.6.2-doublefont.patch:
Index: alevt-1.6.2-doublefont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-10/alevt-1.6.2-doublefont.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- alevt-1.6.2-doublefont.patch 13 Apr 2009 08:23:02 -0000 1.3
+++ alevt-1.6.2-doublefont.patch 30 May 2009 17:30:53 -0000 1.4
@@ -1,6 +1,6 @@
-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
+diff -Naur alevt-1.6.2/alevt.1x.in alevt-1.6.2-doublefont/alevt.1x.in
+--- alevt-1.6.2/alevt.1x.in 2009-05-30 18:38:27.000000000 +0300
++++ alevt-1.6.2-doublefont/alevt.1x.in 2009-05-30 16:42:15.000000000 +0300
@@ -67,6 +67,9 @@
in the selected set are replaced by similar looking symbols.
(default: latin-1)
@@ -11,9 +11,9 @@ diff -Nur alevt-1.6.2.rus+greek/alevt.1x
.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
+diff -Naur alevt-1.6.2/exp-gfx.c alevt-1.6.2-doublefont/exp-gfx.c
+--- alevt-1.6.2/exp-gfx.c 2009-05-30 18:38:27.000000000 +0300
++++ alevt-1.6.2-doublefont/exp-gfx.c 2009-05-30 16:42:15.000000000 +0300
@@ -21,7 +21,16 @@
int sep)
{
@@ -32,9 +32,9 @@ diff -Nur alevt-1.6.2.rus+greek/exp-gfx.
int dest_x=_x*CW;
int dest_y=_y*CH;
-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
+diff -Naur alevt-1.6.2/font.c alevt-1.6.2-doublefont/font.c
+--- alevt-1.6.2/font.c 2009-05-30 18:38:27.000000000 +0300
++++ alevt-1.6.2-doublefont/font.c 2009-05-30 16:42:15.000000000 +0300
@@ -4,4 +4,13 @@
#include "font3.xbm"
#include "font4.xbm"
@@ -49,9 +49,9 @@ diff -Nur alevt-1.6.2.rus+greek/font.c a
+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
+diff -Naur alevt-1.6.2/font.h alevt-1.6.2-doublefont/font.h
+--- alevt-1.6.2/font.h 2009-05-30 18:38:27.000000000 +0300
++++ alevt-1.6.2-doublefont/font.h 2009-05-30 16:42:15.000000000 +0300
@@ -1,20 +1,31 @@
#ifndef FONT_H
#define FONT_H
@@ -92,9 +92,9 @@ diff -Nur alevt-1.6.2.rus+greek/font.h a
+extern int font_height;
#endif
-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
+diff -Naur alevt-1.6.2/main.c alevt-1.6.2-doublefont/main.c
+--- alevt-1.6.2/main.c 2009-05-30 18:38:27.000000000 +0300
++++ alevt-1.6.2-doublefont/main.c 2009-05-30 17:10:16.000000000 +0300
@@ -24,6 +24,12 @@
static int erc = 1;
static int newbttv = -1;
@@ -124,43 +124,38 @@ diff -Nur alevt-1.6.2.rus+greek/main.c a
};
int i;
-@@ -164,7 +172,7 @@
+@@ -164,7 +172,13 @@
int opt, ind;
char *arg;
-setlocale (LC_CTYPE, "");
+ setlocale (LC_CTYPE, "");
++
++ font_width = 288;
++ font_height = 128;
++
++ CW = (font_width/32);
++ CH = (font_height/8);
setprgname(argv[0]);
-@@ -242,6 +250,9 @@
+@@ -242,6 +256,13 @@
else
fatal("bad charset (not latin-1/2/russian/iso8859-7)");
break;
+ 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;
-@@ -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
+diff -Naur alevt-1.6.2/Makefile alevt-1.6.2-doublefont/Makefile
+--- alevt-1.6.2/Makefile 2009-05-30 18:38:27.000000000 +0300
++++ alevt-1.6.2-doublefont/Makefile 2009-05-30 16:42:15.000000000 +0300
@@ -33,9 +33,10 @@
alevt-cap: $(COBJS)
$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
@@ -202,9 +197,9 @@ diff -Nur alevt-1.6.2.rus+greek/Makefile
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
+diff -Naur alevt-1.6.2/xio.c alevt-1.6.2-doublefont/xio.c
+--- alevt-1.6.2/xio.c 2009-05-30 18:38:27.000000000 +0300
++++ alevt-1.6.2-doublefont/xio.c 2009-05-30 16:42:15.000000000 +0300
@@ -130,12 +130,22 @@
int i;
unsigned char *font_bits;
Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-10/alevt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- alevt.spec 13 Apr 2009 08:16:04 -0000 1.8
+++ alevt.spec 30 May 2009 17:30:53 -0000 1.9
@@ -1,6 +1,6 @@
Name: alevt
Version: 1.6.2
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Teletext decoder/browser
Group: Applications/Multimedia
License: GPLv2
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
%doc README CHANGELOG COPYRIGHT
%changelog
+* Sat May 30 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-13
+- update patch0 fix bug #498775 - direct teletext page access
+
* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-12
- new patches from Alexey
More information about the scm-commits
mailing list