Commit 022d5be5 authored by gregor herrmann's avatar gregor herrmann

Imported Upstream version 1.106

parents 45803f31 adb35708
......@@ -4,7 +4,7 @@
"Cairo Perl Team <gtk-perl-list at gnome dot org>"
],
"dynamic_config" : 1,
"generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141520",
"generated_by" : "ExtUtils::MakeMaker version 7.04, CPAN::Meta::Converter version 2.150001",
"license" : [
"lgpl_2_1"
],
......@@ -64,5 +64,5 @@
},
"x_MailingList" : "https://mail.gnome.org/mailman/listinfo/gtk-perl-list"
},
"version" : "1.105"
"version" : "1.106"
}
......@@ -9,7 +9,7 @@ configure_requires:
ExtUtils::MakeMaker: '0'
ExtUtils::PkgConfig: '1'
dynamic_config: 1
generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141520'
generated_by: 'ExtUtils::MakeMaker version 7.04, CPAN::Meta::Converter version 2.150001'
license: lgpl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
......@@ -30,4 +30,4 @@ resources:
homepage: http://gtk2-perl.sourceforge.net
license: http://www.gnu.org/licenses/lgpl-2.1.html
repository: git://git.gnome.org/perl-Cairo
version: '1.105'
version: '1.106'
......@@ -571,16 +571,16 @@ $dep->install (qw(cairo-perl.h
build/cairo-perl-auto.typemap));
$dep->save_config ('build/IFiles.pm');
# On OpenBSD, any program that directly or indirectly wants to load
# On OpenBSD/NetBSD, any program that directly or indirectly wants to load
# libpthread.so must do so from the start. But when perl is built without
# ithreads, it will also most likely not be compiled with "-pthread". When
# libglib/libgobject then go and try to load libpthread.so, the loader will
# error out.
my @openbsd_compat_flags = ();
if ($^O eq 'openbsd' && $Config::Config{ldflags} !~ m/-pthread\b/) {
warn " ***\n *** on OpenBSD, we either need perl linked with '-pthread',\n",
# libcairo then goes and tries to load libpthread.so, the loader will error
# out.
my @bsd_compat_flags = ();
if (($^O eq 'openbsd' || $^O eq 'netbsd') && $Config::Config{ldflags} !~ m/-pthread\b/) {
warn " ***\n *** on OpenBSD/NetBSD, we either need perl linked with '-pthread',\n",
" *** or we need to set LD_PRELOAD=libpthread.so; doing the latter now...\n ***\n";
@openbsd_compat_flags = (
@bsd_compat_flags = (
macro => {FULLPERLRUN => 'LD_PRELOAD=libpthread.so $(FULLPERL)'},
);
}
......@@ -596,7 +596,7 @@ WriteMakefile (
DL_FUNCS => { Cairo=> [] },
META_MERGE => \%meta_merge,
$dep->get_makefile_vars,
@openbsd_compat_flags,
@bsd_compat_flags,
);
sub MY::postamble
......
Overview of changes in Cairo 1.106
==================================
* Generate cairo-perl-auto.typemap and cairo-perl-auto.h in a deterministic
fashion
* Use the pthread compatibility workaround on NetBSD as well
* Fix a test failure in t/CairoFont.t
Overview of changes in Cairo 1.105
==================================
......
......@@ -110,12 +110,12 @@ EOS
$1;
}
foreach (keys %objects, keys %structs, keys %enums, keys %flags)
foreach (sort(keys %objects, keys %structs, keys %enums, keys %flags))
{
print TYPEMAP "$_\tT_CAIROPERL_GENERIC_WRAPPER\n";
}
foreach (keys %objects, keys %structs)
foreach (sort(keys %objects, keys %structs))
{
my $trunk = $_;
$trunk =~ s/ \*//;
......@@ -125,7 +125,7 @@ EOS
print TYPEMAP "const ${trunk}_ornull *\tT_CAIROPERL_GENERIC_WRAPPER\n";
}
foreach (keys %objects)
foreach (sort(keys %objects))
{
my $trunk = $_;
$trunk =~ s/ \*//;
......@@ -196,7 +196,7 @@ EOS
print HEADER "\n/* objects */\n\n";
foreach (keys %objects)
foreach (sort(keys %objects))
{
/^(.+) \*/;
my $type = $1;
......@@ -226,7 +226,7 @@ EOS
print HEADER "\n/* structs */\n\n";
foreach (keys %structs)
foreach (sort(keys %structs))
{
/^(.+) \*/;
my $type = $1;
......@@ -253,7 +253,7 @@ EOS
print HEADER "\n/* enums */\n\n";
foreach my $type (keys %enums)
foreach my $type (sort(keys %enums))
{
my $mangled = mangle ($type);
my $name = name ($type);
......@@ -280,7 +280,7 @@ EOS
print HEADER "\n/* flags */\n\n";
foreach my $type (keys %flags)
foreach my $type (sort(keys %flags))
{
my $mangled = mangle ($type);
my $name = name ($type);
......@@ -380,7 +380,7 @@ sub do_enums
EOS
foreach my $type (keys %enums)
foreach my $type (sort(keys %enums))
{
my $name = name($type);
my @enum_values = @{$enums{$type}};
......@@ -492,7 +492,7 @@ sub do_flags
EOS
foreach my $type (keys %flags)
foreach my $type (sort(keys %flags))
{
my $name = name($type);
my @flag_values = @{$flags{$type}};
......
......@@ -14,7 +14,7 @@ use DynaLoader;
our @ISA = qw/DynaLoader/;
our $VERSION = '1.105';
our $VERSION = '1.106';
sub dl_load_flags { $^O eq 'darwin' ? 0x00 : 0x01 }
......
......@@ -62,10 +62,13 @@ my $ctm = Cairo::Matrix->init_identity;
my $font = Cairo::ScaledFont->create ($face, $matrix, $ctm, $options);
isa_ok ($font, 'Cairo::ScaledFont');
isa_ok ($font->extents, 'HASH');
isa_ok ($font->glyph_extents ({ index => 1, x => 2, y => 3 }), 'HASH');
SKIP: {
skip 'scaled font tests', 10
unless $font->status eq 'success';
isa_ok ($font->extents, 'HASH');
isa_ok ($font->glyph_extents ({ index => 1, x => 2, y => 3 }), 'HASH');
skip 'new stuff', 8
unless Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 2, 0);
......@@ -92,6 +95,8 @@ SKIP: {
my $text = 'æſðđŋ';
my ($status, $glyphs, $clusters, $flags) =
$font->text_to_glyphs (5, 10, $text);
skip 'show_text_glyphs', 1
unless $status eq 'success';
$cr->show_text_glyphs ($text, $glyphs, $clusters, $flags);
is ($cr->status, 'success');
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment