Mon Jun 3 00:08:24 PDT 2013

9 files changed, 76 insertions, 40 deletions

diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index 4fa32fc80..a76d0d289 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185449 2013-05-14 10:14:59Z heftig $
+# $Id: PKGBUILD 186990 2013-06-02 19:42:17Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
 pkgver=3.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64)
 license=('GPL')
@@ -22,6 +22,10 @@ build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --disable-static --disable-schemas-compile
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 20453e898..5ed08a417 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186311 2013-05-24 16:14:27Z heftig $
+# $Id: PKGBUILD 186989 2013-06-02 19:40:09Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=clutter-gst
 pkgver=2.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer bindings for clutter"
 arch=(i686 x86_64)
 url="http://www.clutter-project.org/"
@@ -19,6 +19,10 @@ build() {
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index b6c650f88..2b974e18f 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185518 2013-05-14 16:57:57Z heftig $
+# $Id: PKGBUILD 186992 2013-06-02 19:43:30Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=eog-plugins
 pkgver=3.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins for Eye of Gnome"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/"
@@ -19,6 +19,10 @@ build() {
   cd $pkgname-$pkgver
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
     --sysconfdir=/etc --localstatedir=/var
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD
index bbc09d657..dc4925c11 100644
--- a/extra/libchamplain/PKGBUILD
+++ b/extra/libchamplain/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185652 2013-05-16 19:22:22Z heftig $
+# $Id: PKGBUILD 186991 2013-06-02 19:42:55Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
 pkgname=libchamplain
 pkgver=0.12.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Gtk3 widget for displaying rasterized maps"
 url="http://projects.gnome.org/libchamplain/"
 license=('LGPL')
@@ -16,12 +16,16 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-
 sha256sums=('631ce8e91b02c596e29778d3f7c1d28013e2e40d080a88f2d9a06f8b79f9e493')
 
 build() {
-    cd $pkgname-$pkgver
-    ./configure --prefix=/usr --disable-static --disable-debug --enable-vala
-    make
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static --disable-debug --enable-vala
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
 }
 
 package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/libogg/PKGBUILD b/extra/libogg/PKGBUILD
index 35bfbfffc..f9c7b1611 100644
--- a/extra/libogg/PKGBUILD
+++ b/extra/libogg/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134991 2011-08-09 20:12:08Z eric $
-# Maintainer: 
+# $Id: PKGBUILD 186983 2013-06-02 16:07:31Z tomegun $
+# Maintainer:  Tom Gundersen <teg@jklm.no>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=libogg
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="Ogg bitstream and framing library"
 arch=('i686' 'x86_64')
@@ -13,8 +13,6 @@ depends=('glibc')
 options=('!libtool')
 source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.xz
         config_types.h)
-md5sums=('84a35715170f2cd4c77a4448772b95d5'
-         'a4d786b1b1955cb85b64fd16cbbee3f9')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
@@ -36,3 +34,5 @@ package() {
       "${pkgdir}/usr/include/ogg/config_types.h"
   fi
 }
+md5sums=('ca25d8da0ddfc8c6cbbf78d847a209fe'
+         'a4d786b1b1955cb85b64fd16cbbee3f9')
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index e72c8e08a..ae93b817e 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185713 2013-05-17 13:46:00Z ronald $
+# $Id: PKGBUILD 186980 2013-06-02 10:21:27Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
 pkgver=3.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org"
@@ -14,19 +14,21 @@ depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'suitespars
 makedepends=('gcc-fortran' 'texlive-core')
 optdepends=('texinfo: for help-support in octave'
             'gnuplot: alternative plotting')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig})
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}
+        mex-gcc-4.8.patch)
 options=('!emptydirs')
 install=octave.install
 sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4'
-          'SKIP')
+          'SKIP'
+          '0608af9b7ccce8455f534d2fc4acf2f4c8f83a60')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  autoreconf -vfi
+  # https://savannah.gnu.org/bugs/?38746
+  patch -Np1 -i "${srcdir}/mex-gcc-4.8.patch"
 
-  # http://www.nabble.com/Random-rounding-errors-td16010966.html
-  FFLAGS="-O -ffloat-store" \
+  autoreconf -vfi
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
   --enable-shared --disable-static \
diff --git a/extra/octave/mex-gcc-4.8.patch b/extra/octave/mex-gcc-4.8.patch
new file mode 100644
index 000000000..99d501879
--- /dev/null
+++ b/extra/octave/mex-gcc-4.8.patch
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Clemens Buchacher <drizzd@aon.at>
+# Date 1369937542 14400
+#      Thu May 30 14:12:22 2013 -0400
+# Node ID 122d3f62e179ba044d47e58510905719220d8706
+# Parent  e38a0fa08368d4dd6f3a0dfd20cbe28cf8555f73
+do not include C++ header in extern "C" context (bug #38746)
+
+* mex.h: Include mexproto.h outside of extern "C" block.
+
+diff -r e38a0fa08368 -r 122d3f62e179 src/mex.h
+--- a/src/mex.h	Mon May 27 21:41:57 2013 +0200
++++ b/src/mex.h	Thu May 30 14:12:22 2013 -0400
+@@ -64,6 +64,8 @@
+ 
+ #define mxMAXNAME 64
+ 
++#include "mexproto.h"
++
+ #if defined (__cplusplus)
+ extern "C" {
+ #endif
+@@ -74,8 +76,6 @@
+ void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]);
+ #endif
+ 
+-#include "mexproto.h"
+-
+ /* V4 floating point routines renamed in V5.  */
+ #define mexIsNaN mxIsNaN
+ #define mexIsFinite mxIsFinite
diff --git a/extra/octave/octave-gethelp.patch b/extra/octave/octave-gethelp.patch
deleted file mode 100644
index c0e693abc..000000000
--- a/extra/octave/octave-gethelp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Help parallel compilation
-patch by Sebastien Fabbro 
---- scripts/Makefile.am.orig	2011-06-09 22:27:22.688268651 +0100
-+++ scripts/Makefile.am	2011-02-08 10:00:51.000000000 +0000
-@@ -316,7 +316,7 @@
- 
- gethelp_SOURCES = gethelp.cc
- 
--.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile
-+.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp
- 	@$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT)
- 	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \
- 		cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 4f17adce2..c74fd3391 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=2.0.0_p0
+pkgver=2.0.0_p195
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.ruby-lang.org/en/'
@@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
 options=('!emptydirs' '!makeflags')
 source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
         'gemrc')
-md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a'
+md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6'
          '6fb8e7a09955e0f64be3158fb4a27e7a')
 
 build() {