[packages/eventum: 4/8] fix monolog autoloaders
glen
glen at pld-linux.org
Mon Mar 28 18:18:16 CEST 2016
commit 2f4f114e853fa7bdf781be0b047543f733cb65c2
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Mar 11 10:49:05 2016 +0200
fix monolog autoloaders
autoload.patch | 10 ++++++----
eventum.spec | 3 ++-
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 04a5930..15e7f30 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -2,7 +2,7 @@
# Conditional build:
%bcond_with order # with experimental order patch
-%define rel 1.3
+%define rel 1.6
%define subver 60
%define githash 788184f
%define php_min_version 5.3.7
@@ -450,6 +450,7 @@ vendor defuse/php-encryption
vendor ramsey/array_column
vendor willdurand/email-reply-parser
vendor symfony/polyfill-php55
+vendor theorchard/monolog-cascade
# remove backups from patching as we use globs to package files to buildroot
find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
diff --git a/autoload.patch b/autoload.patch
index b220397..414282f 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -337,9 +337,9 @@
+ 'Text' => array($pearDir),
+ 'XML' => array($pearDir),
);
---- eventum-3.0.10-60-g788184f/vendor/composer/autoload_psr4.php~ 2016-03-11 10:18:46.856708564 +0200
-+++ eventum-3.0.10-60-g788184f/vendor/composer/autoload_psr4.php 2016-03-11 10:18:50.023327584 +0200
-@@ -4,20 +4,21 @@
+--- eventum-3.0.10-60-g788184f/vendor/composer/autoload_psr4.php 2016-03-11 10:18:50.023327584 +0200
++++ eventum-3.0.10-60-g788184f/vendor/composer/autoload_psr4.php 2016-03-11 10:45:47.269003688 +0200
+@@ -4,21 +4,22 @@
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
@@ -363,15 +363,17 @@
- 'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
- 'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
- 'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
+- 'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
+ 'Symfony\\Component\\Yaml\\' => array($phpDir . '/Symfony/Component/Yaml'),
+ 'Symfony\\Component\\Serializer\\' => array($phpDir . '/Symfony/Component/Serializer'),
+ 'Symfony\\Component\\OptionsResolver\\' => array($phpDir . '/Symfony/Component/OptionsResolver'),
+ 'Symfony\\Component\\HttpFoundation\\' => array($phpDir . '/Symfony/Component/HttpFoundation'),
+ 'Symfony\\Component\\Filesystem\\' => array($phpDir . '/Symfony/Component/Filesystem'),
+ 'Symfony\\Component\\Config\\' => array($phpDir . '/Symfony/Component/Config'),
- 'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
++ 'Monolog\\' => array($phpDir . '/Monolog'),
'Eventum\\' => array($baseDir . '/src'),
'EmailReplyParser\\' => array($vendorDir . '/willdurand/email-reply-parser/src/EmailReplyParser'),
+ 'Cascade\\' => array($vendorDir . '/theorchard/monolog-cascade/src'),
--- 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 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/1ea3a6502b8f41ad7de5bcc608d15f8f3645b558
More information about the pld-cvs-commit
mailing list