You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
transmission/transmission-1.51-libevent....

201 lines
7.7 KiB

diff -r -u transmission-1.50.orig/cli/Makefile.in transmission-1.50/cli/Makefile.in
--- transmission-1.50.orig/cli/Makefile.in 2009-02-13 17:43:47.000000000 +0100
+++ transmission-1.50/cli/Makefile.in 2009-02-20 11:20:28.000000000 +0100
@@ -53,7 +53,6 @@
am__DEPENDENCIES_1 =
transmissioncli_DEPENDENCIES = \
$(top_builddir)/libtransmission/libtransmission.a \
- $(top_builddir)/third-party/libevent/libevent.la \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -288,7 +287,7 @@
transmissioncli_SOURCES = cli.c
transmissioncli_LDADD = \
$(top_builddir)/libtransmission/libtransmission.a \
- $(top_builddir)/third-party/libevent/libevent.la \
+ -levent -levent_core \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(INTLLIBS) \
diff -r -u transmission-1.50.orig/configure transmission-1.50/configure
--- transmission-1.50.orig/configure 2009-02-13 17:43:45.000000000 +0100
+++ transmission-1.50/configure 2009-02-20 11:20:57.000000000 +0100
@@ -1053,7 +1053,6 @@
LIBNOTIFY_LIBS
DBUS_GLIB_CFLAGS
DBUS_GLIB_LIBS'
-ac_subdirs_all='third-party/libevent'
# Initialize some variables set by options.
ac_init_help=
@@ -23905,16 +23904,6 @@
-subdirs="$subdirs third-party/libevent"
-
-{ $as_echo "$as_me:$LINENO: invoking libevent's configure script" >&5
-$as_echo "$as_me: invoking libevent's configure script" >&6;}
-LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
-
-
-
-
-
pkg_failed=no
{ $as_echo "$as_me:$LINENO: checking for GTK" >&5
$as_echo_n "checking for GTK... " >&6; }
diff -r -u transmission-1.50.orig/daemon/Makefile.in transmission-1.50/daemon/Makefile.in
--- transmission-1.50.orig/daemon/Makefile.in 2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.50/daemon/Makefile.in 2009-02-20 11:29:43.000000000 +0100
@@ -57,7 +57,6 @@
$(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
- $(top_builddir)/third-party/libevent/libevent.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -68,7 +67,7 @@
$(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
- $(top_builddir)/third-party/libevent/libevent.la \
+ -levent -levent_core \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -307,7 +306,7 @@
$(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
- $(top_builddir)/third-party/libevent/libevent.la \
+ -levent -levent_core \
$(INTLLIBS) \
$(LIBCURL_LIBS) \
$(ZLIB_LIBS) \
--- transmission-1.50.orig/gtk/Makefile.in 2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.50/gtk/Makefile.in 2009-02-20 11:22:10.000000000 +0100
@@ -72,7 +72,6 @@
am__DEPENDENCIES_1 =
transmission_DEPENDENCIES = \
$(top_builddir)/libtransmission/libtransmission.a \
- $(top_builddir)/third-party/libevent/libevent.la \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -397,7 +396,7 @@
dist_man_MANS = transmission.1
transmission_LDADD = \
$(top_builddir)/libtransmission/libtransmission.a \
- $(top_builddir)/third-party/libevent/libevent.la \
+ -levent -levent_core \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a $(GTK_LIBS) \
$(GIO_LIBS) $(LIBNOTIFY_LIBS) $(DBUS_GLIB_LIBS) \
diff -r -u transmission-1.50.orig/gtk/util.c transmission-1.50/gtk/util.c
--- transmission-1.50.orig/gtk/util.c 2009-02-13 17:40:54.000000000 +0100
+++ transmission-1.50/gtk/util.c 2009-02-20 11:22:18.000000000 +0100
@@ -38,7 +38,7 @@
#include <dbus/dbus-glib.h>
#endif
-#include <libevent/evhttp.h>
+#include <evhttp.h>
#include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
#include <libtransmission/utils.h> /* tr_inf */
diff -r -u transmission-1.50.orig/libtransmission/clients.c transmission-1.50/libtransmission/clients.c
--- transmission-1.50.orig/libtransmission/clients.c 2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.50/libtransmission/clients.c 2009-02-20 11:22:34.000000000 +0100
@@ -17,7 +17,7 @@
#include <stdlib.h> /* strtol */
#include <string.h>
-#include <libevent/event.h> /* evbuffer */
+#include <event.h> /* evbuffer */
#include "transmission.h"
#include "clients.h"
diff -r -u transmission-1.50.orig/libtransmission/fdlimit.c transmission-1.50/libtransmission/fdlimit.c
--- transmission-1.50.orig/libtransmission/fdlimit.c 2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.50/libtransmission/fdlimit.c 2009-02-20 11:28:30.000000000 +0100
@@ -56,7 +56,7 @@
#include <unistd.h>
#include <fcntl.h> /* O_LARGEFILE posix_fadvise */
-#include <evutil.h>
+#include <event.h>
#include "transmission.h"
#include "fdlimit.h"
diff -r -u transmission-1.50.orig/libtransmission/Makefile.in transmission-1.50/libtransmission/Makefile.in
--- transmission-1.50.orig/libtransmission/Makefile.in 2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.50/libtransmission/Makefile.in 2009-02-20 11:23:02.000000000 +0100
@@ -82,7 +82,6 @@
am__DEPENDENCIES_2 = ./libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
- $(top_builddir)/third-party/libevent/libevent.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -472,7 +471,7 @@
./libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
- $(top_builddir)/third-party/libevent/libevent.la \
+ -levent -levent_core \
$(INTLLIBS) \
$(LIBCURL_LIBS) \
$(OPENSSL_LIBS) \
diff -r -u transmission-1.50.orig/libtransmission/net.c transmission-1.50/libtransmission/net.c
--- transmission-1.50.orig/libtransmission/net.c 2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.50/libtransmission/net.c 2009-02-20 11:28:24.000000000 +0100
@@ -39,7 +39,7 @@
#include <fcntl.h>
#endif
-#include <evutil.h>
+#include <event.h>
#include "transmission.h"
#include "fdlimit.h"
diff -r -u transmission-1.50.orig/libtransmission/rpc-server.c transmission-1.50/libtransmission/rpc-server.c
--- transmission-1.50.orig/libtransmission/rpc-server.c 2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.50/libtransmission/rpc-server.c 2009-02-20 11:23:16.000000000 +0100
@@ -24,8 +24,8 @@
#include <zlib.h>
#endif
-#include <libevent/event.h>
-#include <libevent/evhttp.h>
+#include <event.h>
+#include <evhttp.h>
#include "transmission.h"
#include "bencode.h"
diff -r -u transmission-1.50.orig/third-party/Makefile.in transmission-1.50/third-party/Makefile.in
--- transmission-1.50.orig/third-party/Makefile.in 2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.50/third-party/Makefile.in 2009-02-20 11:23:36.000000000 +0100
@@ -253,7 +253,6 @@
top_srcdir = @top_srcdir@
transmissionlocaledir = @transmissionlocaledir@
SUBDIRS = \
- libevent \
libnatpmp \
miniupnp
--- transmission-1.51/daemon/remote.c~ 2009-02-27 17:46:36.000000000 +0100
+++ transmission-1.51/daemon/remote.c 2009-02-28 09:40:41.000000000 +0100
@@ -21,7 +21,7 @@
#include <unistd.h> /* getcwd */
#endif
-#include <libevent/event.h>
+#include <event.h>
#define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
#include <curl/curl.h>