[Pkg-haskell-commits] darcs: darcs: Remove patches applied upstream.

[Trent W. Buck]

Tue Apr 26 03:25:15 UTC 2011  Trent W. Buck <trentbuck at gmail.com>
  * Remove patches applied upstream.
  Ignore-this: baec1cd535f37162f503712e420a9938

    R ./patches/600759-fix-curl_multi_perform
    R ./patches/no-libHSdarcs
    M ./patches/series -2

Tue Apr 26 03:25:15 UTC 2011  Trent W. Buck <trentbuck at gmail.com>
  * Remove patches applied upstream.
  Ignore-this: baec1cd535f37162f503712e420a9938
diff -rN -u -purd old-darcs/patches/600759-fix-curl_multi_perform new-darcs/patches/600759-fix-curl_multi_perform
--- old-darcs/patches/600759-fix-curl_multi_perform	2011-04-26 05:32:43.031722374 +0000
+++ new-darcs/patches/600759-fix-curl_multi_perform	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-Fri Apr 16 08:47:39 EST 2010  Dmitry Kurochkin <dmitry.kurochkin at gmail.com>
-  * Fix hscurl.c when URL is downloaded during the first call to curl_multi_perform.
-  Turns out that the first call to curl_multi_perform() can fetch the URL or
-  result in error. I can easily reproduce this using HTTP server on localhost.
-  This means that situation when running_handles is zero is valid, so remove the
-  error and handle it correctly.
-Index: darcs/src/hscurl.c
-===================================================================
---- darcs.orig/src/hscurl.c	2010-05-23 18:58:07.000000000 +1000
-+++ darcs/src/hscurl.c	2010-11-09 20:00:47.012893809 +1100
-@@ -16,7 +16,6 @@
-     RESULT_MULTI_INIT_FAIL,
-     RESULT_EASY_INIT_FAIL,
-     RESULT_SLIST_APPEND_FAIL,
--    RESULT_NO_RUNNING_HANDLES,
-     RESULT_MULTI_INFO_READ_FAIL,
-     RESULT_UNKNOWN_MESSAGE,
-     RESULT_FILE_OPEN_FAIL
-@@ -30,7 +29,6 @@
-     "curl_multi_init() failed",
-     "curl_easy_init() failed",
-     "curl_slist_append() failed",
--    "curl_multi_perform() - no running handles",
-     "curl_multi_info_read() failed",
-     "curl_multi_info_read() returned unknown message",
-     "fopen() failed"
-@@ -64,11 +62,9 @@
-   error = curl_multi_perform(multi, &running_handles);
-   if (error != CURLM_OK && error != CURLM_CALL_MULTI_PERFORM)
-     return curl_multi_strerror(error);
--  if (running_handles == 0)
--    return error_strings[RESULT_NO_RUNNING_HANDLES];
- 
-   running_handles_last = running_handles;
--  while (1)
-+  while (running_handles_last > 0)
-     {
-       while (error == CURLM_CALL_MULTI_PERFORM)
-         error = curl_multi_perform(multi, &running_handles);
diff -rN -u -purd old-darcs/patches/no-libHSdarcs new-darcs/patches/no-libHSdarcs
--- old-darcs/patches/no-libHSdarcs	2011-04-26 05:32:43.031722374 +0000
+++ new-darcs/patches/no-libHSdarcs	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-Author:         Ganesh Sittampalam <ganesh at earth.li>
-Forwarded:      http://bugs.darcs.net/patch184
-Bug:            http://bugs.darcs.net/issue1508
-Description:    add cabal flag to control build of darcs library
-Index: darcs-2.4.3/darcs.cabal
-===================================================================
---- darcs-2.4.3.orig/darcs.cabal	2010-05-10 16:48:13.382446211 +1000
-+++ darcs-2.4.3/darcs.cabal	2010-05-10 16:48:15.402474918 +1000
-@@ -98,6 +98,10 @@
-   description: Use GADT type witnesses.
-   default:     False
- 
-+flag library
-+  description: Build darcs library
-+  default:     True
-+
- flag color
-   description: Use ansi color escapes.
- 
-@@ -157,6 +161,11 @@
- -- ----------------------------------------------------------------------
- 
- Library
-+  if flag(library)
-+    buildable: True
-+  else
-+    buildable: False
-+
-   hs-source-dirs:   src
-   include-dirs:     src
- 
diff -rN -u -purd old-darcs/patches/series new-darcs/patches/series
--- old-darcs/patches/series	2011-04-26 05:32:43.031722374 +0000
+++ new-darcs/patches/series	2011-04-26 05:32:43.051723432 +0000
@@ -1,6 +1,4 @@
 extra-license-file
-no-libHSdarcs
 no-hspwd
 use-sensible-editor
 skip-external.sh-test
-600759-fix-curl_multi_perform