1.1 --- a/rrdtool/rrdtool.patch Wed Aug 08 20:29:13 2012 +0200
1.2 +++ b/rrdtool/rrdtool.patch Wed Aug 08 20:31:17 2012 +0200
1.3 @@ -1,6 +1,6 @@
1.4 -Index: RRDTool-OO-0.31/Makefile.PL
1.5 ---- RRDTool-OO-0.31/Makefile.PL.orig 2010-01-09 00:50:31.000000000 +0100
1.6 -+++ RRDTool-OO-0.31/Makefile.PL 2010-12-27 08:45:34.000000000 +0100
1.7 +Index: RRDTool-OO-0.32/Makefile.PL
1.8 +--- RRDTool-OO-0.32/Makefile.PL.orig 2010-06-26 05:32:42.000000000 +0200
1.9 ++++ RRDTool-OO-0.32/Makefile.PL 2012-03-08 10:57:56.000000000 +0100
1.10 @@ -10,52 +10,12 @@
1.11 }
1.12 };
1.13 @@ -54,18 +54,18 @@
1.14 RRDs => 0,
1.15 }, # e.g., Module::Name => 1.1
1.16 $ExtUtils::MakeMaker::VERSION >= 6.50 ? (%$meta_merge) : (),
1.17 -Index: RRDTool-OO-0.31/lib/RRDTool/OO.pm
1.18 ---- RRDTool-OO-0.31/lib/RRDTool/OO.pm.orig 2010-05-26 02:26:34.000000000 +0200
1.19 -+++ RRDTool-OO-0.31/lib/RRDTool/OO.pm 2010-12-27 08:45:34.000000000 +0100
1.20 -@@ -5,7 +5,6 @@
1.21 - use warnings;
1.22 +Index: RRDTool-OO-0.32/lib/RRDTool/OO.pm
1.23 +--- RRDTool-OO-0.32/lib/RRDTool/OO.pm.orig 2012-03-07 17:29:01.000000000 +0100
1.24 ++++ RRDTool-OO-0.32/lib/RRDTool/OO.pm 2012-03-08 21:30:51.000000000 +0100
1.25 +@@ -6,7 +6,6 @@
1.26 use Carp;
1.27 use RRDs;
1.28 + use Data::Dumper;
1.29 -use Log::Log4perl qw(:easy);
1.30
1.31 - our $VERSION = '0.31';
1.32 + our $VERSION = '0.32';
1.33
1.34 -@@ -189,7 +188,7 @@
1.35 +@@ -203,7 +202,7 @@
1.36 # Check if we got all mandatory parameters
1.37 for(@{$ref->{mandatory}}) {
1.38 if(! exists $options_hash{$_}) {
1.39 @@ -74,7 +74,7 @@
1.40 "Mandatory parameter '$_' not set " .
1.41 "in $method() (@{[%mandatory]}) (@$options)");
1.42 }
1.43 -@@ -201,7 +200,7 @@
1.44 +@@ -215,7 +214,7 @@
1.45 for(keys %options_hash) {
1.46 if(! exists $optional{$_} and
1.47 ! exists $mandatory{$_}) {
1.48 @@ -84,31 +84,12 @@
1.49 }
1.50 }
1.51 Index: bindings/perl-shared/Makefile.PL
1.52 ---- bindings/perl-shared/Makefile.PL.orig 2010-12-17 17:10:20.000000000 +0100
1.53 -+++ bindings/perl-shared/Makefile.PL 2010-12-27 08:47:23.000000000 +0100
1.54 -@@ -1,52 +1,6 @@
1.55 - use ExtUtils::MakeMaker;
1.56 - use Config;
1.57 --# See lib/ExtUtils/MakeMaker.pm for details of how to influence
1.58 --# the contents of the Makefile that is written.
1.59 --
1.60 --if (($Config{'osname'} eq 'MSWin32' && $ENV{'OSTYPE'} eq '')) {
1.61 -- WriteMakefile(
1.62 -- 'NAME' => 'RRDs',
1.63 -- 'VERSION_FROM' => 'RRDs.pm',
1.64 -- 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL} -D_CRT_SECURE_NO_WARNINGS -DWIN32",
1.65 -- 'INC' => '-I../../src/ "-IC:/Perl/lib/CORE" -I"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\include" -I"C:\Program Files\Microsoft SDKs\Windows\v6.0A\Include"',
1.66 -- 'LDDLFLAGS' => '-dll -nologo -opt:ref,icf -ltcg -libpath:"C:\Perl\lib\CORE" -machine:X86',
1.67 -- 'LDFLAGS' => '-nologo -opt:ref,icf -ltcg -libpath:"C:\Perl\lib\CORE" -machine:X86',
1.68 -- 'OPTIMIZE' => '-O2 -MD',
1.69 -- 'LIBS' => '"..\..\win32\Release\rrdlib.lib" "..\..\win32\Release" "C:\Perl\lib\CORE\perl514.lib" -L../../contrib/lib -L"C:\Program Files\Microsoft SDKs\Windows\v6.0A\lib" -L"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\lib" -L"C:\Perl\lib\CORE"',
1.70 -- 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' },
1.71 -- ($] ge '5.005') ? (
1.72 -- 'AUTHOR' => 'Tobias Oetiker (tobi@oetiker.ch)',
1.73 -- 'ABSTRACT' => 'Round Robin Database Tool',
1.74 -- ) : ()
1.75 -- );
1.76 --}else{
1.77 +--- bindings/perl-shared/Makefile.PL.orig 2011-12-15 17:07:05.000000000 +0100
1.78 ++++ bindings/perl-shared/Makefile.PL 2012-03-08 10:57:56.000000000 +0100
1.79 +@@ -20,32 +20,7 @@
1.80 + ) : ()
1.81 + );
1.82 + }else{
1.83 - # if the last argument when calling Makefile.PL is RPATH=/... and ... is the
1.84 - # path to librrd.so then the Makefile will be written such that RRDs.so knows
1.85 - # where to find librrd.so later on ...
1.86 @@ -135,32 +116,25 @@
1.87 - } else {
1.88 - $librrd = "-L../../src/.libs/ $R -lrrd";
1.89 - }
1.90 --
1.91 -+my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib @l_pangocairo@";
1.92 ++ my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lcairo -lpangocairo -lpixman-1 -lpango -lpangoft2 -lfreetype -lpng -lgobject2 -lgio2 -lgmodule2 -lglib2 -lfontconfig -lfreetype -lxml2 -lexpat -lpcre -lz -liconv -lintl";
1.93 +
1.94 WriteMakefile(
1.95 'NAME' => 'RRDs',
1.96 - 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
1.97 -@@ -59,5 +13,4 @@
1.98 - 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' },
1.99 - ($^O eq 'darwin') ? ( 'LDDLFLAGS' => "-L../../src/.libs/ $Config{lddlflags}" ) : ()
1.100 - );
1.101 --}
1.102 -
1.103 Index: bindings/python/setup.py
1.104 --- bindings/python/setup.py.orig 2008-03-15 11:39:48.000000000 +0100
1.105 -+++ bindings/python/setup.py 2010-12-27 08:45:34.000000000 +0100
1.106 ++++ bindings/python/setup.py 2012-03-08 10:57:56.000000000 +0100
1.107 @@ -47,7 +47,7 @@
1.108 Extension(
1.109 "rrdtoolmodule",
1.110 ["rrdtoolmodule.c"],
1.111 - libraries=['rrd'],
1.112 -+ libraries=['rrd', 'freetype', 'png', 'z'],
1.113 ++ libraries=['rrd', 'freetype', 'art_lgpl', 'png', 'z'],
1.114 library_dirs=[library_dir],
1.115 include_dirs=[include_dir],
1.116 )
1.117 Index: configure
1.118 ---- configure.orig 2010-12-26 20:51:06.000000000 +0100
1.119 -+++ configure 2010-12-27 08:45:34.000000000 +0100
1.120 +--- configure.orig 2012-01-24 11:09:06.000000000 +0100
1.121 ++++ configure 2012-03-08 10:57:56.000000000 +0100
1.122 @@ -25560,7 +25560,7 @@
1.123 $as_echo_n "(cached) " >&6
1.124 else
1.125 @@ -236,8 +210,8 @@
1.126
1.127 save_CPPFLAGS="$CPPFLAGS"
1.128 Index: src/rrd_daemon.c
1.129 ---- src/rrd_daemon.c.orig 2010-12-21 17:06:32.000000000 +0100
1.130 -+++ src/rrd_daemon.c 2010-12-27 08:45:34.000000000 +0100
1.131 +--- src/rrd_daemon.c.orig 2011-12-16 08:29:44.000000000 +0100
1.132 ++++ src/rrd_daemon.c 2012-03-08 10:57:56.000000000 +0100
1.133 @@ -105,7 +105,7 @@
1.134 #include <tcpd.h>
1.135 #endif /* HAVE_LIBWRAP */
1.136 @@ -248,8 +222,8 @@
1.137
1.138 #define RRDD_LOG(severity, ...) \
1.139 Index: src/rrd_open.c
1.140 ---- src/rrd_open.c.orig 2010-12-26 20:24:48.000000000 +0100
1.141 -+++ src/rrd_open.c 2010-12-27 08:45:34.000000000 +0100
1.142 +--- src/rrd_open.c.orig 2012-01-24 11:08:48.000000000 +0100
1.143 ++++ src/rrd_open.c 2012-03-08 10:57:56.000000000 +0100
1.144 @@ -296,7 +296,7 @@
1.145 #endif
1.146 if (rdwr & RRD_CREAT)
