From owner-svn-ports-head@freebsd.org Mon Sep 10 15:20:47 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9BEE21092D2E; Mon, 10 Sep 2018 15:20:47 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4A87F8610C; Mon, 10 Sep 2018 15:20:47 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 455AE2159; Mon, 10 Sep 2018 15:20:47 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8AFKlE2036569; Mon, 10 Sep 2018 15:20:47 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8AFKkjL036566; Mon, 10 Sep 2018 15:20:46 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201809101520.w8AFKkjL036566@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 10 Sep 2018 15:20:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479430 - head/databases/libdrizzle-redux/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/databases/libdrizzle-redux/files X-SVN-Commit-Revision: 479430 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2018 15:20:47 -0000 Author: tobik Date: Mon Sep 10 15:20:46 2018 New Revision: 479430 URL: https://svnweb.freebsd.org/changeset/ports/479430 Log: databases/libdrizzle-redux: Fix build with Clang 6 libdrizzle/binlog.cc:319:48: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] "packet size error:%"PRIu32":%"PRIu32, con->packet_size, binlog_event->length); ^ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p479076_s338486/logs/errors/libdrizzle-redux-5.1.4_2.log PR: 230958 Approved by: jim@ohlste.in (maintainer timeout, 2 weeks) Added: head/databases/libdrizzle-redux/files/ head/databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc (contents, props changed) head/databases/libdrizzle-redux/files/patch-libdrizzle_field.cc (contents, props changed) head/databases/libdrizzle-redux/files/patch-libdrizzle_statement__param.cc (contents, props changed) Added: head/databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc Mon Sep 10 15:20:46 2018 (r479430) @@ -0,0 +1,20 @@ +--- libdrizzle/binlog.cc.orig 2018-08-27 19:29:31 UTC ++++ libdrizzle/binlog.cc +@@ -316,7 +316,7 @@ drizzle_return_t drizzle_state_binlog_read(drizzle_st + if (con->packet_size != binlog_event->length) + { + drizzle_set_error(con, "drizzle_state_binlog_read", +- "packet size error:%"PRIu32":%"PRIu32, con->packet_size, binlog_event->length); ++ "packet size error:%" PRIu32 ":%" PRIu32, con->packet_size, binlog_event->length); + con->binlog->error_fn(DRIZZLE_RETURN_UNEXPECTED_DATA, con, con->binlog->binlog_context); + return DRIZZLE_RETURN_UNEXPECTED_DATA; + } +@@ -374,7 +374,7 @@ drizzle_return_t drizzle_state_binlog_read(drizzle_st + event_crc= (uint32_t)crc32(0, binlog_event->raw_data, (binlog_event->raw_length - DRIZZLE_BINLOG_CRC32_LEN)); + if (event_crc != binlog_event->checksum) + { +- drizzle_set_error(con, __func__, "CRC doesn't match: 0x%"PRIX32", 0x%"PRIX32, event_crc, binlog_event->checksum); ++ drizzle_set_error(con, __func__, "CRC doesn't match: 0x%" PRIX32 ", 0x%" PRIX32, event_crc, binlog_event->checksum); + con->binlog->error_fn(DRIZZLE_RETURN_BINLOG_CRC, con, con->binlog->binlog_context); + return DRIZZLE_RETURN_BINLOG_CRC; + } Added: head/databases/libdrizzle-redux/files/patch-libdrizzle_field.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/libdrizzle-redux/files/patch-libdrizzle_field.cc Mon Sep 10 15:20:46 2018 (r479430) @@ -0,0 +1,20 @@ +--- libdrizzle/field.cc.orig 2018-08-27 19:29:52 UTC ++++ libdrizzle/field.cc +@@ -239,7 +239,7 @@ drizzle_return_t drizzle_state_field_read(drizzle_st * + } + + drizzle_log_debug(con, +- "field_offset= %"PRIu64", field_size= %zu, field_total= %"PRIu64, ++ "field_offset= %" PRIu64 ", field_size= %zu, field_total= %" PRIu64, + con->result->field_offset, con->result->field_size, + con->result->field_total); + +@@ -295,7 +295,7 @@ drizzle_return_t drizzle_state_field_read(drizzle_st * + con->packet_size-= con->result->field_size; + + drizzle_log_debug(con, +- "field_offset= %"PRIu64", field_size= %zu, field_total= %"PRIu64, ++ "field_offset= %" PRIu64 ", field_size= %zu, field_total= %" PRIu64, + con->result->field_offset, con->result->field_size, + con->result->field_total); + Added: head/databases/libdrizzle-redux/files/patch-libdrizzle_statement__param.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/libdrizzle-redux/files/patch-libdrizzle_statement__param.cc Mon Sep 10 15:20:46 2018 (r479430) @@ -0,0 +1,62 @@ +--- libdrizzle/statement_param.cc.orig 2018-08-27 19:24:50 UTC ++++ libdrizzle/statement_param.cc +@@ -599,11 +599,11 @@ char *long_to_string(drizzle_bind_st *param, uint32_t + char* buffer= param->data_buffer + 50; + if (param->options.is_unsigned) + { +- snprintf(buffer, 12, "%"PRIu32, val); ++ snprintf(buffer, 12, "%" PRIu32, val); + } + else + { +- snprintf(buffer, 12, "%"PRId32, (int32_t)val); ++ snprintf(buffer, 12, "%" PRId32, (int32_t)val); + } + return buffer; + } +@@ -614,11 +614,11 @@ char *longlong_to_string(drizzle_bind_st *param, uint6 + char* buffer= param->data_buffer + 50; + if (param->options.is_unsigned) + { +- snprintf(buffer, 21, "%"PRIu64, val); ++ snprintf(buffer, 21, "%" PRIu64, val); + } + else + { +- snprintf(buffer, 21, "%"PRId64, (int64_t)val); ++ snprintf(buffer, 21, "%" PRId64, (int64_t)val); + } + return buffer; + } +@@ -639,7 +639,7 @@ char *time_to_string(drizzle_bind_st *param, drizzle_d + int used = 0; + + /* Values are transferred with days separated from hours, but presented with days folded into hours. */ +- used = snprintf(buffer, buffersize-used, "%s%02u:%02"PRIu8":%02"PRIu8, (time->negative) ? "-" : "", time->hour + 24 * time->day, time->minute, time->second); ++ used = snprintf(buffer, buffersize-used, "%s%02u:%02" PRIu8 ":%02" PRIu8, (time->negative) ? "-" : "", time->hour + 24 * time->day, time->minute, time->second); + + /* TODO: the existence (and length) of the decimals should be decided based on the number of fields sent by the server or possibly the column's "decimals" value, not by whether the microseconds are 0 */ + if (time->microsecond || time->show_microseconds) +@@ -657,19 +657,19 @@ char *timestamp_to_string(drizzle_bind_st *param, driz + int buffersize = 27; + int used = 0; + +- used += snprintf(buffer, buffersize-used, "%04"PRIu16"-%02"PRIu8"-%02"PRIu32, ++ used += snprintf(buffer, buffersize-used, "%04" PRIu16 "-%02" PRIu8 "-%02" PRIu32, + timestamp->year, timestamp->month, timestamp->day); + assert(used < buffersize); + + if (param->type == DRIZZLE_COLUMN_TYPE_DATE) + return buffer; + +- used += snprintf(buffer+used, buffersize-used, " %02"PRIu16":%02"PRIu8":%02"PRIu8, ++ used += snprintf(buffer+used, buffersize-used, " %02" PRIu16 ":%02" PRIu8 ":%02" PRIu8, + timestamp->hour, timestamp->minute, timestamp->second); + + if (timestamp->microsecond || timestamp->show_microseconds) + { +- used += snprintf(buffer+used, buffersize-used, ".%06"PRIu32, timestamp->microsecond); ++ used += snprintf(buffer+used, buffersize-used, ".%06" PRIu32, timestamp->microsecond); + } + + assert(used < buffersize);