perl-gtk.patch 1.3 KB

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