[tor-commits] [torbrowser/maint-2.3] Bump Vidalia to 0.2.19. This version removes the OpenSSL dependency and changes the paths to be relative to the Vidalia binary.

6 Jun 2012

commit c664f36f0031ba2d8dadeafc54e45a0bc941f607
Author: Shondoit Walker shondoit@gmail.com
Date:   Fri Jun 1 10:07:21 2012 +0200
Bump Vidalia to 0.2.19. This version removes the OpenSSL dependency and changes the paths to be relative to the Vidalia binary.
---
 build-scripts/config/vidalia.conf.ff               |   12 +++-
 build-scripts/config/vidalia.conf.ff+pidgin        |   12 +++-
 build-scripts/config/vidalia.conf.ff+pidgin-linux  |   12 +++-
 build-scripts/config/vidalia.conf.ff-linux         |   12 +++-
 build-scripts/config/vidalia.conf.ff-osx           |   12 +++-
 build-scripts/linux.mk                             |    4 +-
 build-scripts/osx.mk                               |    2 +-
 build-scripts/versions.mk                          |    9 +--
 build-scripts/windows.mk                           |    4 +-
 .../0001-Adapt-paths-etc-for-OS-X-TBB.patch        |   61 --------------------
 10 files changed, 47 insertions(+), 93 deletions(-)

diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff
index d03289e..1d9d2fa 100644
--- a/build-scripts/config/vidalia.conf.ff
+++ b/build-scripts/config/vidalia.conf.ff
@@ -1,10 +1,14 @@
 [General]
-BrowserDirectory=FirefoxPortable
+BrowserDirectory=..\FirefoxPortable\App\Firefox
 BrowserExecutable=tbb-firefox.exe
 LanguageCode=en
+ProfileDirectory=..\..\Data\profile
+DefaultProfileDirectory=..\DefaultData\profile
+PluginsDirectory=..\..\Data\plugins
+DefaultPluginsDirectory=..\DefaultData\plugins
[Tor]
 ControlPort=9051
-TorExecutable=.\App\tor.exe
-Torrc=.\Data\Tor\torrc
-DataDirectory=.\Data\Tor
+TorExecutable=.\tor.exe
+Torrc=..\Data\Tor\torrc
+DataDirectory=..\Data\Tor
diff --git a/build-scripts/config/vidalia.conf.ff+pidgin b/build-scripts/config/vidalia.conf.ff+pidgin
index 43cb0f2..92098a4 100644
--- a/build-scripts/config/vidalia.conf.ff+pidgin
+++ b/build-scripts/config/vidalia.conf.ff+pidgin
@@ -1,11 +1,15 @@
 [General]
-BrowserDirectory=FirefoxPortable
+BrowserDirectory=..\FirefoxPortable\App\Firefox
 BrowserExecutable=tbb-firefox.exe
-IMExecutable=PidginPortable\PidginPortable.exe
+IMExecutable=..\PidginPortable\PidginPortable.exe
 LanguageCode=en
 RunProxyAtStart=true
+ProfileDirectory=..\..\Data\profile
+DefaultProfileDirectory=..\DefaultData\profile
+PluginsDirectory=..\..\Data\plugins
+DefaultPluginsDirectory=..\DefaultData\plugins
[Tor]
 ControlPort=9051
-TorExecutable=.\App\tor.exe
-Torrc=.\Data\Tor\torrc
+TorExecutable=.\tor.exe
+Torrc=..\Data\Tor\torrc
diff --git a/build-scripts/config/vidalia.conf.ff+pidgin-linux b/build-scripts/config/vidalia.conf.ff+pidgin-linux
index 59d81bd..4ed8009 100644
--- a/build-scripts/config/vidalia.conf.ff+pidgin-linux
+++ b/build-scripts/config/vidalia.conf.ff+pidgin-linux
@@ -1,11 +1,15 @@
 [General]
-BrowserDirectory=.
+BrowserDirectory=./Firefox
 BrowserExecutable=firefox
 LanguageCode=en
-IMExecutable=./App/pidgin
+IMExecutable=./pidgin
 RunProxyAtStart=true
+ProfileDirectory=../../Data/profile
+DefaultProfileDirectory=./defaults/profile
+PluginsDirectory=../../Data/profile/extensions
+DefaultPluginsDirectory=./extensions
[Tor]
 ControlPort=9051
-TorExecutable=./App/tor
-Torrc=./Data/Tor/torrc
+TorExecutable=./tor
+Torrc=../Data/Tor/torrc
diff --git a/build-scripts/config/vidalia.conf.ff-linux b/build-scripts/config/vidalia.conf.ff-linux
index 4535b7b..26c66be 100644
--- a/build-scripts/config/vidalia.conf.ff-linux
+++ b/build-scripts/config/vidalia.conf.ff-linux
@@ -1,12 +1,16 @@
 [General]
-BrowserDirectory=.
+BrowserDirectory=./Firefox
 BrowserExecutable=firefox
 InterfaceStyle=Cleanlooks
 LanguageCode=en
+ProfileDirectory=../../Data/profile
+DefaultProfileDirectory=./defaults/profile
+PluginsDirectory=../../Data/profile/extensions
+DefaultPluginsDirectory=./extensions
[Tor]
 ControlPort=9051
-TorExecutable=./App/tor
-Torrc=./Data/Tor/torrc
+TorExecutable=./tor
+Torrc=../Data/Tor/torrc
 AutoControl=true
-DataDirectory=./Data/Tor
+DataDirectory=../Data/Tor
diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx
index 2c40be6..35b0d01 100644
--- a/build-scripts/config/vidalia.conf.ff-osx
+++ b/build-scripts/config/vidalia.conf.ff-osx
@@ -1,11 +1,15 @@
 [General]
-BrowserDirectory=../../
+BrowserDirectory=../../../TorBrowser.app/Contents/MacOS
 BrowserExecutable=firefox-bin
 LanguageCode=en
+ProfileDirectory=../../../../../Library/Application Support/Firefox/Profiles/profile
+DefaultProfileDirectory=./defaults/profile
+PluginsDirectory=../../../../../Library/Application Support/Firefox/Profiles/profile/extensions
+DefaultPluginsDirectory=./extensions
[Tor]
 ControlPort=9051
-TorExecutable=../../Contents/MacOS/tor
-Torrc=../../Library/Vidalia/torrc
+TorExecutable=../../../tor
+Torrc=../../../../../Library/Vidalia/torrc
 AutoControl=true
-DataDirectory=../../Contents/Resources/Data/Tor
+DataDirectory=../../../../Resources/Data/Tor
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 81b0888..c06e763 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -63,8 +63,8 @@ build-qt: build-zlib build-openssl $(QT_DIR)
    cd $(QT_DIR) && make install
    touch $(STAMP_DIR)/build-qt
-VIDALIA_OPTS=-DOPENSSL_LIBCRYPTO=$(BUILT_DIR)/lib/libcrypto.so.1.0.0 -DOPENSSL_LIBSSL=$(BUILT_DIR)/lib/libssl.so.1.0.0 -DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake ..
-build-vidalia: build-openssl build-qt $(VIDALIA_DIR)
+VIDALIA_OPTS=-DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake ..
+build-vidalia: build-qt $(VIDALIA_DIR)
    -mkdir $(VIDALIA_DIR)/build
    cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) && make -j $(NUM_CORES)
    cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 40b3d01..06ad594 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -77,7 +77,7 @@ build-qt: build-zlib build-openssl $(QT_DIR)
VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \
    -DCMAKE_BUILD_TYPE=debug ..
-build-vidalia: build-openssl build-qt $(VIDALIA_DIR)
+build-vidalia: build-qt $(VIDALIA_DIR)
    -mkdir $(VIDALIA_DIR)/build
    cd $(VIDALIA_DIR)/build && \
    MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) cmake $(VIDALIA_OPTS) \
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 035875e..a1a940c 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -6,7 +6,7 @@ ZLIB_VER=1.2.7
 OPENSSL_VER=1.0.1c
 LIBPNG_VER=1.5.10
 QT_VER=4.8.1
-VIDALIA_VER=0.2.17
+VIDALIA_VER=0.2.19
 LIBEVENT_VER=2.0.19-stable
 TOR_VER=0.2.2.36
 PIDGIN_VER=2.6.4
@@ -184,14 +184,9 @@ $(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) ../src/current-patches/openssl/*
    cp patch-any-src.sh $(OPENSSL_DIR)
    cd $(OPENSSL_DIR) && ./patch-any-src.sh
-$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) ../src/current-patches/vidalia/*patch | $(BUILD_DIR)
+$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR)
    rm -rf $(VIDALIA_DIR)
    cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -C $(BUILD_DIR)/
-ifeq (MacOS,$(PLATFORM))
-	cp ../src/current-patches/vidalia/*patch $(VIDALIA_DIR)
-	cp patch-any-src.sh $(VIDALIA_DIR)
-	cd $(VIDALIA_DIR) && ./patch-any-src.sh
-endif
$(LIBEVENT_DIR): $(FETCH_DIR)/$(LIBEVENT_PACKAGE) | $(BUILD_DIR)
    rm -rf $(LIBEVENT_DIR)
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index ecefc3e..213d3e5 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -78,10 +78,10 @@ build-qt: build-zlib build-openssl $(QT_DIR)
    cd $(QT_DIR) && make install
    touch $(STAMP_DIR)/build-qt
-VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB)
+VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DWIX_BINARY_DIR=$(WIX_LIB)
 # XXX Once we build qt on windows, we'll want to add build-qt here
 build-vidalia: PATH+=:$(QT_LIB)
-build-vidalia: build-openssl $(VIDALIA_DIR)
+build-vidalia: $(VIDALIA_DIR)
    -mkdir $(VIDALIA_DIR)/build
    cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) ..
    cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES)
diff --git a/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch
deleted file mode 100644
index 293a52e..0000000
--- a/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c06d989faabadfa643dfd4a34abae549f4eef213 Mon Sep 17 00:00:00 2001
-From: Sebastian Hahn sebastian@torproject.org
-Date: Wed, 18 Apr 2012 02:01:36 +0200
-Subject: [PATCH] Adapt paths etc for OS X TBB
-
----
- src/vidalia/MainWindow.cpp |   21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
-index d170d47..6835b1e 100644
---- a/src/vidalia/MainWindow.cpp
-+++ b/src/vidalia/MainWindow.cpp
-@@ -619,24 +619,27 @@ MainWindow::launchBrowserFromDirectory()
- 
-   /* The browser is in <browserDirectory>/App/Firefox/<browserDirectoryFilename> */
-   QString browserExecutable =
--    QDir::toNativeSeparators(browserDirectory + "/App/Firefox/" + browserDirectoryFilename);
-+    QDir::toNativeSeparators(browserDirectory + "/Contents/MacOS/TorBrowser.app/Contents/MacOS/" + browserDirectoryFilename);
-   /* The profile is in <browserDirectory>/Data/profile */
-   QString profileDir =
--    QDir::toNativeSeparators(browserDirectory + "/Data/profile");
-+    QDir::toNativeSeparators(browserDirectory + "/Library/Application Support/Firefox/Profiles/profile");
- 
-   /* Copy the profile directory if it's not already there */
-   QDir browserDirObj = QDir(browserDirectory);
- 
-   /* Copy the profile directory if it's not already there */
--  if (!browserDirObj.exists("Data/profile")) {
--    browserDirObj.mkdir("Data/profile");
--    copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile");
-+  if (!browserDirObj.exists("Library/Application Support/Firefox/Profiles/profile")) {
-+     browserDirObj.mkdir("Library/Application Support/Firefox/Profiles/profile");
-+     QString src = browserDirectory + "/Contents/MacOS/TorBrowser.app/Contents/MacOS/defaults/profile";
-+     QString dst = profileDir;
-+     vNotice("Copying '%1' to '%2'").arg(src).arg(dst);
-+     copy_dir(src, dst);
-   }
- 
-   /* Copy the plugins directory if it's not already there */
--  if (!browserDirObj.exists("Data/plugins")) {
--    browserDirObj.mkdir("Data/plugins");
--    copy_dir(browserDirectory + "/App/DefaultData/plugins", browserDirectory + "/Data/plugins");
-+  if (!browserDirObj.exists("MacOS/Data/plugins")) {
-+    browserDirObj.mkdir("MacOS/Data/plugins");
-+    copy_dir(browserDirectory + "/MacOS/Data/plugins", browserDirectory + "/MacOS/Data/plugins");
-   }
- 
-   /* Build the command line arguments */
-@@ -644,7 +647,7 @@ MainWindow::launchBrowserFromDirectory()
-   // Is this better or worse than MOZ_NO_REMOTE?
-   commandLine << "-no-remote";
-   commandLine << "-profile";
--  commandLine << profileDir;
-+  commandLine << QDir::currentPath () + "/" +  profileDir;
- 
-   /* Launch the browser */
-   if(!_browserProcess->state() != QProcess::NotRunning)
--- 
-1.7.9.6
-

    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[tor-commits] [torbrowser/maint-2.3] Bump Vidalia to 0.2.19. This version removes the OpenSSL dependency and changes the paths to be relative to the Vidalia binary.