summaryrefslogtreecommitdiffstats
path: root/php-horde-Horde-Autoloader-Sabre.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-02-20 11:41:59 +0100
committerRemi Collet <fedora@famillecollet.com>2014-02-20 11:41:59 +0100
commit2ea9ed14d05d8454cecfb913231fbec832a5fd93 (patch)
tree30c5c45dc83c033f4d6025a7578bfc2e935370c3 /php-horde-Horde-Autoloader-Sabre.patch
parent45216de74f55a442693e015c14c9df2eeb2d6b44 (diff)
php-horde-Horde-Autoloader: new autoloader patch for SabreDAV and VObject
Diffstat (limited to 'php-horde-Horde-Autoloader-Sabre.patch')
-rw-r--r--php-horde-Horde-Autoloader-Sabre.patch12
1 files changed, 8 insertions, 4 deletions
diff --git a/php-horde-Horde-Autoloader-Sabre.patch b/php-horde-Horde-Autoloader-Sabre.patch
index 1bfe9ae..c02bad3 100644
--- a/php-horde-Horde-Autoloader-Sabre.patch
+++ b/php-horde-Horde-Autoloader-Sabre.patch
@@ -1,6 +1,6 @@
-diff -up Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.old Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php
---- Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.old 2014-01-03 15:51:31.000000000 +0100
-+++ Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php 2014-01-03 15:51:48.000000000 +0100
+diff -up Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.fedora Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php
+--- Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.fedora 2012-11-19 14:12:28.000000000 +0100
++++ Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php 2014-02-20 11:34:05.139297471 +0100
@@ -13,6 +13,7 @@
require_once 'Horde/Autoloader.php';
require_once 'Horde/Autoloader/ClassPathMapper.php';
@@ -9,7 +9,7 @@ diff -up Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.old Horde_Autol
class Horde_Autoloader_Default extends Horde_Autoloader
{
-@@ -25,6 +26,10 @@ class Horde_Autoloader_Default extends H
+@@ -25,6 +26,14 @@ class Horde_Autoloader_Default extends H
$this->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Default($path));
}
}
@@ -17,6 +17,10 @@ diff -up Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.old Horde_Autol
+ if (is_dir($sabre = '/usr/share/php/Sabre')) {
+ $this->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Prefix('/^Sabre\\\\/', $sabre));
+ }
++ /* Keep VObject from pear (v2.1), not ready for v3.1 */
++ if (is_dir($vobject = '/usr/share/pear/Sabre/VObject')) {
++ $this->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Prefix('/^Sabre\\\\VObject\\\\/', $vobject));
++ }
}
}