diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-11-20 19:50:20 +0100 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-11-20 19:50:20 +0100 |
| commit | 770180ddaadf92e05e2090119cb7ca0ef2f5df61 (patch) | |
| tree | 7b8f91758cf36d4b6c00e1cd1c47b25892d5a0c2 /community/mysql-workbench | |
| parent | faee5bd4b0762f249ced28d3020c7c141eabea42 (diff) | |
| download | packages-770180ddaadf92e05e2090119cb7ca0ef2f5df61.tar.xz | |
community/mysql-workbench: more json 32-bit patching
Diffstat (limited to 'community/mysql-workbench')
| -rw-r--r-- | community/mysql-workbench/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/mysql-workbench/mysql-workbench-community-6.3.10-32bit.patch (renamed from community/mysql-workbench/mysql-workbench-community-6.3.10-src-32bit-jsonview.patch) | 39 |
2 files changed, 40 insertions, 5 deletions
diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD index 4b7dbeb0..9ea771ec 100644 --- a/community/mysql-workbench/PKGBUILD +++ b/community/mysql-workbench/PKGBUILD @@ -1,7 +1,7 @@ # see https://github.com/mysql/mysql-workbench/pull/14/files -source+=('mysql-workbench-community-6.3.10-src-32bit-jsonview.patch') -sha256sums+=('5339ece7c0f92667e7dbcfb48d6c0c8ddb322dab4c95d5b01ff8e22d0aebaa3b') +source+=('mysql-workbench-community-6.3.10-32bit.patch') +sha256sums+=('285dd5899c625a5d9091f8f178a6a58c86508dacd033435ba2dab4938cb238f9') eval "$( declare -f prepare | \ @@ -10,7 +10,7 @@ eval "$( a \ \ # 32-bit compilation bug in jsonview \ - patch -Np1 < "${srcdir}"/mysql-workbench-community-6.3.10-src-32bit-jsonview.patch + patch -Np1 < "${srcdir}"/mysql-workbench-community-6.3.10-32bit.patch } ' )" diff --git a/community/mysql-workbench/mysql-workbench-community-6.3.10-src-32bit-jsonview.patch b/community/mysql-workbench/mysql-workbench-community-6.3.10-32bit.patch index 24af9724..5aadcff8 100644 --- a/community/mysql-workbench/mysql-workbench-community-6.3.10-src-32bit-jsonview.patch +++ b/community/mysql-workbench/mysql-workbench-community-6.3.10-32bit.patch @@ -1,6 +1,41 @@ -diff -rauN mysql-workbench-community-6.3.10-src/library/forms/jsonview.cpp mysql-workbench-community-6.3.10-src-32bit-json-patch/library/forms/jsonview.cpp +diff -rauN mysql-workbench-community-6.3.10-src/library/base/jsonparser.cpp mysql-workbench-community-6.3.10-src-32bit-patch/library/base/jsonparser.cpp +--- mysql-workbench-community-6.3.10-src/library/base/jsonparser.cpp 2017-11-09 17:11:42.000000000 +0100 ++++ mysql-workbench-community-6.3.10-src-32bit-patch/library/base/jsonparser.cpp 2017-11-20 19:27:01.973630756 +0100 +@@ -912,6 +912,8 @@ + return _uinteger64; + } + ++#ifdef DEFINE_UINT64_T_FUNCTIONS ++ + //-------------------------------------------------------------------------------------------------- + + int64_t JsonValue::operator=(int64_t other) { +@@ -929,6 +931,7 @@ + _uinteger64 = other; + return other; + } ++#endif // DEFINE_UINT64_T_FUNCTIONS + + #endif + +@@ -1668,12 +1671,14 @@ + 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; +diff -rauN mysql-workbench-community-6.3.10-src/library/forms/jsonview.cpp mysql-workbench-community-6.3.10-src-32bit-patch/library/forms/jsonview.cpp --- mysql-workbench-community-6.3.10-src/library/forms/jsonview.cpp 2017-11-09 17:11:42.000000000 +0100 -+++ mysql-workbench-community-6.3.10-src-32bit-json-patch/library/forms/jsonview.cpp 2017-11-19 20:13:03.643328777 +0100 ++++ mysql-workbench-community-6.3.10-src-32bit-patch/library/forms/jsonview.cpp 2017-11-20 19:26:16.963100986 +0100 @@ -651,8 +651,10 @@ if (data != nullptr) { std::stringstream buffer; |