Wed Jan 29 03:27:46 UTC 2014

14 files changed, 138 insertions, 68 deletions

diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index e4414475b..b2149a2f1 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 204521 2014-01-22 01:48:51Z eric $
+# $Id: PKGBUILD 204839 2014-01-28 14:14:20Z juergen $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 pkgname=emacs
 pkgver=24.3
-pkgrel=5
+pkgrel=6
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls')
 install=emacs.install
 source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}
         emacs-24.3-giflib5.patch)
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index aeaf9c5dc..9bfe06764 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200800 2013-12-05 17:20:20Z heftig $
+# $Id: PKGBUILD 204833 2014-01-28 08:59:57Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gtk3
-pkgver=3.10.6
+pkgver=3.10.7
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
 arch=(i686 x86_64)
@@ -17,16 +17,9 @@ optdepends=('gnome-themes-standard: Default widget theme'
 license=(LGPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
         settings.ini)
-sha256sums=('3c24c57fc5cb7a5ea39d3a3ff7b12be63d7f21a52fd6f20f7b983e19b7b0268a'
+sha256sums=('b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427'
             '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119')
 
-prepare() {
-    cd "gtk+-$pkgver"
-    
-    # protocols too new; made with a wayland from git, not 1.3.0
-    rm gdk/wayland/gtk-shell-{client-protocol.h,protocol.c}
-}
-
 build() {
     cd "gtk+-$pkgver"
 
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index 9d0fa5510..929ef11e7 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198083 2013-10-30 12:42:02Z allan $
+# $Id: PKGBUILD 204834 2014-01-28 09:00:12Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.10.1
+pkgver=3.10.2
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('gtk3' 'libxml2')
 makedepends=('intltool' 'gobject-introspection' 'glade')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('38de44f832b4110a3442af2fce58fce0a54f4b22a763c490bcdc1b1db2fb0b01')
+sha256sums=('045d244b1fd6a2d1b91a40712cbbfb18c6e44844c266a0a16ac5ec1800add8f5')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
index 646f5bec8..120fb180b 100644
--- a/extra/kdebindings-korundum/PKGBUILD
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 204124 2014-01-15 10:16:43Z svenstaro $
+# $Id: PKGBUILD 204820 2014-01-28 03:33:03Z td123 $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-korundum
 pkgver=4.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Ruby bindings for libraries created by the KDE community"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum"
 arch=('i686' 'x86_64')
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index c2179c223..8ee4a1b63 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 204099 2014-01-15 10:16:16Z svenstaro $
+# $Id: PKGBUILD 204821 2014-01-28 03:33:04Z td123 $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
 pkgver=4.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Ruby bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
 arch=('i686' 'x86_64')
@@ -15,8 +15,11 @@ conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz")
 sha1sums=('c6a778cc4d5cdfc375f4121b03b5b44be9de158a')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../qtruby-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/mysql-python/PKGBUILD b/extra/mysql-python/PKGBUILD
index 63b2e43e4..977f22f10 100644
--- a/extra/mysql-python/PKGBUILD
+++ b/extra/mysql-python/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180685 2013-03-25 19:15:36Z bpiotrowski $
+# $Id: PKGBUILD 204827 2014-01-28 04:02:31Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=mysql-python
-pkgver=1.2.4
-pkgrel=2
+pkgver=1.2.5
+pkgrel=1
 pkgdesc="MySQL support for Python"
 arch=("i686" "x86_64")
 url="http://mysql-python.sourceforge.net/"
@@ -12,7 +12,7 @@ license=('GPL2')
 depends=('python2' 'libmariadbclient')
 makedepends=('mariadb' 'python2-distribute')
 source=("http://pypi.python.org/packages/source/M/MySQL-python/MySQL-python-${pkgver}.zip")
-md5sums=('ddf2386daf10a97af115ffad2ed4a9a0')
+md5sums=('654f75b302db6ed8dc5a898c625e030c')
 
 package() {
   cd ${srcdir}/MySQL-python-${pkgver}
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 6308093e3..9c1638653 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198368 2013-10-30 14:26:41Z allan $
+# $Id: PKGBUILD 204842 2014-01-28 15:36:21Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,26 +6,21 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.7
-pkgrel=4
+pkgver=2.10.8
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
 license=('GPL')
 makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
              'tk' 'ca-certificates' 'intltool' 'networkmanager')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        pidgin-2.10.7-link-libirc-to-libsasl2.patch)
-sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192'
-            '063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2{,.asc})
+sha256sums=('b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227'
+            'SKIP')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # https://developer.pidgin.im/ticket/15517
-  patch -Np1 -i "$srcdir/pidgin-2.10.7-link-libirc-to-libsasl2.patch"
-  autoreconf -vi
-
   # Use Python 2
   sed -i 's/env python$/&2/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}
diff --git a/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch
deleted file mode 100644
index abffa20b8..000000000
--- a/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am pidgin-2.10.7/libpurple/protocols/irc/Makefile.am
---- pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am	2013-02-14 02:44:47.000000000 +0200
-+++ pidgin-2.10.7/libpurple/protocols/irc/Makefile.am	2013-02-14 02:49:58.000000000 +0200
-@@ -27,7 +27,7 @@ else
- st =
- pkg_LTLIBRARIES   = libirc.la
- libirc_la_SOURCES = $(IRCSOURCES)
--libirc_la_LIBADD  = $(GLIB_LIBS)
-+libirc_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS)
- 
- endif
- 
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 63c931ff8..648e8a9f5 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197422 2013-10-25 19:15:13Z eric $
+# $Id: PKGBUILD 204822 2014-01-28 03:33:05Z td123 $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
 pkgver=1.4.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64')
 url="http://www.rrdtool.org"
diff --git a/extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch b/extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch
new file mode 100644
index 000000000..8fefb275d
--- /dev/null
+++ b/extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch
@@ -0,0 +1,84 @@
+From f5bbf838c8b13369a61c6756355305388df5824f Mon Sep 17 00:00:00 2001
+From: Tim Moore <tmoore@incrementalism.net>
+Date: Tue, 31 Dec 2013 17:39:45 +1100
+Subject: [PATCH] Fix installing gem from file without dependencies.
+
+Commit 9437ccc fixed the ability to install remote gems that was accidentally
+broken by d97fba1, but in the process accidentally broke installing from local
+files.
+
+This also changes the order to check for local first, to avoid unnecessary
+network requests in the case where the gem is local.
+
+Closes #760.
+---
+ lib/rubygems/commands/install_command.rb           | 20 ++++++++++++--------
+ test/rubygems/test_gem_commands_install_command.rb | 14 ++++++++++++++
+ 2 files changed, 26 insertions(+), 8 deletions(-)
+
+diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb
+index 4485eb1..8219eef 100644
+--- a/lib/rubygems/commands/install_command.rb
++++ b/lib/rubygems/commands/install_command.rb
+@@ -228,7 +228,18 @@ to write the specification by hand.  For example:
+   def install_gem_without_dependencies name, req # :nodoc:
+     gem = nil
+ 
+-    if remote? then
++    if local? then
++      if name =~ /\.gem$/ and File.file? name then
++        source = Gem::Source::SpecificFile.new name
++        spec = source.spec
++      else
++        source = Gem::Source::Local.new
++        spec = source.find_gem name, req
++      end
++      gem = source.download spec if spec
++    end
++
++    if remote? and not gem then
+       dependency = Gem::Dependency.new name, req
+       dependency.prerelease = options[:prerelease]
+ 
+@@ -236,13 +247,6 @@ to write the specification by hand.  For example:
+       gem = fetcher.download_to_cache dependency
+     end
+ 
+-    if local? and not gem then
+-      source = Gem::Source::Local.new
+-      spec = source.find_gem name, req
+-
+-      gem = source.download spec
+-    end
+-
+     inst = Gem::Installer.new gem, options
+     inst.install
+ 
+diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb
+index 76ea6b4..a5917c0 100644
+--- a/test/rubygems/test_gem_commands_install_command.rb
++++ b/test/rubygems/test_gem_commands_install_command.rb
+@@ -560,6 +560,20 @@ ERROR:  Possible alternatives: non_existent_with_hint
+     assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
+   end
+ 
++  def test_install_gem_ignore_dependencies_specific_file
++    spec = quick_spec 'a', 2
++
++    util_build_gem spec
++
++    FileUtils.mv spec.cache_file, @tempdir
++
++    @cmd.options[:ignore_dependencies] = true
++
++    @cmd.install_gem File.join(@tempdir, spec.file_name), nil
++
++    assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
++  end
++
+   def test_parses_requirement_from_gemname
+     spec_fetcher do |fetcher|
+       fetcher.gem 'a', 2
+-- 
+1.8.5.2
+
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index fc4fb1009..aa7ded71a 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -4,20 +4,28 @@
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=2.0.0_p353
-pkgrel=1
+pkgver=2.1.0
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.ruby-lang.org/en/'
 license=('BSD' 'custom')
-makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+# disable ruby tk since 1.9.3 it has caused a segfault on require 'tk'
+# https://bugs.ruby-lang.org/issues/8000
+# wait for upstream to start supporting tk 8.6
+makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml') # 'tk'
 options=('!emptydirs' '!makeflags' 'staticlibs')
-source=("http://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
-        'gemrc')
-md5sums=('20eb8f067d20f6b76b7e16cce2a85a55'
-         '6fb8e7a09955e0f64be3158fb4a27e7a')
+source=("http://cache.ruby-lang.org/pub/ruby/ruby-${pkgver}.tar.bz2"
+        'gemrc'
+        '0001-Fix-installing-gem-from-file-without-dependencies.patch')
+md5sums=('1546eeb763ac7754365664be763a1e8f'
+         '6fb8e7a09955e0f64be3158fb4a27e7a'
+         '61a1507f260866805fc6451c14733b25')
 
 build() {
-  cd ruby-${pkgver//_/-}
+  cd ruby-${pkgver}
+
+  # fixes https://github.com/rubygems/rubygems/issues/760
+  patch -Np1 -i ${srcdir}/0001-Fix-installing-gem-from-file-without-dependencies.patch
 
   PKG_CONFIG=/usr/bin/pkg-config ./configure \
     --prefix=/usr \
@@ -30,7 +38,7 @@ build() {
 }
 
 check() {
-  cd ruby-${pkgver//_/-}
+  cd ruby-${pkgver}
 
   make test
 }
@@ -38,14 +46,13 @@ check() {
 package_ruby() {
   pkgdesc='An object-oriented language for quick and easy programming'
   depends=('gdbm' 'openssl' 'libffi' 'libyaml')
-  optdepends=('tk: for Ruby/TK'
-              'ruby-docs: Ruby documentation')
+  optdepends=('ruby-docs: Ruby documentation') # 'tk: for Ruby/TK'
   provides=('rubygems' 'rake')
   conflicts=('rake')
   backup=('etc/gemrc')
   install='ruby.install'
 
-  cd ruby-${pkgver//_/-}
+  cd ruby-${pkgver}
 
   make DESTDIR="${pkgdir}" install-nodoc
 
@@ -58,7 +65,7 @@ package_ruby() {
 package_ruby-docs() {
   pkgdesc='Documentation files for ruby'
 
-  cd ruby-${pkgver//_/-}
+  cd ruby-${pkgver}
 
   make DESTDIR="${pkgdir}" install-doc install-capi
 
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 130811a26..f8664fb03 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 200590 2013-11-29 15:17:27Z angvp $
+# $Id: PKGBUILD 204824 2014-01-28 03:33:08Z td123 $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=subversion
 pkgver=1.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64')
 url="http://subversion.apache.org/"
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 0b3b99432..f58083a1f 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -10,7 +10,7 @@ _patchlevel=135
 __hgrev=de28b1568fc2
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:vim')
 url="http://www.vim.org"
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index 6556a85e2..bbd8ace05 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 203596 2014-01-13 17:12:31Z andyrtr $
+# $Id: PKGBUILD 204826 2014-01-28 03:33:10Z td123 $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
 pkgver=0.4.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64')
 url="http://www.weechat.org/"