[or-cvs] r17399: {torbrowser} Update the INSTALL document, prepare change log entry for up (in torbrowser/trunk: . build-scripts src/current-patches)
ioerror at seul.org
ioerror at seul.org
Thu Nov 27 04:45:03 UTC 2008
Author: ioerror
Date: 2008-11-26 23:45:03 -0500 (Wed, 26 Nov 2008)
New Revision: 17399
Added:
torbrowser/trunk/src/current-patches/qt-interlock-fix.patch
Modified:
torbrowser/trunk/README
torbrowser/trunk/build-scripts/INSTALL
Log:
Update the INSTALL document, prepare change log entry for upcoming release, add patch for Qt, etc.
Modified: torbrowser/trunk/README
===================================================================
--- torbrowser/trunk/README 2008-11-27 01:56:44 UTC (rev 17398)
+++ torbrowser/trunk/README 2008-11-27 04:45:03 UTC (rev 17399)
@@ -164,4 +164,11 @@
Update Pidgin to 2.5.1
1.1.5: Released 2008-11-xx
Set AllowMultipleInstances=true, to allow Tor Browser Bundle and
- Firefox to be run at the same time (suggested by John Brooks)
\ No newline at end of file
+ Firefox to be run at the same time (suggested by John Brooks)>>>>>>> .r17398
+1.1.6: Planned Release
+ Update Vidalia to release 0.1.10
+ Update Firefox to 2.0.0.18
+ Update Tor to 0.2.1.7-alpha
+ Added a small patch and instructions to fix Qt compile time error
+ Corrected some minor mistakes in the INSTALL document
+ Updated INSTALL document to reflect updated build process
Modified: torbrowser/trunk/build-scripts/INSTALL
===================================================================
--- torbrowser/trunk/build-scripts/INSTALL 2008-11-27 01:56:44 UTC (rev 17398)
+++ torbrowser/trunk/build-scripts/INSTALL 2008-11-27 04:45:03 UTC (rev 17399)
@@ -2,6 +2,7 @@
### Instructions for building Tor Browser Bundle components
###
### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
+### Copyright 2008 The Tor Project <https://www.torproject.org/>
### See LICENSE for licensing information
###
### $Id$
@@ -33,7 +34,7 @@
==============================================
To build Tor Browser Bundle, you need to have built:
- Vidalia (in /c/build/vidalia by default)
+ Vidalia (in /c/build/vidalia-<version> by default)
Tor (in /c/build/tor-<version> by default)
Polipo (in /c/build/polipo-<version> by default)
and have uncompressed Firefox Portable or produce a custom build Firefox
@@ -229,7 +230,8 @@
You will be prompted for the install path for your MinGW directory, enter 'C:\MinGW'
You may have an error about win32api.h being not found. This is not true. You
have win32api.h and Qt is wrong. This is a result of the Qt installer not
-understanding how to count version numbers.
+understanding how to count version numbers. This is probably fixed in newer
+versions of Qt. YMMV.
Installing msysDTK
==================
@@ -321,23 +323,23 @@
Download openssl:
- http://www.openssl.org/source/openssl-0.9.8g.tar.gz
+ http://www.openssl.org/source/openssl-0.9.8h.tar.gz
Unpack it:
cd /c/build/
- tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/openssl-0.9.8g.tar.gz
+ tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/openssl-0.9.8h.tar.gz
You should see errors not unlike:
- tar: openssl-0.9.8g/include/openssl/bn.h: Cannot create symlink to `../../crypto/bn/bn.h': No such file or directory
- tar: openssl-0.9.8g/include/openssl/blowfish.h: Cannot create symlink to `../../crypto/bf/blowfish.h': No such file or directory
- tar: openssl-0.9.8g/include/openssl/bio.h: Cannot create symlink to `../../crypto/bio/bio.h': No such file or directory
- tar: openssl-0.9.8g/include/openssl/asn1t.h: Cannot create symlink to `../../crypto/asn1/asn1t.h': No such file or directory
- tar: openssl-0.9.8g/include/openssl/asn1_mac.h: Cannot create symlink to `../../crypto/asn1/asn1_mac.h': No such file or directory
- tar: openssl-0.9.8g/include/openssl/asn1.h: Cannot create symlink to `../../crypto/asn1/asn1.h': No such file or directory
- tar: openssl-0.9.8g/include/openssl/aes.h: Cannot create symlink to `../../crypto/aes/aes.h': No such file or directory
- tar: openssl-0.9.8g/apps/md4.c: Cannot create symlink to `../crypto/md4/md4.c': No such file or directory
+ tar: openssl-0.9.8h/include/openssl/bn.h: Cannot create symlink to `../../crypto/bn/bn.h': No such file or directory
+ tar: openssl-0.9.8h/include/openssl/blowfish.h: Cannot create symlink to `../../crypto/bf/blowfish.h': No such file or directory
+ tar: openssl-0.9.8h/include/openssl/bio.h: Cannot create symlink to `../../crypto/bio/bio.h': No such file or directory
+ tar: openssl-0.9.8h/include/openssl/asn1t.h: Cannot create symlink to `../../crypto/asn1/asn1t.h': No such file or directory
+ tar: openssl-0.9.8h/include/openssl/asn1_mac.h: Cannot create symlink to `../../crypto/asn1/asn1_mac.h': No such file or directory
+ tar: openssl-0.9.8h/include/openssl/asn1.h: Cannot create symlink to `../../crypto/asn1/asn1.h': No such file or directory
+ tar: openssl-0.9.8h/include/openssl/aes.h: Cannot create symlink to `../../crypto/aes/aes.h': No such file or directory
+ tar: openssl-0.9.8h/apps/md4.c: Cannot create symlink to `../crypto/md4/md4.c': No such file or directory
tar: Error exit delayed from previous errors
Uncompressing OpenSSL shows a number of errors concerning symlinks. These do
@@ -345,11 +347,10 @@
Now configure the source package:
- cd openssl-0.9.8g/
- ./config --no-idea -norc5 -no-mdc2 mingw
- ./config -no-idea -norc5 -no-mdc2
+ cd openssl-0.9.8h/
+ ./config -no-idea -no-rc5 -no-mdc2
-Edit '/c/build/openssl-0.9.8g/Makefile' and remove the "test:" and "tests:" sections that follow:
+Edit '/c/build/openssl-0.9.8h/Makefile' and remove the "test:" and "tests:" sections that follow:
test: tests
@@ -405,11 +406,11 @@
Download, unpack, build and install Tor:
https://www.torproject.org/download.html
- https://www.torproject.org/dist/tor-0.2.0.26-rc.tar.gz
- https://www.torproject.org/dist/tor-0.2.0.26-rc.tar.gz.asc
+ https://www.torproject.org/dist/tor-0.2.1.7-alpha.tar.gz
+ https://www.torproject.org/dist/tor-0.2.1.7-alpha.gz.asc
$ cd /c/build/
- tar -C /c/build -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/tor-0.2.0.26-rc.tar.gz
- $ cd tor-0.2.0.26-rc/
+ tar -C /c/build -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/tor-0.2.1.7-alpha.tar.gz
+ $ cd tor-0.2.1.7-alpha/
./configure
make
@@ -421,15 +422,15 @@
Download Vidalia:
- http://vidalia-project.net/dist/vidalia-0.1.2.tar.gz
- http://vidalia-project.net/dist/vidalia-0.1.2.tar.gz.asc
+ http://vidalia-project.net/dist/vidalia-0.1.10.tar.gz
+ http://vidalia-project.net/dist/vidalia-0.1.10.tar.gz.asc
Verify the signature.
Unpack Vidalia:
- tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/vidalia-0.1.2.tar.gz
- mv vidalia-0.1.2/ vidalia
+ tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/vidalia-0.1.10.tar.gz
+ mv vidalia-0.1.10/ vidalia
Set a proper environment:
@@ -483,6 +484,16 @@
This is OK. You can ignore these errors.
+It appears that for whatever reason, Qt now requires a small patch to compile
+Vidalia. We've created a small patch that will allow the build to function.
+
+Apply it like so:
+
+ cd /c/Qt/4.3.5/src/corelib/arch
+ patch -p0 < /c/build/qt-interlock-fix.patch
+
+This patch is very simple and should no longer be required in Qt 4.4.4
+
Now you'll build Vidalia by running MSYS make:
make
@@ -537,7 +548,7 @@
Download FirefoxPortable:
- http://downloads.sourceforge.net/portableapps/Firefox_Portable_2.0.0.14_en-us.paf.exe?download
+ http://downloads.sourceforge.net/portableapps/Firefox_Portable_2.0.0.18_en-us.paf.exe?download
Run the installer and select it into: 'C:\build\FirefoxPortable\'
@@ -619,7 +630,7 @@
And then change the Tor version:
From: TOR=/c/build/tor-0.2.0.26-rc
- TO: TOR=/c/build/tor-0.2.0.26-rc
+ TO: TOR=/c/build/tor-0.2.1.7-alpha
Now you can run "make bundle_LANGUAGE", e.g. "make bundle_en-US".
@@ -641,7 +652,7 @@
New languages can be added by finding out the appropriate Mozilla
language pack code from:
- http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.12/win32/xpi
+ http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.18/win32/xpi
If the Mozilla code differs from the Vidalia one, update
patch-vidalia-language.sh accordingly.
Added: torbrowser/trunk/src/current-patches/qt-interlock-fix.patch
===================================================================
--- torbrowser/trunk/src/current-patches/qt-interlock-fix.patch (rev 0)
+++ torbrowser/trunk/src/current-patches/qt-interlock-fix.patch 2008-11-27 04:45:03 UTC (rev 17399)
@@ -0,0 +1,36 @@
+--- qatomic_windows.h-orig Wed Nov 26 14:36:33 2008
++++ qatomic_windows.h Wed Nov 26 15:11:57 2008
+@@ -190,13 +190,32 @@
+
+ #if !(defined Q_CC_BOR) || (__BORLANDC__ < 0x560)
+
++#if defined(Q_CC_GNU)
++#include <windows.h>
++#endif
++
++#ifndef __INTERLOCKED_DECLARED
++
++extern "C" {
++__declspec(dllimport) long __stdcall InterlockedCompareExchange(long *, long, long);
++__declspec(dllimport) long __stdcall InterlockedIncrement(long *);
++__declspec(dllimport) long __stdcall InterlockedDecrement(long *);
++__declspec(dllimport) long __stdcall InterlockedExchange(long *, long);
++__declspec(dllimport) long __stdcall InterlockedExchangeAdd(long *, long);
++}
++
++#endif
++/*
+ extern "C" {
+ __declspec(dllimport) long __stdcall InterlockedCompareExchange(long *, long, long);
+ __declspec(dllimport) long __stdcall InterlockedIncrement(long *);
+ __declspec(dllimport) long __stdcall InterlockedDecrement(long *);
+ __declspec(dllimport) long __stdcall InterlockedExchange(long *, long);
+ __declspec(dllimport) long __stdcall InterlockedExchangeAdd(long *, long);
+-}
++}
++*/
++
++
+
+ #else
+
More information about the tor-commits
mailing list