remove fix assets

3 files changed, 3 insertions, 136 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3ff3e6a583f..4de972eb40c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rethinkdb
 	pkgdesc = Distributed NoSQL database for realtime applications
 	pkgver = 2.4.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.rethinkdb.com
 	install = rethinkdb.install
 	arch = x86_64
@@ -23,7 +23,6 @@ pkgbase = rethinkdb
 	source = rethinkdb.tmpfiles.d
 	source = mksnapshot_crash_fix.patch
 	source = v8_g++7_build_fix.patch::https://github.com/nodejs/node/commit/66c1197f3aefd5b9f36533e6b617f2046acc2c0f.patch
-	source = fix_assets.patch
 	sha512sums = SKIP
 	sha512sums = a298232f6393735f2d459eb23f78089dd7eb1bae4907dfe61b286ceb8f93d3131c2dd45f09643089d00e2a4bef0f35739c9c8984f88b34c0ab515793f38eda46
 	sha512sums = d0e86e86010fafcfdad7a58fe9ed9e93deefb1ab803aa283f60cccaf7a0ee11990c59b9ab01872b1c97b08418d7b53064e938b428e50a310442b32aa385277d9
@@ -31,7 +30,6 @@ pkgbase = rethinkdb
 	sha512sums = 112bc0f9ecfdfae6efba5d8cc3f773085b3f345d33d350188dc70609c425e6c656a0a3069ae5c66cdc684a94fd442e990a88c0ca8d1875f085f660c76c3d7250
 	sha512sums = 8deea735b2c7b6fc0221a49e818d4347869330fa9e35a94c15d54f7bc64ac0b8a573906fea6cc64c05a177f3065c96d8b4d0e2a3724b6137d7f12ba7a7b419f7
 	sha512sums = 15f1f9508adef9cd14320b6649f3b766a0dd8dd478290424e9af6343a7fd64e246aafbbf2f19109e5812decb2f15dcb283fec57875bc50a540737441a0fd248d
-	sha512sums = b71d9a4ee892fadcc9471bd2bed31515b1cec796a19fa1fa616045088d21c0be6feba287e80b5c086a9e8a88dce5a9bcb7dbb367b92c4ff171aa8fa5de192cf7
 
 pkgname = rethinkdb
 
diff --git a/PKGBUILD b/PKGBUILD
index b585c26fc6f6..7a7f25e21487 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=rethinkdb
 pkgver=2.4.1
 _node=6.11.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Distributed NoSQL database for realtime applications'
 arch=(x86_64)
 url=https://www.rethinkdb.com
@@ -25,7 +25,6 @@ source=(
   rethinkdb.tmpfiles.d
   mksnapshot_crash_fix.patch
   v8_g++7_build_fix.patch::https://github.com/nodejs/node/commit/66c1197f3aefd5b9f36533e6b617f2046acc2c0f.patch
-  fix_assets.patch
 )
 noextract=(node-v$_node.tar.gz)
 sha512sums=('SKIP'
@@ -34,8 +33,7 @@ sha512sums=('SKIP'
             'cab680a7e765e0a844b72ab3a57f19f3268d9a717bbe19230bd79537f0424179a56037c368326d2173a4a9cde075a67c85ce9b5a32733afb7d44806df1eac0ac'
             '112bc0f9ecfdfae6efba5d8cc3f773085b3f345d33d350188dc70609c425e6c656a0a3069ae5c66cdc684a94fd442e990a88c0ca8d1875f085f660c76c3d7250'
             '8deea735b2c7b6fc0221a49e818d4347869330fa9e35a94c15d54f7bc64ac0b8a573906fea6cc64c05a177f3065c96d8b4d0e2a3724b6137d7f12ba7a7b419f7'
-            '15f1f9508adef9cd14320b6649f3b766a0dd8dd478290424e9af6343a7fd64e246aafbbf2f19109e5812decb2f15dcb283fec57875bc50a540737441a0fd248d'
-            'b71d9a4ee892fadcc9471bd2bed31515b1cec796a19fa1fa616045088d21c0be6feba287e80b5c086a9e8a88dce5a9bcb7dbb367b92c4ff171aa8fa5de192cf7')
+            '15f1f9508adef9cd14320b6649f3b766a0dd8dd478290424e9af6343a7fd64e246aafbbf2f19109e5812decb2f15dcb283fec57875bc50a540737441a0fd248d')
 
 prepare() {
   # There are a ton of hard dependencies on Python 2
@@ -50,7 +48,6 @@ prepare() {
   cd $pkgname
 
   patch -p0 < ../mksnapshot_crash_fix.patch
-  patch -p1 < ../fix_assets.patch
 
   PATH="$srcdir"/bin:$PATH ./configure \
     --prefix=/usr \
diff --git a/fix_assets.patch b/fix_assets.patch
deleted file mode 100644
index 529095c2feb3..000000000000
--- a/fix_assets.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff --git a/src/gen/web_assets.cc b/src/gen/web_assets.cc
-index 4acf0f24d6..f77973c5a4 100644
---- a/src/gen/web_assets.cc
-+++ b/src/gen/web_assets.cc
-@@ -222,70 +222,70 @@ std::map<std::string, const std::string> static_web_assets = {
-       "        <meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n"
-       "\n"
-       "        <link rel=\"stylesheet\" type=\"text/css\" href=\"cluster.css?v=2.4."
--      "0-8-g07da06-dirty\" />\n"
-+      "1\" />\n"
-       "        <link rel=\"stylesheet\" type=\"text/css\" href=\"js/chosen/chosen.c"
--      "ss?v=2.4.0-8-g07da06-dirty\" />\n"
-+      "ss?v=2.4.1\" />\n"
-       "        <link rel=\"stylesheet\" type=\"text/css\" href=\"js/codemirror/code"
--      "mirror.css?v=2.4.0-8-g07da06-dirty\" />\n"
-+      "mirror.css?v=2.4.1\" />\n"
-       "        <link rel=\"stylesheet\" type=\"text/css\" href=\"js/codemirror/ambi"
--      "ance.css?v=2.4.0-8-g07da06-dirty\" />\n"
-+      "ance.css?v=2.4.1\" />\n"
-       "        <link rel=\"stylesheet\" type=\"text/css\" href=\"fonts/stylesheet.c"
--      "ss?v=2.4.0-8-g07da06-dirty\" />\n"
-+      "ss?v=2.4.1\" />\n"
-       "        <link rel=\"stylesheet\" type=\"text/css\" href=\"js/nanoscroller/na"
--      "noscroller.css?v=2.4.0-8-g07da06-dirty\" />\n"
-+      "noscroller.css?v=2.4.1\" />\n"
-       "\n"
-       "        <script type=\"text/javascript\" src=\"js/jquery-1.7.2.min.js?v=2.4."
--      "0-8-g07da06-dirty\"></script>\n"
-+      "1\"></script>\n"
-       "        <script type=\"text/javascript\" src=\"js/ZeroClipboard.min.js?v=2.4"
--      ".0-8-g07da06-dirty\"></script>\n"
--      "        <script type=\"text/javascript\" src=\"js/underscore-min.js?v=2.4.0-"
--      "8-g07da06-dirty\"></script>\n"
--      "        <script type=\"text/javascript\" src=\"js/backbone.js?v=2.4.0-8-g07d"
--      "a06-dirty\"></script>\n"
-+      ".1\"></script>\n"
-+      "        <script type=\"text/javascript\" src=\"js/underscore-min.js?v=2.4.1\""
-+      "></script>\n"
-+      "        <script type=\"text/javascript\" src=\"js/backbone.js?v=2.4.1\"></sc"
-+      "ript>\n"
-       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-modal."
--      "js?v=2.4.0-8-g07da06-dirty\"></script>\n"
-+      "js?v=2.4.1\"></script>\n"
-       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-alert."
--      "js?v=2.4.0-8-g07da06-dirty\"></script>\n"
-+      "js?v=2.4.1\"></script>\n"
-       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-typeah"
--      "ead.js?v=2.4.0-8-g07da06-dirty\"></script>\n"
-+      "ead.js?v=2.4.1\"></script>\n"
-       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-button"
--      ".js?v=2.4.0-8-g07da06-dirty\"></script>\n"
-+      ".js?v=2.4.1\"></script>\n"
-       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-dropdo"
--      "wn.js?v=2.4.0-8-g07da06-dirty\"></script>\n"
-+      "wn.js?v=2.4.1\"></script>\n"
-       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-toolti"
--      "p.js?v=2.4.0-8-g07da06-dirty\"></script>\n"
-+      "p.js?v=2.4.1\"></script>\n"
-       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-popove"
--      "r.js?v=2.4.0-8-g07da06-dirty\"></script>\n"
--      "        <script type=\"text/javascript\" src=\"js/jquery.form.js?v=2.4.0-8-g"
--      "07da06-dirty\"></script>\n"
-+      "r.js?v=2.4.1\"></script>\n"
-+      "        <script type=\"text/javascript\" src=\"js/jquery.form.js?v=2.4.1\"><"
-+      "/script>\n"
-       "        <script type=\"text/javascript\" src=\"js/nanoscroller/jquery.nanosc"
--      "roller.min.js?v=2.4.0-8-g07da06-dirty\"></script>\n"
--      "        <script type=\"text/javascript\" src=\"js/jquery.color.js?v=2.4.0-8-"
--      "g07da06-dirty\"></script>\n"
--      "        <script type=\"text/javascript\" src=\"js/jquery.timeago.js?v=2.4.0-"
--      "8-g07da06-dirty\"></script>\n"
--      "        <script type=\"text/javascript\" src=\"js/date-en-US.js?v=2.4.0-8-g0"
--      "7da06-dirty\"></script>\n"
--      "        <script type=\"text/javascript\" src=\"js/d3.v2.min.js?v=2.4.0-8-g07"
--      "da06-dirty\"></script>\n"
--      "        <script type=\"text/javascript\" src=\"js/rdb_cubism.v1.js?v=2.4.0-8"
--      "-g07da06-dirty\"></script>\n"
--      "        <script type=\"text/javascript\" src=\"js/xdate.js?v=2.4.0-8-g07da06"
--      "-dirty\"></script>\n"
-+      "roller.min.js?v=2.4.1\"></script>\n"
-+      "        <script type=\"text/javascript\" src=\"js/jquery.color.js?v=2.4.1\">"
-+      "</script>\n"
-+      "        <script type=\"text/javascript\" src=\"js/jquery.timeago.js?v=2.4.1\""
-+      "></script>\n"
-+      "        <script type=\"text/javascript\" src=\"js/date-en-US.js?v=2.4.1\"></"
-+      "script>\n"
-+      "        <script type=\"text/javascript\" src=\"js/d3.v2.min.js?v=2.4.1\"></s"
-+      "cript>\n"
-+      "        <script type=\"text/javascript\" src=\"js/rdb_cubism.v1.js?v=2.4.1\""
-+      "></script>\n"
-+      "        <script type=\"text/javascript\" src=\"js/xdate.js?v=2.4.1\"></scrip"
-+      "t>\n"
-       "        <script type=\"text/javascript\" src=\"js/chosen/chosen.jquery.min.j"
--      "s?v=2.4.0-8-g07da06-dirty\"></script>\n"
--      "        <script type=\"text/javascript\" src=\"cluster-min.js?v=2.4.0-8-g07d"
--      "a06-dirty\"></script>\n"
-+      "s?v=2.4.1\"></script>\n"
-+      "        <script type=\"text/javascript\" src=\"cluster-min.js?v=2.4.1\"></sc"
-+      "ript>\n"
-       "        <script type=\"text/javascript\" src=\"js/codemirror/codemirror.js?v"
--      "=2.4.0-8-g07da06-dirty\"></script>\n"
-+      "=2.4.1\"></script>\n"
-       "        <script type=\"text/javascript\" src=\"js/codemirror/javascript.js?v"
--      "=2.4.0-8-g07da06-dirty\"></script>\n"
-+      "=2.4.1\"></script>\n"
-       "        <script type=\"text/javascript\" src=\"js/codemirror/matchbrackets.j"
--      "s?v=2.4.0-8-g07da06-dirty\"></script>\n"
--      "        <script type=\"text/javascript\" src=\"js/reql_docs.js?v=2.4.0-8-g07"
--      "da06-dirty\"></script>\n"
--      "        <script type=\"text/javascript\" src=\"js/tableview.js?v=2.4.0-8-g07"
--      "da06-dirty\"></script>\n"
-+      "s?v=2.4.1\"></script>\n"
-+      "        <script type=\"text/javascript\" src=\"js/reql_docs.js?v=2.4.1\"></s"
-+      "cript>\n"
-+      "        <script type=\"text/javascript\" src=\"js/tableview.js?v=2.4.1\"></s"
-+      "cript>\n"
-       "\n"
-       "    </head>\n"
-       "    <body>\n"
-@@ -26328,7 +26328,7 @@ std::map<std::string, const std::string> static_web_assets = {
-       "ternal/admin-deps_2.0.4/node_modules/rethinkdb-webui/node_modules/browserify"
-       "/node_modules/buffer/index.js\"}],\"rethinkdb-version\":[function(require,mo"
-       "dule,exports){\n"
--      "module.exports=\"2.4.0-8-g07da06-dirty\";\n"
-+      "module.exports=\"2.4.1\";\n"
-       "},{}],\"rethinkdb\":[function(require,module,exports){\n"
-       "var error,net,rethinkdb;net=require(\"./net\"),rethinkdb=require(\"./ast\"),"
-       "error=require(\"./errors\"),rethinkdb.connect=net.connect,rethinkdb.Error=er"