[packages/eventum/dev-3.0] skip loading empty psr4 and include paths

glen glen at pld-linux.org
Mon Oct 12 22:42:57 CEST 2015


commit 8f48fa6e7b982e4e026589c38443a7666ed031f0
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Oct 12 23:16:03 2015 +0300

    skip loading empty psr4 and include paths

 autoload.patch | 23 +++++++++++++++++++++++
 eventum.spec   |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/eventum.spec b/eventum.spec
index ded3ef1..10efdfc 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_with	order	# with experimental order patch
 
-%define		rel		1.8
+%define		rel		1.9
 %define		subver  101
 %define		githash e275162
 %define		php_min_version 5.3.3
diff --git a/autoload.patch b/autoload.patch
index 8870624..3af00e9 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -313,3 +313,26 @@
  
      return;
  }
+--- eventum-3.0.2-101-ge275162/vendor/composer/autoload_real.php~	2015-10-12 21:33:13.000000000 +0300
++++ eventum-3.0.2-101-ge275162/vendor/composer/autoload_real.php	2015-10-12 23:14:26.708974755 +0300
+@@ -23,20 +23,11 @@
+         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+         spl_autoload_unregister(array('ComposerAutoloaderInitEventumCore', 'loadClassLoader'));
+ 
+-        $includePaths = require __DIR__ . '/include_paths.php';
+-        array_push($includePaths, get_include_path());
+-        set_include_path(join(PATH_SEPARATOR, $includePaths));
+-
+         $map = require __DIR__ . '/autoload_namespaces.php';
+         foreach ($map as $namespace => $path) {
+             $loader->set($namespace, $path);
+         }
+ 
+-        $map = require __DIR__ . '/autoload_psr4.php';
+-        foreach ($map as $namespace => $path) {
+-            $loader->setPsr4($namespace, $path);
+-        }
+-
+         $classMap = require __DIR__ . '/autoload_classmap.php';
+         if ($classMap) {
+             $loader->addClassMap($classMap);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/5301be5399334f9ba2adc6e933ef2590d9f8f3ca



More information about the pld-cvs-commit mailing list