[or-cvs] r14140: Initial steps for UPnP integration (in progress) (torbrowser/trunk/src/current-patches)

[sjm217 at seul.org]

Author: sjm217
Date: 2008-03-20 08:05:56 -0400 (Thu, 20 Mar 2008)
New Revision: 14140

Added:
   torbrowser/trunk/src/current-patches/torbrowser-miniupnp.patch
   torbrowser/trunk/src/current-patches/vidalia-miniupnp.patch
Log:
Initial steps for UPnP integration (in progress)

Added: torbrowser/trunk/src/current-patches/torbrowser-miniupnp.patch
===================================================================
--- torbrowser/trunk/src/current-patches/torbrowser-miniupnp.patch	                        (rev 0)
+++ torbrowser/trunk/src/current-patches/torbrowser-miniupnp.patch	2008-03-20 12:05:56 UTC (rev 14140)
@@ -0,0 +1,28 @@
+Index: build-scripts/INSTALL
+===================================================================
+--- build-scripts/INSTALL	(revision 14128)
++++ build-scripts/INSTALL	(working copy)
+@@ -129,7 +129,23 @@
+ For libevent, use 1.3e, as suggested by the document above.
+ libevent 1.4.0 is newer but untested.
+ 
++Building miniupnp
++=================
+ 
++mingw32-make.exe -f Makefile.mingw
++INSTALL=install
++INSTALLPREFIX=/usr/local
++INSTALLDIRINC=$INSTALLPREFIX/include/miniupnpc
++INSTALLDIRLIB=$INSTALLPREFIX/lib
++HEADERS="miniupnpc.h miniwget.h upnpcommands.h igd_desc_parse.h upnpreplyparse.h upnperrors.h"
++LIBRARY=libminiupnpc.a
++APIVERSION=2
++SONAME=$SHAREDLIBRARY.$APIVERSION
++$INSTALL -d $INSTALLDIRINC
++$INSTALL --mode=644 $HEADERS $INSTALLDIRINC
++$INSTALL -d $INSTALLDIRLIB
++$INSTALL --mode=644 $LIBRARY $INSTALLDIRLIB
++
+ Building Vidalia
+ ================
+ 

Added: torbrowser/trunk/src/current-patches/vidalia-miniupnp.patch
===================================================================
--- torbrowser/trunk/src/current-patches/vidalia-miniupnp.patch	                        (rev 0)
+++ torbrowser/trunk/src/current-patches/vidalia-miniupnp.patch	2008-03-20 12:05:56 UTC (rev 14140)
@@ -0,0 +1,21 @@
+Index: src/vidalia/CMakeLists.txt
+===================================================================
+--- src/vidalia/CMakeLists.txt	(revision 2423)
++++ src/vidalia/CMakeLists.txt	(working copy)
+@@ -238,9 +238,16 @@
+ endif(APPLE)
+ add_dependencies(${vidalia_BIN} translations)
+ 
++## Link in miniupnpc
++find_library(MINIUPNPC
++    NAMES miniupnpc
++    PATHS ${MINIUPNPC_LIBRARY_DIR}
++)
++
+ ## Link to the Qt libraries and other libraries built as a part of Vidalia
+ target_link_libraries(${vidalia_BIN}
+   ${QT_LIBRARIES}
++  ${MINIUPNPC}
+   torcontrol
+   util
+ )