Mon Jan 9 23:14:46 UTC 2012

8 files changed, 103 insertions, 42 deletions

diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 9f8a2c007..788db3ca6 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145348 2011-12-22 00:36:32Z dan $
+# $Id: PKGBUILD 146299 2012-01-08 22:58:11Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.8.1
+pkgver=1.7.8.3
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -80,7 +80,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('198e23e6e50245331590a6159ccdbdbe1792422c'
-          'b49ce0b4da4f85671693c9b2c6f6a8b8ee65c809'
+sha1sums=('e5eb8c289b69d69fd08c81b587a06eb5dd2b5c1c'
+          'a6e2b7cff8181ee52a1cc00ebba7b349850d6680'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index 05a63141a..195b91483 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144348 2011-12-04 22:01:25Z eric $
-#  Maintainer: Eric Bélanger <eric@archlinux.org>
+# $Id: PKGBUILD 146281 2012-01-08 05:34:24Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glsof
-pkgver=1.6.1
-_fmver=1.6.1
+pkgver=1.7.0
+_fmver=1.7.0
 _qver=1.0.0
 pkgrel=1
 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
@@ -15,14 +15,14 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}
 if [ "$CARCH" = "i686" ]; then
   source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \
           glsof-filemonitor glsof-queries)
-  sha1sums=('afafaafefcfc5f4bb76f6cbe7c4a39a478e351c2'
+  sha1sums=('00db4305995a67cea6bc12bfe7ef3984d07434ae'
             'd5a17d66dd02cd78bad5ffdda0b936c7848e4890'
             '197b58f40880995d6442fd42a58fa1f4594fd19d'
             '2797c326904af16a254c3e39b8c529ea14ef37e5')
 elif [ "$CARCH" = "x86_64" ]; then
   source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \
           glsof-filemonitor glsof-queries)
-  sha1sums=('afafaafefcfc5f4bb76f6cbe7c4a39a478e351c2'
+  sha1sums=('00db4305995a67cea6bc12bfe7ef3984d07434ae'
             'c5dd12e9b2860f1c427ed7cd482e898978051d2c'
             '197b58f40880995d6442fd42a58fa1f4594fd19d'
             '2797c326904af16a254c3e39b8c529ea14ef37e5')
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index 905ea0e90..d60713620 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145137 2011-12-17 18:24:13Z ibiru $
+# $Id: PKGBUILD 146295 2012-01-08 17:45:05Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime
-pkgver=2.4.29
+pkgver=2.4.31
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('glib2' 'zlib')
 makedepends=('gtk-sharp-2' 'pkgconfig')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c85dd7b2ac19754bf687fe8653c3631415b3a2ce70b4365268f03a1bd002ffa5')
+sha256sums=('d9601328ee3d2d5be57ac8397571af4835dba8eb2c68ad224de3ec722a81fd04')
 
 build() {
   # get rid of that .wapi errors in fakeroot
@@ -28,8 +28,4 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-
-  # These are gmime alternatives for the same shareutils tools
-  mv "$pkgdir/usr/bin/uuencode" "$pkgdir/usr/bin/guuencode"
-  mv "$pkgdir/usr/bin/uudecode" "$pkgdir/usr/bin/guudecode"
 }
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index ef30c63bb..9e9aaef60 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143654 2011-11-28 04:52:17Z eric $
+# $Id: PKGBUILD 146283 2012-01-08 05:55:19Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Ben Mazer <blm@groknil.org>
 
 pkgname=msmtp
-pkgver=1.4.26
+pkgver=1.4.27
 pkgrel=1
 pkgdesc="A mini smtp client"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('texlive-core')
 provides=('smtp-forwarder')
 install=msmtp.install
 source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('0ce5352447b01dc21970b7a00cf13b8a3e7172c9')
+sha1sums=('e335745133b4729fe84c49f836b4d2fa9281e040')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/re-alpine/PKGBUILD b/extra/re-alpine/PKGBUILD
index 9293744c9..92043c7a3 100644
--- a/extra/re-alpine/PKGBUILD
+++ b/extra/re-alpine/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125747 2011-05-29 05:24:41Z eric $
+# $Id: PKGBUILD 146303 2012-01-09 01:01:51Z eric $
 # Maintainer:  Eric Bélanger <eric@archlinux.org>
 # Contributor: Smith Dhumbumroong <zodmaner@gmail.com>
 
@@ -26,7 +26,7 @@ sha1sums=('9c2f13dbc7ca75e7a09f81df607db84694b10fa6'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 < ../maildir.patch
-   LIBS+=-lpam ./configure --prefix=/usr --without-passfile --without-tcl \
+   LIBS+="-lpam -lkrb5 -lcrypto" ./configure --prefix=/usr --without-passfile --without-tcl \
     --disable-shared --with-system-pinerc=/etc/alpine.d/pine.conf \
     --with-system-fixed-pinerc=/etc/alpine.d/pine.conf.fixed
   make
diff --git a/extra/transmission/0001-gtk-conf-set-correct-download-dir-default.patch b/extra/transmission/0001-gtk-conf-set-correct-download-dir-default.patch
new file mode 100644
index 000000000..3b0a38400
--- /dev/null
+++ b/extra/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/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 68d081cd4..2d43a286b 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,21 +1,28 @@
-# $Id: PKGBUILD 141093 2011-10-23 18:45:30Z ibiru $
+# $Id: PKGBUILD 146293 2012-01-08 17:03:43Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
 pkgver=2.42
-pkgrel=1
+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)
+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')
+         'be39806c35b7544856fa4070b00fc960'
+         'f9fae46f5aa9ed3a22af64091604c6d0'
+         'bd764dea56aaf69757762ea1a4c92be2')
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  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
@@ -29,16 +36,16 @@ package_transmission-cli() {
   backup=('etc/conf.d/transmissiond')
   install=transmission-cli.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
 
   for dir in daemon cli web utils
   do
-      make -C "${dir}" DESTDIR="${pkgdir}" install
+      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"
+  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() {
@@ -48,11 +55,11 @@ package_transmission-gtk() {
   	      'transmission-cli: daemon and web support')
   install=transmission-gtk.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  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"
+  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() {
@@ -61,11 +68,11 @@ package_transmission-qt() {
   optdepends=('transmission-cli: daemon and web support')
   install=transmission-qt.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
 
-  make -C qt INSTALL_ROOT="${pkgdir}"/usr install
+  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"
+  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"
 }
diff --git a/extra/transmission/fix_minimize.patch b/extra/transmission/fix_minimize.patch
new file mode 100644
index 000000000..fe0f42a03
--- /dev/null
+++ b/extra/transmission/fix_minimize.patch
@@ -0,0 +1,27 @@
+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" );

+ }