r24914 - in /branches/upstream/libhtml-template-pro-perl/current: Changes META.yml Makefile.PL lib/HTML/Template/Pro.pm perl-HTML-Template-Pro.spec procore.c
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Mon Sep 8 17:42:36 UTC 2008
Author: gregoa
Date: Mon Sep 8 17:42:34 2008
New Revision: 24914
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=24914
Log:
[svn-upgrade] Integrating new upstream version, libhtml-template-pro-perl (0.71)
Modified:
branches/upstream/libhtml-template-pro-perl/current/Changes
branches/upstream/libhtml-template-pro-perl/current/META.yml
branches/upstream/libhtml-template-pro-perl/current/Makefile.PL
branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/Pro.pm
branches/upstream/libhtml-template-pro-perl/current/perl-HTML-Template-Pro.spec
branches/upstream/libhtml-template-pro-perl/current/procore.c
Modified: branches/upstream/libhtml-template-pro-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/Changes?rev=24914&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/Changes (original)
+++ branches/upstream/libhtml-template-pro-perl/current/Changes Mon Sep 8 17:42:34 2008
@@ -149,3 +149,7 @@
0.70 Thu Apr 3 22:12:33 EEST 2008
- fixed regression in include scope (reported by Naxim Babych)
+
+0.71 Sat Aug 16 15:05:01 EEST 2008
+ - fixed evaluation of variables in 'if' even in shadow context
+ - fixed misconfig on Darvin (CPAN #38013)
Modified: branches/upstream/libhtml-template-pro-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/META.yml?rev=24914&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/META.yml (original)
+++ branches/upstream/libhtml-template-pro-perl/current/META.yml Mon Sep 8 17:42:34 2008
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: HTML-Template-Pro
-version: 0.70
+version: 0.71
abstract: Perl/XS module to use HTML Templates from CGI scripts
license: ~
generated_by: ExtUtils::MakeMaker version 6.32
Modified: branches/upstream/libhtml-template-pro-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/Makefile.PL?rev=24914&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/Makefile.PL (original)
+++ branches/upstream/libhtml-template-pro-perl/current/Makefile.PL Mon Sep 8 17:42:34 2008
@@ -29,7 +29,8 @@
$DEF{MMAP}=has_mmap();
}
-$DEF{INT64_NAME} = $Config{i64type};
+$DEF{INT64_NAME} = find_int64();
+$DEF{INT64_NAME} ||= $Config{i64type};
my $i;
for ($i=0; $i<@ARGV; $i++) {
@@ -165,8 +166,8 @@
# those tests are copied from Time-HiRes-01.20
sub try_compile_and_link {
- my ($c, $cccmd, $ccflags) = @_;
-
+ my ($c, $cccmd, $ccflags, $verbose) = @_;
+ $verbose = 1 unless defined $verbose;
my ($ok) = 0;
my ($tmp) = File::Spec->catfile( File::Spec->tmpdir(), "tmp$$" );
local(*TMPC);
@@ -188,7 +189,7 @@
}
$cccmd = "$cc -o $tmp $ccflags $tmp.c @$LIBS"
unless (defined $cccmd);
- print "trying $cccmd\n";
+ print "trying $cccmd\n" if $verbose;
system($cccmd);
if ($^O eq 'VMS') {
$ok = -s "$tmp$obj_ext" && -x _;
@@ -261,3 +262,27 @@
return 0;
}
+sub find_int64 {
+ foreach my $type ('long long','long','int') {
+ return $type if try_as_int64($type);
+ }
+ return;
+}
+
+sub try_as_int64 {
+ my $type=shift;
+ print "looking for int64: trying $type...";
+ if (try_compile_and_link('
+ int main (int argc, char** argv)
+ {
+ if (sizeof('.$type.')==8) return 0;
+ return sizeof('.$type.');
+ }
+',undef, '',0)){
+ print "Ok.\n";
+ return 1;
+ }
+ print "no.\n";
+ return 0;
+}
+
Modified: branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/Pro.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/Pro.pm?rev=24914&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/Pro.pm (original)
+++ branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/Pro.pm Mon Sep 8 17:42:34 2008
@@ -9,7 +9,7 @@
use vars qw($VERSION @ISA);
@ISA = qw(DynaLoader);
-$VERSION = '0.70';
+$VERSION = '0.71';
bootstrap HTML::Template::Pro $VERSION;
Modified: branches/upstream/libhtml-template-pro-perl/current/perl-HTML-Template-Pro.spec
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/perl-HTML-Template-Pro.spec?rev=24914&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/perl-HTML-Template-Pro.spec (original)
+++ branches/upstream/libhtml-template-pro-perl/current/perl-HTML-Template-Pro.spec Mon Sep 8 17:42:34 2008
@@ -6,7 +6,7 @@
%define module HTML-Template-Pro
Name: perl-%module
-Version: 0.70
+Version: 0.71
Release: alt1
Packager: Igor Yu. Vlasenko <viy at altlinux.org>
@@ -50,10 +50,13 @@
%files
%doc README Changes README.ru FAQ
-%perl_vendor_privlib/*
+%perl_vendor_archlib/*
%perl_vendor_man3dir/*
%changelog
+* Sat Aug 16 2008 Igor Vlasenko <viy at altlinux.ru> 0.71-alt1
+- new version; see Changes
+
* Thu Apr 03 2008 Igor Vlasenko <viy at altlinux.ru> 0.70-alt1
- new version; see Changes
Modified: branches/upstream/libhtml-template-pro-perl/current/procore.c
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/procore.c?rev=24914&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/procore.c (original)
+++ branches/upstream/libhtml-template-pro-perl/current/procore.c Mon Sep 8 17:42:34 2008
@@ -400,7 +400,8 @@
iftag.tag=HTML_TEMPLATE_TAG_IF;
iftag.vcontext=state->is_visible;
iftag.position=state->cur_pos; /* unused */
- if (is_var_true(state,name)) {
+ /* state->is_visible && means that we do not evaluate variable in shadow */
+ if (state->is_visible && is_var_true(state,name)) {
iftag.value=1;
/* state->is_visible is not touched */
} else {
@@ -419,16 +420,16 @@
iftag.tag=HTML_TEMPLATE_TAG_UNLESS;
iftag.vcontext=state->is_visible;
iftag.position=state->cur_pos; /* unused */
- if (is_var_true(state,name)) {
+ /* state->is_visible && means that we do not evaluate variable in shadow */
+ if (state->is_visible && !is_var_true(state,name)) {
+ iftag.value=1;
+ /* state->is_visible is not touched */
+ } else {
iftag.value=0;
- tagstack_push(&(state->tag_stack), iftag);
state->is_visible=0;
- } else {
- iftag.value=1;
- tagstack_push(&(state->tag_stack), iftag);
- /* state->is_visible is not touched */
- }
- if (debuglevel>3) tmpl_log(state,TMPL_LOG_DEBUG2,"unless:visible context =%d value=%d ",iftag.vcontext,iftag.value);
+ }
+ tagstack_push(&(state->tag_stack), iftag);
+ if (debuglevel>3) tmpl_log(state,TMPL_LOG_DEBUG2,"tag_handler_unless:visible context =%d value=%d ",iftag.vcontext,iftag.value);
}
static
More information about the Pkg-perl-cvs-commits
mailing list