Sat Jun 29 01:17:51 PDT 2013

4 files changed, 57 insertions, 14 deletions

diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD
index 769bda9dc..a08083345 100644
--- a/extra/gtkmm/PKGBUILD
+++ b/extra/gtkmm/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 185348 2013-05-13 15:46:57Z jgc $
+# $Id: PKGBUILD 189082 2013-06-28 13:55:25Z lcarlier $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtkmm
 pkgname=('gtkmm' 'gtkmm-docs')
-pkgver=2.24.3
+pkgver=2.24.4
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
-url="http://gtkmm.sourceforge.net/"
+url="http://www.gtkmm.org/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('c564a438677174b97d69dd70467cb03c933481006398dc9377417aa6abe02a39')
+sha256sums=('443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD
index 8aa2059e4..04e6dcd55 100644
--- a/extra/libwebp/PKGBUILD
+++ b/extra/libwebp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184409 2013-05-06 19:38:39Z foutrelis $
+# $Id: PKGBUILD 188992 2013-06-27 23:02:01Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=libwebp
-pkgver=0.3.0
-pkgrel=3
+pkgver=0.3.1
+pkgrel=1
 pkgdesc="WebP library and conversion tools"
 arch=(x86_64 i686)
 url="https://developers.google.com/speed/webp/"
@@ -13,7 +13,7 @@ license=(BSD)
 depends=(libpng libjpeg libtiff giflib)
 options=('!libtool')
 source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('8903fca40ece603b9cb20d32105168da7e2a33bebbd4d89001a3c8741ef03ddb')
+sha256sums=('b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index fa1ef15e5..13b3c4a87 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186426 2013-05-26 09:26:05Z bluewind $
+# $Id: PKGBUILD 188995 2013-06-28 01:52:37Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
-pkgver=1.4.7
-pkgrel=7
+pkgver=1.4.8
+pkgrel=1
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64')
 url="http://www.rrdtool.org"
@@ -15,24 +15,28 @@ optdepends=('tcl: to use corresponding binding' \
             'ruby: to use corresponding binding' \
             'lua51: to use corresponding binding')
 options=('!libtool' '!emptydirs' '!makeflags')
-source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
-sha1sums=('faab7df7696b69f85d6f89dd9708d7cf0c9a273b')
+source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz 
+        rrdtool-pangofont.patch)
+sha1sums=('56d68857f39e70bfa32360947614d8220702ed02'
+          '8c600285bdab7776c1d5301df7cf486d69eae048')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
   sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in
+  patch -p1 -i ../rrdtool-pangofont.patch
 }
 
 build() {
   cd ${pkgname}-${pkgver}
+  autoconf
   PYTHON=python2 LUA=/usr/bin/lua5.1 \
     LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \
     ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
     --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
     --enable-ruby --enable-ruby-site-install --enable-python \
     --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
-  make
+  make LIBS+="-lglib-2.0"
 }
 
 package() {
diff --git a/extra/rrdtool/rrdtool-pangofont.patch b/extra/rrdtool/rrdtool-pangofont.patch
new file mode 100644
index 000000000..60936d8b5
--- /dev/null
+++ b/extra/rrdtool/rrdtool-pangofont.patch
@@ -0,0 +1,39 @@
+From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001
+From: Tobias Oetiker <tobi@oetiker.ch>
+Date: Wed, 24 Apr 2013 23:49:28 +0200
+Subject: [PATCH] move to non-deprecated pango_font_map_create_context
+
+---
+ configure.ac    | 2 +-
+ src/rrd_graph.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f9e395..d6b2722 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -535,7 +535,7 @@ EX_CHECK_ALL(cairo,      cairo_font_options_create,     cairo.h,
+ EX_CHECK_ALL(cairo,      cairo_svg_surface_create,      cairo-svg.h,            cairo-svg,   1.10.2,  http://cairographics.org/releases/, "")
+ EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,            cairo-pdf,   1.10.2,  http://cairographics.org/releases/, "")
+ EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,             cairo-ps,    1.10.2,  http://cairographics.org/releases/, "")
+-EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_context_set_font_options,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
++EX_CHECK_ALL(pangocairo-1.0,  pango_font_map_create_context,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
+ 
+ fi
+ EX_CHECK_ALL(glib-2.0,   glib_check_version,            glib.h,                 glib-2.0,    2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "")
+diff --git a/src/rrd_graph.c b/src/rrd_graph.c
+index 5547aa6..25ae485 100644
+--- a/src/rrd_graph.c
++++ b/src/rrd_graph.c
+@@ -4282,7 +4282,7 @@ void rrd_graph_init(
+         fontmap = pango_cairo_font_map_get_default();
+     }
+ 
+-    context =  pango_cairo_font_map_create_context((PangoCairoFontMap*)fontmap);
++    context =  pango_font_map_create_context(fontmap);
+ 
+     pango_cairo_context_set_resolution(context, 100);
+ 
+-- 
+1.8.1.6
+