From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1179382-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 46DAC1382C5
for <garchives@archives.gentoo.org>; Sat, 13 Jun 2020 16:28:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 90962E0DCC;
Sat, 13 Jun 2020 16:28:34 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6D4FBE0DCC
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Jun 2020 16:28:34 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 56B7434F0EE
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Jun 2020 16:28:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 62347297
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Jun 2020 16:28:29 +0000 (UTC)
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1592065651.0e284078f85da68d22f75be7a1df666382bd75c8.floppym@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
X-VCS-Directories: dev-db/mysql-workbench/files/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 0e284078f85da68d22f75be7a1df666382bd75c8
X-VCS-Branch: master
Date: Sat, 13 Jun 2020 16:28:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1e0ec875-3a6c-4a73-a7a8-2024923b7f7a
X-Archives-Hash: 376bd798ff43a3519e6cb7f652a3689f
commit: 0e284078f85da68d22f75be7a1df666382bd75c8
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jun 13 08:08:38 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 16:27:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e284078
dev-db/mysql-workbench: remove unused patch
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16211
.../files/mysql-workbench-6.3.10-i386-json.patch | 182 ---------------------
1 file changed, 182 deletions(-)
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
deleted file mode 100644
index 31e789992d1..00000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Last-Update: 2018-03-05
-Forwarded: not-needed
-Origin: upstream, https://github.com/mysql/mysql-workbench/commit/fff08d9ec68de8215fc8f12fe0ee42e598e1cf75.patch
-Bug-Upstream: https://github.com/mysql/mysql-workbench/pull/14
-Bug-Upstream: https://bugs.mysql.com/bug.php?id=84886
-Bug-Upstream: https://bugs.mysql.com/bug.php?id=84951
-From: Christian Hesse <mail@eworm.de>
-Description: fixes FTBFS on 32bit architectures.
-
-~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:346:79: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'JsonParser::JsonArray::SizeType {aka unsigned int}' [-Werror=format=]
- throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
- ^
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In member function 'const JsonParser::JsonValue& JsonParser::JsonArray::at(JsonParser::JsonArray::SizeType) const':
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:361:79: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'JsonParser::JsonArray::SizeType {aka unsigned int}' [-Werror=format=]
- throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
- ^
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In member function 'void JsonParser::JsonWriter::write(const JsonParser::JsonValue&)':
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1672:44: error: conversion from 'const JsonParser::JsonValue' to 'int64_t {aka long long int}' is ambiguous
- _output += std::to_string((int64_t)value);
- ^~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1001:3: note: candidate: JsonParser::JsonValue::operator bool() const
- JsonValue::operator bool() const {
- ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:981:3: note: candidate: JsonParser::JsonValue::operator double() const
- JsonValue::operator double() const {
- ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:950:3: note: candidate: JsonParser::JsonValue::operator size_t() const
- JsonValue::operator size_t() const {
- ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:939:3: note: candidate: JsonParser::JsonValue::operator ssize_t() const
- JsonValue::operator ssize_t() const {
- ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1675:45: error: conversion from 'const JsonParser::JsonValue' to 'uint64_t {aka long long unsigned int}' is ambiguous
- _output += std::to_string((uint64_t)value);
-~~~~
-
---- a/library/base/jsonparser.cpp
-+++ b/library/base/jsonparser.cpp
-@@ -342,9 +342,9 @@
- * If no such data is present std::out_of_range is thrown.
- */
- JsonValue &JsonArray::at(SizeType pos) {
- if (pos > _data.size())
-- throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
-+ throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", pos));
- return _data.at(pos);
- }
-
- //--------------------------------------------------------------------------------------------------
-@@ -357,9 +357,9 @@
- * If no such data is present std::out_of_range is thrown.
- */
- const JsonValue &JsonArray::at(SizeType pos) const {
- if (pos > _data.size())
-- throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
-+ throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", pos));
- return _data.at(pos);
- }
-
- //--------------------------------------------------------------------------------------------------
-@@ -1667,14 +1667,16 @@
- break;
- case VDouble:
- _output += std::to_string((double)value);
- break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- case VInt64:
- _output += std::to_string((int64_t)value);
- break;
- case VUint64:
- _output += std::to_string((uint64_t)value);
- break;
-+#endif
- case VObject:
- write((JsonObject)value);
- break;
- case VArray:
---- a/library/forms/jsonview.cpp
-+++ b/library/forms/jsonview.cpp
-@@ -650,10 +650,12 @@
- bool setData = false;
- if (data != nullptr) {
- std::stringstream buffer;
- double number = 0;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- int64_t number2 = 0;
- uint64_t number3 = 0;
-+#endif
- bool retBool = false;
- auto &storedValue = data->getData();
- switch (storedValue.getType()) {
- case VDouble:
-@@ -663,8 +665,9 @@
- buffer >> number;
- storedValue = number;
- setData = true;
- break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- case VInt64:
- if (!base::is_number(value))
- break;
- buffer << value;
-@@ -679,8 +682,9 @@
- buffer >> number3;
- storedValue = number3;
- setData = true;
- break;
-+#endif
- case VBoolean:
- if (!base::isBool(value))
- break;
- buffer << value;
-@@ -1072,16 +1076,18 @@
- case VDouble:
- node->set_string(1, std::to_string((double)value));
- node->set_string(2, "Double");
- break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- case VInt64:
- node->set_string(1, std::to_string((int64_t)value));
- node->set_string(2, "Long Integer");
- break;
- case VUint64:
- node->set_string(1, std::to_string((uint64_t)value));
- node->set_string(2, "Unsigned Long Integer");
- break;
-+#endif
- default:
- break;
- }
- node->set_data(new JsonTreeBaseView::JsonValueNodeData(value));
-@@ -1321,10 +1327,12 @@
- JsonParser::JsonValue &storedValue = (!key.empty() ? ((JsonObject &)data->getData())[key] : data->getData());
- if (data != NULL) {
- std::stringstream buffer;
- double number = 0;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- int64_t number2 = 0;
- uint64_t number3 = 0;
-+#endif
- bool retBool = false;
- switch (storedValue.getType()) {
- case VDouble:
- if (!base::is_number(value))
-@@ -1334,8 +1342,9 @@
- storedValue = number;
- node->set_float(column, number);
- _dataChanged(false);
- break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- case VInt64:
- if (!base::is_number(value))
- break;
- buffer << value;
-@@ -1352,8 +1361,9 @@
- storedValue = number3;
- node->set_float(column, (double)number3);
- _dataChanged(false);
- break;
-+#endif
- case VBoolean:
- if (!base::isBool(value))
- break;
- buffer << value;
-@@ -1611,14 +1621,16 @@
- switch (value.getType()) {
- case VDouble:
- node->set_float(columnId, (double)value);
- break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- case VInt64:
- node->set_long(columnId, (int64_t)value);
- break;
- case VUint64:
- node->set_long(columnId, (uint64_t)value);
- break;
-+#endif
- default:
- break;
- }
- }