net/seafile-ccnet/patches/010-libevent-include-path.patch

   1 diff -rupN seafile-ccnet-4.1.2.orig/include/ccnet/ccnet-client.h seafile-ccnet-4.1.2/include/ccnet/ccnet-client.h
   2 --- seafile-ccnet-4.1.2.orig/include/ccnet/ccnet-client.h       2015-09-03 21:43:37.000000000 +0200
   3 +++ seafile-ccnet-4.1.2/include/ccnet/ccnet-client.h    2015-09-04 10:21:05.578937942 +0200
   4 @@ -10,11 +10,7 @@
   5  #include <glib.h>
   6  #include <glib-object.h>
   7
   8 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
   9  #include <event2/util.h>
  10 -#else
  11 -#include <evutil.h>
  12 -#endif
  13
  14  #include "ccnet-session-base.h"
  15
  16 diff -rupN seafile-ccnet-4.1.2.orig/include/ccnet/cevent.h seafile-ccnet-4.1.2/include/ccnet/cevent.h
  17 --- seafile-ccnet-4.1.2.orig/include/ccnet/cevent.h     2015-09-03 21:43:37.000000000 +0200
  18 +++ seafile-ccnet-4.1.2/include/ccnet/cevent.h  2015-09-04 10:21:10.498933107 +0200
  19 @@ -6,13 +6,9 @@
  20  #ifndef CEVENT_H
  21  #define CEVENT_H
  22
  23 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  24  #include <event2/event.h>
  25  #include <event2/event_compat.h>
  26  #include <event2/event_struct.h>
  27 -#else
  28 -#include <event.h>
  29 -#endif
  30
  31  #include <glib.h>
  32
  33 diff -rupN seafile-ccnet-4.1.2.orig/lib/job-mgr.c seafile-ccnet-4.1.2/lib/job-mgr.c
  34 --- seafile-ccnet-4.1.2.orig/lib/job-mgr.c      2015-09-03 21:43:37.000000000 +0200
  35 +++ seafile-ccnet-4.1.2/lib/job-mgr.c   2015-09-04 10:19:49.323012920 +0200
  36 @@ -1,11 +1,7 @@
  37  /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
  38
  39 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  40  #include <event2/event.h>
  41  #include <event2/event_compat.h>
  42 -#else
  43 -#include <event.h>
  44 -#endif
  45
  46  #include <string.h>
  47  #include <stdlib.h>
  48 diff -rupN seafile-ccnet-4.1.2.orig/lib/libccnet_utils.h seafile-ccnet-4.1.2/lib/libccnet_utils.h
  49 --- seafile-ccnet-4.1.2.orig/lib/libccnet_utils.h       2015-09-03 21:43:37.000000000 +0200
  50 +++ seafile-ccnet-4.1.2/lib/libccnet_utils.h    2015-09-04 10:20:00.003002414 +0200
  51 @@ -15,11 +15,7 @@
  52  #include <glib-object.h>
  53  #include <stdlib.h>
  54
  55 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  56  #include <event2/util.h>
  57 -#else
  58 -#include <evutil.h>
  59 -#endif
  60
  61  #ifdef WIN32
  62      #include <errno.h>
  63 diff -rupN seafile-ccnet-4.1.2.orig/lib/mainloop.c seafile-ccnet-4.1.2/lib/mainloop.c
  64 --- seafile-ccnet-4.1.2.orig/lib/mainloop.c     2015-09-03 21:43:37.000000000 +0200
  65 +++ seafile-ccnet-4.1.2/lib/mainloop.c  2015-09-04 10:20:10.355992232 +0200
  66 @@ -3,13 +3,9 @@
  67  #include "include.h"
  68  #include <ccnet.h>
  69
  70 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  71  #include <event2/event.h>
  72  #include <event2/event_compat.h>
  73  #include <event2/event_struct.h>
  74 -#else
  75 -#include <event.h>
  76 -#endif
  77
  78  static int
  79  cmdrsp_cb (const char *code, char *content, int clen, void *data)
  80 diff -rupN seafile-ccnet-4.1.2.orig/lib/net.h seafile-ccnet-4.1.2/lib/net.h
  81 --- seafile-ccnet-4.1.2.orig/lib/net.h  2015-09-03 21:43:37.000000000 +0200
  82 +++ seafile-ccnet-4.1.2/lib/net.h       2015-09-04 10:20:22.951979845 +0200
  83 @@ -19,11 +19,7 @@
  84      #include <netinet/tcp.h>
  85  #endif
  86
  87 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  88  #include <event2/util.h>
  89 -#else
  90 -#include <evutil.h>
  91 -#endif
  92
  93  #ifdef WIN32
  94      #define ECONNREFUSED WSAECONNREFUSED
  95 diff -rupN seafile-ccnet-4.1.2.orig/lib/packet-io.h seafile-ccnet-4.1.2/lib/packet-io.h
  96 --- seafile-ccnet-4.1.2.orig/lib/packet-io.h    2015-09-03 21:43:37.000000000 +0200
  97 +++ seafile-ccnet-4.1.2/lib/packet-io.h 2015-09-04 10:20:31.827971118 +0200
  98 @@ -5,11 +5,7 @@
  99
 100  #include <packet.h>
 101
 102 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 103  #include <event2/util.h>
 104 -#else
 105 -#include <evutil.h>
 106 -#endif
 107
 108  struct buffer;
 109
 110 diff -rupN seafile-ccnet-4.1.2.orig/lib/processor.c seafile-ccnet-4.1.2/lib/processor.c
 111 --- seafile-ccnet-4.1.2.orig/lib/processor.c    2015-09-03 21:43:37.000000000 +0200
 112 +++ seafile-ccnet-4.1.2/lib/processor.c 2015-09-04 10:20:53.395949916 +0200
 113 @@ -4,11 +4,7 @@
 114
 115  #include <pthread.h>
 116
 117 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 118  #include <event2/event.h>
 119 -#else
 120 -#include <event.h>
 121 -#endif
 122
 123  #include "ccnet-client.h"
 124  #include "processor.h"
 125 diff -rupN seafile-ccnet-4.1.2.orig/lib/timer.c seafile-ccnet-4.1.2/lib/timer.c
 126 --- seafile-ccnet-4.1.2.orig/lib/timer.c        2015-09-03 21:43:37.000000000 +0200
 127 +++ seafile-ccnet-4.1.2/lib/timer.c     2015-09-04 10:20:38.571964488 +0200
 128 @@ -1,12 +1,8 @@
 129  /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 130
 131 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 132  #include <event2/event.h>
 133  #include <event2/event_compat.h>
 134  #include <event2/event_struct.h>
 135 -#else
 136 -#include <event.h>
 137 -#endif
 138
 139  #include <sys/time.h>
 140
 141 diff -rupN seafile-ccnet-4.1.2.orig/lib/utils.h seafile-ccnet-4.1.2/lib/utils.h
 142 --- seafile-ccnet-4.1.2.orig/lib/utils.h        2015-09-03 21:43:37.000000000 +0200
 143 +++ seafile-ccnet-4.1.2/lib/utils.h     2015-09-04 10:20:45.578957600 +0200
 144 @@ -11,11 +11,7 @@
 145  #include <glib-object.h>
 146  #include <stdlib.h>
 147
 148 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 149  #include <event2/util.h>
 150 -#else
 151 -#include <evutil.h>
 152 -#endif
 153
 154  #ifdef WIN32
 155  #include <errno.h>
 156 diff -rupN seafile-ccnet-4.1.2.orig/net/common/connect-mgr.h seafile-ccnet-4.1.2/net/common/connect-mgr.h
 157 --- seafile-ccnet-4.1.2.orig/net/common/connect-mgr.h   2015-09-03 21:43:37.000000000 +0200
 158 +++ seafile-ccnet-4.1.2/net/common/connect-mgr.h        2015-09-04 10:21:20.266923508 +0200
 159 @@ -3,11 +3,7 @@
 160  #ifndef CCNET_CONNECTION_MANAGER
 161  #define CCNET_CONNECTION_MANAGER
 162
 163 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 164  #include <event2/event.h>
 165 -#else
 166 -#include <event.h>
 167 -#endif
 168
 169  #include "timer.h"
 170
 171 diff -rupN seafile-ccnet-4.1.2.orig/net/common/packet-io.c seafile-ccnet-4.1.2/net/common/packet-io.c
 172 --- seafile-ccnet-4.1.2.orig/net/common/packet-io.c     2015-09-03 21:43:37.000000000 +0200
 173 +++ seafile-ccnet-4.1.2/net/common/packet-io.c  2015-09-04 10:21:28.691915231 +0200
 174 @@ -13,13 +13,9 @@
 175
 176  #include <unistd.h>
 177
 178 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 179  #include <event2/event.h>
 180  #include <event2/bufferevent.h>
 181  #include <event2/bufferevent_struct.h>
 182 -#else
 183 -#include <event.h>
 184 -#endif
 185
 186  #include <glib.h>
 187  #include <errno.h>
 188 diff -rupN seafile-ccnet-4.1.2.orig/net/common/packet-io.h seafile-ccnet-4.1.2/net/common/packet-io.h
 189 --- seafile-ccnet-4.1.2.orig/net/common/packet-io.h     2015-09-03 21:43:37.000000000 +0200
 190 +++ seafile-ccnet-4.1.2/net/common/packet-io.h  2015-09-04 10:21:51.130893188 +0200
 191 @@ -5,13 +5,9 @@
 192
 193  #include "packet.h"
 194
 195 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 196  #include <event2/util.h>
 197  #include <event2/buffer.h>
 198  #include <event2/buffer_compat.h>
 199 -#else
 200 -#include <evutil.h>
 201 -#endif
 202
 203  /* struct evbuffer; */
 204  /* for libevent2 */
 205 diff -rupN seafile-ccnet-4.1.2.orig/net/common/peer.c seafile-ccnet-4.1.2/net/common/peer.c
 206 --- seafile-ccnet-4.1.2.orig/net/common/peer.c  2015-09-03 21:43:37.000000000 +0200
 207 +++ seafile-ccnet-4.1.2/net/common/peer.c       2015-09-04 10:22:00.506883980 +0200
 208 @@ -2,14 +2,10 @@
 209
 210  #include "common.h"
 211
 212 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 213  #include <event2/event.h>
 214  #include <event2/bufferevent.h>
 215  #include <event2/bufferevent_compat.h>
 216  #include <event2/bufferevent_struct.h>
 217 -#else
 218 -#include <event.h>
 219 -#endif
 220
 221  #include <stdio.h>
 222  #include <stdlib.h>
 223 diff -rupN seafile-ccnet-4.1.2.orig/net/common/session.h seafile-ccnet-4.1.2/net/common/session.h
 224 --- seafile-ccnet-4.1.2.orig/net/common/session.h       2015-09-03 21:43:37.000000000 +0200
 225 +++ seafile-ccnet-4.1.2/net/common/session.h    2015-09-04 10:22:13.114871598 +0200
 226 @@ -3,13 +3,9 @@
 227  #ifndef CCNET_SESSION_H
 228  #define CCNET_SESSION_H
 229
 230 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 231  #include <event2/event.h>
 232  #include <event2/event_compat.h>
 233  #include <event2/event_struct.h>
 234 -#else
 235 -#include <event.h>
 236 -#endif
 237
 238  #include <glib.h>
 239  #include <glib/gstdio.h>