Changes between Initial Version and Version 1 of BuildingTransmissionQtWindows/transmission-1.61-Qt-build.diff


Ignore:
Timestamp:
May 29, 2009, 3:46:03 AM (13 years ago)
Author:
rb07
Comment:

patch file

Legend:

Unmodified
Added
Removed
Modified
  • BuildingTransmissionQtWindows/transmission-1.61-Qt-build.diff

    v1 v1  
     1diff -NaurX diff-excludes.txt transmission-1.61-orig/configure transmission-1.61/configure
     2--- transmission-1.61-orig/configure    2009-05-12 00:34:04.000000000 +0000
     3+++ transmission-1.61/configure 2009-05-23 08:25:03.055357401 +0000
     4@@ -27567,6 +27567,7 @@
     5      have_msw="yes"
     6      CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
     7      CPPFLAGS="$CPPFLAGS -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN"
     8+     LDFLAGS="$LDFLAGS -no-undefined"
     9      LIBS="$LIBS -lshell32 -lws2_32"
     10      transmissionlocaledir="locale"
     11      if test -z "$host_alias"; then
     12diff -NaurX diff-excludes.txt transmission-1.61-orig/libtransmission/fdlimit.c transmission-1.61/libtransmission/fdlimit.c
     13--- transmission-1.61-orig/libtransmission/fdlimit.c    2009-05-12 00:32:26.000000000 +0000
     14+++ transmission-1.61/libtransmission/fdlimit.c 2009-05-23 03:22:11.565354847 +0000
     15@@ -302,7 +302,7 @@
     16     /* open the file */
     17     flags = doWrite ? ( O_RDWR | O_CREAT ) : O_RDONLY;
     18 #ifdef O_RANDOM
     19-    flags |= O_RANDOM
     20+    flags |= O_RANDOM;
     21 #endif
     22 #ifdef O_LARGEFILE
     23     flags |= O_LARGEFILE;
     24diff -NaurX diff-excludes.txt transmission-1.61-orig/libtransmission/net.c transmission-1.61/libtransmission/net.c
     25--- transmission-1.61-orig/libtransmission/net.c        2009-05-12 00:32:26.000000000 +0000
     26+++ transmission-1.61/libtransmission/net.c     2009-05-23 11:22:53.944463863 +0000
     27@@ -31,8 +31,8 @@
     28 #include <sys/types.h>
     29 
     30 #ifdef WIN32
     31- #include <winsock2.h> /* inet_addr */
     32- #include <WS2tcpip.h>
     33+ #define _WIN32_WINNT  0x0501
     34+ #include <ws2tcpip.h>
     35 #else
     36  #include <arpa/inet.h> /* inet_addr */
     37  #include <netdb.h>
     38diff -NaurX diff-excludes.txt transmission-1.61-orig/libtransmission/net.h transmission-1.61/libtransmission/net.h
     39--- transmission-1.61-orig/libtransmission/net.h        2009-05-12 00:32:26.000000000 +0000
     40+++ transmission-1.61/libtransmission/net.h     2009-05-23 03:19:58.135376325 +0000
     41@@ -32,7 +32,7 @@
     42 #ifdef WIN32
     43  #include <inttypes.h>
     44  #include <winsock2.h>
     45- #include <WS2tcpip.h>
     46+ #include <ws2tcpip.h>
     47  typedef int socklen_t;
     48 #else
     49  #include <sys/types.h>
     50diff -NaurX diff-excludes.txt transmission-1.61-orig/libtransmission/trevent.c transmission-1.61/libtransmission/trevent.c
     51--- transmission-1.61-orig/libtransmission/trevent.c    2009-05-12 00:32:26.000000000 +0000
     52+++ transmission-1.61/libtransmission/trevent.c 2009-05-23 03:25:39.131472658 +0000
     53@@ -23,7 +23,7 @@
     54 
     55 #ifdef WIN32
     56 
     57-#include <WinSock2.h>
     58+#include <winsock2.h>
     59 
     60 static int
     61 pgpipe( int handles[2] )
     62diff -NaurX diff-excludes.txt transmission-1.61-orig/third-party/libnatpmp/getgateway.c transmission-1.61/third-party/libnatpmp/getgateway.c
     63--- transmission-1.61-orig/third-party/libnatpmp/getgateway.c   2009-05-12 00:32:39.000000000 +0000
     64+++ transmission-1.61/third-party/libnatpmp/getgateway.c        2009-05-23 07:57:31.809390788 +0000
     65@@ -261,7 +261,7 @@
     66 #endif /* #ifdef USE_SOCKET_ROUTE */
     67 
     68 #ifdef USE_WIN32_CODE
     69-int getdefaultgateway(in_addr_t * addr)
     70+LIBSPEC int getdefaultgateway(in_addr_t * addr)
     71 {
     72        HKEY networkCardsKey;
     73        HKEY networkCardKey;
     74diff -NaurX diff-excludes.txt transmission-1.61-orig/third-party/libnatpmp/natpmp.c transmission-1.61/third-party/libnatpmp/natpmp.c
     75--- transmission-1.61-orig/third-party/libnatpmp/natpmp.c       2009-05-12 00:32:39.000000000 +0000
     76+++ transmission-1.61/third-party/libnatpmp/natpmp.c    2009-05-23 08:03:09.821359878 +0000
     77@@ -18,8 +18,9 @@
     78 #include <time.h>
     79 #include <sys/time.h>
     80 #ifdef WIN32
     81+#include <errno.h>
     82 #include <winsock2.h>
     83-#include <Ws2tcpip.h>
     84+#include <ws2tcpip.h>
     85 #include <io.h>
     86 #define EWOULDBLOCK WSAEWOULDBLOCK
     87 #define ECONNREFUSED WSAECONNREFUSED
     88@@ -34,7 +35,7 @@
     89 #include "natpmp.h"
     90 #include "getgateway.h"
     91 
     92-int initnatpmp(natpmp_t * p)
     93+LIBSPEC int initnatpmp(natpmp_t * p)
     94 {
     95 #ifdef WIN32
     96        u_long ioctlArg = 1;
     97@@ -70,7 +71,7 @@
     98        return 0;
     99 }
     100 
     101-int closenatpmp(natpmp_t * p)
     102+LIBSPEC int closenatpmp(natpmp_t * p)
     103 {
     104        if(!p)
     105                return NATPMP_ERR_INVALIDARGS;
     106@@ -113,7 +114,7 @@
     107        return n;
     108 }
     109 
     110-int getnatpmprequesttimeout(natpmp_t * p, struct timeval * timeout)
     111+LIBSPEC int getnatpmprequesttimeout(natpmp_t * p, struct timeval * timeout)
     112 {
     113        struct timeval now;
     114        if(!p || !timeout)
     115@@ -131,7 +132,7 @@
     116        return 0;
     117 }
     118 
     119-int sendpublicaddressrequest(natpmp_t * p)
     120+LIBSPEC int sendpublicaddressrequest(natpmp_t * p)
     121 {
     122        if(!p)
     123                return NATPMP_ERR_INVALIDARGS;
     124@@ -143,7 +144,7 @@
     125        return sendnatpmprequest(p);
     126 }
     127 
     128-int sendnewportmappingrequest(natpmp_t * p, int protocol,
     129+LIBSPEC int sendnewportmappingrequest(natpmp_t * p, int protocol,
     130                               uint16_t privateport, uint16_t publicport,
     131                                                          uint32_t lifetime)
     132 {
     133@@ -228,7 +229,7 @@
     134        return n;
     135 }
     136 
     137-int readnatpmpresponseorretry(natpmp_t * p, natpmpresp_t * response)
     138+LIBSPEC int readnatpmpresponseorretry(natpmp_t * p, natpmpresp_t * response)
     139 {
     140        int n;
     141        if(!p || !response)
     142@@ -268,7 +269,7 @@
     143 }
     144 
     145 #ifdef ENABLE_STRNATPMPERR
     146-const char * strnatpmperr(int r)
     147+LIBSPEC const char * strnatpmperr(int r)
     148 {
     149        const char * s;
     150        switch(r) {
     151diff -NaurX diff-excludes.txt transmission-1.61-orig/third-party/miniupnp/minissdpc.c transmission-1.61/third-party/miniupnp/minissdpc.c
     152--- transmission-1.61-orig/third-party/miniupnp/minissdpc.c     2009-05-12 00:32:38.000000000 +0000
     153+++ transmission-1.61/third-party/miniupnp/minissdpc.c  2009-05-23 03:17:26.395365582 +0000
     154@@ -12,8 +12,14 @@
     155 #include <sys/types.h>
     156 #ifdef WIN32
     157 #include <winsock2.h>
     158-#include <Ws2tcpip.h>
     159+#include <ws2tcpip.h>
     160 #include <io.h>
     161+/* Hack */
     162+#define UNIX_PATH_LEN  108
     163+struct sockaddr_un {
     164+  uint16_t     sun_family;
     165+  char         sun_path[UNIX_PATH_LEN];
     166+};
     167 #else
     168 #include <sys/socket.h>
     169 #include <sys/un.h>
     170diff -NaurX diff-excludes.txt transmission-1.61-orig/third-party/miniupnp/miniupnpc.c transmission-1.61/third-party/miniupnp/miniupnpc.c
     171--- transmission-1.61-orig/third-party/miniupnp/miniupnpc.c     2009-05-12 00:32:38.000000000 +0000
     172+++ transmission-1.61/third-party/miniupnp/miniupnpc.c  2009-05-23 08:07:56.859450767 +0000
     173@@ -10,7 +10,7 @@
     174 #ifdef WIN32
     175 /* Win32 Specific includes and defines */
     176 #include <winsock2.h>
     177-#include <Ws2tcpip.h>
     178+#include <ws2tcpip.h>
     179 #include <io.h>
     180 #define snprintf _snprintf
     181 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
     182@@ -49,7 +49,7 @@
     183 #define SERVICEPREFIX2 'u'
     184 
     185 /* root description parsing */
     186-void parserootdesc(const char * buffer, int bufsize, struct IGDdatas * data)
     187+LIBSPEC void parserootdesc(const char * buffer, int bufsize, struct IGDdatas * data)
     188 {
     189        struct xmlparser parser;
     190        /* xmlparser object */
     191@@ -340,7 +340,7 @@
     192  * no devices was found.
     193  * It is up to the caller to free the chained list
     194  * delay is in millisecond (poll) */
     195-struct UPNPDev * upnpDiscover(int delay, const char * multicastif,
     196+LIBSPEC struct UPNPDev * upnpDiscover(int delay, const char * multicastif,
     197                               const char * minissdpdsock, int sameport)
     198 {
     199        struct UPNPDev * tmp;
     200@@ -489,7 +489,7 @@
     201 
     202 /* freeUPNPDevlist() should be used to
     203  * free the chained list returned by upnpDiscover() */
     204-void freeUPNPDevlist(struct UPNPDev * devlist)
     205+LIBSPEC void freeUPNPDevlist(struct UPNPDev * devlist)
     206 {
     207        struct UPNPDev * next;
     208        while(devlist)
     209@@ -525,7 +525,7 @@
     210 
     211 /* Prepare the Urls for usage...
     212  */
     213-void GetUPNPUrls(struct UPNPUrls * urls, struct IGDdatas * data,
     214+LIBSPEC void GetUPNPUrls(struct UPNPUrls * urls, struct IGDdatas * data,
     215                  const char * descURL)
     216 {
     217        char * p;
     218@@ -568,7 +568,7 @@
     219 #endif
     220 }
     221 
     222-void
     223+LIBSPEC void
     224 FreeUPNPUrls(struct UPNPUrls * urls)
     225 {
     226        if(!urls)
     227@@ -655,7 +655,7 @@
     228  * passed as parameters are set. Donc forget to call FreeUPNPUrls(urls) to
     229  * free allocated memory.
     230  */
     231-int
     232+LIBSPEC int
     233 UPNP_GetValidIGD(struct UPNPDev * devlist,
     234                  struct UPNPUrls * urls,
     235                                 struct IGDdatas * data,
     236@@ -722,7 +722,7 @@
     237  * return value :
     238  *   0 - Not ok
     239  *   1 - OK */
     240-int
     241+LIBSPEC int
     242 UPNP_GetIGDFromUrl(const char * rootdescurl,
     243                    struct UPNPUrls * urls,
     244                    struct IGDdatas * data,
     245diff -NaurX diff-excludes.txt transmission-1.61-orig/third-party/miniupnp/upnpcommands.c transmission-1.61/third-party/miniupnp/upnpcommands.c
     246--- transmission-1.61-orig/third-party/miniupnp/upnpcommands.c  2009-05-12 00:32:38.000000000 +0000
     247+++ transmission-1.61/third-party/miniupnp/upnpcommands.c       2009-05-23 08:12:56.793365936 +0000
     248@@ -19,7 +19,7 @@
     249 
     250 /*
     251  * */
     252-UNSIGNED_INTEGER
     253+LIBSPEC UNSIGNED_INTEGER
     254 UPNP_GetTotalBytesSent(const char * controlURL,
     255                                        const char * servicetype)
     256 {
     257@@ -39,7 +39,7 @@
     258 
     259 /*
     260  * */
     261-UNSIGNED_INTEGER
     262+LIBSPEC UNSIGNED_INTEGER
     263 UPNP_GetTotalBytesReceived(const char * controlURL,
     264                                                const char * servicetype)
     265 {
     266@@ -59,7 +59,7 @@
     267 
     268 /*
     269  * */
     270-UNSIGNED_INTEGER
     271+LIBSPEC UNSIGNED_INTEGER
     272 UPNP_GetTotalPacketsSent(const char * controlURL,
     273                                                const char * servicetype)
     274 {
     275@@ -79,7 +79,7 @@
     276 
     277 /*
     278  * */
     279-UNSIGNED_INTEGER
     280+LIBSPEC UNSIGNED_INTEGER
     281 UPNP_GetTotalPacketsReceived(const char * controlURL,
     282                                                const char * servicetype)
     283 {
     284@@ -99,7 +99,7 @@
     285 
     286 /* UPNP_GetStatusInfo() call the corresponding UPNP method
     287  * returns the current status and uptime */
     288-int UPNP_GetStatusInfo(const char * controlURL,
     289+LIBSPEC int UPNP_GetStatusInfo(const char * controlURL,
     290                                        const char * servicetype,
     291                                        char * status,
     292                                        unsigned int * uptime,
     293@@ -159,7 +159,7 @@
     294 
     295 /* UPNP_GetConnectionTypeInfo() call the corresponding UPNP method
     296  * returns the connection type */
     297-int UPNP_GetConnectionTypeInfo(const char * controlURL,
     298+LIBSPEC int UPNP_GetConnectionTypeInfo(const char * controlURL,
     299                                const char * servicetype,
     300                                char * connectionType)
     301 {
     302@@ -198,7 +198,7 @@
     303  * One of the values can be null
     304  * Note : GetLinkLayerMaxBitRates belongs to WANPPPConnection:1 only
     305  * We can use the GetCommonLinkProperties from WANCommonInterfaceConfig:1 */
     306-int UPNP_GetLinkLayerMaxBitRates(const char * controlURL, const char * servicetype, unsigned int * bitrateDown, unsigned int* bitrateUp)
     307+LIBSPEC int UPNP_GetLinkLayerMaxBitRates(const char * controlURL, const char * servicetype, unsigned int * bitrateDown, unsigned int* bitrateUp)
     308 {
     309        struct NameValueParserData pdata;
     310        char buffer[4096];
     311@@ -262,7 +262,7 @@
     312  * 402 Invalid Args - See UPnP Device Architecture section on Control.
     313  * 501 Action Failed - See UPnP Device Architecture section on Control.
     314  */
     315-int UPNP_GetExternalIPAddress(const char * controlURL,
     316+LIBSPEC int UPNP_GetExternalIPAddress(const char * controlURL,
     317                               const char * servicetype,
     318                                                          char * extIpAdd)
     319 {
     320@@ -297,7 +297,7 @@
     321        return ret;
     322 }
     323 
     324-int
     325+LIBSPEC int
     326 UPNP_AddPortMapping(const char * controlURL, const char * servicetype,
     327                     const char * extPort,
     328                                        const char * inPort,
     329@@ -351,7 +351,7 @@
     330        return ret;
     331 }
     332 
     333-int
     334+LIBSPEC int
     335 UPNP_DeletePortMapping(const char * controlURL, const char * servicetype,
     336                        const char * extPort, const char * proto,
     337                        const char * remoteHost)
     338@@ -391,7 +391,7 @@
     339        return ret;
     340 }
     341 
     342-int UPNP_GetGenericPortMappingEntry(const char * controlURL,
     343+LIBSPEC int UPNP_GetGenericPortMappingEntry(const char * controlURL,
     344                                      const char * servicetype,
     345                                                                         const char * index,
     346                                                                         char * extPort,
     347@@ -480,7 +480,7 @@
     348        return r;
     349 }
     350 
     351-int UPNP_GetPortMappingNumberOfEntries(const char * controlURL, const char * servicetype, unsigned int * numEntries)
     352+LIBSPEC int UPNP_GetPortMappingNumberOfEntries(const char * controlURL, const char * servicetype, unsigned int * numEntries)
     353 {
     354        struct NameValueParserData pdata;
     355        char buffer[4096];
     356@@ -513,7 +513,7 @@
     357 /* UPNP_GetSpecificPortMappingEntry retrieves an existing port mapping
     358  * the result is returned in the intClient and intPort strings
     359  * please provide 16 and 6 bytes of data */
     360-int
     361+LIBSPEC int
     362 UPNP_GetSpecificPortMappingEntry(const char * controlURL,
     363                                  const char * servicetype,
     364                                  const char * extPort,