OpenPKG Specs: comparison rrdtool/rrdtool.patch

-:347c73352636
+:50587e5beb2f
-Index: RRDTool-OO-0.31/Makefile.PL
+Index: RRDTool-OO-0.32/Makefile.PL
---- RRDTool-OO-0.31/Makefile.PL.orig	2010-01-09 00:50:31.000000000 +0100
+--- RRDTool-OO-0.32/Makefile.PL.orig	2010-06-26 05:32:42.000000000 +0200
-+++ RRDTool-OO-0.31/Makefile.PL	2010-12-27 08:45:34.000000000 +0100
++++ RRDTool-OO-0.32/Makefile.PL	2012-03-08 10:57:56.000000000 +0100
 @@ -10,52 +10,12 @@
 }
 };
 -# Check if RRDs is installed
 PREREQ_PM         => {
 -                         Log::Log4perl => '0.40',
 RRDs          => 0,
 }, # e.g., Module::Name => 1.1
 $ExtUtils::MakeMaker::VERSION >= 6.50 ? (%$meta_merge) : (),
-Index: RRDTool-OO-0.31/lib/RRDTool/OO.pm
+Index: RRDTool-OO-0.32/lib/RRDTool/OO.pm
---- RRDTool-OO-0.31/lib/RRDTool/OO.pm.orig	2010-05-26 02:26:34.000000000 +0200
+--- RRDTool-OO-0.32/lib/RRDTool/OO.pm.orig	2012-03-07 17:29:01.000000000 +0100
-+++ RRDTool-OO-0.31/lib/RRDTool/OO.pm	2010-12-27 08:45:34.000000000 +0100
++++ RRDTool-OO-0.32/lib/RRDTool/OO.pm	2012-03-08 21:30:51.000000000 +0100
-@@ -5,7 +5,6 @@
+@@ -6,7 +6,6 @@
-use warnings;
 use Carp;
 use RRDs;
+use Data::Dumper;
 -use Log::Log4perl qw(:easy);
-our $VERSION = '0.31';
+our $VERSION = '0.32';
-@@ -189,7 +188,7 @@
+@@ -203,7 +202,7 @@
 # Check if we got all mandatory parameters
 for(@{$ref->{mandatory}}) {
 if(! exists $options_hash{$_}) {
 -            Log::Log4perl->get_logger("")->logcroak(
 +            croak(
 "Mandatory parameter '$_' not set " .
 "in $method() (@{[%mandatory]}) (@$options)");
 }
-@@ -201,7 +200,7 @@
+@@ -215,7 +214,7 @@
 for(keys %options_hash) {
 if(! exists $optional{$_} and
 ! exists $mandatory{$_}) {
 -                Log::Log4perl->get_logger("")->logcroak(
 +               croak(
 "Illegal parameter '$_' in $method()");
 }
 }
 Index: bindings/perl-shared/Makefile.PL
---- bindings/perl-shared/Makefile.PL.orig	2010-12-17 17:10:20.000000000 +0100
+--- bindings/perl-shared/Makefile.PL.orig	2011-12-15 17:07:05.000000000 +0100
-+++ bindings/perl-shared/Makefile.PL	2010-12-27 08:47:23.000000000 +0100
++++ bindings/perl-shared/Makefile.PL	2012-03-08 10:57:56.000000000 +0100
-@@ -1,52 +1,6 @@
+@@ -20,32 +20,7 @@
-use ExtUtils::MakeMaker;
+		) : ()
-use Config;
+	);
--# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+}else{
--# the contents of the Makefile that is written.
--
--if (($Config{'osname'} eq 'MSWin32' && $ENV{'OSTYPE'} eq '')) {
--	WriteMakefile(
--		'NAME'         => 'RRDs',
--		'VERSION_FROM' => 'RRDs.pm',
--		'DEFINE'       => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL} -D_CRT_SECURE_NO_WARNINGS -DWIN32",
--		'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"',
--		'LDDLFLAGS'    => '-dll -nologo -opt:ref,icf -ltcg -libpath:"C:\Perl\lib\CORE" -machine:X86',
--		'LDFLAGS'      => '-nologo -opt:ref,icf -ltcg -libpath:"C:\Perl\lib\CORE" -machine:X86',
--		'OPTIMIZE'     => '-O2 -MD',
--		'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"',
--		'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
--		($] ge '5.005') ? (
--			'AUTHOR'   => 'Tobias Oetiker (tobi@oetiker.ch)',
--			'ABSTRACT' => 'Round Robin Database Tool',
--		) : ()
--	);
--}else{
 -	# if the last argument when calling Makefile.PL is RPATH=/... and ... is the
 -	# path to librrd.so then the Makefile will be written such that RRDs.so knows
 -	# where to find librrd.so later on ...
 -	my $R="";
 -	if ($ARGV[-1] =~ /RPATH=(\S+)/){
 -	if ($^O eq 'darwin'){
 -        $librrd = '-lrrd';
 -	} else {
 -		$librrd = "-L../../src/.libs/ $R -lrrd";
 -	}
--
++    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";
-+my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib @l_pangocairo@";
 	WriteMakefile(
 		'NAME'         => 'RRDs',
-		'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
-@@ -59,5 +13,4 @@
-		'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
-		($^O eq 'darwin') ? ( 'LDDLFLAGS'    => "-L../../src/.libs/ $Config{lddlflags}" ) : ()
-	);
--}
 Index: bindings/python/setup.py
 --- bindings/python/setup.py.orig	2008-03-15 11:39:48.000000000 +0100
-+++ bindings/python/setup.py	2010-12-27 08:45:34.000000000 +0100
++++ bindings/python/setup.py	2012-03-08 10:57:56.000000000 +0100
 @@ -47,7 +47,7 @@
 Extension(
 "rrdtoolmodule",
 ["rrdtoolmodule.c"],
 -            libraries=['rrd'],
-+            libraries=['rrd', 'freetype', 'png', 'z'],
++            libraries=['rrd', 'freetype', 'art_lgpl', 'png', 'z'],
 library_dirs=[library_dir],
 include_dirs=[include_dir],
 )
 Index: configure
---- configure.orig	2010-12-26 20:51:06.000000000 +0100
+--- configure.orig	2012-01-24 11:09:06.000000000 +0100
-+++ configure	2010-12-27 08:45:34.000000000 +0100
++++ configure	2012-03-08 10:57:56.000000000 +0100
 @@ -25560,7 +25560,7 @@
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpangocairo-1.0  $LIBS"
 +  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION} -I${py_exec_prefix}/include/python"
 fi
 save_CPPFLAGS="$CPPFLAGS"
 Index: src/rrd_daemon.c
---- src/rrd_daemon.c.orig	2010-12-21 17:06:32.000000000 +0100
+--- src/rrd_daemon.c.orig	2011-12-16 08:29:44.000000000 +0100
-+++ src/rrd_daemon.c	2010-12-27 08:45:34.000000000 +0100
++++ src/rrd_daemon.c	2012-03-08 10:57:56.000000000 +0100
 @@ -105,7 +105,7 @@
 #include <tcpd.h>
 #endif /* HAVE_LIBWRAP */
 -#include <glib-2.0/glib.h>
 +#include <glib2/glib.h>
 /* }}} */
 #define RRDD_LOG(severity, ...) \
 Index: src/rrd_open.c
---- src/rrd_open.c.orig	2010-12-26 20:24:48.000000000 +0100
+--- src/rrd_open.c.orig	2012-01-24 11:08:48.000000000 +0100
-+++ src/rrd_open.c	2010-12-27 08:45:34.000000000 +0100
++++ src/rrd_open.c	2012-03-08 10:57:56.000000000 +0100
 @@ -296,7 +296,7 @@
 #endif
 if (rdwr & RRD_CREAT)
 goto out_done;
 -#ifdef USE_MADVISE

OpenPKG Specs / file comparison

comparison: rrdtool/rrdtool.patch

rrdtool/rrdtool.patch