1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-12 03:00:28 +00:00

Upgrade to 1.211, add a patch to fix callback problem.

PR:		plamabal @ #bsdchat of taiwan.
This commit is contained in:
Vanilla I. Shu 2002-04-12 06:15:03 +00:00
parent 51a22b820e
commit 6b42c222b5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=57604
6 changed files with 87 additions and 3 deletions

View File

@ -6,8 +6,8 @@
#
PORTNAME= Gimp
PORTVERSION= 1.21
PORTREVISION= 1
PORTVERSION= 1.211
PORTREVISION= 0
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Gimp

View File

@ -1 +1 @@
MD5 (Gimp-1.21.tar.gz) = d66b1876ea7317e17f3ebc5513855f9e
MD5 (Gimp-1.211.tar.gz) = e3bb65da0bc92a4e42b2257cf2adcaba

View File

@ -0,0 +1,49 @@
--- Gimp.pm.orig Sat Dec 1 07:35:04 2001
+++ Gimp.pm Thu Apr 11 18:01:20 2002
@@ -392,6 +392,7 @@
sub callback {
my $type = shift;
my @cb;
+ my @res;
if ($type eq "-run") {
local $function = shift;
local $in_run = 1;
@@ -405,9 +406,7 @@
);
}
die_msg __"required callback 'run' not found\n" unless @cb;
- my @res;
for (@cb) { @res = &$_ }
- return wantarray ? @res : $res[0];
} elsif ($type eq "-net") {
local $in_net = 1;
_initialized_callback;
@@ -420,7 +419,7 @@
);
}
die_msg __"required callback 'net' not found\n" unless @cb;
- for (@cb) { &$_ }
+ for (@cb) { @res = &$_ }
} elsif ($type eq "-query") {
local $in_query = 1;
_initialized_callback;
@@ -431,7 +430,7 @@
);
}
die_msg __"required callback 'query' not found\n" unless @cb;
- for (@cb) { &$_ }
+ for (@cb) { @res = &$_ }
} elsif ($type eq "-quit") {
local $in_quit = 1;
{
@@ -440,8 +439,9 @@
@{$callback{quiet}},
);
}
- for (@cb) { &$_ }
+ for (@cb) { @res = &$_ }
}
+ return (wantarray) ? @res : $res[0];
}
sub register_callback($$) {

View File

@ -0,0 +1,13 @@
--- Gimp/Lib.xs.orig Thu Apr 11 17:46:42 2002
+++ Gimp/Lib.xs Thu Apr 11 17:47:51 2002
@@ -968,6 +968,10 @@
{
arg->data.d_image = unbless(sv, PKG_IMAGE , croak_str); break;
}
+ else if (sv_derived_from (sv, PKG_IMAGE) || SvROK(sv))
+ {
+ arg->data.d_image = unbless(SvRV(sv), PKG_IMAGE , croak_str); break;
+ }
else
strcpy (croak_str, __("argument incompatible with type IMAGE"));

View File

@ -0,0 +1,11 @@
--- Gimp/Makefile.PL.orig Thu Apr 11 17:54:39 2002
+++ Gimp/Makefile.PL Thu Apr 11 17:54:56 2002
@@ -33,7 +33,7 @@
WriteMakefile(
'NAME' => 'Gimp::Lib',
'VERSION_FROM' => '../Gimp.pm',
- 'INC' => "$INC1 $GIMP_INC_NOUI $CPPFLAGS $pdl_inc $CFLAGS",
+ 'INC' => "$INC1 $GIMP_INC_NOUI $CPPFLAGS $pdl_inc $CFLAGS -I/usr/local/include",
'DEFINE' => "$DEFINE1 $DEFS",
'macro' => { libdir => $libdir, exec_prefix => $exec_prefix, prefix => $prefix },
'TYPEMAPS' => ["$topdir/typemap",@pdl_typemaps],

View File

@ -0,0 +1,11 @@
--- Makefile.PL.orig Sat Dec 1 07:02:29 2001
+++ Makefile.PL Thu Apr 11 17:52:04 2002
@@ -333,7 +333,7 @@
'Gimp/Config.pm' => '$(INST_LIBDIR)/Gimp/Config.pm',
},
'LDFROM' => expand("\$(OBJECT) $LIBS $INTLLIBS"),
- 'INC' => "$INC1 $GIMP_INC_NOUI $CPPFLAGS $CFLAGS",
+ 'INC' => "$INC1 $GIMP_INC_NOUI $CPPFLAGS $CFLAGS -I/usr/local/include",
'DEFINE' => "$DEFINE1 $DEFS",
'EXE_FILES' => \@EXE_FILES,
'macro' => \%cfg,