[Pkg-owncloud-commits] [php-sabre-vobject] 338/341: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Tue Aug 11 13:36:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabre-vobject.
commit b276a9b5896716b67683b566145c132b6ce0bf5a
Author: David Prévot <david at tilapin.org>
Date: Mon Jul 27 10:38:54 2015 +0200
Refresh patches
Git-Dch: Ignore
---
.../patches/0001-Use-homemade-autoloader.php.patch | 74 +++++++++++++++-------
...Loader-from-Symfony-instead-of-autoLoader.patch | 8 +--
2 files changed, 54 insertions(+), 28 deletions(-)
diff --git a/debian/patches/0001-Use-homemade-autoloader.php.patch b/debian/patches/0001-Use-homemade-autoloader.php.patch
index 36ea97c..94f9087 100644
--- a/debian/patches/0001-Use-homemade-autoloader.php.patch
+++ b/debian/patches/0001-Use-homemade-autoloader.php.patch
@@ -6,17 +6,19 @@ Work around the lack of proper autoload.php from Composer.
Forwarded: not-needed
---
- bin/bench.php | 4 ++--
- bin/fetch_windows_zones.php | 2 +-
- bin/generate_vcards | 6 +++---
- bin/generateicalendardata.php | 4 ++--
- bin/rrulebench.php | 2 +-
- bin/vobject | 6 +++---
- tests/bootstrap.php | 4 ++--
- 7 files changed, 14 insertions(+), 14 deletions(-)
+ bin/bench.php | 4 ++--
+ bin/bench_freebusygenerator.php | 2 +-
+ bin/bench_manipulatevcard.php | 2 +-
+ bin/fetch_windows_zones.php | 2 +-
+ bin/generate_vcards | 6 +++---
+ bin/generateicalendardata.php | 4 ++--
+ bin/rrulebench.php | 2 +-
+ bin/vobject | 6 +++---
+ tests/bootstrap.php | 4 ++--
+ 9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/bin/bench.php b/bin/bench.php
-index b949c8e..970b7d9 100755
+index 807b407..204560c 100755
--- a/bin/bench.php
+++ b/bin/bench.php
@@ -1,7 +1,7 @@
@@ -29,8 +31,32 @@ index b949c8e..970b7d9 100755
$data = stream_get_contents(STDIN);
+diff --git a/bin/bench_freebusygenerator.php b/bin/bench_freebusygenerator.php
+index 2c51b2a..c9c1ad6 100644
+--- a/bin/bench_freebusygenerator.php
++++ b/bin/bench_freebusygenerator.php
+@@ -1,6 +1,6 @@
+ <?php
+
+-include __DIR__ . '/../vendor/autoload.php';
++include __DIR__ . '/../lib/autoload.php';
+
+ if ($argc < 2) {
+ echo "sabre/vobject ", Sabre\VObject\Version::VERSION, " freebusy benchmark\n";
+diff --git a/bin/bench_manipulatevcard.php b/bin/bench_manipulatevcard.php
+index adc198e..1b8dbbf 100644
+--- a/bin/bench_manipulatevcard.php
++++ b/bin/bench_manipulatevcard.php
+@@ -1,6 +1,6 @@
+ <?php
+
+-include __DIR__ . '/../vendor/autoload.php';
++include __DIR__ . '/../lib/autoload.php';
+
+ if ($argc < 2) {
+ echo "sabre/vobject ", Sabre\VObject\Version::VERSION, " manipulation benchmark\n";
diff --git a/bin/fetch_windows_zones.php b/bin/fetch_windows_zones.php
-index a577c52..f258597 100755
+index 04c2eb9..9ddf002 100755
--- a/bin/fetch_windows_zones.php
+++ b/bin/fetch_windows_zones.php
@@ -1,4 +1,4 @@
@@ -40,7 +66,7 @@ index a577c52..f258597 100755
$windowsZonesUrl = 'http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml';
diff --git a/bin/generate_vcards b/bin/generate_vcards
-index 638f63b..54dbda0 100755
+index 4663c3c..60edadd 100755
--- a/bin/generate_vcards
+++ b/bin/generate_vcards
@@ -1,4 +1,4 @@
@@ -52,16 +78,16 @@ index 638f63b..54dbda0 100755
@@ -6,8 +6,8 @@ namespace Sabre\VObject;
// This sucks.. we have to try to find the composer autoloader. But chances
// are, we can't find it this way. So we'll do our bestest
- $paths = array(
+ $paths = [
- __DIR__ . '/../vendor/autoload.php', // In case vobject is cloned directly
- __DIR__ . '/../../../autoload.php', // In case vobject is a composer dependency.
-+ __DIR__ . '/../lib/autoload.php', // In case vobject is used from the package tree
++ __DIR__ . '/../lib/autoload.php', // In case vobject is used from the package tree
+ __DIR__ . '/../share/php/Sabre/VObject/autoload.php', // In case vobject is used from the system path.
- );
+ ];
foreach($paths as $path) {
diff --git a/bin/generateicalendardata.php b/bin/generateicalendardata.php
-index 92c8c10..070362e 100755
+index eb55e10..a79eefa 100755
--- a/bin/generateicalendardata.php
+++ b/bin/generateicalendardata.php
@@ -1,4 +1,4 @@
@@ -80,7 +106,7 @@ index 92c8c10..070362e 100755
fwrite(STDERR, "Generating " . $events . " events\n");
diff --git a/bin/rrulebench.php b/bin/rrulebench.php
-index f151819..6f262e7 100644
+index af26b47..fd0062d 100644
--- a/bin/rrulebench.php
+++ b/bin/rrulebench.php
@@ -1,6 +1,6 @@
@@ -92,7 +118,7 @@ index f151819..6f262e7 100644
if ($argc < 4) {
echo "sabre/vobject ", Sabre\VObject\Version::VERSION, " RRULE benchmark\n";
diff --git a/bin/vobject b/bin/vobject
-index e52b4fb..23f2f55 100755
+index 2aca7e7..2b63e70 100755
--- a/bin/vobject
+++ b/bin/vobject
@@ -1,4 +1,4 @@
@@ -104,26 +130,26 @@ index e52b4fb..23f2f55 100755
@@ -6,8 +6,8 @@ namespace Sabre\VObject;
// This sucks.. we have to try to find the composer autoloader. But chances
// are, we can't find it this way. So we'll do our bestest
- $paths = array(
+ $paths = [
- __DIR__ . '/../vendor/autoload.php', // In case vobject is cloned directly
- __DIR__ . '/../../../autoload.php', // In case vobject is a composer dependency.
-+ __DIR__ . '/../lib/autoload.php', // In case vobject is used from the package tree
++ __DIR__ . '/../lib/autoload.php', // In case vobject is used from the package tree
+ __DIR__ . '/../share/php/Sabre/VObject/autoload.php', // In case vobject is used from the system path.
- );
+ ];
foreach($paths as $path) {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index a01f8f9..bb0e694 100644
+index 14281e2..dd75d3e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,8 +3,8 @@
date_default_timezone_set('UTC');
- $try = array(
+ $try = [
- __DIR__ . '/../vendor/autoload.php',
- __DIR__ . '/../../../autoload.php',
+ __DIR__ . '/../lib/autoload.php',
+ '/usr/share/php/Sabre/VObject/autoload.php',
- );
+ ];
- foreach($try as $path) {
+ foreach ($try as $path) {
diff --git a/debian/patches/0002-Use-ClassLoader-from-Symfony-instead-of-autoLoader.patch b/debian/patches/0002-Use-ClassLoader-from-Symfony-instead-of-autoLoader.patch
index 435b556..091052f 100644
--- a/debian/patches/0002-Use-ClassLoader-from-Symfony-instead-of-autoLoader.patch
+++ b/debian/patches/0002-Use-ClassLoader-from-Symfony-instead-of-autoLoader.patch
@@ -11,20 +11,20 @@ http://symfony.com/doc/current/components/class_loader/psr4_class_loader.html#us
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index bb0e694..5f35ee0 100644
+index dd75d3e..a1db78b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
-@@ -14,7 +14,13 @@ foreach($try as $path) {
+@@ -14,7 +14,13 @@ foreach ($try as $path) {
}
}
--$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/VObject');
+-$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__ . '/VObject');
+use Symfony\Component\ClassLoader\Psr4ClassLoader;
+
+require_once 'Symfony/Component/ClassLoader/Psr4ClassLoader.php';
+
+$loader = new Psr4ClassLoader();
-+$loader->addPrefix('Sabre\\VObject\\',__DIR__ . '/VObject');
++$loader->addPrefix('Sabre\\VObject\\', __DIR__ . '/VObject');
+$loader->register();
if (!defined('SABRE_TEMPDIR')) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git
More information about the Pkg-owncloud-commits
mailing list