Bugzilla Bug 44041

The sword version in portage fails to build from source. (FTBFS)

The following patch fixes the source error (in conjunction with curl).
(On which it doesn't depend anyway - just another ebuild error)

hyppher+ work # diff -Naur sword-1.5.6/src/mgr/ sword-1.5.6.new/src/mgr
diff -Naur sword-1.5.6/src/mgr/installmgr.cpp sword-1.5.6.new/src/mgr/installmgr.cpp
--- sword-1.5.6/src/mgr/installmgr.cpp  2003-08-15 10:52:15.000000000 +0200
+++ sword-1.5.6.new/src/mgr/installmgr.cpp      2004-03-08 18:10:45.932859616 +0100
@@ -150,6 +150,7 @@
    curl_easy_setopt(curl, CURLOPT_FILE, &ftpfile);
 
    /* Switch on full protocol/debug output */
+   #define TRUE 1
    curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);
 
    res = curl_easy_perform(curl);

Actually, it should be this ("true" is already defined):

--- sword-1.5.6/src/mgr/installmgr.cpp  2003-08-15 10:52:15.000000000 +0200
+++ sword-1.5.6.new/src/mgr/installmgr.cpp      2004-03-08 18:10:45.932859616 +0100
@@ -150,6 +150,7 @@
    curl_easy_setopt(curl, CURLOPT_FILE, &ftpfile);
 
    /* Switch on full protocol/debug output */
-   curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);
+   curl_easy_setopt(curl, CURLOPT_VERBOSE, true);

    res = curl_easy_perform(curl);

Could you check out sword-1.5.7?

Works for me.

After another week or so in ~x86, I'll see if I can bump it to stable. I need
to make sure no one else has any trouble.

patch will now fix sword-1.5.6 or 1.5.7 and has been committed to portage, so
I'm closing this bug. The problem was caused with syntax changes from the curl
updates.