commit 3981d94f789b11972eecc42554aa827a7427c07b Author: Danny Rawlins <monster.romster@gmail.com> Date: Fri Aug 29 19:35:11 2014 +1000 rrdtool: 1.4.7 -> 1.4.8 diff --git a/rrdtool/.footprint b/rrdtool/.footprint index 29e9e28..b470922 100644 --- a/rrdtool/.footprint +++ b/rrdtool/.footprint @@ -2,6 +2,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/rrdcached -rwxr-xr-x root/root usr/bin/rrdcgi +lrwxrwxrwx root/root usr/bin/rrdcreate -> rrdupdate +lrwxrwxrwx root/root usr/bin/rrdinfo -> rrdupdate -rwxr-xr-x root/root usr/bin/rrdtool -rwxr-xr-x root/root usr/bin/rrdupdate drwxr-xr-x root/root usr/include/ @@ -9,33 +11,32 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/rrd_client.h -rw-r--r-- root/root usr/include/rrd_format.h drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/librrd.a -rwxr-xr-x root/root usr/lib/librrd.la -lrwxrwxrwx root/root usr/lib/librrd.so -> librrd.so.4.2.0 -lrwxrwxrwx root/root usr/lib/librrd.so.4 -> librrd.so.4.2.0 --rwxr-xr-x root/root usr/lib/librrd.so.4.2.0 +lrwxrwxrwx root/root usr/lib/librrd.so -> librrd.so.4.2.1 +lrwxrwxrwx root/root usr/lib/librrd.so.4 -> librrd.so.4.2.1 +-rwxr-xr-x root/root usr/lib/librrd.so.4.2.1 +-rw-r--r-- root/root usr/lib/librrd_th.a -rwxr-xr-x root/root usr/lib/librrd_th.la -lrwxrwxrwx root/root usr/lib/librrd_th.so -> librrd_th.so.4.2.0 -lrwxrwxrwx root/root usr/lib/librrd_th.so.4 -> librrd_th.so.4.2.0 --rwxr-xr-x root/root usr/lib/librrd_th.so.4.2.0 +lrwxrwxrwx root/root usr/lib/librrd_th.so -> librrd_th.so.4.2.1 +lrwxrwxrwx root/root usr/lib/librrd_th.so.4 -> librrd_th.so.4.2.1 +-rwxr-xr-x root/root usr/lib/librrd_th.so.4.2.1 drwxr-xr-x root/root usr/lib/perl5/ drwxr-xr-x root/root usr/lib/perl5/site_perl/ -drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/ --r--r--r-- root/root usr/lib/perl5/site_perl/5.16/RRDp.pm -drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/ --r--r--r-- root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/RRDs.pm -drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/auto/ -drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/auto/RRDs/ --r-xr-xr-x root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/auto/RRDs/RRDs.so +drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/ +-r--r--r-- root/root usr/lib/perl5/site_perl/5.18/RRDp.pm +drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/ +-r--r--r-- root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/RRDs.pm +drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/auto/ +drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/auto/RRDs/ +-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/auto/RRDs/RRDs.so drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/librrd.pc drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/py_rrdtool-0.2.1-py2.7.egg-info +-rw-r--r-- root/root usr/lib/python2.7/site-packages/py_rrdtool-0.2.2-py2.7.egg-info -rwxr-xr-x root/root usr/lib/python2.7/site-packages/rrdtoolmodule.so -drwxr-xr-x root/root usr/lib/rrdtool/ --rwxr-xr-x root/root usr/lib/rrdtool/ifOctets.tcl --rw-r--r-- root/root usr/lib/rrdtool/pkgIndex.tcl --rwxr-xr-x root/root usr/lib/tclrrd1.4.7.so +-rwxr-xr-x root/root usr/lib/tclrrd1.4.8.so drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/bin_dec_hex.1.gz @@ -70,3 +71,7 @@ drwxr-xr-x root/root usr/man/man3/ -r--r--r-- root/root usr/man/man3/RRDp.3pm.gz -r--r--r-- root/root usr/man/man3/RRDs.3pm.gz -rw-r--r-- root/root usr/man/man3/librrd.3.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/rrdtool/ +-rwxr-xr-x root/root usr/share/rrdtool/ifOctets.tcl +-rw-r--r-- root/root usr/share/rrdtool/pkgIndex.tcl diff --git a/rrdtool/.md5sum b/rrdtool/.md5sum index 5ec3acc..659449b 100644 --- a/rrdtool/.md5sum +++ b/rrdtool/.md5sum @@ -1 +1,2 @@ -ffe369d8921b4dfdeaaf43812100c38f rrdtool-1.4.7.tar.gz +dbe59386db97fd2f2216729facd74ca8 rrdtool-1.4.8.tar.gz +42e69fd496e2b9d9efbddc03fa081db7 rrdtool-pangofont.patch diff --git a/rrdtool/Pkgfile b/rrdtool/Pkgfile index cf8f6ca..1239466 100644 --- a/rrdtool/Pkgfile +++ b/rrdtool/Pkgfile @@ -5,22 +5,25 @@ # Depends on: intltool libart_lgpl libcgi libgd pango tcl name=rrdtool -version=1.4.7 +version=1.4.8 release=1 -source=(http://oss.oetiker.ch/rrdtool/pub/$name-$version.tar.gz) +source=(http://oss.oetiker.ch/rrdtool/pub/$name-$version.tar.gz + rrdtool-pangofont.patch) build() { cd $name-$version + patch -p1 -i $SRC/rrdtool-pangofont.patch + ./configure \ --prefix=/usr \ --mandir=/usr/man \ --enable-shared \ - --disable-static \ --enable-perl-site-install \ - --enable-ruby-site-install + --enable-ruby-site-install \ + --disable-libwrap - make + make LIBS+="-lglib-2.0" make DESTDIR=$PKG install rm -r \ diff --git a/rrdtool/rrdtool-pangofont.patch b/rrdtool/rrdtool-pangofont.patch new file mode 100644 index 0000000..60936d8 --- /dev/null +++ b/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 +