components/desktop/brltty/patches/brltty-01-solaris-headers.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Fri, 10 Feb 2017 10:03:57 -0800
changeset 7661 aff9737ef6ba
parent 7323 177ebdb56301
permissions -rw-r--r--
25534788 Resync gnome/desktop patches with upstream efforts
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7323
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     1
Solaris requires fcntl.h for open() and friends
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     2
brltty defines logMessage & friends in log.h
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     3
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     4
Fixes build errors:
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     5
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     6
brltty-5.4/Programs/beep_solaris.c: In function 'getKeyboard':
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     7
brltty-5.4/Programs/beep_solaris.c:30:21: warning: implicit declaration of
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     8
  function 'open' [-Wimplicit-function-declaration]
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     9
     if ((keyboard = open("/dev/kbd", O_WRONLY)) != -1) {
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    10
                     ^
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    11
brltty-5.4/Programs/beep_solaris.c:30:38: error: 'O_WRONLY' undeclared
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    12
  (first use in this function)
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    13
     if ((keyboard = open("/dev/kbd", O_WRONLY)) != -1) {
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    14
                                      ^
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    15
brltty-5.4/Programs/beep_solaris.c:32:7: warning: implicit declaration of
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    16
  function 'logMessage' [-Wimplicit-function-declaration]
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    17
       logMessage(LOG_DEBUG, "keyboard opened: fd=%d", keyboard);
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    18
       ^
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    19
brltty-5.4/Programs/beep_solaris.c:32:18: error: 'LOG_DEBUG' undeclared
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    20
  (first use in this function)
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    21
       logMessage(LOG_DEBUG, "keyboard opened: fd=%d", keyboard);
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    22
                  ^
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    23
brltty-5.4/Programs/beep_solaris.c:34:7: warning: implicit declaration of
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    24
  function 'logSystemError' [-Wimplicit-function-declaration]
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    25
       logSystemError("keyboard open");
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    26
       ^
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    27
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    28
brltty-5.4/Programs/pcm_audio.c: In function 'openPcmDevice':
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    29
brltty-5.4/Programs/pcm_audio.c:40:32: warning: implicit declaration of
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    30
  function 'open' [-Wimplicit-function-declaration]
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    31
     if ((pcm->fileDescriptor = open(device, O_WRONLY|O_NONBLOCK)) != -1) {
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    32
                                ^
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    33
brltty-5.4/Programs/pcm_audio.c:40:45: error: 'O_WRONLY' undeclared
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    34
  (first use in this function)
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    35
     if ((pcm->fileDescriptor = open(device, O_WRONLY|O_NONBLOCK)) != -1) {
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    36
                                             
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    37
brltty-5.4/Programs/pcm_audio.c:40:54: error: 'O_NONBLOCK' undeclared
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    38
  (first use in this function)
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    39
     if ((pcm->fileDescriptor = open(device, O_WRONLY|O_NONBLOCK)) != -1) {
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    40
                                                      ^
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    41
brltty-5.4/Programs/pcm_audio.c:56:61: warning: implicit declaration of
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    42
  function 'strerror' [-Wimplicit-function-declaration]
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    43
         logMessage(errorLevel, "Cannot set audio info: %s", strerror(errno));
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    44
                                                             ^
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    45
brltty-5.4/Programs/pcm_audio.c:56:70: error: 'errno' undeclared
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    46
  (first use in this function)
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    47
         logMessage(errorLevel, "Cannot set audio info: %s", strerror(errno));
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    48
                                                                      ^
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    49
7661
aff9737ef6ba 25534788 Resync gnome/desktop patches with upstream efforts
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 7323
diff changeset
    50
Accepted upstream for release after 5.4:
aff9737ef6ba 25534788 Resync gnome/desktop patches with upstream efforts
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 7323
diff changeset
    51
https://github.com/brltty/brltty/pull/84
7323
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    52
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    53
--- brltty-5.4/Programs/beep_solaris.c
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    54
+++ brltty-5.4/Programs/beep_solaris.c
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    55
@@ -18,6 +18,8 @@
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    56
 
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    57
 #include "prologue.h"
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    58
+#include "log.h"
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    59
 
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    60
+#include <fcntl.h>
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    61
 #include <sys/kbio.h>
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    62
 #include <sys/kbd.h>
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    63
 
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    64
--- brltty-5.4/Programs/pcm_audio.c
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    65
+++ brltty-5.4/Programs/pcm_audio.c
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    66
@@ -19,5 +19,8 @@
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    67
 #include "prologue.h"
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    68
 
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    69
+#include <string.h>
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    70
+#include <errno.h>
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    71
+#include <fcntl.h>
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    72
 #include <sys/audio.h>
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    73
 #include <stropts.h>
177ebdb56301 23245462 Move brltty to Userland and upgrade to 5.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    74