aboutsummaryrefslogtreecommitdiffstats
path: root/main/transmission
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2012-02-04 08:50:13 +0200
committerTimo Teräs <timo.teras@iki.fi>2012-02-04 08:51:32 +0200
commit372d4246eca484005416f7c31d92daa2184c4187 (patch)
treeffb22caaceffca31d23ff6f29f7469b371c9280a /main/transmission
parentb377064f47c65a3f21faa12932a954bcbd4c3a72 (diff)
downloadaports-372d4246eca484005416f7c31d92daa2184c4187.tar.bz2
aports-372d4246eca484005416f7c31d92daa2184c4187.tar.xz
main/transmission: upgrade 2.42 and cherry-pick an upstream bug fix
Diffstat (limited to 'main/transmission')
-rw-r--r--main/transmission/0001-gtk-conf-set-correct-download-dir-default.patch31
-rw-r--r--main/transmission/APKBUILD8
2 files changed, 36 insertions, 3 deletions
diff --git a/main/transmission/0001-gtk-conf-set-correct-download-dir-default.patch b/main/transmission/0001-gtk-conf-set-correct-download-dir-default.patch
new file mode 100644
index 0000000000..3b0a38400f
--- /dev/null
+++ b/main/transmission/0001-gtk-conf-set-correct-download-dir-default.patch
@@ -0,0 +1,31 @@
+From 4028320ba2e8c181292e02171d83ebf6ce3aee5a Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@gmail.com>
+Date: Thu, 29 Dec 2011 03:28:27 +0200
+Subject: [PATCH] gtk: conf: set correct download dir default
+
+Otherwise people might get:
+ERROR:open-dialog.c:285:gtr_torrent_options_dialog_new: code should not be reached
+
+It was fixed at some point in ticket #1873, but somebody broket it
+again.
+
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
+---
+ gtk/conf.c | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/gtk/conf.c b/gtk/conf.c
+index 623b839..6ad6ca2 100644
+--- a/gtk/conf.c
++++ b/gtk/conf.c
+@@ -108,7 +108,6 @@ tr_prefs_init_defaults( tr_benc * d )
+ tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_X, 50 );
+ tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_Y, 50 );
+
+- str = g_get_user_special_dir( G_USER_DIRECTORY_DOWNLOAD );
+ tr_bencDictAddStr( d, TR_PREFS_KEY_DOWNLOAD_DIR, str );
+
+ tr_bencDictAddStr( d, PREF_KEY_SORT_MODE, "sort-by-name" );
+--
+1.7.8.1
+
diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD
index 47e1c0184f..26c504aff6 100644
--- a/main/transmission/APKBUILD
+++ b/main/transmission/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:Carlo Landmeter
pkgname=transmission
-pkgver=2.41
-pkgrel=2
+pkgver=2.42
+pkgrel=0
pkgdesc="Lightweight GTK BitTorrent client"
url="http://www.tansmissionbt.com"
install="$pkgname.pre-install"
@@ -11,6 +11,7 @@ depends=
makedepends="openssl-dev pkgconfig curl-dev gtk+-dev intltool libevent-dev
libnotify-dev dbus-glib-dev autoconf automake tar libcanberra-dev gconf-dev"
source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
+ 0001-gtk-conf-set-correct-download-dir-default.patch
transmission-daemon.initd
transmission-daemon.confd
"
@@ -66,6 +67,7 @@ cli() {
"$subpkgdir"/usr/bin/
}
-md5sums="799b7bb24e236dbbdc86275f89ea9e67 transmission-2.41.tar.bz2
+md5sums="2ade0818d465779bd956b8b72ea56b02 transmission-2.42.tar.bz2
+f9fae46f5aa9ed3a22af64091604c6d0 0001-gtk-conf-set-correct-download-dir-default.patch
1ca57137d38c3429295a4699f535a240 transmission-daemon.initd
89478a70fcd93463e1dd8d751da994da transmission-daemon.confd"