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.
191 lines
7.4 KiB
191 lines
7.4 KiB
diff -ur transmission-1.61.orig/cli/Makefile.in transmission-1.61/cli/Makefile.in
|
|
--- transmission-1.61.orig/cli/Makefile.in 2009-05-28 09:24:37.769618239 +0200
|
|
+++ transmission-1.61/cli/Makefile.in 2009-05-28 09:24:45.953608600 +0200
|
|
@@ -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) \
|
|
@@ -278,7 +277,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 -ur transmission-1.61.orig/configure transmission-1.61/configure
|
|
--- transmission-1.61.orig/configure 2009-05-28 09:24:37.944616797 +0200
|
|
+++ transmission-1.61/configure 2009-05-28 09:24:45.963613650 +0200
|
|
@@ -1038,7 +1038,6 @@
|
|
LIBNOTIFY_LIBS
|
|
DBUS_GLIB_CFLAGS
|
|
DBUS_GLIB_LIBS'
|
|
-ac_subdirs_all='third-party/libevent'
|
|
|
|
# Initialize some variables set by options.
|
|
ac_init_help=
|
|
@@ -24734,16 +24733,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 -ur transmission-1.61.orig/daemon/Makefile.in transmission-1.61/daemon/Makefile.in
|
|
--- transmission-1.61.orig/daemon/Makefile.in 2009-05-28 09:24:37.770626622 +0200
|
|
+++ transmission-1.61/daemon/Makefile.in 2009-05-28 09:24:46.123360682 +0200
|
|
@@ -58,7 +58,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)
|
|
@@ -69,7 +68,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)
|
|
@@ -299,7 +298,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) \
|
|
diff -ur transmission-1.61.orig/daemon/remote.c transmission-1.61/daemon/remote.c
|
|
--- transmission-1.61.orig/daemon/remote.c 2009-05-28 09:24:37.770626622 +0200
|
|
+++ transmission-1.61/daemon/remote.c 2009-05-28 09:24:46.144365896 +0200
|
|
@@ -23,7 +23,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>
|
|
diff -ur transmission-1.61.orig/gtk/Makefile.in transmission-1.61/gtk/Makefile.in
|
|
--- transmission-1.61.orig/gtk/Makefile.in 2009-05-28 09:24:37.763616201 +0200
|
|
+++ transmission-1.61/gtk/Makefile.in 2009-05-28 09:24:46.125363829 +0200
|
|
@@ -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) \
|
|
@@ -389,7 +388,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 -ur transmission-1.61.orig/gtk/util.c transmission-1.61/gtk/util.c
|
|
--- transmission-1.61.orig/gtk/util.c 2009-05-28 09:24:37.766615788 +0200
|
|
+++ transmission-1.61/gtk/util.c 2009-05-28 09:24:46.126365786 +0200
|
|
@@ -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 -ur transmission-1.61.orig/libtransmission/clients.c transmission-1.61/libtransmission/clients.c
|
|
--- transmission-1.61.orig/libtransmission/clients.c 2009-05-28 09:24:37.967615518 +0200
|
|
+++ transmission-1.61/libtransmission/clients.c 2009-05-28 09:24:46.127387929 +0200
|
|
@@ -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 -ur transmission-1.61.orig/libtransmission/Makefile.in transmission-1.61/libtransmission/Makefile.in
|
|
--- transmission-1.61.orig/libtransmission/Makefile.in 2009-05-28 09:24:37.964615931 +0200
|
|
+++ transmission-1.61/libtransmission/Makefile.in 2009-05-28 09:24:46.129387025 +0200
|
|
@@ -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)
|
|
@@ -462,7 +461,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 -ur transmission-1.61.orig/libtransmission/net.c transmission-1.61/libtransmission/net.c
|
|
--- transmission-1.61.orig/libtransmission/net.c 2009-05-28 09:24:37.970613779 +0200
|
|
+++ transmission-1.61/libtransmission/net.c 2009-05-28 09:24:46.130388424 +0200
|
|
@@ -39,7 +39,7 @@
|
|
#include <fcntl.h>
|
|
#endif
|
|
|
|
-#include <evutil.h>
|
|
+#include <event.h>
|
|
|
|
#include "transmission.h"
|
|
#include "fdlimit.h"
|
|
diff -ur transmission-1.61.orig/libtransmission/rpc-server.c transmission-1.61/libtransmission/rpc-server.c
|
|
--- transmission-1.61.orig/libtransmission/rpc-server.c 2009-05-28 09:24:37.970613779 +0200
|
|
+++ transmission-1.61/libtransmission/rpc-server.c 2009-05-28 09:24:46.131363912 +0200
|
|
@@ -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 -ur transmission-1.61.orig/third-party/Makefile.in transmission-1.61/third-party/Makefile.in
|
|
--- transmission-1.61.orig/third-party/Makefile.in 2009-05-28 09:24:37.793612493 +0200
|
|
+++ transmission-1.61/third-party/Makefile.in 2009-05-28 09:24:46.132389615 +0200
|
|
@@ -243,7 +243,6 @@
|
|
top_srcdir = @top_srcdir@
|
|
transmissionlocaledir = @transmissionlocaledir@
|
|
SUBDIRS = \
|
|
- libevent \
|
|
libnatpmp \
|
|
miniupnp
|
|
|