From be0c3984eb64975b0448533100fb27281cc2ad2f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Jun 2016 18:15:49 +0200 Subject: glpi: add upstream patch, drop dependency on zend-version --- glpi-0.90-upstream.patch | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 glpi-0.90-upstream.patch (limited to 'glpi-0.90-upstream.patch') diff --git a/glpi-0.90-upstream.patch b/glpi-0.90-upstream.patch new file mode 100644 index 0000000..213f8e2 --- /dev/null +++ b/glpi-0.90-upstream.patch @@ -0,0 +1,36 @@ +Adapted for 0.90 from: + + +From efdec2554b4b65e72de049ea9897ddab5a2b7971 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 19 Apr 2016 11:30:16 +0200 +Subject: [PATCH] Drop Zend\Version usage + +This component is no more relevant as it reports its +own version, not the one of the framework. +--- + inc/config.class.php | 3 +- + lib/Zend/Version/README.md | 15 --- + lib/Zend/Version/Version.php | 226 ----------------------------------------- + lib/Zend/Version/composer.json | 32 ------ + tools/composer.json | 1 - + 5 files changed, 1 insertion(+), 276 deletions(-) + delete mode 100644 lib/Zend/Version/README.md + delete mode 100644 lib/Zend/Version/Version.php + delete mode 100644 lib/Zend/Version/composer.json + +diff --git a/inc/config.class.php b/inc/config.class.php +index 477ded2..f1008db 100644 +--- a/inc/config.class.php ++++ b/inc/config.class.php +@@ -1553,8 +1553,7 @@ static function showLibrariesInformation() { + "): ".(class_exists('ezcGraph') ? 'OK' : 'KO'). "\n"; + + // Zend +- $zv = new Zend\Version\Version; +- echo "Zend Framework version " . $zv::VERSION . " in (" . realpath(GLPI_ZEND_PATH) . ")\n"; ++ echo "Zend Framework in (" . realpath(GLPI_ZEND_PATH) . ")\n"; + + // SimplePie : + $sp = new SimplePie(); + -- cgit