diff options
Diffstat (limited to 'community/vidalia')
| -rw-r--r-- | community/vidalia/PKGBUILD | 12 | ||||
| -rw-r--r-- | community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch | 86 |
2 files changed, 94 insertions, 4 deletions
diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD index 4b2805e9f..5e1543134 100644 --- a/community/vidalia/PKGBUILD +++ b/community/vidalia/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72377 2012-06-13 10:27:38Z tredaelli $ +# $Id: PKGBUILD 72455 2012-06-14 19:38:37Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Rorschach <r0rschach@lavabit.com> pkgname=vidalia pkgver=0.2.19 -pkgrel=1 +pkgrel=2 pkgdesc="Controller GUI for Tor" url="https://www.torproject.org/vidalia" arch=('i686' 'x86_64') @@ -12,13 +12,17 @@ license=('GPL') depends=('qt' 'tor') makedepends=('cmake') install=vidalia.install -source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc}) +source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc} + revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch) md5sums=('caf92b44ad2932bbc1c40d6405951c39' - '1ba45d7c91797e880d79a3fc85818dee') + '1ba45d7c91797e880d79a3fc85818dee' + '72de3a292b8481b381f67016cb2a677c') build() { [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh + patch "$srcdir"/$pkgname-$pkgver/src/vidalia/MainWindow.cpp "$srcdir"/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch + cd "$srcdir" mkdir build cd build diff --git a/community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch b/community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch new file mode 100644 index 000000000..d61f3e86e --- /dev/null +++ b/community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch @@ -0,0 +1,86 @@ +diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp +index 85bc62e..b13f80b 100644 +--- a/src/vidalia/MainWindow.cpp ++++ b/src/vidalia/MainWindow.cpp +@@ -626,9 +626,6 @@ MainWindow::launchBrowserFromDirectory() + + /** Directory for the browser */ + QString browserDirectory = settings.getBrowserDirectory(); +- if(QDir(browserDirectory).isRelative()) +- browserDirectory = QDir(QDir::toNativeSeparators(QCoreApplication::applicationDirPath() +- + "/" + browserDirectory)).canonicalPath(); + + /** Relative path to the browser executable from the browserDirectory */ + QString browserExecutable = QDir::toNativeSeparators(browserDirectory + "/" + settings.getBrowserExecutable()); +@@ -1068,20 +1065,6 @@ MainWindow::start() + QString torrc = settings.getTorrc(); + QFileInfo torrcInfo(torrc); + +- if(QDir(torrcInfo.filePath()).isRelative()) { +- torrc = QCoreApplication::applicationDirPath() + "/" + torrc; +- +- QFileInfo newTorrcInfo(torrc); +- if(!newTorrcInfo.exists() and torrcInfo.exists()) { +- torrc = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(torrcInfo.absoluteFilePath()); +- vWarn("Automigrating configuration for Torrc:\nOld path: %1\nNew path: %2") +- .arg(newTorrcInfo.filePath()) +- .arg(torrc); +- settings.setTorrc(torrc); +- torrc = QCoreApplication::applicationDirPath() + "/" + torrc; +- } +- } +- + if(settings.bootstrap()) { + QString boottorrc = settings.bootstrapFrom(); + vNotice(tr("Bootstrapping torrc from %1 to %2") +@@ -1104,20 +1087,6 @@ MainWindow::start() + QString dataDirectory = settings.getDataDirectory(); + QFileInfo dataDirectoryInfo(dataDirectory); + +- if(QDir(dataDirectory).isRelative()) { +- dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; +- +- QFileInfo newDataDirectoryInfo(dataDirectory); +- if(!newDataDirectoryInfo.exists() and dataDirectoryInfo.exists()) { +- dataDirectory = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(dataDirectoryInfo.absoluteFilePath()); +- vWarn("Automigrating configuration for DataDirectory:\nOld path: %1\nNew path: %2") +- .arg(newDataDirectoryInfo.absoluteFilePath()) +- .arg(dataDirectory); +- settings.setDataDirectory(dataDirectory); +- dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; +- } +- } +- + QString expDataDirectory = QDir(expand_filename(dataDirectory)).canonicalPath(); + if (!dataDirectory.isEmpty()) + args << "DataDirectory" << expDataDirectory; +@@ -1175,20 +1144,6 @@ MainWindow::start() + QString torExecutable = settings.getExecutable(); + QFileInfo torExecutableInfo(torExecutable); + +- if(QDir(torExecutableInfo.filePath()).isRelative()) { +- torExecutable = QCoreApplication::applicationDirPath() + "/" + torExecutable; +- +- QFileInfo newTorExecutableInfo(torExecutable); +- if(!newTorExecutableInfo.exists() and torExecutableInfo.exists()) { +- torExecutable = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(torExecutableInfo.absoluteFilePath()); +- vWarn("Automigrating configuration for TorExecutable:\nOld path: %1\nNew path: %2") +- .arg(newTorExecutableInfo.filePath()) +- .arg(torExecutable); +- settings.setExecutable(torExecutable); +- torExecutable = QCoreApplication::applicationDirPath() + "/" + torExecutable; +- } +- } +- + _torControl->start(torExecutable, args); + } + +@@ -1251,8 +1206,6 @@ MainWindow::started() + /* Try to connect to Tor's control port */ + if(settings.autoControlPort()) { + QString dataDirectory = settings.getDataDirectory(); +- if(QDir(dataDirectory).isRelative()) +- dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; + + QFile file(QString("%1/port.conf").arg(QDir(expand_filename(dataDirectory)).canonicalPath())); + int tries = 0, maxtries = 5; |