misc patches for CouchDB

bits/COUCHDB-1152_move_to_ICU-4_4_2.patch

@@ -0,0 +1,39 @@
+Index: src/couchdb/priv/Makefile.am
+===================================================================
+--- src/couchdb/priv/Makefile.am	(revision 1129890)
++++ src/couchdb/priv/Makefile.am	(working copy)
+@@ -78,9 +78,9 @@
+ 	        $(LN_S) couch_icu_driver couch_icu_driver.so; \
+ 	fi
+ if WINDOWS
+-	$(INSTALL) $(ICU_LOCAL_BIN)/icuuc42.dll $(bindir)
+-	$(INSTALL) $(ICU_LOCAL_BIN)/icudt42.dll $(bindir)
+-	$(INSTALL) $(ICU_LOCAL_BIN)/icuin42.dll $(bindir)
++	$(INSTALL) $(ICU_LOCAL_BIN)/icuuc44.dll $(bindir)
++	$(INSTALL) $(ICU_LOCAL_BIN)/icudt44.dll $(bindir)
++	$(INSTALL) $(ICU_LOCAL_BIN)/icuin44.dll $(bindir)
+ 	$(INSTALL) $(JS_LIB_BINARY) $(bindir)
+ 	$(INSTALL) .libs/couchspawnkillable.exe \
+ 		"$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe"
+Index: INSTALL.Windows
+===================================================================
+--- INSTALL.Windows	(revision 1129890)
++++ INSTALL.Windows	(working copy)
+@@ -9,7 +9,7 @@
+ You will need the following installed:
+
+  * Erlang OTP (=14B01)        (http://erlang.org/)
+- * ICU                        (http://icu.sourceforge.net/)
++ * ICU        (=4.4.*)         (http://icu.sourceforge.net/)
+  * OpenSSL                    (http://www.openssl.org/)
+  * Mozilla SpiderMonkey (1.8) (http://www.mozilla.org/js/spidermonkey/)
+  * libcurl                    (http://curl.haxx.se/libcurl/)
+@@ -21,7 +21,7 @@
+
+  * When installing Erlang, you must build it from source.
+
+-   The CouchDB build makes use of a number of the Erlang build scripts.
++The CouchDB build requires a number of the Erlang build scripts.
+
+  * When installing ICU, select the binaries built with Visual Studio 2008.
+

bits/COUCHDB-1197_libtool_sed_hackery.patch

@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+index 7a9bc87..600b374 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -517,10 +517,12 @@ AC_OUTPUT
+ # PLEASE, someone help put this out of its misery!!
+ # This hackery is being tracked via COUCHDB-440.
+ if test x${IS_WINDOWS} = xTRUE; then
+-    sed -e 's,libname_spec="lib\\$name",libname_spec="\\\$name",' \
++    mv libtool libtool.dist
++    sed -E -e 's,libname_spec="lib\\$name",libname_spec="\\\$name",' \
+         -e 's,-link,,' \
+-        < libtool > libtool.tmp
+-    mv libtool.tmp libtool
++        -e 's/-Xlinker --out-implib -Xlinker \\\$lib//' \
++        -e 's/(-shared -nostdlib)/-dll \1/' \
++        < libtool.dist > libtool
+     # probably would chmod +x if we weren't on windows...
+ fi
+
+