[arch-commits] Commit in mysql-workbench/trunk (2 files)

Christian Hesse eworm at archlinux.org
Fri Nov 10 14:15:18 UTC 2017


    Date: Friday, November 10, 2017 @ 14:15:17
  Author: eworm
Revision: 266112

drop build fix for i686

Modified:
  mysql-workbench/trunk/PKGBUILD
Deleted:
  mysql-workbench/trunk/0004-fix-build-for-i686.patch

-------------------------------+
 0004-fix-build-for-i686.patch |  140 ----------------------------------------
 PKGBUILD                      |    5 -
 2 files changed, 145 deletions(-)

Deleted: 0004-fix-build-for-i686.patch
===================================================================
--- 0004-fix-build-for-i686.patch	2017-11-10 12:57:44 UTC (rev 266111)
+++ 0004-fix-build-for-i686.patch	2017-11-10 14:15:17 UTC (rev 266112)
@@ -1,140 +0,0 @@
-From af2bff95077b376a21ba815505589f4ad6b62140 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Tue, 7 Feb 2017 23:10:23 +0100
-Subject: [PATCH 1/1] fix build for i686
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
----
- library/base/jsonparser.cpp |  6 ++++--
- library/forms/jsonview.cpp  | 12 ++++++++++++
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/library/base/jsonparser.cpp b/library/base/jsonparser.cpp
-index 6ed4b3f..fb4e055 100644
---- a/library/base/jsonparser.cpp
-+++ b/library/base/jsonparser.cpp
-@@ -343,7 +343,7 @@ namespace JsonParser {
-    */
-   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);
-   }
- 
-@@ -358,7 +358,7 @@ namespace JsonParser {
-    */
-   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);
-   }
- 
-@@ -1668,12 +1668,14 @@ namespace JsonParser {
-       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 --git a/library/forms/jsonview.cpp b/library/forms/jsonview.cpp
-index 1259427..2d50491 100644
---- a/library/forms/jsonview.cpp
-+++ b/library/forms/jsonview.cpp
-@@ -651,8 +651,10 @@ void JsonTreeBaseView::setCellValue(mforms::TreeNodeRef node, int column, const
-   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()) {
-@@ -664,6 +666,7 @@ void JsonTreeBaseView::setCellValue(mforms::TreeNodeRef node, int column, const
-         storedValue = number;
-         setData = true;
-         break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-       case VInt64:
-         if (!base::is_number(value))
-           break;
-@@ -680,6 +683,7 @@ void JsonTreeBaseView::setCellValue(mforms::TreeNodeRef node, int column, const
-         storedValue = number3;
-         setData = true;
-         break;
-+#endif
-       case VBoolean:
-         if (!base::isBool(value))
-           break;
-@@ -1073,6 +1077,7 @@ void JsonTreeView::generateNumberInTree(JsonParser::JsonValue &value, int /*colu
-       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");
-@@ -1081,6 +1086,7 @@ void JsonTreeView::generateNumberInTree(JsonParser::JsonValue &value, int /*colu
-       node->set_string(1, std::to_string((uint64_t)value));
-       node->set_string(2, "Unsigned Long Integer");
-       break;
-+#endif
-     default:
-       break;
-   }
-@@ -1322,8 +1328,10 @@ void JsonGridView::setCellValue(mforms::TreeNodeRef node, int column, const std:
-   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:
-@@ -1334,6 +1342,7 @@ void JsonGridView::setCellValue(mforms::TreeNodeRef node, int column, const std:
-         storedValue = number;
-         node->set_float(column, number);
-         _dataChanged(false);
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-       case VInt64:
-         if (!base::is_number(value))
-           break;
-@@ -1352,6 +1361,7 @@ void JsonGridView::setCellValue(mforms::TreeNodeRef node, int column, const std:
-         node->set_float(column, (double)number3);
-         _dataChanged(false);
-         break;
-+#endif
-       case VBoolean:
-         if (!base::isBool(value))
-           break;
-@@ -1611,12 +1621,14 @@ void JsonGridView::generateNumberInTree(JsonParser::JsonValue &value, int column
-     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;
-   }
--- 
-2.11.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-10 12:57:44 UTC (rev 266111)
+++ PKGBUILD	2017-11-10 14:15:17 UTC (rev 266112)
@@ -36,7 +36,6 @@
 	'0001-mysql-workbench-no-check-for-updates.patch'
 	'0002-disable-unsupported-operating-system-warning.patch'
 	'0003-add-option-to-hide-nonstandard-server-warning.patch'
-	'0004-fix-build-for-i686.patch'
 	'0005-gdal-use-CPLFree.patch'
 	'0006-mysql-include-my_dir.patch'
 	'arch_linux_profile.xml')
@@ -52,7 +51,6 @@
             'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
             '0d65832bc5a73d4cfecef4b552bb78a30ce6020a5fabe5558dcf2ade8341b593'
             '3c9097af599f08388c471d6fd02f40ea72e5759eaa89f731e662852a5e67feea'
-            '68295716c55e5f7b07b3ec1162b512b33a0563952a0eb4ef6fd71d852c61de11'
             '0965b4f12a0ae26bea131f05c7383d4a9b068d556b092ad23e19e1d8f6895531'
             'd97a1fec15e0dc4491e79ce380f6f994f1c4b387d960c13e178a18b0299c0436'
             '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
@@ -75,9 +73,6 @@
 	# add option to hide nonstandard server warning
 	patch -Np1 < "${srcdir}"/0003-add-option-to-hide-nonstandard-server-warning.patch
 
-	# fix build for i686
-	patch -Np1 < "${srcdir}"/0004-fix-build-for-i686.patch
-
 	# gdal: use CPLFree()
 	patch -Np1 < "${srcdir}"/0005-gdal-use-CPLFree.patch
 


More information about the arch-commits mailing list