1 7099 dc144907 --- brltty-3.7.orig/Programs/Makefile.in 2005-08-27 05:33:11.000000000 +0100 2 7099 dc144907 +++ brltty-3.7/Programs/Makefile.in 2005-10-28 08:17:12.412662000 +0100 3 7099 dc144907 @@ -497,8 +497,8 @@ 4 6302 richb 5 6302 richb install-api-key: 6 7099 dc144907 file=$(sysconfdir)/$(API_AUTHFILE) && \ 7 6302 richb - if test ! -f $$file -a -w $(sysconfdir) -a -z "$(INSTALL_ROOT)"; \ 8 6907 dc144907 - then umask 077 && $(SRC_DIR)/brltty-genkey $$file; fi 9 6302 richb + if test ! -f $$file -a -w $(sysconfdir) -a -d "$(INSTALL_ROOT)"; \ 10 6907 dc144907 + then umask 077 && (dd if=/dev/urandom bs=16 count=1 2>/dev/null | perl -e 'while(<>){print unpack( "H*", $$_),"\n";}') >$$file; fi 11 6302 richb 12 6302 richb ############################################################################### 13 7099 dc144907 14 7099 dc144907 --- brltty-3.7.orig/Programs/tunetest.c 2005-08-16 22:36:49.000000000 +0100 15 7099 dc144907 +++ brltty-3.7/Programs/tunetest.c 2005-10-28 08:24:37.711867000 +0100 16 7099 dc144907 @@ -161,14 +161,16 @@ 17 7099 dc144907 while (argc) { 18 6302 richb short note = integerArgument(*argv++, 1, 127, "note"); 19 6302 richb short duration = integerArgument(*argv++, 1, 255, "duration"); 20 7099 dc144907 - TuneElement te = TUNE_NOTE(duration, note); 21 6302 richb argc -= 2; 22 7099 dc144907 - *(element++) = te; 23 6302 richb + element->duration = duration; /* TUNE_NOTE(duration, note); */ 24 6302 richb + element->note = note; 25 6302 richb + element++; 26 6302 richb } 27 6302 richb 28 7099 dc144907 { 29 7099 dc144907 - TuneElement te = TUNE_STOP(); 30 7099 dc144907 - *element = te; 31 7099 dc144907 + element->duration = 0; /* TUNE_STOP(0); */ 32 7099 dc144907 + element->note = 0; 33 7099 dc144907 + 34 7099 dc144907 } 35 7099 dc144907 36 6302 richb if (!setTuneDevice(tuneDevice)) { 37 7099 dc144907 --- brltty-3.7/Programs/usb_internal.h.orig 2005-10-28 08:35:22.536880000 +0100 38 7099 dc144907 +++ brltty-3.7/Programs/usb_internal.h 2005-10-28 08:38:31.824690000 +0100 39 7099 dc144907 @@ -42,6 +42,7 @@ 40 7099 dc144907 } input; 41 6302 richb 42 7099 dc144907 struct { 43 7099 dc144907 + char c; /* Forte compiler doesn't like empty structs. */ 44 7099 dc144907 } output; 45 7099 dc144907 } direction; 46 7099 dc144907 } UsbEndpoint; 47 7099 dc144907 --- brltty-3.7/Programs/xbrlapi.c.orig Fri Oct 28 08:44:32 2005 48 7099 dc144907 +++ brltty-3.7/Programs/xbrlapi.c Fri Oct 28 08:48:23 2005 49 7099 dc144907 @@ -300,7 +300,8 @@ 50 7099 dc144907 &actual_type,&actual_format,&nitems,&bytes_after,&wm_name)) 51 7099 dc144907 return NULL; /* window disappeared */ 52 7099 dc144907 wm_name_size+=bytes_after; 53 7099 dc144907 - } while (bytes_after && ({if (!XFree(wm_name)) fatal("tempo_XFree(wm_name)"); 1;})); 54 7099 dc144907 + if ( bytes_after && !XFree(wm_name)) fatal("tempo_XFree(wm_name)"); 55 7099 dc144907 + } while (bytes_after ); 56 7099 dc144907 if (actual_type==None) return NULL; 57 7099 dc144907 else { 58 7099 dc144907 debugf("type %lx name %s",actual_type,wm_name); 59