[gentoo-commits] gentoo-x86 commit in net-im/licq/files: licq-1.8.0-socks5.patch licq-1.8.0-doxygen.patch

[Lars Wendler (polynomial-c)]

polynomial-c    13/09/28 15:03:35

  Added:                licq-1.8.0-socks5.patch licq-1.8.0-doxygen.patch
  Log:
  Fixed bug #484706 and #486126. Took over maintenance
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

Revision  Changes    Path
1.1                  net-im/licq/files/licq-1.8.0-socks5.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/licq/files/licq-1.8.0-socks5.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/licq/files/licq-1.8.0-socks5.patch?rev=1.1&content-type=text/plain

Index: licq-1.8.0-socks5.patch
===================================================================
From 6b5f463697739be42948a052a03cc706f06c2150 Mon Sep 17 00:00:00 2001
From: Anders Olofsson <flynd@××××.org>
Date: Thu, 19 Sep 2013 20:33:16 +0200
Subject: [PATCH] core: Workaround defines in socks.h

socks.h defines send to Rsend which also affected the name of
TCPSocket::send().

Fixes Gentoo bug 484706
---
 licq/src/socket.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/licq/src/socket.cpp b/licq/src/socket.cpp
index 9d4cb3f..c06c266 100644
--- a/licq/src/socket.cpp
+++ b/licq/src/socket.cpp
@@ -49,6 +49,10 @@
 extern "C" {
 #include <socks.h>
 }
+#define socket_send Rsend
+#undef send
+#else
+#define socket_send send
 #endif // SOCKS5
 
 #ifdef SOCKS5_OPTLEN
@@ -477,7 +481,7 @@ bool INetSocket::send(Buffer& buf)
   char* dataPos = buf.getDataStart();
   while (bytesLeft > 0)
   {
-    ssize_t bytesSent = ::send(myDescriptor, dataPos, bytesLeft, 0);
+    ssize_t bytesSent = ::socket_send(myDescriptor, dataPos, bytesLeft, 0);
     if (bytesSent < 0)
     {
       if (errno == EINTR)
-- 
1.8.4




1.1                  net-im/licq/files/licq-1.8.0-doxygen.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/licq/files/licq-1.8.0-doxygen.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/licq/files/licq-1.8.0-doxygen.patch?rev=1.1&content-type=text/plain

Index: licq-1.8.0-doxygen.patch
===================================================================
From b05d42fda3da5d1b42bd89feb3b49516ce7d85b3 Mon Sep 17 00:00:00 2001
From: Anders Olofsson <flynd@××××.org>
Date: Fri, 27 Sep 2013 21:55:54 +0200
Subject: [PATCH] core: Make Doxygen usage optional

Patch by Ben Kohler to solve Gentoo bug 486126.
---
 licq/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/licq/CMakeLists.txt b/licq/CMakeLists.txt
index 9e84538..f90d9d5 100644
--- a/licq/CMakeLists.txt
+++ b/licq/CMakeLists.txt
@@ -12,6 +12,7 @@ include(CheckFileOffsetBits)
 
 # Options
 option(ENABLE_NLS "Enable translation of program messages" ON)
+option(USE_DOXYGEN "Build docs via doxygen" OFF)
 option(USE_FIFO "Use Licq FIFO" ON)
 option(USE_HEBREW "Include support for hebrew reverse string" OFF)
 option(USE_OPENSSL "Enable secure communication channels" ON)
@@ -142,7 +143,7 @@ include(cmake/LicqVersion.cmake)
 # Doxygen is option
 find_package(Doxygen)
 
-if (DOXYGEN_FOUND)
+if (USE_DOXYGEN)
   if (NOT DOXYGEN_DOT_FOUND)
     message(SEND_ERROR "Need the dot program to build documentation")
   endif (NOT DOXYGEN_DOT_FOUND)
@@ -158,7 +159,7 @@ if (DOXYGEN_FOUND)
     DEPENDS ${DOXY_CONFIG}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMENT "Generating doxygen documentation" VERBATIM)
-endif (DOXYGEN_FOUND)
+endif (USE_DOXYGEN)
 
 # make uninstall (file added to top binary dir to work with build_all)
 configure_file(
-- 
1.8.4