Refresh patches.

thomaschaaf · May 15, 2012 · 5b359c0 · 5b359c0
1 parent ef25813
commit 5b359c0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/debian/patches/2001_FHS_paths_for_nodejs.patch b/debian/patches/2001_FHS_paths_for_nodejs.patch
@@ -56,7 +56,7 @@ Last-Update: 2011-09-11
  t = join(w, 'Tools')
 --- a/lib/module.js
 +++ b/lib/module.js
-@@ -480,7 +480,7 @@
+@@ -485,7 +485,7 @@
  };
 
  Module._initPaths = function() {

diff --git a/debian/patches/2002_build_without_libv8_debug.patch b/debian/patches/2002_build_without_libv8_debug.patch
@@ -5,7 +5,7 @@ Author: Jérémy Lal <kapouer@melix.org>
 Last-Update: 2010-01-01
 --- a/wscript
 +++ b/wscript
-@@ -423,7 +423,7 @@
+@@ -435,7 +435,7 @@
        conf.fatal("Cannot find v8")
 
      if o.debug:

diff --git a/debian/patches/2007_fix_use_shared_zlib.patch b/debian/patches/2007_fix_use_shared_zlib.patch
@@ -5,7 +5,7 @@ Last-Update: 2012-01-23
 
 --- a/wscript
 +++ b/wscript
-@@ -284,9 +284,6 @@
+@@ -296,9 +296,6 @@
    conf.env["USE_GDBJIT"] = o.use_gdbjit
    conf.env['USE_NPM'] = not o.without_npm
 
@@ -15,7 +15,7 @@ Last-Update: 2012-01-23
    conf.check(lib='dl', uselib_store='DL')
    if not sys.platform.startswith("sunos") and not sys.platform.startswith("win32"):
      conf.env.append_value("CCFLAGS", "-rdynamic")
-@@ -429,6 +426,9 @@
+@@ -441,6 +438,9 @@
                              libpath=v8_libpath):
          conf.fatal("Cannot find v8_g")
 

diff --git a/debian/patches/2008_fix_use_shared_cares.patch b/debian/patches/2008_fix_use_shared_cares.patch
@@ -108,7 +108,7 @@ Last-Update: 2012-01-23
  	-rm -f src/unix/eio/*.o
 --- a/wscript
 +++ b/wscript
-@@ -429,6 +429,18 @@
+@@ -441,6 +441,18 @@
    if conf.env["USE_SHARED_ZLIB"] and not sys.platform.startswith("win32"):
      conf.env.append_value("LINKFLAGS", "-lz")
 
@@ -127,7 +127,7 @@ Last-Update: 2012-01-23
    conf.define("HAVE_CONFIG_H", 1)
 
    if sys.platform.startswith("sunos"):
-@@ -679,10 +691,6 @@
+@@ -678,10 +690,6 @@
    bld.install_files('${PREFIX}/include/node/', 'deps/uv/include/*.h')
    bld.install_files('${PREFIX}/include/node/uv-private', 'deps/uv/include/uv-private/*.h')
    bld.install_files('${PREFIX}/include/node/ev', 'deps/uv/src/ev/*.h')
@@ -138,7 +138,7 @@ Last-Update: 2012-01-23
 
 
  def build(bld):
-@@ -939,7 +947,6 @@
+@@ -938,7 +946,6 @@
      deps/http_parser
      deps/uv/include
      deps/uv/src/ev

diff --git a/debian/patches/2009_fix_shared_ev.patch b/debian/patches/2009_fix_shared_ev.patch
@@ -32,15 +32,15 @@ Last-Update: 2012-02-17
 
    opt.add_option( '--with-dtrace'
                  , action='store_true'
-@@ -279,6 +299,7 @@
+@@ -291,6 +311,7 @@
 
    conf.env["USE_SHARED_V8"] = o.shared_v8 or o.shared_v8_includes or o.shared_v8_libpath or o.shared_v8_libname
    conf.env["USE_SHARED_CARES"] = o.shared_cares or o.shared_cares_includes or o.shared_cares_libpath
 +  conf.env["USE_SHARED_LIBEV"] = o.shared_libev or o.shared_libev_includes or o.shared_libev_libpath
    conf.env["USE_SHARED_ZLIB"] = o.shared_zlib or o.shared_zlib_includes or o.shared_zlib_libpath
 
    conf.env["USE_GDBJIT"] = o.use_gdbjit
-@@ -441,6 +462,20 @@
+@@ -453,6 +474,20 @@
                            libpath=cares_libpath):
        conf.fatal("Cannot find c-ares")
 
@@ -61,7 +61,7 @@ Last-Update: 2012-02-17
    conf.define("HAVE_CONFIG_H", 1)
 
    if sys.platform.startswith("sunos"):
-@@ -895,7 +930,7 @@
+@@ -894,7 +929,7 @@
    node = bld.new_task_gen("cxx", product_type)
    node.name         = "node"
    node.target       = "node"
@@ -172,7 +172,7 @@ Last-Update: 2012-02-17
   * Returns the default loop.
 --- a/deps/uv/src/unix/core.c
 +++ b/deps/uv/src/unix/core.c
-@@ -170,10 +170,6 @@
+@@ -179,10 +179,6 @@
  }