[Kolab-devel] HK-GW-kronolith_2.2_RC1-Fbview_menu.patch fails to apply

[Richard Bos]

It looks like this patch is not correct: 
HK-GW-kronolith_2.2_RC1-Fbview_menu.patch
When it is applied (patch -p2), the first hunk is rejected and another hunk 
results in an calendar.orig file (no reject!).

I think that the 1st hunk (kronolith/attendees.php) is rejected because it 
ends with the following lines:

 if ($browser->hasFeature('javascript')) {
     Horde::addScriptFile('open_savedattlist_win.js');

While these lines are not in the source file, itself.  The file 
(attendees.php) hasat the end:
$notification->notify(array('status'));
require KRONOLITH_TEMPLATES . '/attendees/attendees.inc';
.....

The second hunk does not fail, but it results in a calendar.php.orig file.  
Which results in unsuccessfull rpmbuild of kronolith as the calendar.php.orig 
is recognized as an installed, but not packaged file...  The patch itself is 
good, but it is just 2 lines wrong.   The patch has:
@@ -134,6 +134,6 @@ Horde::addScriptFile
while it should be:
@@ -136,6 +136,6 @@ Horde::addScriptFile

The one above is easy to fix ;) I don't know what is correct for the 1st 
failing hunk.

I downloaded the tarbal from http://ftp.horde.org/pub/kronolith, the md5sum 
is: 
kronolith-h3-2.2-rc1.tar.gz 0a3e928ddd92503fe8c9339833671fd0

-- 
Richard Bos
We are borrowing the world of our children,
It is not inherited from our parents.