[arch-commits] Commit in transmission/repos (30 files)
Ionut Biru
ibiru at archlinux.org
Mon Feb 20 20:48:33 UTC 2012
Date: Monday, February 20, 2012 @ 15:48:33
Author: ibiru
Revision: 150701
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
transmission/repos/extra-i686/0001-gtk-conf-set-correct-download-dir-default.patch
(from rev 150699, transmission/trunk/0001-gtk-conf-set-correct-download-dir-default.patch)
transmission/repos/extra-i686/PKGBUILD
(from rev 150699, transmission/trunk/PKGBUILD)
transmission/repos/extra-i686/transmission-cli.install
(from rev 150699, transmission/trunk/transmission-cli.install)
transmission/repos/extra-i686/transmission-gtk.install
(from rev 150699, transmission/trunk/transmission-gtk.install)
transmission/repos/extra-i686/transmission-qt.install
(from rev 150699, transmission/trunk/transmission-qt.install)
transmission/repos/extra-i686/transmissiond
(from rev 150699, transmission/trunk/transmissiond)
transmission/repos/extra-i686/transmissiond.conf
(from rev 150699, transmission/trunk/transmissiond.conf)
transmission/repos/extra-x86_64/0001-gtk-conf-set-correct-download-dir-default.patch
(from rev 150700, transmission/trunk/0001-gtk-conf-set-correct-download-dir-default.patch)
transmission/repos/extra-x86_64/PKGBUILD
(from rev 150700, transmission/trunk/PKGBUILD)
transmission/repos/extra-x86_64/transmission-cli.install
(from rev 150700, transmission/trunk/transmission-cli.install)
transmission/repos/extra-x86_64/transmission-gtk.install
(from rev 150700, transmission/trunk/transmission-gtk.install)
transmission/repos/extra-x86_64/transmission-qt.install
(from rev 150700, transmission/trunk/transmission-qt.install)
transmission/repos/extra-x86_64/transmissiond
(from rev 150700, transmission/trunk/transmissiond)
transmission/repos/extra-x86_64/transmissiond.conf
(from rev 150700, transmission/trunk/transmissiond.conf)
Deleted:
transmission/repos/extra-i686/0001-gtk-conf-set-correct-download-dir-default.patch
transmission/repos/extra-i686/PKGBUILD
transmission/repos/extra-i686/fix_minimize.patch
transmission/repos/extra-i686/transmission-cli.install
transmission/repos/extra-i686/transmission-gtk.install
transmission/repos/extra-i686/transmission-qt.install
transmission/repos/extra-i686/transmissiond
transmission/repos/extra-i686/transmissiond.conf
transmission/repos/extra-x86_64/0001-gtk-conf-set-correct-download-dir-default.patch
transmission/repos/extra-x86_64/PKGBUILD
transmission/repos/extra-x86_64/fix_minimize.patch
transmission/repos/extra-x86_64/transmission-cli.install
transmission/repos/extra-x86_64/transmission-gtk.install
transmission/repos/extra-x86_64/transmission-qt.install
transmission/repos/extra-x86_64/transmissiond
transmission/repos/extra-x86_64/transmissiond.conf
-------------------------------------------------------------------+
extra-i686/0001-gtk-conf-set-correct-download-dir-default.patch | 62 ++--
extra-i686/PKGBUILD | 153 ++++------
extra-i686/fix_minimize.patch | 27 -
extra-i686/transmission-cli.install | 18 -
extra-i686/transmission-gtk.install | 24 -
extra-i686/transmission-qt.install | 22 -
extra-i686/transmissiond | 92 +++---
extra-i686/transmissiond.conf | 10
extra-x86_64/0001-gtk-conf-set-correct-download-dir-default.patch | 62 ++--
extra-x86_64/PKGBUILD | 153 ++++------
extra-x86_64/fix_minimize.patch | 27 -
extra-x86_64/transmission-cli.install | 18 -
extra-x86_64/transmission-gtk.install | 24 -
extra-x86_64/transmission-qt.install | 22 -
extra-x86_64/transmissiond | 92 +++---
extra-x86_64/transmissiond.conf | 10
16 files changed, 378 insertions(+), 438 deletions(-)
Deleted: extra-i686/0001-gtk-conf-set-correct-download-dir-default.patch
===================================================================
--- extra-i686/0001-gtk-conf-set-correct-download-dir-default.patch 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-i686/0001-gtk-conf-set-correct-download-dir-default.patch 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,31 +0,0 @@
-From 4028320ba2e8c181292e02171d83ebf6ce3aee5a Mon Sep 17 00:00:00 2001
-From: Felipe Contreras <felipe.contreras at 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 at 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
-
Copied: transmission/repos/extra-i686/0001-gtk-conf-set-correct-download-dir-default.patch (from rev 150699, transmission/trunk/0001-gtk-conf-set-correct-download-dir-default.patch)
===================================================================
--- extra-i686/0001-gtk-conf-set-correct-download-dir-default.patch (rev 0)
+++ extra-i686/0001-gtk-conf-set-correct-download-dir-default.patch 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,31 @@
+From 4028320ba2e8c181292e02171d83ebf6ce3aee5a Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras at 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 at 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
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-i686/PKGBUILD 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,78 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-
-pkgbase=transmission
-pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.42
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.transmissionbt.com/"
-license=('MIT')
-makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
-source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
- transmissiond transmissiond.conf
- 0001-gtk-conf-set-correct-download-dir-default.patch
- fix_minimize.patch)
-md5sums=('50f6dd76c5c01f45d5ed20783c686815'
- '08875299e3fbb68fc546c1f350ac1f06'
- 'be39806c35b7544856fa4070b00fc960'
- 'f9fae46f5aa9ed3a22af64091604c6d0'
- 'bd764dea56aaf69757762ea1a4c92be2')
-build() {
- cd "$srcdir/$pkgbase-$pkgver"
-
- patch -Np1 -i "$srcdir/0001-gtk-conf-set-correct-download-dir-default.patch"
- patch -Np2 -i "$srcdir/fix_minimize.patch"
-
- ./configure --prefix=/usr
- make
- pushd qt
- qmake qtr.pro
- make
-}
-package_transmission-cli() {
- pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
- depends=('curl' 'libevent')
- backup=('etc/conf.d/transmissiond')
- install=transmission-cli.install
-
- cd "$srcdir/$pkgbase-$pkgver"
-
- for dir in daemon cli web utils
- do
- make -C "$dir" DESTDIR="$pkgdir" install
- done
-
- install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond"
- install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond"
- install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
-}
-
-package_transmission-gtk() {
- pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)"
- depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
- optdepends=('notification-daemon: Desktop notification support'
- 'transmission-cli: daemon and web support')
- install=transmission-gtk.install
-
- cd "$srcdir/$pkgbase-$pkgver"
-
- make -C gtk DESTDIR="$pkgdir" install
- make -C po DESTDIR="$pkgdir" install
- install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-gtk/COPYING"
-}
-
-package_transmission-qt() {
- pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)"
- depends=('curl' 'qt' 'libevent')
- optdepends=('transmission-cli: daemon and web support')
- install=transmission-qt.install
-
- cd "$srcdir/$pkgbase-$pkgver"
-
- make -C qt INSTALL_ROOT="$pkgdir"/usr install
-
- install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-qt/COPYING"
- install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png"
- install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop"
-}
Copied: transmission/repos/extra-i686/PKGBUILD (from rev 150699, transmission/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=transmission
+pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
+pkgver=2.50
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.transmissionbt.com/"
+license=('MIT')
+makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
+source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
+ transmissiond transmissiond.conf
+ 0001-gtk-conf-set-correct-download-dir-default.patch)
+md5sums=('07606789fab2f9730fa454cfc7a04b2d'
+ '08875299e3fbb68fc546c1f350ac1f06'
+ 'be39806c35b7544856fa4070b00fc960'
+ 'f9fae46f5aa9ed3a22af64091604c6d0')
+build() {
+ cd "$srcdir/$pkgbase-$pkgver"
+
+ patch -Np1 -i "$srcdir/0001-gtk-conf-set-correct-download-dir-default.patch"
+
+ ./configure --prefix=/usr
+ make
+ pushd qt
+ qmake qtr.pro
+ make
+}
+package_transmission-cli() {
+ pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
+ depends=('curl' 'libevent')
+ backup=('etc/conf.d/transmissiond')
+ install=transmission-cli.install
+
+ cd "$srcdir/$pkgbase-$pkgver"
+
+ for dir in daemon cli web utils
+ do
+ make -C "$dir" DESTDIR="$pkgdir" install
+ done
+
+ install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond"
+ install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond"
+ install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
+}
+
+package_transmission-gtk() {
+ pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)"
+ depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
+ optdepends=('notification-daemon: Desktop notification support'
+ 'transmission-cli: daemon and web support')
+ install=transmission-gtk.install
+
+ cd "$srcdir/$pkgbase-$pkgver"
+
+ make -C gtk DESTDIR="$pkgdir" install
+ make -C po DESTDIR="$pkgdir" install
+ install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-gtk/COPYING"
+}
+
+package_transmission-qt() {
+ pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)"
+ depends=('curl' 'qt' 'libevent')
+ optdepends=('transmission-cli: daemon and web support')
+ install=transmission-qt.install
+
+ cd "$srcdir/$pkgbase-$pkgver"
+
+ make -C qt INSTALL_ROOT="$pkgdir"/usr install
+
+ install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-qt/COPYING"
+ install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png"
+ install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop"
+}
Deleted: extra-i686/fix_minimize.patch
===================================================================
--- extra-i686/fix_minimize.patch 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-i686/fix_minimize.patch 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,27 +0,0 @@
-Index: /trunk/gtk/main.c
-===================================================================
---- /trunk/gtk/main.c (revision 12968)
-+++ /trunk/gtk/main.c (revision 13067)
-@@ -73,4 +73,5 @@
- gboolean is_iconified;
-
-+ guint activation_count;
- guint timer;
- guint update_model_soon_tag;
-@@ -533,6 +534,14 @@
-
- static void
--on_activate( GApplication * app UNUSED, gpointer unused UNUSED )
--{
-+on_activate( GApplication * app UNUSED, struct cbdata * cbdata )
-+{
-+ cbdata->activation_count++;
-+
-+ /* GApplication emits an 'activate' signal when bootstrapping the primary.
-+ * Ordinarily we handle that by presenting the main window, but if the user
-+ * user started Transmission minimized, ignore that initial signal... */
-+ if( cbdata->is_iconified && ( cbdata->activation_count == 1 ) )
-+ return;
-+
- gtr_action_activate( "present-main-window" );
- }
Deleted: extra-i686/transmission-cli.install
===================================================================
--- extra-i686/transmission-cli.install 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-i686/transmission-cli.install 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,9 +0,0 @@
-post_install() {
- cat << _EOF
-
- If you want to run the Transmission daemon at boot,
- add transmissiond to the DAEMONS array in /etc/rc.conf.
- You have to set the user in /etc/conf.d/transmissiond.
-
-_EOF
-}
Copied: transmission/repos/extra-i686/transmission-cli.install (from rev 150699, transmission/trunk/transmission-cli.install)
===================================================================
--- extra-i686/transmission-cli.install (rev 0)
+++ extra-i686/transmission-cli.install 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,9 @@
+post_install() {
+ cat << _EOF
+
+ If you want to run the Transmission daemon at boot,
+ add transmissiond to the DAEMONS array in /etc/rc.conf.
+ You have to set the user in /etc/conf.d/transmissiond.
+
+_EOF
+}
Deleted: extra-i686/transmission-gtk.install
===================================================================
--- extra-i686/transmission-gtk.install 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-i686/transmission-gtk.install 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: transmission/repos/extra-i686/transmission-gtk.install (from rev 150699, transmission/trunk/transmission-gtk.install)
===================================================================
--- extra-i686/transmission-gtk.install (rev 0)
+++ extra-i686/transmission-gtk.install 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-i686/transmission-qt.install
===================================================================
--- extra-i686/transmission-qt.install 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-i686/transmission-qt.install 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: transmission/repos/extra-i686/transmission-qt.install (from rev 150699, transmission/trunk/transmission-qt.install)
===================================================================
--- extra-i686/transmission-qt.install (rev 0)
+++ extra-i686/transmission-qt.install 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-i686/transmissiond
===================================================================
--- extra-i686/transmissiond 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-i686/transmissiond 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/transmissiond
-
-PID=`pidof -o %PPID /usr/bin/transmission-daemon`
-case "$1" in
- start)
- stat_busy "Starting Transmission Daemon"
- [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" $TRANS_USER
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon transmissiond
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Transmission Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon transmissiond
- stat_done
- fi
- ;;
- restart)
- $0 stop
- while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done
- $0 start
- ;;
- reload)
- stat_busy "Reloading config"
- [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|reload}"
-esac
-exit 0
Copied: transmission/repos/extra-i686/transmissiond (from rev 150699, transmission/trunk/transmissiond)
===================================================================
--- extra-i686/transmissiond (rev 0)
+++ extra-i686/transmissiond 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/transmissiond
+
+PID=`pidof -o %PPID /usr/bin/transmission-daemon`
+case "$1" in
+ start)
+ stat_busy "Starting Transmission Daemon"
+ [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" $TRANS_USER
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon transmissiond
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Transmission Daemon"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon transmissiond
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done
+ $0 start
+ ;;
+ reload)
+ stat_busy "Reloading config"
+ [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ stat_done
+ fi
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart|reload}"
+esac
+exit 0
Deleted: extra-i686/transmissiond.conf
===================================================================
--- extra-i686/transmissiond.conf 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-i686/transmissiond.conf 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,5 +0,0 @@
-# example configuration file
-
-# TRANSMISSION_HOME=/home/foo
-# TRANS_USER="foo"
-# TRANS_ARGS="-g $TRANSMISSION_HOME/.config/transmission-daemon"
Copied: transmission/repos/extra-i686/transmissiond.conf (from rev 150699, transmission/trunk/transmissiond.conf)
===================================================================
--- extra-i686/transmissiond.conf (rev 0)
+++ extra-i686/transmissiond.conf 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,5 @@
+# example configuration file
+
+# TRANSMISSION_HOME=/home/foo
+# TRANS_USER="foo"
+# TRANS_ARGS="-g $TRANSMISSION_HOME/.config/transmission-daemon"
Deleted: extra-x86_64/0001-gtk-conf-set-correct-download-dir-default.patch
===================================================================
--- extra-x86_64/0001-gtk-conf-set-correct-download-dir-default.patch 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-x86_64/0001-gtk-conf-set-correct-download-dir-default.patch 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,31 +0,0 @@
-From 4028320ba2e8c181292e02171d83ebf6ce3aee5a Mon Sep 17 00:00:00 2001
-From: Felipe Contreras <felipe.contreras at 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 at 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
-
Copied: transmission/repos/extra-x86_64/0001-gtk-conf-set-correct-download-dir-default.patch (from rev 150700, transmission/trunk/0001-gtk-conf-set-correct-download-dir-default.patch)
===================================================================
--- extra-x86_64/0001-gtk-conf-set-correct-download-dir-default.patch (rev 0)
+++ extra-x86_64/0001-gtk-conf-set-correct-download-dir-default.patch 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,31 @@
+From 4028320ba2e8c181292e02171d83ebf6ce3aee5a Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras at 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 at 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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-x86_64/PKGBUILD 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,78 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-
-pkgbase=transmission
-pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.42
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.transmissionbt.com/"
-license=('MIT')
-makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
-source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
- transmissiond transmissiond.conf
- 0001-gtk-conf-set-correct-download-dir-default.patch
- fix_minimize.patch)
-md5sums=('50f6dd76c5c01f45d5ed20783c686815'
- '08875299e3fbb68fc546c1f350ac1f06'
- 'be39806c35b7544856fa4070b00fc960'
- 'f9fae46f5aa9ed3a22af64091604c6d0'
- 'bd764dea56aaf69757762ea1a4c92be2')
-build() {
- cd "$srcdir/$pkgbase-$pkgver"
-
- patch -Np1 -i "$srcdir/0001-gtk-conf-set-correct-download-dir-default.patch"
- patch -Np2 -i "$srcdir/fix_minimize.patch"
-
- ./configure --prefix=/usr
- make
- pushd qt
- qmake qtr.pro
- make
-}
-package_transmission-cli() {
- pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
- depends=('curl' 'libevent')
- backup=('etc/conf.d/transmissiond')
- install=transmission-cli.install
-
- cd "$srcdir/$pkgbase-$pkgver"
-
- for dir in daemon cli web utils
- do
- make -C "$dir" DESTDIR="$pkgdir" install
- done
-
- install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond"
- install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond"
- install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
-}
-
-package_transmission-gtk() {
- pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)"
- depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
- optdepends=('notification-daemon: Desktop notification support'
- 'transmission-cli: daemon and web support')
- install=transmission-gtk.install
-
- cd "$srcdir/$pkgbase-$pkgver"
-
- make -C gtk DESTDIR="$pkgdir" install
- make -C po DESTDIR="$pkgdir" install
- install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-gtk/COPYING"
-}
-
-package_transmission-qt() {
- pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)"
- depends=('curl' 'qt' 'libevent')
- optdepends=('transmission-cli: daemon and web support')
- install=transmission-qt.install
-
- cd "$srcdir/$pkgbase-$pkgver"
-
- make -C qt INSTALL_ROOT="$pkgdir"/usr install
-
- install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-qt/COPYING"
- install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png"
- install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop"
-}
Copied: transmission/repos/extra-x86_64/PKGBUILD (from rev 150700, transmission/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=transmission
+pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
+pkgver=2.50
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.transmissionbt.com/"
+license=('MIT')
+makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
+source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
+ transmissiond transmissiond.conf
+ 0001-gtk-conf-set-correct-download-dir-default.patch)
+md5sums=('07606789fab2f9730fa454cfc7a04b2d'
+ '08875299e3fbb68fc546c1f350ac1f06'
+ 'be39806c35b7544856fa4070b00fc960'
+ 'f9fae46f5aa9ed3a22af64091604c6d0')
+build() {
+ cd "$srcdir/$pkgbase-$pkgver"
+
+ patch -Np1 -i "$srcdir/0001-gtk-conf-set-correct-download-dir-default.patch"
+
+ ./configure --prefix=/usr
+ make
+ pushd qt
+ qmake qtr.pro
+ make
+}
+package_transmission-cli() {
+ pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
+ depends=('curl' 'libevent')
+ backup=('etc/conf.d/transmissiond')
+ install=transmission-cli.install
+
+ cd "$srcdir/$pkgbase-$pkgver"
+
+ for dir in daemon cli web utils
+ do
+ make -C "$dir" DESTDIR="$pkgdir" install
+ done
+
+ install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond"
+ install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond"
+ install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
+}
+
+package_transmission-gtk() {
+ pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)"
+ depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
+ optdepends=('notification-daemon: Desktop notification support'
+ 'transmission-cli: daemon and web support')
+ install=transmission-gtk.install
+
+ cd "$srcdir/$pkgbase-$pkgver"
+
+ make -C gtk DESTDIR="$pkgdir" install
+ make -C po DESTDIR="$pkgdir" install
+ install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-gtk/COPYING"
+}
+
+package_transmission-qt() {
+ pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)"
+ depends=('curl' 'qt' 'libevent')
+ optdepends=('transmission-cli: daemon and web support')
+ install=transmission-qt.install
+
+ cd "$srcdir/$pkgbase-$pkgver"
+
+ make -C qt INSTALL_ROOT="$pkgdir"/usr install
+
+ install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-qt/COPYING"
+ install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png"
+ install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop"
+}
Deleted: extra-x86_64/fix_minimize.patch
===================================================================
--- extra-x86_64/fix_minimize.patch 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-x86_64/fix_minimize.patch 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,27 +0,0 @@
-Index: /trunk/gtk/main.c
-===================================================================
---- /trunk/gtk/main.c (revision 12968)
-+++ /trunk/gtk/main.c (revision 13067)
-@@ -73,4 +73,5 @@
- gboolean is_iconified;
-
-+ guint activation_count;
- guint timer;
- guint update_model_soon_tag;
-@@ -533,6 +534,14 @@
-
- static void
--on_activate( GApplication * app UNUSED, gpointer unused UNUSED )
--{
-+on_activate( GApplication * app UNUSED, struct cbdata * cbdata )
-+{
-+ cbdata->activation_count++;
-+
-+ /* GApplication emits an 'activate' signal when bootstrapping the primary.
-+ * Ordinarily we handle that by presenting the main window, but if the user
-+ * user started Transmission minimized, ignore that initial signal... */
-+ if( cbdata->is_iconified && ( cbdata->activation_count == 1 ) )
-+ return;
-+
- gtr_action_activate( "present-main-window" );
- }
Deleted: extra-x86_64/transmission-cli.install
===================================================================
--- extra-x86_64/transmission-cli.install 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-x86_64/transmission-cli.install 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,9 +0,0 @@
-post_install() {
- cat << _EOF
-
- If you want to run the Transmission daemon at boot,
- add transmissiond to the DAEMONS array in /etc/rc.conf.
- You have to set the user in /etc/conf.d/transmissiond.
-
-_EOF
-}
Copied: transmission/repos/extra-x86_64/transmission-cli.install (from rev 150700, transmission/trunk/transmission-cli.install)
===================================================================
--- extra-x86_64/transmission-cli.install (rev 0)
+++ extra-x86_64/transmission-cli.install 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,9 @@
+post_install() {
+ cat << _EOF
+
+ If you want to run the Transmission daemon at boot,
+ add transmissiond to the DAEMONS array in /etc/rc.conf.
+ You have to set the user in /etc/conf.d/transmissiond.
+
+_EOF
+}
Deleted: extra-x86_64/transmission-gtk.install
===================================================================
--- extra-x86_64/transmission-gtk.install 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-x86_64/transmission-gtk.install 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: transmission/repos/extra-x86_64/transmission-gtk.install (from rev 150700, transmission/trunk/transmission-gtk.install)
===================================================================
--- extra-x86_64/transmission-gtk.install (rev 0)
+++ extra-x86_64/transmission-gtk.install 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/transmission-qt.install
===================================================================
--- extra-x86_64/transmission-qt.install 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-x86_64/transmission-qt.install 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: transmission/repos/extra-x86_64/transmission-qt.install (from rev 150700, transmission/trunk/transmission-qt.install)
===================================================================
--- extra-x86_64/transmission-qt.install (rev 0)
+++ extra-x86_64/transmission-qt.install 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/transmissiond
===================================================================
--- extra-x86_64/transmissiond 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-x86_64/transmissiond 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/transmissiond
-
-PID=`pidof -o %PPID /usr/bin/transmission-daemon`
-case "$1" in
- start)
- stat_busy "Starting Transmission Daemon"
- [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" $TRANS_USER
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon transmissiond
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Transmission Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon transmissiond
- stat_done
- fi
- ;;
- restart)
- $0 stop
- while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done
- $0 start
- ;;
- reload)
- stat_busy "Reloading config"
- [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|reload}"
-esac
-exit 0
Copied: transmission/repos/extra-x86_64/transmissiond (from rev 150700, transmission/trunk/transmissiond)
===================================================================
--- extra-x86_64/transmissiond (rev 0)
+++ extra-x86_64/transmissiond 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/transmissiond
+
+PID=`pidof -o %PPID /usr/bin/transmission-daemon`
+case "$1" in
+ start)
+ stat_busy "Starting Transmission Daemon"
+ [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" $TRANS_USER
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon transmissiond
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Transmission Daemon"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon transmissiond
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done
+ $0 start
+ ;;
+ reload)
+ stat_busy "Reloading config"
+ [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ stat_done
+ fi
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart|reload}"
+esac
+exit 0
Deleted: extra-x86_64/transmissiond.conf
===================================================================
--- extra-x86_64/transmissiond.conf 2012-02-20 20:48:02 UTC (rev 150700)
+++ extra-x86_64/transmissiond.conf 2012-02-20 20:48:33 UTC (rev 150701)
@@ -1,5 +0,0 @@
-# example configuration file
-
-# TRANSMISSION_HOME=/home/foo
-# TRANS_USER="foo"
-# TRANS_ARGS="-g $TRANSMISSION_HOME/.config/transmission-daemon"
Copied: transmission/repos/extra-x86_64/transmissiond.conf (from rev 150700, transmission/trunk/transmissiond.conf)
===================================================================
--- extra-x86_64/transmissiond.conf (rev 0)
+++ extra-x86_64/transmissiond.conf 2012-02-20 20:48:33 UTC (rev 150701)
@@ -0,0 +1,5 @@
+# example configuration file
+
+# TRANSMISSION_HOME=/home/foo
+# TRANS_USER="foo"
+# TRANS_ARGS="-g $TRANSMISSION_HOME/.config/transmission-daemon"
More information about the arch-commits
mailing list