Attachment 622702 Details for Bug 863639 – Git patch that fix the issues (for me)

[patch] Git patch that fix the issues (for me)

0001-Fix-smarty3-issues-bz-863639.patch (text/plain), 24.75 KB, created by Johan Cwiklinski on 2012-10-06 13:15:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johan Cwiklinski

Created: 2012-10-06 13:15:40 UTC

Size: 24.75 KB

patch

obsolete

>From 81c638b8d3416ccc1ed93c17ba55d8472a7f7d38 Mon Sep 17 00:00:00 2001
>From: Johan Cwiklinski <johan@x-tnd.be>
>Date: Sat, 6 Oct 2012 15:15:23 +0200
>Subject: [PATCH] Fix smarty3 issues, bz #863639
>
>---
> php-pear-PhpDocumentor-1.4.4-smarty3.patch | 379 +++++++++++++++++++++++++++++
> php-pear-PhpDocumentor.spec                |  13 +-
> 2 files changed, 390 insertions(+), 2 deletions(-)
> create mode 100644 php-pear-PhpDocumentor-1.4.4-smarty3.patch
>
>diff --git a/php-pear-PhpDocumentor-1.4.4-smarty3.patch b/php-pear-PhpDocumentor-1.4.4-smarty3.patch
>new file mode 100644
>index 0000000..697d40f
>--- /dev/null
>+++ b/php-pear-PhpDocumentor-1.4.4-smarty3.patch
>@@ -0,0 +1,379 @@
>+diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc
>+--- PhpDocumentor-1.4.4/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc.patch	2011-12-03 22:40:10.000000000 +0100
>++++ PhpDocumentor-1.4.4/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc	2012-10-06 12:38:57.939447241 +0200
>+@@ -168,7 +168,7 @@ class CHMdefaultConverter extends Conver
>+         $templ->assign('source_loc',$pathinfo['source_loc']);
>+         $templ->assign('docs',$pathinfo['docs']);
>+         $templ->assign("subdir",'../');
>+-        $templ->register_outputfilter('CHMdefault_outputfilter');
>++        $templ->registerFilter('output', 'CHMdefault_outputfilter');
>+         $this->setTargetDir($this->getFileSourcePath($this->base_dir));
>+         $this->addSourceTOC($pathinfo['name'],$this->getFileSourceName($path),$pathinfo['package'],$pathinfo['subpackage'], true);
>+         phpDocumentor_out("\n");
>+@@ -188,7 +188,7 @@ class CHMdefaultConverter extends Conver
>+         $templ->assign('title',$title);
>+         $templ->assign('file',$path);
>+         $templ->assign("subdir",'../');
>+-        $templ->register_outputfilter('CHMdefault_outputfilter');
>++        $templ->registerFilter('output', 'CHMdefault_outputfilter');
>+         $pathinfo = $this->proceduralpages->getPathInfo($path, $this);
>+         $this->setTargetDir($this->base_dir . PATH_DELIMITER . '__examplesource');
>+         $this->addSourceTOC($title,'exsource_'.$path,$pathinfo['package'],$pathinfo['subpackage'], false);
>+@@ -349,7 +349,7 @@ class CHMdefaultConverter extends Conver
>+         }
>+         $this->setTargetDir($this->base_dir . PATH_DELIMITER . $this->class_dir);
>+         $this->class_data->assign("subdir",$a);
>+-        $this->class_data->register_outputfilter('CHMdefault_outputfilter');
>++        $this->class_data->registerFilter('output', 'CHMdefault_outputfilter');
>+         $this->addTOC($this->class,$this->class,$this->package,$this->subpackage, true);
>+         $this->writefile($this->class . '.html',$this->class_data->fetch('class.tpl'));
>+         unset($this->class_data);
>+@@ -369,7 +369,7 @@ class CHMdefaultConverter extends Conver
>+         $this->setTargetDir($this->base_dir . PATH_DELIMITER . $this->page_dir);
>+         $this->page_data->assign("package",$this->package);
>+         $this->page_data->assign("subdir",$a);
>+-        $this->page_data->register_outputfilter('CHMdefault_outputfilter');
>++        $this->page_data->registerFilter('output', 'CHMdefault_outputfilter');
>+         $this->addTOC($this->curpage->file,$this->page,$this->package,$this->subpackage);
>+         $this->writefile($this->page . '.html',$this->page_data->fetch('page.tpl'));
>+         unset($this->page_data);
>+@@ -405,7 +405,7 @@ class CHMdefaultConverter extends Conver
>+             $template->assign("letters",$mletters[$package_indexes[$i]['package']]);
>+             $template->assign("title","Package ".$package_indexes[$i]['package']." Element Index");
>+             $template->assign("subdir",'../');
>+-            $template->register_outputfilter('CHMdefault_outputfilter');
>++            $template->registerFilter('output', 'CHMdefault_outputfilter');
>+             $this->setTargetDir($this->base_dir . PATH_DELIMITER . $package_indexes[$i]['package']);
>+             $this->addTOC($package_indexes[$i]['package']." Alphabetical Index",'elementindex_'.$package_indexes[$i]['package'],$package_indexes[$i]['package'],'');
>+             $this->writefile('elementindex_'.$package_indexes[$i]['package'].'.html',$template->fetch('pkgelementindex.tpl'));
>+@@ -433,7 +433,7 @@ class CHMdefaultConverter extends Conver
>+         $template->assign("letters",$mletters);
>+         $template->assign("title","Element Index");
>+         $template->assign("date",date("r",time()));
>+-        $template->register_outputfilter('CHMdefault_outputfilter');
>++        $template->registerFilter('output', 'CHMdefault_outputfilter');
>+         phpDocumentor_out("\n");
>+         flush();
>+         $this->setTargetDir($this->base_dir);
>+@@ -497,7 +497,7 @@ class CHMdefaultConverter extends Conver
>+         $template->assign("date",date("r",time()));
>+         $template->assign("title",$this->title);
>+         $template->assign("package",$key);
>+-        $template->register_outputfilter('CHMdefault_outputfilter');
>++        $template->registerFilter('output', 'CHMdefault_outputfilter');
>+         phpDocumentor_out("\n");
>+         flush();
>+         $this->setTargetDir($this->base_dir);
>+@@ -539,7 +539,7 @@ class CHMdefaultConverter extends Conver
>+             $template->assign("classtrees",$this->generateFormattedClassTrees($package));
>+             $template->assign("package",$package);
>+             $template->assign("date",date("r",time()));
>+-            $template->register_outputfilter('CHMdefault_outputfilter');
>++            $template->registerFilter('output', 'CHMdefault_outputfilter');
>+             $this->addTOC("$package Class Trees","classtrees_$package",$package,'');
>+             $this->writefile("classtrees_$package.html",$template->fetch('classtrees.tpl'));
>+             phpDocumentor_out("\n");
>+@@ -665,7 +665,7 @@ class CHMdefaultConverter extends Conver
>+         }
>+         $templ = &$this->newSmarty();
>+         $templ->assign('todos',$todolist);
>+-        $templ->register_outputfilter('CHMdefault_outputfilter');
>++        $templ->registerFilter('output', 'CHMdefault_outputfilter');
>+         $this->setTargetDir($this->base_dir);
>+         $this->addTOC('Todo List','todolist','Index','',false,true);
>+         $this->addKLink('Todo List', 'todolist', '', 'Development');
>+@@ -799,7 +799,7 @@ class CHMdefaultConverter extends Conver
>+         $a = '../';
>+         if ($element->subpackage) $a .= '../';
>+         $template->assign('subdir',$a);
>+-        $template->register_outputfilter('CHMdefault_outputfilter');
>++        $template->registerFilter('output', 'CHMdefault_outputfilter');
>+         $contents = $template->fetch('tutorial.tpl');
>+         if ($element->package == $GLOBALS['phpDocumentor_DefaultPackageName'] && empty($element->subpackage) && ($element->name == $element->package . '.pkg'))
>+         {
>+@@ -1895,6 +1895,6 @@ function CHMdefault_lettersort($a, $b)
>+ /** @access private */
>+ function CHMdefault_outputfilter($src, &$smarty)
>+ {
>+-    return str_replace('{$subdir}',$smarty->_tpl_vars['subdir'],$src);
>++    return str_replace('{$subdir}',$smarty->getTemplateVars('subdir'),$src);
>+ }
>+ ?>
>+diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
>+--- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc.patch	2011-12-03 22:40:11.000000000 +0100
>++++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc	2012-10-06 12:38:44.047448159 +0200
>+@@ -166,7 +166,7 @@ class HTMLframesConverter extends Conver
>+         $templ->assign('source_loc',$pathinfo['source_loc']);
>+         $templ->assign('docs',$pathinfo['docs']);
>+         $templ->assign("subdir",'../');
>+-        $templ->register_outputfilter('HTMLframes_outputfilter');
>++        $templ->registerFilter('output', 'HTMLframes_outputfilter');
>+         $this->setTargetDir($this->getFileSourcePath($this->base_dir));
>+         phpDocumentor_out("\n");
>+         $this->setSourcePaths($path);
>+@@ -185,7 +185,7 @@ class HTMLframesConverter extends Conver
>+         $templ->assign('title',$title);
>+         $templ->assign('file',$path);
>+         $templ->assign("subdir",'../');
>+-        $templ->register_outputfilter('HTMLframes_outputfilter');
>++        $templ->registerFilter('output', 'HTMLframes_outputfilter');
>+         $this->setTargetDir($this->base_dir . PATH_DELIMITER . '__examplesource');
>+         phpDocumentor_out("\n");
>+         $this->writefile('exsource_'.$path.'.html',$templ->fetch('examplesource.tpl'));
>+@@ -343,7 +343,7 @@ class HTMLframesConverter extends Conver
>+         }
>+         $this->setTargetDir($this->base_dir . PATH_DELIMITER . $this->class_dir);
>+         $this->class_data->assign("subdir",$a);
>+-        $this->class_data->register_outputfilter('HTMLframes_outputfilter');
>++        $this->class_data->registerFilter('output', 'HTMLframes_outputfilter');
>+         $this->writefile($this->class . '.html',$this->class_data->fetch('class.tpl'));
>+         unset($this->class_data);
>+     }
>+@@ -362,7 +362,7 @@ class HTMLframesConverter extends Conver
>+         $this->setTargetDir($this->base_dir . PATH_DELIMITER . $this->page_dir);
>+         $this->page_data->assign("package",$this->package);
>+         $this->page_data->assign("subdir",$a);
>+-        $this->page_data->register_outputfilter('HTMLframes_outputfilter');
>++        $this->page_data->registerFilter('output', 'HTMLframes_outputfilter');
>+         $this->writefile($this->page . '.html',$this->page_data->fetch('page.tpl'));
>+         unset($this->page_data);
>+     }
>+@@ -605,7 +605,7 @@ class HTMLframesConverter extends Conver
>+             $template->assign("index",$package_indexes[$i]['pindex']);
>+             $template->assign("package",$package_indexes[$i]['package']);
>+             $template->assign("letters",$mletters[$package_indexes[$i]['package']]);
>+-            $template->register_outputfilter('HTMLframes_outputfilter');
>++            $template->registerFilter('output', 'HTMLframes_outputfilter');
>+             $this->setTargetDir($this->base_dir);
>+             $this->writefile('elementindex_'.$package_indexes[$i]['package'].'.html',$template->fetch('pkgelementindex.tpl'));
>+         }
>+@@ -630,7 +630,7 @@ class HTMLframesConverter extends Conver
>+         $template = &$this->newSmarty();
>+         $template->assign("index",$elindex);
>+         $template->assign("letters",$mletters);
>+-        $template->register_outputfilter('HTMLframes_outputfilter');
>++        $template->registerFilter('output', 'HTMLframes_outputfilter');
>+         phpDocumentor_out("\n");
>+         flush();
>+         $this->setTargetDir($this->base_dir);
>+@@ -655,7 +655,7 @@ class HTMLframesConverter extends Conver
>+         $index->assign("date",date("r",time()));
>+         $index->assign("title",$this->title);
>+         $index->assign("start","li_$start.html");
>+-        $index->register_outputfilter('HTMLframes_outputfilter');
>++        $index->registerFilter('output', 'HTMLframes_outputfilter');
>+         if (isset($this->tutorials[$start]['']['pkg'][$start . '.pkg']))
>+         {
>+             $index->assign("blank",$start.'/tutorial_'.$start.'.pkg');
>+@@ -687,7 +687,7 @@ class HTMLframesConverter extends Conver
>+             }
>+         }
>+         $package->assign("packages",$this->package_index);
>+-        $package->register_outputfilter('HTMLframes_outputfilter');
>++        $package->registerFilter('output', 'HTMLframes_outputfilter');
>+         $this->writefile("packages.html",$package->fetch('top_frame.tpl'));
>+         unset($index);
>+     }
>+@@ -701,7 +701,7 @@ class HTMLframesConverter extends Conver
>+         $template->assign("date",date("r",time()));
>+         $template->assign("title",$this->title);
>+         $template->assign("package",$key);
>+-        $template->register_outputfilter('HTMLframes_outputfilter');
>++        $template->registerFilter('output', 'HTMLframes_outputfilter');
>+         phpDocumentor_out("\n");
>+         flush();
>+         $this->setTargetDir($this->base_dir);
>+@@ -745,7 +745,7 @@ class HTMLframesConverter extends Conver
>+             $template->assign('todolink','todolist.html');
>+             $template->assign("classtreepage","classtrees_$package");
>+             $template->assign("elementindex","elementindex_$package");
>+-            $template->register_outputfilter('HTMLframes_outputfilter');
>++            $template->registerFilter('output', 'HTMLframes_outputfilter');
>+             if (isset($this->package_pages[$package]))
>+             {
>+                 $template->assign("packagedoc",$package.'/package_' . $package . '.html');
>+@@ -760,7 +760,7 @@ class HTMLframesConverter extends Conver
>+             $template->assign("classtrees",$this->generateFormattedClassTrees($package));
>+             $template->assign("interfaces",$this->generateFormattedInterfaceTrees($package));
>+             $template->assign("package",$package);
>+-            $template->register_outputfilter('HTMLframes_outputfilter');
>++            $template->registerFilter('output', 'HTMLframes_outputfilter');
>+             $this->writefile("classtrees_$package.html",$template->fetch('classtrees.tpl'));
>+             phpDocumentor_out("\n");
>+             flush();
>+@@ -900,7 +900,7 @@ class HTMLframesConverter extends Conver
>+         }
>+         $templ = &$this->newSmarty();
>+         $templ->assign('todos',$todolist);
>+-        $templ->register_outputfilter('HTMLframes_outputfilter');
>++        $templ->registerFilter('output', 'HTMLframes_outputfilter');
>+         $this->setTargetDir($this->base_dir);
>+         $this->writefile('todolist.html',$templ->fetch('todolist.tpl'));
>+     }
>+@@ -1011,7 +1011,7 @@ class HTMLframesConverter extends Conver
>+         $a = '../';
>+         if ($element->subpackage) $a .= '../';
>+         $template->assign('subdir',$a);
>+-        $template->register_outputfilter('HTMLframes_outputfilter');
>++        $template->registerFilter('output', 'HTMLframes_outputfilter');
>+         $contents = $template->fetch('tutorial.tpl');
>+         $a = '';
>+         if ($element->subpackage) $a = PATH_DELIMITER . $element->subpackage;
>+@@ -1901,6 +1901,6 @@ function HTMLframes_lettersort($a, $b)
>+ /** @access private */
>+ function HTMLframes_outputfilter($src, &$smarty)
>+ {
>+-    return str_replace('{$subdir}',$smarty->_tpl_vars['subdir'],$src);
>++    return str_replace('{$subdir}',$smarty->getTemplateVars('subdir'),$src);
>+ }
>+ ?>
>+diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc
>+--- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc.patch	2011-12-03 22:40:12.000000000 +0100
>++++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc	2012-10-06 12:38:21.533449643 +0200
>+@@ -162,7 +162,7 @@ class HTMLSmartyConverter extends Conver
>+         $templ->assign('source_loc',$pathinfo['source_loc']);
>+         $templ->assign('docs',$pathinfo['docs']);
>+         $templ->assign("subdir",'../');
>+-        $templ->register_outputfilter('HTMLSmarty_outputfilter');
>++        $templ->registerFilter('output', 'HTMLSmarty_outputfilter');
>+         $this->setTargetDir($this->getFileSourcePath($this->base_dir));
>+         phpDocumentor_out("\n");
>+         $this->setSourcePaths($path);
>+@@ -181,7 +181,7 @@ class HTMLSmartyConverter extends Conver
>+         $templ->assign('title',$title);
>+         $templ->assign('file',$path);
>+         $templ->assign("subdir",'../');
>+-        $templ->register_outputfilter('HTMLSmarty_outputfilter');
>++        $templ->registerFilter('output', 'HTMLSmarty_outputfilter');
>+         $this->setTargetDir($this->base_dir . PATH_DELIMITER . '__examplesource');
>+         phpDocumentor_out("\n");
>+         $this->writefile('exsource_'.$path.'.html',$templ->fetch('examplesource.tpl'));
>+@@ -361,7 +361,7 @@ class HTMLSmartyConverter extends Conver
>+         $this->class_data->assign("packageindex",$this->package_index);
>+         $this->class_data->assign("package",$this->package);
>+         $this->class_data->assign("subdir",$a);
>+-        $this->class_data->register_outputfilter('HTMLSmarty_outputfilter');
>++        $this->class_data->registerFilter('output', 'HTMLSmarty_outputfilter');
>+         $this->writefile($this->class . '.html',$this->class_data->fetch('class.tpl'));
>+         unset($this->class_data);
>+     }
>+@@ -536,7 +536,7 @@ class HTMLSmartyConverter extends Conver
>+         $this->page_data->assign("packageindex",$this->package_index);
>+         $this->page_data->assign("package",$this->package);
>+         $this->page_data->assign("subdir",$a);
>+-        $this->page_data->register_outputfilter('HTMLSmarty_outputfilter');
>++        $this->page_data->registerFilter('output', 'HTMLSmarty_outputfilter');
>+         $this->writefile($this->page . '.html',$this->page_data->fetch('page.tpl'));
>+         unset($this->page_data);
>+     }
>+@@ -621,7 +621,7 @@ class HTMLSmartyConverter extends Conver
>+             $template->assign("letters",$mletters[$package_indexes[$i]['package']]);
>+             $template->assign("title","Package ".$package_indexes[$i]['package']." Element Index");
>+             $template->assign("date",date("r",time()));
>+-            $template->register_outputfilter('HTMLSmarty_outputfilter');
>++            $template->registerFilter('output', 'HTMLSmarty_outputfilter');
>+             $this->setTargetDir($this->base_dir);
>+             $this->writefile('elementindex_'.$package_indexes[$i]['package'].'.html',$template->fetch('pkgelementindex.tpl'));
>+         }
>+@@ -657,7 +657,7 @@ class HTMLSmartyConverter extends Conver
>+         phpDocumentor_out("\n");
>+         flush();
>+         $this->setTargetDir($this->base_dir);
>+-        $template->register_outputfilter('HTMLSmarty_outputfilter');
>++        $template->registerFilter('output', 'HTMLSmarty_outputfilter');
>+         $this->writefile('elementindex.html',$template->fetch('elementindex.tpl'));
>+         usort($this->package_index,"HTMLSmarty_pindexcmp");
>+         $index = &$this->newSmarty();
>+@@ -694,7 +694,7 @@ class HTMLSmartyConverter extends Conver
>+         {
>+             $index->assign("contents",$this->package_pages[$start]);
>+         }
>+-        $index->register_outputfilter('HTMLSmarty_outputfilter');
>++        $index->registerFilter('output', 'HTMLSmarty_outputfilter');
>+         phpDocumentor_out("\n");
>+         flush();
>+         $this->setTargetDir($this->base_dir);
>+@@ -716,7 +716,7 @@ class HTMLSmartyConverter extends Conver
>+         $template->assign("date",date("r",time()));
>+         $template->assign("title",$this->title);
>+         $template->assign("package",$key);
>+-        $template->register_outputfilter('HTMLSmarty_outputfilter');
>++        $template->registerFilter('output', 'HTMLSmarty_outputfilter');
>+         phpDocumentor_out("\n");
>+         flush();
>+         $this->setTargetDir($this->base_dir);
>+@@ -761,7 +761,7 @@ class HTMLSmartyConverter extends Conver
>+             $template->assign("package",$package);
>+             $template->assign("date",date("r",time()));
>+             $template->assign("title","Class Trees for Package $package");
>+-            $template->register_outputfilter('HTMLSmarty_outputfilter');
>++            $template->registerFilter('output', 'HTMLSmarty_outputfilter');
>+             $this->writefile("classtrees_$package.html",$template->fetch('classtrees.tpl'));
>+             phpDocumentor_out("\n");
>+             flush();
>+@@ -914,7 +914,7 @@ class HTMLSmartyConverter extends Conver
>+         }
>+         $templ = &$this->newSmarty();
>+         $templ->assign('todos',$todolist);
>+-        $templ->register_outputfilter('HTMLSmarty_outputfilter');
>++        $templ->registerFilter('output', 'HTMLSmarty_outputfilter');
>+         $this->setTargetDir($this->base_dir);
>+         $this->writefile('todolist.html',$templ->fetch('todolist.tpl'));
>+     }
>+@@ -979,7 +979,7 @@ class HTMLSmartyConverter extends Conver
>+         $template->assign("files",$allfiles);
>+         $template->assign("all",$out);
>+         $template->assign("title","phpDocumentor Parser Errors and Warnings");
>+-        $template->register_outputfilter('HTMLSmarty_outputfilter');
>++        $template->registerFilter('output', 'HTMLSmarty_outputfilter');
>+         $this->setTargetDir($this->base_dir);
>+         $this->writefile("errors.html",$template->fetch('errors.tpl'));
>+         unset($template);
>+@@ -1020,7 +1020,7 @@ class HTMLSmartyConverter extends Conver
>+         $x = substr($x,strpos($x,'<body'));
>+         $template->assign("contents",trim(substr($x,strpos($x,'>') + 1)));
>+         $this->package_pages[$element->package] = trim(substr($x,strpos($x,'>') + 1));
>+-        $template->register_outputfilter('HTMLSmarty_outputfilter');
>++        $template->registerFilter('output', 'HTMLSmarty_outputfilter');
>+         phpDocumentor_out("\n");
>+         flush();
>+         $this->setTargetDir($this->base_dir);
>+@@ -1054,7 +1054,7 @@ class HTMLSmartyConverter extends Conver
>+         $template->assign("subdir",$a);
>+         $a = '';
>+         if ($element->subpackage) $a = PATH_DELIMITER . $element->subpackage;
>+-        $template->register_outputfilter('HTMLSmarty_outputfilter');
>++        $template->registerFilter('output', 'HTMLSmarty_outputfilter');
>+         $this->setTargetDir($this->base_dir . PATH_DELIMITER . $element->package . $a);
>+         $this->writeFile('tutorial_'.$element->name.'.html',$template->fetch('tutorial.tpl'));
>+         if ($element->name == $element->package . '.pkg')
>+@@ -1954,6 +1954,6 @@ function HTMLSmarty_lettersort($a, $b)
>+ /** @access private */
>+ function HTMLSmarty_outputfilter($src, &$smarty)
>+ {
>+-    return str_replace('{$subdir}',$smarty->_tpl_vars['subdir'],$src);
>++    return str_replace('{$subdir}',$smarty->getTemplateVars('subdir'),$src);
>+ }
>+ ?>
>+diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/pkgelementindex.tpl
>+--- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/pkgelementindex.tpl.patch	2012-10-06 15:10:41.195846270 +0200
>++++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/pkgelementindex.tpl	2012-10-06 15:10:52.016845557 +0200
>+@@ -1,5 +1,5 @@
>+ {include file="header.tpl"}
>+ <a name="top"></a>
>+ <h1>Element index for package {$package}</h1>
>+-{include file="basicindex.tpl" indexname=elementindex_$package}
>++{include file="basicindex.tpl" indexname="elementindex_$package"}
>+ {include file="footer.tpl"}
>+diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc
>+--- PhpDocumentor-1.4.4/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc.patch	2011-12-03 22:40:12.000000000 +0100
>++++ PhpDocumentor-1.4.4/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc	2012-10-06 12:37:49.093451785 +0200
>+@@ -1629,7 +1629,7 @@ class XMLDocBookpeardoc2Converter extend
>+             {
>+                 foreach($ids as $id => $unll)
>+                 {
>+-                    if (!in_array($id, $templ->_tpl_vars['ids']))
>++                    if (!in_array($id, $templ->getTemplateVars('ids')))
>+                     {
>+                         $templ->append('ids',$id);
>+                     }
>diff --git a/php-pear-PhpDocumentor.spec b/php-pear-PhpDocumentor.spec
>index 9081c36..0788283 100644
>--- a/php-pear-PhpDocumentor.spec
>+++ b/php-pear-PhpDocumentor.spec
>@@ -4,11 +4,12 @@
> Summary:          The complete documentation solution for PHP
> Name:             php-pear-PhpDocumentor
> Version:          1.4.4
>-Release:          4%{?dist}
>+Release:          5%{?dist}
> License:          LGPLv2+
> Group:            Development/Libraries
> URL:              http://www.phpdoc.org/
> Source0:          http://pear.php.net/get/%{pear_name}-%{version}.tgz
>+Patch0:          php-pear-PhpDocumentor-1.4.4-smarty3.patch
> BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildArch:        noarch
>@@ -47,13 +48,18 @@ in Docbook XML.
> %setup -q -c
> [ -f package2.xml ] || mv package.xml package2.xml
> mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
>-cd %{pear_name}-%{version}
>+pushd %{pear_name}-%{version}
>+
>+#fix smarty3 issues
>+%patch0 -p1  -b .patch
>+sed -i -e '/PhpDocumentor/s/md5sum=".*" name/name/' %{pear_name}.xml
> 
> # don't install our own php-Smarty
> # don't install scripts in bin, but in doc
> sed -e '/Smarty-2/d' \
>     -e '/name="scripts/s/role="php"/role="doc"/' \
>     -i %{pear_name}.xml
>+popd
> 
> 
> %build
>@@ -117,6 +123,9 @@ fi
> 
> 
> %changelog
>+* Sat Oct 06 2012 Johan Cwiklinski <johan AT x-tnd DOT be> - 1.4.4-5
>+- Smarty3 patch
>+
> * Sun Aug 19 2012 Remi Collet <remi@fedoraproject.org> - 1.4.4-4
> - rebuilt for new pear_datadir
> 
>-- 
>1.7.11.4
>

Actions: View | Diff

Attachments on bug 863639: 622702 | 651573