|
|
|
|
Index: Cairo-1.042/Makefile.PL
|
|
|
|
|
--- Cairo-1.042/Makefile.PL.orig 2007-10-13 12:13:24 +0200
|
|
|
|
|
+++ Cairo-1.042/Makefile.PL 2007-10-13 12:14:39 +0200
|
|
|
|
|
@@ -48,7 +48,7 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Add this now since it's not required to generate a Makefile.
|
|
|
|
|
-$prereqs{'Test::Number::Delta'} = 1.00;
|
|
|
|
|
+# $prereqs{'Test::Number::Delta'} = 1.00;
|
|
|
|
|
|
|
|
|
|
my $autogen_dir = 'build';
|
|
|
|
|
mkdir $autogen_dir unless (-d $autogen_dir);
|
|
|
|
|
@@ -308,7 +308,9 @@
|
|
|
|
|
|
|
|
|
|
my $dep = ExtUtils::Depends->new ('Cairo');
|
|
|
|
|
$dep->set_inc ('-I. -I'.$autogen_dir.' '.$cairo_cfg{cflags});
|
|
|
|
|
-$dep->set_libs ($cairo_cfg{libs});
|
|
|
|
|
+my $libs = $cairo_cfg{libs};
|
|
|
|
|
+$libs =~ s/(.*?)\s+-lz\s+(.*?\s+-lz\s+)/$1 $2/s;
|
|
|
|
|
+$dep->set_libs ($libs);
|
|
|
|
|
$dep->add_xs (@xs_files);
|
|
|
|
|
$dep->add_c ('cairo-perl-enums.c');
|
|
|
|
|
$dep->add_pm ('Cairo.pm' => '$(INST_LIBDIR)/Cairo.pm');
|
|
|
|
|
Index: Glib-1.160/Makefile.PL
|
|
|
|
|
--- Glib-1.160/Makefile.PL.orig 2007-09-16 19:05:03 +0200
|
|
|
|
|
+++ Glib-1.160/Makefile.PL 2007-10-13 12:12:39 +0200
|
|
|
|
|
@@ -121,6 +121,8 @@
|
|
|
|
|
# this will be inherited by dependant modules, so they can find their
|
|
|
|
|
# generated files.
|
|
|
|
|
$glib->set_inc ($glibcfg{cflags} . $gthreadcfg{cflags} . ' -I. ');
|
|
|
|
|
+$gthreadcfg{libs} =~ s/-pthread/-lpthread/sg;
|
|
|
|
|
+$gthreadcfg{libs} =~ s/(-lpthread)(.+)$/$2$1/s;
|
|
|
|
|
$glib->set_libs ($glibcfg{libs} . $gthreadcfg{libs});
|
|
|
|
|
my $cwd = cwd();
|
|
|
|
|
$glib->add_typemaps (map {File::Spec->catfile($cwd,$_)} 'typemap');
|
