[arch-commits] Commit in rrdtool/trunk (PKGBUILD rrdtool-pangofont.patch)

[Eric Bélanger]

    Date: Friday, June 28, 2013 @ 03:52:00
  Author: eric
Revision: 188994

upgpkg: rrdtool 1.4.8-1

Upstream update, Fix pango font (close FS#35953)

Added:
  rrdtool/trunk/rrdtool-pangofont.patch
Modified:
  rrdtool/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   14 +++++++++-----
 rrdtool-pangofont.patch |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-28 01:14:19 UTC (rev 188993)
+++ PKGBUILD	2013-06-28 01:52:00 UTC (rev 188994)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger <eric at 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 @@
             '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() {

Added: rrdtool-pangofont.patch
===================================================================
--- rrdtool-pangofont.patch	                        (rev 0)
+++ rrdtool-pangofont.patch	2013-06-28 01:52:00 UTC (rev 188994)
@@ -0,0 +1,39 @@
+From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001
+From: Tobias Oetiker <tobi at 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
+