see plug-ins/perl/Changes

plug-ins/perl/Changes

@@ -1,10 +1,13 @@
 Revision history for Gimp-Perl extension.
 
+	- set the version of all modules explicitly (for the benefit of CPAN).
 	- added examples/avi (avi load/save plug-in, uncompressed 24 bit).
 	- possible fix for another installation horror problem.
         - fixed a longstanding bug (?): not every class had a DESTROY, so
           the AUTOLOAD tried to resolve DESTROY after gimp_close had been
           called.
+        - did the DESTROY catch differently...
+        - fixed the testsuite.
         - started to revamp the extra argument handling.
         - updated PDB Explorer a bit, still broken.
         - almost full i18n of gimp-perl. A de translation is available.

plug-ins/perl/Gimp.pm

@@ -435,7 +435,7 @@ for(qw(_gimp_procedure_available gimp_call_procedure set_trace initialized)) {
 *lock  = \&{"$interface_pkg\::lock" };
 *unlock= \&{"$interface_pkg\::unlock" };
 
-my %ignore_function = ();
+my %ignore_function = (DESTROY => 1);
 
 @PREFIXES=("gimp_", "");
 
@@ -503,14 +503,10 @@ sub AUTOLOAD {
    croak __"function/macro \"$name\" not found in $class";
 }
 
-# better have a destroy method here, than fall into nirvana later
-sub DESTROY { }
-
 sub _pseudoclass {
   my ($class, @prefixes)= @_;
   unshift(@prefixes,"");
   *{"Gimp::$class\::AUTOLOAD"} = \&AUTOLOAD;
-  *{"Gimp::$class\::DESTROY"}  = sub { };
   push(@{"$class\::ISA"}		, "Gimp::$class");
   push(@{"Gimp::$class\::PREFIXES"}	, @prefixes); @prefixes=@{"Gimp::$class\::PREFIXES"};
   push(@{"$class\::PREFIXES"}		, @prefixes); @prefixes=@{"$class\::PREFIXES"};

plug-ins/perl/Gimp/Compat.pm

@@ -43,7 +43,7 @@ Gimp-Perl extension (contact him to include new functions) is Marc Lehmann
 
 package      Gimp::Compat;
 
-$VERSION=$Gimp::VERSION;
+$VERSION=1.14;
 
 use Gimp ('croak', '__');
 

plug-ins/perl/Gimp/Lib.pm

@@ -6,7 +6,7 @@ use base qw(DynaLoader);
 
 require DynaLoader;
 
-$VERSION = $Gimp::VERSION;
+$VERSION = 1.14;
 
 use subs qw(
 	gimp_call_procedure		gimp_main	gimp_init

plug-ins/perl/Gimp/Module.pm

@@ -19,7 +19,7 @@ package Gimp::Module;
 use base qw(DynaLoader);
 require DynaLoader;
 
-$VERSION=0.00;
+$VERSION=1.14;
 
 bootstrap Gimp::Module;
 

plug-ins/perl/Gimp/Net.pm

@@ -19,7 +19,7 @@ use Gimp ('croak','__');
 
 require DynaLoader;
 
-$VERSION = $Gimp::VERSION;
+$VERSION = 1.14;
 
 bootstrap Gimp::Net $VERSION;
 

plug-ins/perl/Gimp/Pod.pm

@@ -1,6 +1,6 @@
 package Gimp::Pod;
 
-$VERSION=$Gimp::VERSION;
+$VERSION=1.14;
 
 sub myqx(&) {
    local $/;

plug-ins/perl/Gimp/UI.pm

@@ -4,7 +4,7 @@ use Gimp ('__');
 use Gimp::Fu;
 use Gtk;
 
-$VERSION = $Gimp::VERSION;
+$VERSION = 1.14;
 
 =head1 NAME
 

plug-ins/perl/Gimp/Util.pm

@@ -51,7 +51,7 @@ require      Exporter;
 
 use Gimp;
 
-$VERSION=$Gimp::VERSION;
+$VERSION=1.14;
 
 ##############################################################################
 =pod

plug-ins/perl/Makefile.PL

@@ -218,6 +218,11 @@ msgmerge:
         msgmerge -w 83 po/gimp-perl.pot - >gimp-perl.pot~ && \\
         mv gimp-perl.pot~ po/gimp-perl.pot
 	for po in po/*.po; do msgmerge -w 83 \$\$po po/gimp-perl.pot >\$\$po~ && mv \$\$po~ \$\$po; done
+
+# set \$VERSION in all modules
+setver:
+	\$(PERL) -pi -e 's/^(\\s*\\\$\$VERSION\\s*=\\s*).*\$\$/\$\${1}\$(VERSION);/' *.pm Gimp/*.pm
+
 ";
 
    $postamble;
@@ -262,7 +267,7 @@ print "ok\n";
 
 WriteMakefile(
     'dist'	=> {
-	            PREOP	=> 'chmod -R u=rwX,go=rX . ;',
+	            PREOP	=> 'make setver && chmod -R u=rwX,go=rX . ;',
 	            COMPRESS	=> 'gzip -9v',
 	            SUFFIX	=> '.gz',
 	           },

plug-ins/perl/examples/avi

@@ -64,7 +64,7 @@ register "file_avi_save",
                             $us_frame,
                             $framesize*1_000_000/$us_frame,
                             0,
-                            0,
+                            0x00000810,  # only a god may know why...
                             scalar@layers,
                             0,
                             1,

plug-ins/perl/t/run.t

@@ -50,7 +50,7 @@ sub tests {
    skip($n,1,sub{0 != ($l=$i->layer_new(10,10,RGBA_IMAGE,"new layer",100,VALUE_MODE))});
    skip($n,1,sub {!!ref $l});
    
-   skip($n,1,sub{gimp_image_add_layer($l,0) || 1});
+   skip($n,1,sub{Gimp->image_add_layer($l,0) || 1});
    skip($n,"new layer",sub{$l->get_name()});
    
    skip($n,1,sub{$l->paintbrush(50,[1,1,2,2,5,3,7,4,2,8],CONTINUOUS,0) || 1});
@@ -58,7 +58,7 @@ sub tests {
    
    skip($n,1,sub{Plugin->sharpen(RUN_NONINTERACTIVE,$i,$l,10) || 1});
    skip($n,1,sub{$l->sharpen(10) || 1});
-   skip($n,1,sub{plug_in_sharpen($i,$l,10) || 1});
+   skip($n,1,sub{Gimp->plug_in_sharpen($i,$l,10) || 1});
    
    skip($n,1,sub{$i->delete || 1});
 }