diff --git a/component/groonga/buildout.cfg b/component/groonga/buildout.cfg index 40c3c129f169661ffde2d35c723e0ebbdc190ef6..d0a7835ee68492421121c73b3111380bc5bdd3fe 100644 --- a/component/groonga/buildout.cfg +++ b/component/groonga/buildout.cfg @@ -13,8 +13,8 @@ extends = [groonga] recipe = slapos.recipe.cmmi -url = http://packages.groonga.org/source/groonga/groonga-5.0.8.tar.gz -md5sum = ccb36449fdd62c61367f3ed5e830aec3 +url = http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz +md5sum = 35e3d64bc10adadeded70db682987e4b # temporary patch to respect more tokens in natural language mode. patches = ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b diff --git a/component/mariadb/buildout.cfg b/component/mariadb/buildout.cfg index 2349b27f2f824886954783a00f7ab93bc0f4a3ce..520915f7051cd033d99072d03d7f7a3c9cc731ed 100644 --- a/component/mariadb/buildout.cfg +++ b/component/mariadb/buildout.cfg @@ -61,8 +61,8 @@ post-install = # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users. # http://mroonga.github.com/ recipe = slapos.recipe.cmmi -url = http://packages.groonga.org/source/mroonga/mroonga-5.08.tar.gz -md5sum = 65011c1da8700c4950d11dea7355b32d +url = http://packages.groonga.org/source/mroonga/mroonga-5.09.tar.gz +md5sum = bf31841d3cc049977920390ebb8257df pre-configure = mkdir fake_mariadb_source && ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql @@ -74,7 +74,6 @@ configure-options = patch-options = -p1 patches = ${:_profile_base_location_}/mroonga_boolean.patch#36645770ae612515b74b90884ecc59fc - ${:_profile_base_location_}/mroonga_5.08_mariadb_10.1.8.patch#ead45e0fbb4cf3c2d39ece012793d3c4 environment = PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include diff --git a/component/mariadb/mroonga_5.08_mariadb_10.1.8.patch b/component/mariadb/mroonga_5.08_mariadb_10.1.8.patch deleted file mode 100644 index c0a4879bfd1bbd01bd4d98ac8839c02df5660224..0000000000000000000000000000000000000000 --- a/component/mariadb/mroonga_5.08_mariadb_10.1.8.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 4a40e81d17d1df28cfeca56d3d9c8f26d0132cfa -Author: Kouhei Sutou <kou@clear-code.com> -Date: Sun Oct 18 17:23:28 2015 +0900 - - Use public API - - It fixes a build error on MariaDB 10.1.8. - -diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp -index 819de30..bfd9631 100644 ---- a/ha_mroonga.cpp -+++ b/ha_mroonga.cpp -@@ -9620,13 +9620,13 @@ void ha_mroonga::check_count_skip(key_part_map start_key_part_map, - - if (where->type() == Item::FUNC_ITEM) { - Item_func *func_item = static_cast<Item_func *>(where); -- if (func_item->arg_count == 0) { -+ if (func_item->argument_count() == 0) { - break; - } - target = func_item->key_item(); - where = where->next; - if (func_item->arguments()[0] == where) { -- uint n_args = func_item->arg_count; -+ uint n_args = func_item->argument_count(); - for (; n_args > 0; --n_args) { - where = where->next; - }