This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libgeo-proj4-perl.
commit 009014c7f89b632423fe4f37c2e042e95ab3e023 Author: Bas Couwenberg <[email protected]> Date: Thu Feb 23 20:09:39 2017 +0100 Imported Upstream version 1.06 --- Changes | 9 +++++++ META.json | 2 +- META.yml | 2 +- Makefile.PL | 18 +++++++------ Proj4.xs | 72 +++++++++++++++++++++++++-------------------------- README | 12 ++++----- examples/test_list.pl | 2 +- lib/Geo/Proj4.pm | 6 ++--- 8 files changed, 67 insertions(+), 56 deletions(-) diff --git a/Changes b/Changes index 82fed55..5a45e80 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,14 @@ Revision history for Perl extension Geo::Proj4. +version 1.06: Thu 23 Feb 10:24:01 CET 2017 + + Fixes: + - NO_ERROR renamed: name conflict on mingw32/Windows 10 + reported by [James P. Rushworth] + - do not symlink on windows + - crash on list functions from example, caused by a stack overflow. + reported by [James P. Rushworth] + version 1.05: Tue Jan 21 14:32:06 CET 2014 Improvements: diff --git a/META.json b/META.json index ce32bc2..1e428d3 100644 --- a/META.json +++ b/META.json @@ -35,5 +35,5 @@ } }, "release_status" : "stable", - "version" : "1.05" + "version" : "1.06" } diff --git a/META.yml b/META.yml index c8a5fdd..43978c3 100644 --- a/META.yml +++ b/META.yml @@ -18,4 +18,4 @@ no_index: - t - inc requires: {} -version: 1.05 +version: 1.06 diff --git a/Makefile.PL b/Makefile.PL index cafb5dc..2f93bb2 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -3,7 +3,7 @@ use ExtUtils::MakeMaker; require 5.006; # increased per release -my $relversion = '1.05'; +my $relversion = '1.06'; my $libversion = '4.4.9'; @@ -29,12 +29,14 @@ my $version = $1; $version ge $libversion or die "ERROR: libproj too old, found $version required is $libversion\n"; -unlink 'projects.h'; -my $own_projects = "src/$version/projects.h"; -if(-f $own_projects) -{ symlink $own_projects, 'projects.h' - or die "ERROR: cannot install $own_projects: $!\n"; - warn "installed $own_projects\n"; +if($^O ne 'MSWin32' && $^O ne 'cygwin') +{ unlink 'projects.h'; + my $own_projects = "src/$version/projects.h"; + if(-f $own_projects) + { symlink $own_projects, 'projects.h' + or die "ERROR: cannot install $own_projects: $!\n"; + warn "installed $own_projects\n"; + } } WriteMakefile @@ -42,7 +44,7 @@ WriteMakefile , VERSION => $relversion , AUTHOR => 'Mark Overmeer' , ABSTRACT => 'Proj4 library for carthographic projections' - , INC => "-I. -I$FWTools/include" + , INC => "-I$FWTools/include -I." , LIBS => [ "-L$FWTools/lib -lproj" ] , LICENSE => 'perl' ); diff --git a/Proj4.xs b/Proj4.xs index cc92a26..fefed6a 100644 --- a/Proj4.xs +++ b/Proj4.xs @@ -9,7 +9,7 @@ MODULE = Geo::Proj4 PACKAGE = Geo::Proj4 -#define NO_ERROR "no error" +#define PROJ4_NO_ERROR "no error" int libproj_version_proj4() @@ -27,16 +27,16 @@ new_proj4(defn) rawstruct = pj_init_plus(defn); if(rawstruct==NULL) - { EXTEND(SP, 3); - PUSHs(&PL_sv_undef); - PUSHs(sv_2mortal(newSViv(pj_errno))); - PUSHs(sv_2mortal(newSVpv(pj_strerrno(pj_errno),0))); + { EXTEND(SP, 3); + PUSHs(&PL_sv_undef); + PUSHs(sv_2mortal(newSViv(pj_errno))); + PUSHs(sv_2mortal(newSVpv(pj_strerrno(pj_errno),0))); } else { SV *object = newSV(0); sv_setref_pv(object, "Geo::Proj4", (void *)rawstruct); - XPUSHs(sv_2mortal(object)); + XPUSHs(sv_2mortal(object)); } SV * @@ -177,8 +177,8 @@ transform_proj4(proj_from, proj_to, points, degrees) if(pj_transform(proj_from, proj_to, nrpoints, 0, x, y, z)==0) { - XPUSHs(sv_2mortal(newSViv(0))); - XPUSHs(sv_2mortal(newSVpv(NO_ERROR, 0))); + XPUSHs(sv_2mortal(newSViv(0))); + XPUSHs(sv_2mortal(newSVpv(PROJ4_NO_ERROR, 0))); retlist = (AV *)sv_2mortal((SV *)newAV()); @@ -248,8 +248,8 @@ def_types_proj4(void) || strcmp(type->id,"geocent")==0 ) continue; - PUSHs(sv_2mortal(newSVpv(type->id, 0))); - } + XPUSHs(sv_2mortal(newSVpv(type->id, 0))); + } #endif SV * @@ -261,11 +261,11 @@ type_proj4(id) #if PJ_VERSION >= 449 for(type = pj_get_list_ref(); type->id; type++) { if(strcmp(id, type->id)!=0) - continue; + continue; - PUSHs(sv_2mortal(newSVpv(*type->descr, 0))); - break; - } + XPUSHs(sv_2mortal(newSVpv(*type->descr, 0))); + break; + } #endif SV * @@ -275,8 +275,8 @@ def_ellps_proj4(void) PPCODE: #if PJ_VERSION >= 449 for(ellps = pj_get_ellps_ref(); ellps->id; ellps++) - { PUSHs(sv_2mortal(newSVpv(ellps->id, 0))); - } + { XPUSHs(sv_2mortal(newSVpv(ellps->id, 0))); + } #endif SV * @@ -290,11 +290,11 @@ ellps_proj4(id) { if(strcmp(id, ellps->id)!=0) continue; - PUSHs(sv_2mortal(newSVpv(ellps->major, 0))); - PUSHs(sv_2mortal(newSVpv(ellps->ell, 0))); - PUSHs(sv_2mortal(newSVpv(ellps->name, 0))); - break; - } + XPUSHs(sv_2mortal(newSVpv(ellps->major, 0))); + XPUSHs(sv_2mortal(newSVpv(ellps->ell, 0))); + XPUSHs(sv_2mortal(newSVpv(ellps->name, 0))); + break; + } #endif SV * @@ -304,8 +304,8 @@ def_units_proj4(void) PPCODE: #if PJ_VERSION >= 449 for(unit = pj_get_units_ref(); unit->id; unit++) - { PUSHs(sv_2mortal(newSVpv(unit->id, 0))); - } + { XPUSHs(sv_2mortal(newSVpv(unit->id, 0))); + } #endif SV * @@ -317,12 +317,12 @@ unit_proj4(id) #if PJ_VERSION >= 449 for(units = pj_get_units_ref(); units->id; units++) { if(strcmp(id, units->id)!=0) - continue; + continue; - PUSHs(sv_2mortal(newSVpv(units->to_meter, 0))); - PUSHs(sv_2mortal(newSVpv(units->name, 0))); - break; - } + XPUSHs(sv_2mortal(newSVpv(units->to_meter, 0))); + XPUSHs(sv_2mortal(newSVpv(units->name, 0))); + break; + } #endif SV * @@ -332,8 +332,8 @@ def_datums_proj4(void) PPCODE: #if PJ_VERSION >= 449 for(datum = pj_get_datums_ref(); datum->id; datum++) - { PUSHs(sv_2mortal(newSVpv(datum->id, 0))); - } + { XPUSHs(sv_2mortal(newSVpv(datum->id, 0))); + } #endif SV * @@ -345,17 +345,17 @@ datum_proj4(id) #if PJ_VERSION >= 449 for(datum = pj_get_datums_ref(); datum->id; datum++) { if(strcmp(id, datum->id)!=0) - continue; + continue; - PUSHs(sv_2mortal(newSVpv(datum->ellipse_id, 0))); - PUSHs(sv_2mortal(newSVpv(datum->defn, 0))); + XPUSHs(sv_2mortal(newSVpv(datum->ellipse_id, 0))); + XPUSHs(sv_2mortal(newSVpv(datum->defn, 0))); if(datum->comments!=NULL && strlen(datum->comments)) - { PUSHs(sv_2mortal(newSVpv(datum->comments, 0))); + { XPUSHs(sv_2mortal(newSVpv(datum->comments, 0))); } - break; - } + break; + } #endif void diff --git a/README b/README index 19fa858..7c1f5e7 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -=== README for Geo-Proj4 version 1.05 -= Generated on Tue Jan 21 14:32:14 2014 by OODoc 2.01 +=== README for Geo-Proj4 version 1.06 += Generated on Thu Feb 23 10:24:50 2017 by OODoc 2.02 There are various ways to install this module: @@ -9,16 +9,16 @@ There are various ways to install this module: (2) if you use Windows, have a look at http://ppm.activestate.com/ (3) if you have downloaded this module manually (as root/administrator) - gzip -d Geo-Proj4-1.05.tar.gz - tar -xf Geo-Proj4-1.05.tar - cd Geo-Proj4-1.05 + gzip -d Geo-Proj4-1.06.tar.gz + tar -xf Geo-Proj4-1.06.tar + cd Geo-Proj4-1.06 perl Makefile.PL make # optional make test # optional make install For usage, see the included manual-pages or - http://search.cpan.org/dist/Geo-Proj4-1.05/ + http://search.cpan.org/dist/Geo-Proj4-1.06/ Please report problems to http://rt.cpan.org/Dist/Display.html?Queue=Geo-Proj4 diff --git a/examples/test_list.pl b/examples/test_list.pl index f19a675..dda426c 100644 --- a/examples/test_list.pl +++ b/examples/test_list.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl # when run, it will show all definitions. use warnings; use strict; diff --git a/lib/Geo/Proj4.pm b/lib/Geo/Proj4.pm index 89bc8f6..c5df181 100644 --- a/lib/Geo/Proj4.pm +++ b/lib/Geo/Proj4.pm @@ -1,10 +1,10 @@ -# Copyrights 2014 by [Mark Overmeer]. +# Copyrights 2017 by [Mark Overmeer]. # For other contributors see Changes. # See the manual pages for details on the licensing terms. -# Pod stripped from pm file by OODoc 2.01. +# Pod stripped from pm file by OODoc 2.02. package Geo::Proj4; use vars '$VERSION'; -$VERSION = '1.05'; +$VERSION = '1.06'; use strict; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libgeo-proj4-perl.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
