diff options
| author | root <root@rshg054.dnsready.net> | 2012-07-06 00:01:51 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-07-06 00:01:51 +0000 |
| commit | 810a5a6e8edafe2550300c5030083669db6e3973 (patch) | |
| tree | 67bce9a7079962a26b9f1d156941e8e4a3cda92c /community/vidalia | |
| parent | 7f6f69dc52c8601768ba48fa7b69507a80d532cb (diff) | |
Fri Jul 6 00:01:50 UTC 2012
Diffstat (limited to 'community/vidalia')
| -rw-r--r-- | community/vidalia/PKGBUILD | 10 | ||||
| -rw-r--r-- | community/vidalia/bug6178.patch | 28 |
2 files changed, 33 insertions, 5 deletions
diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD index 5e1543134..29f509fcf 100644 --- a/community/vidalia/PKGBUILD +++ b/community/vidalia/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72455 2012-06-14 19:38:37Z tredaelli $ +# $Id: PKGBUILD 73256 2012-07-04 13:05:20Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Rorschach <r0rschach@lavabit.com> pkgname=vidalia pkgver=0.2.19 -pkgrel=2 +pkgrel=3 pkgdesc="Controller GUI for Tor" url="https://www.torproject.org/vidalia" arch=('i686' 'x86_64') @@ -13,15 +13,15 @@ depends=('qt' 'tor') makedepends=('cmake') install=vidalia.install source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc} - revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch) + bug6178.patch) md5sums=('caf92b44ad2932bbc1c40d6405951c39' '1ba45d7c91797e880d79a3fc85818dee' - '72de3a292b8481b381f67016cb2a677c') + 'bdc0855fef6b230ab63a5b523e853d4e') 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 + patch -d "$srcdir/$pkgname-$pkgver" -i "$srcdir"/bug6178.patch -p1 cd "$srcdir" mkdir build diff --git a/community/vidalia/bug6178.patch b/community/vidalia/bug6178.patch new file mode 100644 index 000000000..5da41ef55 --- /dev/null +++ b/community/vidalia/bug6178.patch @@ -0,0 +1,28 @@ +From: Tomás Touceda <chiiph@torproject.org> +Date: Thu, 28 Jun 2012 23:55:24 +0000 (-0300) +Subject: Do not add relative root to datadirectory if it is empty +X-Git-Url: https://gitweb.torproject.org + +Do not add relative root to datadirectory if it is empty +--- + +diff --git a/changes/bug6178 b/changes/bug6178 +new file mode 100644 +index 0000000..e727ed9 +--- /dev/null ++++ b/changes/bug6178 +@@ -0,0 +1 @@ ++ o Do not add relative root to DataDirectory if it is empty. Fixes bug 6178. +diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp +index a8dce5a..a7a4a09 100644 +--- a/src/vidalia/MainWindow.cpp ++++ b/src/vidalia/MainWindow.cpp +@@ -1104,7 +1104,7 @@ MainWindow::start() + QString dataDirectory = settings.getDataDirectory(); + QFileInfo dataDirectoryInfo(dataDirectory); + +- if(QDir(dataDirectory).isRelative()) { ++ if(not dataDirectory.isEmpty() and QDir(dataDirectory).isRelative()) { + dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; + + QFileInfo newDataDirectoryInfo(dataDirectory); |