components/desktop/synergy/patches/06-ns.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 --- ./src/lib/arch/unix/ArchPluginUnix.cpp.orig Tue Mar 15 12:03:49 2016
  24 +++ ./src/lib/arch/unix/ArchPluginUnix.cpp      Wed Jul 27 11:22:25 2016
  25 @@ -48,6 +48,19 @@
  26  void
  27  ArchPluginUnix::load()
  28  {
  29 +#if __sun
  30 +#define LIBNS "/usr/lib/synergy/plugins/libns.so"
  31 +
  32 +               LOG((CLOG_DEBUG "loading plugin: %s", LIBNS));
  33 +               void* handle = dlopen(LIBNS, RTLD_LAZY);
  34 +               if (handle == NULL) {
  35 +                       LOG((CLOG_ERR "failed to load plugin '%s', error: %s",
  36 +                               LIBNS, dlerror()));
  37 +                       return;
  38 +               }
  39 +               LOG((CLOG_DEBUG "plugin loaded: %s",
  40 +                       LIBNS));
  41 +#else
  42         String pluginsDir = getPluginsDir();
  43         LOG((CLOG_DEBUG "plugins dir: %s", pluginsDir.c_str()));
  44
  45 @@ -108,6 +121,7 @@
  46
  47                 m_pluginTable.insert(std::make_pair(name, handle));
  48         }
  49 +#endif /* __sun */
  50  }
  51
  52  void