summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /www-apps/davical/files/inc_path.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'www-apps/davical/files/inc_path.patch')
-rw-r--r--www-apps/davical/files/inc_path.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/www-apps/davical/files/inc_path.patch b/www-apps/davical/files/inc_path.patch
new file mode 100644
index 000000000000..2230249df0f9
--- /dev/null
+++ b/www-apps/davical/files/inc_path.patch
@@ -0,0 +1,28 @@
+--- htdocs/always.php.orig 2012-01-05 21:28:16.382878446 +0100
++++ htdocs/always.php 2012-01-05 21:30:06.828431957 +0100
+@@ -48,7 +48,7 @@
+ // $c->default_locale = array('es_MX', 'es_AR', 'es', 'pt'); // An array of locales to try, or just a single locale
+ // $c->local_tzid = 'Pacific/Auckland'; // Perhaps we should read from /etc/timezone - I wonder how standard that is?
+ $c->default_locale = 'en';
+-$c->locale_path = '../locale';
++$c->locale_path = '../../davical/locale';
+ $c->base_url = preg_replace('#/[^/]+\.php.*$#', '', $_SERVER['SCRIPT_NAME']);
+ $c->base_directory = preg_replace('#/[^/]*$#', '', $_SERVER['DOCUMENT_ROOT']);
+ $c->default_privileges = array('read-free-busy', 'schedule-deliver');
+@@ -80,6 +80,7 @@
+ '../../awl/inc'
+ , '/usr/share/awl/inc' // Where it ends up on Debian
+ , '/usr/share/php/awl/inc' // Fedora's standard for PHP libraries
++ , '/usr/share/php5/awl/inc' // Gentoo's standard for PHP5 libraries
+ , '/usr/local/share/awl/inc'
+ );
+ foreach( $try_paths AS $awl_include_path ) {
+@@ -95,7 +96,7 @@
+ }
+
+ // Ensure that ../inc is in our included paths as early as possible
+-set_include_path( '../inc'. PATH_SEPARATOR. get_include_path());
++set_include_path( '../../davical/inc'. PATH_SEPARATOR. get_include_path());
+
+
+ /** We actually discovered this and worked around it earlier, but we can't log it until the utilties are loaded */