X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=autoload.patch;h=303641e03a62ddd84245ce698aa712e6de8a671a;hb=947341a21416b54401892cefbe457798b926bcf1;hp=248488391e7b076f34bbc86639bb5e6ab57db343;hpb=8c25237f75fec1ff1df2630412bec10acf02ea3a;p=packages%2Feventum.git

diff --git a/autoload.patch b/autoload.patch
index 2484883..303641e 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -1,5 +1,5 @@
---- eventum-3.0.2-101-ge275162/vendor/composer/autoload_classmap.php	2015-10-12 22:14:26.698664318 +0300
-+++ eventum-3.0.2-101-ge275162/vendor/composer/autoload_classmap.php	2015-10-12 23:10:35.845683103 +0300
+--- eventum-3.0.3-275-g696281e/vendor/composer/autoload_classmap.php~	2015-10-26 20:37:03.877806879 +0200
++++ eventum-3.0.3-275-g696281e/vendor/composer/autoload_classmap.php	2015-10-26 20:37:31.494068933 +0200
 @@ -4,6 +4,7 @@
  
  $vendorDir = dirname(dirname(__FILE__));
@@ -16,16 +16,14 @@
      'Category' => $baseDir . '/lib/eventum/class.category.php',
      'Command_Line' => $baseDir . '/lib/eventum/class.command_line.php',
      'Contact' => $baseDir . '/lib/eventum/crm/class.contact.php',
-@@ -44,12 +44,7 @@
+@@ -49,10 +49,7 @@
      'Email_Response' => $baseDir . '/lib/eventum/class.email_response.php',
      'Error_Handler' => $baseDir . '/lib/eventum/class.error_handler.php',
-     'Eventum_Autoload' => $baseDir . '/lib/eventum/autoload.php',
+     'Eventum_Bot' => $baseDir . '/lib/eventum/irc/Eventum_Bot.php',
 -    'Eventum_RPC' => $vendorDir . '/eventum/rpc/class.Eventum_RPC.php',
 -    'Eventum_RPC_Exception' => $vendorDir . '/eventum/rpc/class.Eventum_RPC.php',
      'FAQ' => $baseDir . '/lib/eventum/class.faq.php',
--    'File' => $vendorDir . '/pear-pear.php.net/File/File.php',
 -    'FileReader' => $vendorDir . '/php-gettext/php-gettext/streams.php',
--    'File_Util' => $vendorDir . '/pear-pear.php.net/File_Util/File/Util.php',
      'Filter' => $baseDir . '/lib/eventum/class.filter.php',
      'Group' => $baseDir . '/lib/eventum/class.group.php',
      'Help' => $baseDir . '/lib/eventum/class.help.php',
@@ -239,80 +237,58 @@
 +    'Smarty' => $phpDir. '/Smarty3/Smarty.class.php',
 +    'SphinxClient' => $phpDir . '/sphinxapi.php',
  );
---- eventum-3.0.2-101-ge275162/vendor/composer/autoload_files.php	2015-10-12 22:06:43.978822341 +0300
-+++ eventum-3.0.2-101-ge275162/vendor/composer/autoload_files.php	2015-10-12 22:06:43.978822341 +0300
-@@ -6,6 +6,6 @@
+--- eventum-3.0.3-118-g751b8cc/vendor/composer/autoload_files.php~	2015-10-19 22:57:36.000000000 +0300
++++ eventum-3.0.3-118-g751b8cc/vendor/composer/autoload_files.php	2015-10-19 23:01:26.239594821 +0300
+@@ -4,10 +4,10 @@
+ 
+ $vendorDir = dirname(dirname(__FILE__));
  $baseDir = dirname($vendorDir);
 +$phpDir = PHP_DATADIR . '/php';
  
  return array(
+     $vendorDir . '/ircmaxell/password-compat/lib/password.php',
 -    $vendorDir . '/smarty-gettext/smarty-gettext/block.t.php',
 -    $vendorDir . '/smarty-gettext/smarty-gettext/function.locale.php',
 +    $phpDir. '/Smarty3/plugins/block.t.php',
+     $baseDir . '/lib/eventum/gettext.php',
  );
---- eventum-3.0.2-101-ge275162/vendor/composer/autoload_namespaces.php	2015-10-12 22:08:53.596910822 +0300
-+++ eventum-3.0.2-101-ge275162/vendor/composer/autoload_namespaces.php	2015-10-12 23:10:35.849016388 +0300
-@@ -4,12 +4,13 @@
+--- eventum-3.0.3-13-gfefa325/vendor/composer/autoload_namespaces.php.old	2015-10-13 22:57:18.000000000 +0300
++++ eventum-3.0.3-13-gfefa325/vendor/composer/autoload_namespaces.php	2015-10-13 23:38:11.988033704 +0300
+@@ -3,15 +3,16 @@
+ // autoload_namespaces.php @generated by Composer
  
--$vendorDir = dirname(dirname(__FILE__));
+ $vendorDir = dirname(dirname(__FILE__));
 -$baseDir = dirname($vendorDir);
 +$pearDir = PEAR_INSTALL_DIR . '/';
-+$phpDir = PHP_DATADIR . '/php';
  
  return array(
+     'SecurityLib' => array($vendorDir . '/ircmaxell/security-lib/lib'),
+     'RandomLib' => array($vendorDir . '/ircmaxell/random-lib/lib'),
 -    'PEAR' => array($vendorDir . '/pear/pear_exception'),
 -    'Net' => array($vendorDir . '/pear/net_smtp'),
 -    'Mail' => array($vendorDir . '/pear/mail'),
 -    'DB' => array($vendorDir . '/pear/db'),
 -    'Auth' => array($vendorDir . '/pear/auth_sasl'),
 -    '' => array($vendorDir . '/pear/pear-core-minimal/src'),
-+    'PEAR' => array($pearDir),
-+    'Net' => array($pearDir),
-+    'Mail' => array($pearDir),
-+    'DB' => array($pearDir),
 +    'Auth' => array($pearDir),
-+    'XML' => array($pearDir),
++    'DB' => array($pearDir),
++    'Mail' => array($pearDir),
++    'Net' => array($pearDir),
++    'PEAR' => array($pearDir),
 +    'Text' => array($pearDir),
++    'XML' => array($pearDir),
  );
---- eventum-3.0.2-101-ge275162/vendor/composer/include_paths.php	2015-10-12 21:33:13.000000000 +0300
-+++ eventum-3.0.2-101-ge275162/vendor/composer/include_paths.php	2015-10-12 22:01:47.979854575 +0300
-@@ -6,22 +6,4 @@
- $baseDir = dirname($vendorDir);
- 
- return array(
--    $vendorDir . '/pear/pear_exception',
--    $vendorDir . '/pear/auth_sasl',
--    $vendorDir . '/pear/pear-core-minimal/src',
--    $vendorDir . '/pear/db',
--    $vendorDir . '/pear-pear.php.net/XML_RPC',
--    $vendorDir . '/pear-pear.php.net/File',
--    $vendorDir . '/pear-pear.php.net/File_Util',
--    $vendorDir . '/pear-pear.php.net/Mail_Mime',
--    $vendorDir . '/pear-pear.php.net/Mail_mimeDecode',
--    $vendorDir . '/pear-pear.php.net/Math_Stats',
--    $vendorDir . '/pear-pear.php.net/Net_LDAP2',
--    $vendorDir . '/pear-pear.php.net/Net_Socket',
--    $vendorDir . '/pear-pear.php.net/Net_POP3',
--    $vendorDir . '/pear-pear.php.net/Net_SmartIRC',
--    $vendorDir . '/pear-pear.php.net/Net_URL',
--    $vendorDir . '/pear-pear.php.net/Text_Diff',
--    $vendorDir . '/pear/mail',
--    $vendorDir . '/pear/net_smtp',
- );
---- eventum-3.0.2-101-ge275162/autoload.php	2015-10-12 22:42:04.697464456 +0300
-+++ eventum-3.0.2-101-ge275162/autoload.php	2015-10-12 22:46:12.383826829 +0300
-@@ -39,7 +39,7 @@
-     define('APP_PHP_GETTEXT_PATH', APP_PATH . '/vendor/php-gettext/php-gettext');
- 
-     // fonts directory for phplot
--    define('APP_FONTS_PATH', APP_PATH . '/vendor/fonts/liberation');
-+    define('APP_FONTS_PATH', '/usr/share/fonts/TTF');
+--- eventum-3.0.3-13-gfefa325/autoload.php~	2015-10-13 21:36:40.000000000 +0300
++++ eventum-3.0.3-13-gfefa325/autoload.php	2015-10-13 23:39:26.450266254 +0300
+@@ -48,4 +48,4 @@
+ define('APP_PHP_GETTEXT_PATH', APP_PATH . '/vendor/php-gettext/php-gettext');
  
-     return;
- }
+ // fonts directory for phplot
+-define('APP_FONTS_PATH', APP_PATH . '/vendor/fonts/liberation');
++define('APP_FONTS_PATH', '/usr/share/fonts/TTF');
 --- 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 @@
+@@ -23,10 +23,6 @@
          self::$loader = $loader = new \Composer\Autoload\ClassLoader();
          spl_autoload_unregister(array('ComposerAutoloaderInitEventumCore', 'loadClassLoader'));
  
@@ -323,13 +299,3 @@
          $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);