components/desktop/synergy/patches/07-Werrors.cpp.patch

   1 # Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
   2 #
   3 # Permission is hereby granted, free of charge, to any person obtaining a
   4 # copy of this software and associated documentation files (the "Software"),
   5 # to deal in the Software without restriction, including without limitation
   6 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   7 # and/or sell copies of the Software, and to permit persons to whom the
   8 # Software is furnished to do so, subject to the following conditions:
   9 #
  10 # The above copyright notice and this permission notice (including the next
  11 # paragraph) shall be included in all copies or substantial portions of the
  12 # Software.
  13 #
  14 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  15 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  16 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  17 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  20 # DEALINGS IN THE SOFTWARE.
  21 #
  22
  23 --- ./CMakeLists.txt    Tue Mar 15 12:03:49 2016
  24 +++ ./CMakeLists.txt.new        Thu Jun 30 15:23:52 2016
  25 @@ -77,7 +77,7 @@
  26
  27         # warnings as errors:
  28         # we have a problem with people checking in code with warnings.
  29 -       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-unused-local-typedef")
  30 +       # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-unused-local-typedef")
  31
  32         if (NOT APPLE)
  33                 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
  34 --- ./src/lib/synergy/ArgsBase.cpp      Tue Mar 15 12:03:49 2016
  35 +++ ./src/lib/synergy/ArgsBase.cpp.new  Wed Jun 15 18:18:32 2016
  36 @@ -27,9 +27,6 @@
  37  #else
  38  m_daemon(true), // backward compatibility for unix (daemon by default)
  39  #endif
  40 -#if WINAPI_XWINDOWS
  41 -m_disableXInitThreads(false),
  42 -#endif
  43  m_backend(false),
  44  m_restartable(true),
  45  m_noHooks(false),
  46 @@ -40,6 +37,9 @@
  47  m_disableTray(false),
  48  m_enableIpc(false),
  49  m_enableDragDrop(false),
  50 +#if WINAPI_XWINDOWS
  51 +m_disableXInitThreads(false),
  52 +#endif
  53  m_shouldExit(false),
  54  m_synergyAddress(),
  55  m_enableCrypto(false),
  56 --- ./src/lib/plugin/ns/SecureSocket.cpp        Tue Mar 15 12:03:49 2016
  57 +++ ./src/lib/plugin/ns/SecureSocket.cpp.new    Wed Jun 15 18:18:32 2016
  58 @@ -529,7 +529,8 @@
  59  SecureSocket::verifyCertFingerprint()
  60  {
  61         // calculate received certificate fingerprint
  62 -       X509 *cert = cert = SSL_get_peer_certificate(m_ssl->m_ssl);
  63 +       // SKK  WAS  X509 *cert = cert = SSL_get_peer_certificate(m_ssl->m_ssl);
  64 +       X509 *cert = SSL_get_peer_certificate(m_ssl->m_ssl);
  65         EVP_MD* tempDigest;
  66         unsigned char tempFingerprint[EVP_MAX_MD_SIZE];
  67         unsigned int tempFingerprintLen;
  68 --- ./src/lib/platform/XWindowsEventQueueBuffer.cpp     Tue Mar 15 12:03:49 2016
  69 +++ ./src/lib/platform/XWindowsEventQueueBuffer.cpp.new Thu Jun 30 16:52:10 2016
  70 @@ -54,10 +54,10 @@
  71
  72  XWindowsEventQueueBuffer::XWindowsEventQueueBuffer(
  73                 Display* display, Window window, IEventQueue* events) :
  74 -       m_events(events),
  75         m_display(display),
  76         m_window(window),
  77 -       m_waiting(false)
  78 +       m_waiting(false),
  79 +       m_events(events)
  80  {
  81         assert(m_display != NULL);
  82         assert(m_window  != None);
  83 --- ./src/lib/platform/XWindowsScreen.cpp       Tue Mar 15 12:03:49 2016
  84 +++ ./src/lib/platform/XWindowsScreen.cpp.new   Wed Jun 15 18:18:32 2016
  85 @@ -96,6 +96,7 @@
  86                 bool disableXInitThreads,
  87                 int mouseScrollDelta,
  88                 IEventQueue* events) :
  89 +       PlatformScreen(events),
  90         m_isPrimary(isPrimary),
  91         m_mouseScrollDelta(mouseScrollDelta),
  92         m_display(NULL),
  93 @@ -120,8 +121,7 @@
  94         m_xkb(false),
  95         m_xi2detected(false),
  96         m_xrandr(false),
  97 -       m_events(events),
  98 -       PlatformScreen(events)
  99 +       m_events(events)
 100  {
 101         assert(s_screen == NULL);
 102
 103 --- ./src/lib/arch/unix/ArchNetworkBSD.cpp      Tue Mar 15 12:03:49 2016
 104 +++ ./src/lib/arch/unix/ArchNetworkBSD.cpp.new  Wed Jun 15 18:18:32 2016
 105 @@ -328,6 +328,7 @@
 106                 // the unblock event was signalled.  flush the pipe.
 107                 char dummy[100];
 108                 int ignore;
 109 +               (void)ignore;
 110
 111                 do {
 112                         ignore = read(unblockPipe[0], dummy, sizeof(dummy));
 113 @@ -370,6 +371,7 @@
 114         return n;
 115  }
 116
 117 +
 118  #else
 119
 120  int
 121 @@ -503,6 +505,7 @@
 122         if (unblockPipe != NULL) {
 123                 char dummy = 0;
 124                 int ignore;
 125 +               (void)ignore;
 126
 127                 ignore = write(unblockPipe[1], &dummy, 1);
 128         }
 129 --- ./src/lib/arch/unix/ArchMultithreadPosix.cpp        Tue Mar 15 12:03:49 2016
 130 +++ ./src/lib/arch/unix/ArchMultithreadPosix.cpp.new    Wed Jun 15 18:18:32 2016
 131 @@ -277,6 +277,7 @@
 132  {
 133         pthread_mutexattr_t attr;
 134         int status = pthread_mutexattr_init(&attr);
 135 +       (void)status;
 136         assert(status == 0);
 137         ArchMutexImpl* mutex = new ArchMutexImpl;
 138         status = pthread_mutex_init(&mutex->m_mutex, &attr);
 139 --- ./src/test/CMakeLists.txt   Tue Mar 15 12:03:49 2016
 140 +++ ./src/test/CMakeLists.txt.new       Wed Jun 15 18:18:32 2016
 141 @@ -14,6 +14,7 @@
 142  # You should have received a copy of the GNU General Public License
 143  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 144
 145 +if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
 146  include_directories(
 147         ../../ext/gtest-1.6.0
 148         ../../ext/gtest-1.6.0/include
 149 @@ -31,3 +32,5 @@
 150
 151  add_subdirectory(integtests)
 152  add_subdirectory(unittests)
 153 +
 154 +endif()
 155 --- ./src/micro/uSynergy.h      Tue Mar 15 12:03:49 2016
 156 +++ ./src/micro/uSynergy.h.new  Wed Jun 15 18:18:32 2016
 157 @@ -26,6 +26,17 @@
 158  */
 159  #include <stdint.h>
 160
 161 +#ifdef __sun
 162 +#include <sys/isa_defs.h>
 163 +#if defined(_LITTLE_ENDIAN)
 164 +#define __LITTLE_ENDIAN__
 165 +#define USYNERGY_LITTLE_ENDIAN
 166 +#else
 167 +#define __BIG_ENDIAN__
 168 +#define USYNERGY_BIG_ENDIAN
 169 +#endif
 170 +#endif
 171 +
 172  #ifdef __cplusplus
 173  extern "C" {
 174  #endif