X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=autoload.patch;h=7cab1dfbf3cab4bab05dd11b640c03bb09724eed;hb=bcb86d50ba3cafa5212bb2d9e7363dc6711184c6;hp=b2b04da222f43789c3af1df17103f714dd1a0a57;hpb=3c566b655c0bbad988981d3b1c8fecfab6938b36;p=packages%2Feventum.git

diff --git a/autoload.patch b/autoload.patch
index b2b04da..7cab1df 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -1,15 +1,14 @@
---- 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 22:14:26.698664318 +0300
-@@ -4,6 +4,8 @@
+--- eventum-3.0.3-13-gfefa325/vendor/composer/autoload_classmap.php~	2015-10-13 23:35:34.243698812 +0300
++++ eventum-3.0.3-13-gfefa325/vendor/composer/autoload_classmap.php	2015-10-13 23:36:06.729885261 +0300
+@@ -4,6 +4,7 @@
  
  $vendorDir = dirname(dirname(__FILE__));
  $baseDir = dirname($vendorDir);
-+$pearDir = PEAR_INSTALL_DIR;
 +$phpDir = PHP_DATADIR . '/php';
  
  return array(
      'Abstract_Fulltext_Search' => $baseDir . '/lib/eventum/search/class.abstract_fulltext_search.php',
-@@ -19,7 +21,6 @@
+@@ -19,7 +20,6 @@
      'CLI_Misc' => $baseDir . '/lib/eventum/class.cli_misc.php',
      'CRM' => $baseDir . '/lib/eventum/class.crm.php',
      'CRMException' => $baseDir . '/lib/eventum/class.crmexception.php',
@@ -17,20 +16,18 @@
      '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 +45,7 @@
+@@ -43,10 +43,7 @@
+     'Email_Account' => $baseDir . '/lib/eventum/class.email_account.php',
      '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_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',
-@@ -64,44 +60,14 @@
+@@ -64,44 +59,14 @@
      'Lock' => $baseDir . '/lib/eventum/class.lock.php',
      'Mail_Helper' => $baseDir . '/lib/eventum/class.mail_helper.php',
      'Mail_Queue' => $baseDir . '/lib/eventum/class.mail_queue.php',
@@ -75,7 +72,7 @@
      'Pager' => $baseDir . '/lib/eventum/class.pager.php',
      'Partner' => $baseDir . '/lib/eventum/class.partner.php',
      'Phone_Support' => $baseDir . '/lib/eventum/class.phone_support.php',
-@@ -131,159 +97,18 @@
+@@ -131,159 +96,19 @@
      'Severity' => $baseDir . '/lib/eventum/class.severity.php',
 -    'Smarty' => $vendorDir . '/smarty/smarty/libs/Smarty.class.php',
 -    'SmartyBC' => $vendorDir . '/smarty/smarty/libs/SmartyBC.class.php',
@@ -238,72 +235,67 @@
 +    // external deps
 +    'PHPlot' => $phpDir .'/phplot/phplot.php',
 +    'Smarty' => $phpDir. '/Smarty3/Smarty.class.php',
++    'SphinxClient' => $phpDir . '/sphinxapi.php',
  );
---- eventum-3.0.2-101-ge275162/vendor/composer/autoload_files.php	2015-10-12 21:33:13.000000000 +0300
-+++ eventum-3.0.2-101-ge275162/vendor/composer/autoload_files.php	2015-10-12 22:06:43.978822341 +0300
-@@ -6,6 +6,5 @@
+--- 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',
-+	'/usr/share/php/Smarty3/plugins/block.t.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 22:08:53.596910822 +0300
-@@ -4,12 +4,11 @@
+--- 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),
++    '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');
+--- 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');
  
-     // fonts directory for phplot
--    define('APP_FONTS_PATH', APP_PATH . '/vendor/fonts/liberation');
-+    define('APP_FONTS_PATH', '/usr/share/fonts/TTF');
+ // 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,10 +23,6 @@
+         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+         spl_autoload_unregister(array('ComposerAutoloaderInitEventumCore', 'loadClassLoader'));
  
-     return;
- }
+-        $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);