From 45f6f5ba8bddfd2dded88cc700495afb0430122d76a83a1e94a817c512273a03 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 3 Mar 2007 13:33:40 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sbl?expand=0&rev=4 --- sbl.changes | 7 +++++++ sbl.spec | 6 +++++- sblsrc-2.2-invalid-operation.patch | 20 -------------------- sblsrc-2.2.dif | 30 ------------------------------ sblsrc-2.2.tgz | 3 --- sblsrc-2.3b.tgz | 4 ++-- 6 files changed, 14 insertions(+), 56 deletions(-) delete mode 100644 sblsrc-2.2-invalid-operation.patch delete mode 100644 sblsrc-2.2.dif delete mode 100644 sblsrc-2.2.tgz diff --git a/sbl.changes b/sbl.changes index 3803aa4..b0f5256 100644 --- a/sbl.changes +++ b/sbl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 2 13:06:32 CET 2007 - marco@suse.de + +- added patch from ssommer@suse.de +- changed screen device from /dev/vcsa0 to /dev/vcsa +- + ------------------------------------------------------------------- Mon Jan 22 12:19:49 CET 2007 - ssommer@suse.de diff --git a/sbl.spec b/sbl.spec index c07eff8..fd264f4 100644 --- a/sbl.spec +++ b/sbl.spec @@ -13,7 +13,7 @@ Name: sbl BuildRequires: gcc-c++ Version: 2.3b -Release: 1 +Release: 2 License: GNU General Public License (GPL) Group: Hardware/Other Source: sblsrc-2.3b.tgz @@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT %config /etc/suse-blinux.conf %changelog +* Fri Mar 02 2007 - marco@suse.de +- added patch from ssommer@suse.de +- changed screen device from /dev/vcsa0 to /dev/vcsa +- * Mon Jan 22 2007 - ssommer@suse.de - fixed invalid operation error and deobfuscated the code a bit * Wed Jan 25 2006 - mls@suse.de diff --git a/sblsrc-2.2-invalid-operation.patch b/sblsrc-2.2-invalid-operation.patch deleted file mode 100644 index 9cbca5b..0000000 --- a/sblsrc-2.2-invalid-operation.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur sblsrc-2.2.org/prog/Alva/brlmain.cc sblsrc-2.2/prog/Alva/brlmain.cc ---- sblsrc-2.2.org/prog/Alva/brlmain.cc 2007-01-22 11:57:37.511031000 +0100 -+++ sblsrc-2.2/prog/Alva/brlmain.cc 2007-01-22 12:05:03.354199000 +0100 -@@ -488,10 +488,12 @@ - } - if (i < j) /* there is something different */ - { -- for (k = 0; -- k < (j - i); -- rawdata[k++] = TransTable[(prevdata[i + k] = brl->disp[i + k])]); -- WriteToBrlDisplay (model->NbStCells + i, j - i, rawdata); -+ for (k = 0; k < (j - i); k++) -+ { -+ prevdata[i + k] = brl->disp[i + k]; -+ rawdata[k] = TransTable[prevdata[i + k]]; -+ WriteToBrlDisplay (model->NbStCells + i, j - i, rawdata); -+ } - } - } - diff --git a/sblsrc-2.2.dif b/sblsrc-2.2.dif deleted file mode 100644 index 9263318..0000000 --- a/sblsrc-2.2.dif +++ /dev/null @@ -1,30 +0,0 @@ - prog/speech/softspeech_server.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -Index: sblsrc-2.2/prog/speech/softspeech_server.c -================================================================================ ---- sblsrc-2.2/prog/Makefile -+++ sblsrc-2.2/prog/Makefile -@@ -44,7 +44,7 @@ - #LD = gcc - LD = $(COMPCPP) - COMMONLDFLAGS = -rdynamic --LDFLAGS = $(COMMONLDFLAGS) -s -+LDFLAGS = $(COMMONLDFLAGS) - LDLIBS = -L. -lspeech -ldl - PREFIX = - ##BRL_TARGETS = Fhp_usb ---- sblsrc-2.2/prog/speech/softspeech_server.c -+++ sblsrc-2.2/prog/speech/softspeech_server.c -@@ -1780,9 +1780,9 @@ - strsignal(signum)); - - #if defined(__PPC__) -- addr = info.regs->nip; -+ addr = (void*) info.regs->nip; - #elif defined(__i386__) -- addr = info.eip; -+ addr = (void*) info.eip; - #endif - min_j = 0; - min_diff = (uintptr_t)addr - (uintptr_t)symbols[0].value; diff --git a/sblsrc-2.2.tgz b/sblsrc-2.2.tgz deleted file mode 100644 index 0522ecd..0000000 --- a/sblsrc-2.2.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:266e977ec97175a94c412522484ec22b674ceef886daaafe27c60d327f58708e -size 468301 diff --git a/sblsrc-2.3b.tgz b/sblsrc-2.3b.tgz index 7238a3b..b47451f 100644 --- a/sblsrc-2.3b.tgz +++ b/sblsrc-2.3b.tgz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee55b0d39558ccd49b8c671f37c86e98d6de13da4ce4426155c6d12d73251733 -size 271848 +oid sha256:19a58d9addc3babf692df6645a115189cadcd7ce1857782372b5ae94da03f561 +size 271881