[packages/mysql-workbench] - up to 8.0.34
baggins
baggins at pld-linux.org
Sun Sep 17 18:05:44 CEST 2023
commit e82e0b51929fcd3736ceb920f4eef19a26072181
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Sep 17 17:32:05 2023 +0200
- up to 8.0.34
antlr-res.patch | 23 +++++-----
bashism.patch | 31 --------------
format-string.patch | 20 ---------
glib2.patch | 31 --------------
ldconfig.patch | 4 +-
log_slow_queries.patch | 4 +-
mysql-version.patch | 12 +++---
mysql-workbench-bug-78668.patch | 25 -----------
mysql-workbench.spec | 95 ++++++++++++++++++++---------------------
no-Werror.patch | 13 ------
pld-profile.patch | 4 +-
stdint.patch | 30 +++++++++++++
types.patch | 12 +++---
13 files changed, 105 insertions(+), 199 deletions(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index cd5849e..00a8032 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -7,35 +7,31 @@
#
# Conditional build:
%bcond_without gnome_keyring # build with gnome-keyring
-%bcond_without unixodbc # Use unixODBC instead of iODBC
-%bcond_with system_antlr # Use system antlr (All known publicly available versions of Antlr3C are buggy)
Summary: Extensible modeling tool for MySQL
Summary(pl.UTF-8): Narzędzie do modelowania baz danych dla MySQL-a
Name: mysql-workbench
-Version: 6.3.10
-Release: 5
+Version: 8.0.34
+Release: 1
License: GPL v2
Group: Applications/Databases
# Source0Download: http://dev.mysql.com/downloads/workbench/
-Source0: http://cdn.mysql.com/Downloads/MySQLGUITools/%{name}-community-%{version}-src.tar.gz
-# Source0-md5: 565e52097c58a663d3498bb740eaefe5
-Source1: http://www.antlr3.org/download/antlr-3.4-complete.jar
-# Source1-md5: 1b91dea1c7d480b3223f7c8a9aa0e172
+Source0: https://dev.mysql.com/get/Downloads/MySQLGUITools/%{name}-community-%{version}-src.tar.gz
+# Source0-md5: 8718de577ba7242b85388fd06eea9f4c
+Source1: http://www.antlr.org/download/antlr-4.11.1-complete.jar
+# Source1-md5: 3a8e221b166f90d13d70f5dd97941353
Source2: PLD_Linux_(MySQL_Package).xml
Patch0: pld-profile.patch
Patch1: log_slow_queries.patch
-Patch2: bashism.patch
-Patch3: wrapper-exec.patch
-Patch4: antlr-res.patch
-Patch5: mysql-version.patch
-Patch6: ldconfig.patch
-Patch7: format-string.patch
-Patch8: types.patch
-Patch9: glib2.patch
-Patch10: no-Werror.patch
+Patch2: wrapper-exec.patch
+Patch3: antlr-res.patch
+Patch4: mysql-version.patch
+Patch5: ldconfig.patch
+Patch6: types.patch
+Patch7: stdint.patch
URL: http://wb.mysql.com/
BuildRequires: OpenGL-devel
+BuildRequires: antlr4-cpp-runtime-devel
BuildRequires: autoconf
BuildRequires: automake >= 1.9
BuildRequires: boost-devel
@@ -46,7 +42,6 @@ BuildRequires: ctemplate-devel >= 2.3
BuildRequires: gdal-devel
BuildRequires: glib2-devel
BuildRequires: gtkmm3-devel
-%{?with_system_antlr:BuildRequires: libantlr3c-devel >= 3.4}
BuildRequires: libgnome-keyring-devel
%{?with_gnome_keyring:BuildRequires: libgnome-keyring-devel}
BuildRequires: libsigc++-devel >= 2.0
@@ -61,7 +56,8 @@ BuildRequires: /usr/bin/mysql_config
BuildRequires: pcre-cxx-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
-BuildRequires: python-devel >= 1:2.6
+BuildRequires: python3-devel >= 1:3.6
+BuildRequires: rapidjson-devel
BuildRequires: readline-devel
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.658
@@ -69,18 +65,18 @@ BuildRequires: sqlite3-devel
BuildRequires: swig
BuildRequires: swig-python
BuildRequires: tinyxml-devel
-%{?with_unixodbc:BuildRequires: unixODBC-devel}
+BuildRequires: unixODBC-devel
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXext-devel
Requires: desktop-file-utils
-Requires: python-paramiko
-Requires: python-pexpect
-Requires: python-sqlite
+Requires: python3-paramiko
+Requires: python3-pexpect
+#Requires: python3-sqlite
Requires: shared-mime-info
Requires: xdg-utils
Suggests: gnome-keyring
Suggests: mysql-utilities
-Suggests: python-pyodbc
+Suggests: python3-pyodbc
Suggests: sudo
Obsoletes: mysql-administrator
Obsoletes: mysql-gui-tools
@@ -113,30 +109,35 @@ skomplikowanych migracji do MySQL-a.
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
cp -p '%{SOURCE2}' res/mysql.profiles
-%if %{with system_antlr}
-rm -r ext/antlr-runtime
-%else
install -d linux-res/bin
cp -p %{SOURCE1} linux-res/bin
-%endif
# use System provided libraries
-#rm -r ext/scintilla
-#rm -r ext/HTMLRenderer
-#rm -r ext/Aga.Controls
+%{__rm} -r ext/Aga.Controls
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
+ ext/scintilla/gtk/DepGen.py \
+ ext/scintilla/qt/ScintillaEdit/WidgetGen.py \
+ ext/scintilla/scripts/Dependencies.py \
+ ext/scintilla/scripts/FileGenerator.py \
+ ext/scintilla/scripts/HFacer.py \
+ ext/scintilla/scripts/LexGen.py \
+ ext/scintilla/test/gi/filter-scintilla-h.py \
+ ext/scintilla/win32/DepGen.py \
+ res/scripts/python/mysqlwbmeb.py
%build
-install -d build
-cd build
+install -d build-dir
+cd build-dir
%cmake \
+ -DUSE_UNIXODBC=ON \
+ -DODBC_LIBRARIES="`%{_bindir}/odbc_config --libs`" \
+ -DODBC_INCLUDE_DIRS=%{_includedir} \
+ -DODBC_DEFINITIONS="`%{_bindir}/odbc_config --cflags`" \
-DLIB_INSTALL_DIR=%{_libdir} \
-DWB_INSTALL_DIR_EXECUTABLE=%{_libdir}/%{name} \
- -DUSE_UNIXODBC=%{!?with_unixodbc:NO}%{?with_unixodbc:YES} \
-DMySQL_CONFIG_PATH=%{_bindir}/mysql_config \
..
@@ -144,19 +145,16 @@ cd build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -C build install \
+%{__make} -C build-dir install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-community
# deprecated gnome-vfs install
%{__rm} $RPM_BUILD_ROOT%{_datadir}/mime-info/%{name}.mime
-%py_comp $RPM_BUILD_ROOT%{_libdir}/%{name}
-%py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
-# cleaning sshtunnel.py breaks ssh connections
-# cleaning the rest fails to import workbench.log
-%py_postclean -x sshtunnel.py %{_libdir}/%{name}
+%py3_comp $RPM_BUILD_ROOT%{_libdir}/%{name}
+%py3_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -167,7 +165,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc ChangeLog README
+%doc ChangeLog README.md
%attr(755,root,root) %{_bindir}/%{name}
%attr(755,root,root) %{_bindir}/%{name}-bin
%attr(755,root,root) %{_bindir}/wbcopytables
@@ -175,12 +173,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/%{name}
-%attr(755,root,root) %{_datadir}/%{name}/sshtunnel.py
+%{_datadir}/%{name}/__pycache__
%attr(755,root,root) %{_datadir}/%{name}/mysqlwbmeb.py
%{_datadir}/%{name}/*.glade
%{_datadir}/%{name}/*.py.txt
-%{_datadir}/%{name}/*.py[co]
-#%%{_datadir}/%{name}/*.rc
%{_datadir}/%{name}/*.css
%{_datadir}/%{name}/*.vbs
%{_datadir}/%{name}/data
@@ -197,7 +193,8 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/%{name}
%attr(755,root,root) %{_libdir}/%{name}/*.so*
%dir %{_libdir}/%{name}/modules
-%{_libdir}/%{name}/modules/*.py*
+%{_libdir}/%{name}/modules/__pycache__
+%{_libdir}/%{name}/modules/*.py
%attr(755,root,root) %{_libdir}/%{name}/modules/*.so*
%dir %{_libdir}/%{name}/plugins
%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so*
diff --git a/antlr-res.patch b/antlr-res.patch
index 789e7dc..05d408b 100644
--- a/antlr-res.patch
+++ b/antlr-res.patch
@@ -1,13 +1,12 @@
-stay in buildroot
-
---- mysql-workbench-community-6.3.10-src/library/parsers/grammars/build-parsers~ 2015-02-25 10:08:47.000000000 +0200
-+++ mysql-workbench-community-6.3.10-src/library/parsers/grammars/build-parsers 2015-05-12 11:52:46.517522447 +0300
-@@ -2,7 +2,7 @@
+--- mysql-workbench-community-8.0.34-src/CMakeLists.txt.orig 2023-07-13 14:52:08.000000000 +0200
++++ mysql-workbench-community-8.0.34-src/CMakeLists.txt 2023-09-16 12:42:01.501693526 +0200
+@@ -144,8 +144,7 @@
+ check_function_exists (strtoumax HAVE_STRTOUMAX)
- TARGET_DIRECTORY=..
- GENERATE_FILES=false
--BASE_DIRECTORY=../../../..
-+BASE_DIRECTORY=../../..
- LINUX_RES_JAR_PATH=$BASE_DIRECTORY/linux-res/bin/antlr-3.4-complete.jar
- SOURCE_FILE=MySQL.g
- SOURCE_FILE2=MySQLSimpleParser.g
+ set(ANTLR_JAR_FILENAME "antlr-4.11.1-complete.jar")
+-get_filename_component(SOURCE_PARENT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
+-set(LINUX_RES_BIN_DIR ${SOURCE_PARENT_DIR}/linux-res/bin)
++set(LINUX_RES_BIN_DIR ${CMAKE_SOURCE_DIR}/linux-res/bin)
+ message("WITH_ANTLR_JAR: ${WITH_ANTLR_JAR}")
+ if(WITH_ANTLR_JAR)
+ get_filename_component(ANTLR_JAR_USER_DIR ${WITH_ANTLR_JAR} DIRECTORY)
diff --git a/bashism.patch b/bashism.patch
deleted file mode 100644
index 770e741..0000000
--- a/bashism.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysql-workbench-gpl-5.2.38-src/./frontend/linux/workbench/mysql-workbench.in~ 2012-02-21 18:53:41.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/./frontend/linux/workbench/mysql-workbench.in 2012-05-11 20:35:21.219997098 +0300
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- # Uncomment the following line if you're having trouble with gnome-keyring lockups.
- # This will cause passwords to be stored only temporarily for the session.
---- mysql-workbench-community-6.2.5-src/plugins/wb.admin/backend/wb_server_management.py 2015-05-12 11:40:29.032525721 +0300
-+++ mysql-workbench-community-6.2.5-src/plugins/wb.admin/backend/wb_server_management.py 2015-05-12 11:42:48.473107723 +0300
-@@ -88,10 +88,10 @@
- if as_user != Users.ADMIN:
- sudo_user = "sudo -u %s" % as_user
- sudo_prefix = sudo_prefix.replace('sudo', sudo_user)
-- if '/bin/sh' in sudo_prefix or '/bin/bash' in sudo_prefix:
-+ if '/bin/sh' in sudo_prefix or '/bin/sh' in sudo_prefix:
- command = sudo_prefix + " \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\""
- else:
-- command = sudo_prefix + " /bin/bash -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\""
-+ command = sudo_prefix + " /bin/sh -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\""
-
- return command
-
---- mysql-workbench-community-6.2.5-src/./plugins/migration/wbcopytables.in~ 2015-02-25 10:08:47.000000000 +0200
-+++ mysql-workbench-community-6.2.5-src/./plugins/migration/wbcopytables.in 2015-05-12 11:45:07.170317749 +0300
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- # Set the destdir=<some_dir> when ever you install using DESTDIR=<some_dir>.
- destdir="$WB_DEST_DIR"
diff --git a/format-string.patch b/format-string.patch
deleted file mode 100644
index 5ad5425..0000000
--- a/format-string.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mysql-workbench-community-6.3.10-src/library/base/jsonparser.cpp~ 2017-11-09 16:11:42.000000000 +0000
-+++ mysql-workbench-community-6.3.10-src/library/base/jsonparser.cpp 2018-03-08 13:43:48.632064990 +0000
-@@ -343,7 +343,7 @@
- */
- 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 @@
- */
- 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);
- }
-
diff --git a/glib2.patch b/glib2.patch
deleted file mode 100644
index 96cd2a9..0000000
--- a/glib2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysql-workbench-community-6.3.10-src/library/base/threaded_timer.cpp~ 2017-11-09 17:11:42.000000000 +0100
-+++ mysql-workbench-community-6.3.10-src/library/base/threaded_timer.cpp 2019-11-02 23:47:55.439608459 +0100
-@@ -173,7 +173,7 @@
- /**
- * Entry point for all pool (worker) threads.
- */
--gpointer ThreadedTimer::pool_function(gpointer data, gpointer user_data) {
-+void ThreadedTimer::pool_function(gpointer data, gpointer user_data) {
- ThreadedTimer *timer = static_cast<ThreadedTimer *>(user_data);
- TimerTask *task = static_cast<TimerTask *>(data);
-
-@@ -197,8 +197,6 @@
- task->scheduled = false;
- logWarning("Threaded timer: unknown exception in pool function\n");
- }
--
-- return NULL;
- }
-
- //--------------------------------------------------------------------------------------------------
---- mysql-workbench-community-6.3.10-src/library/base/base/threaded_timer.h~ 2017-11-09 17:11:42.000000000 +0100
-+++ mysql-workbench-community-6.3.10-src/library/base/base/threaded_timer.h 2019-11-02 23:55:37.562925708 +0100
-@@ -82,7 +82,7 @@
- ~ThreadedTimer();
-
- static gpointer start(gpointer data);
-- static gpointer pool_function(gpointer data, gpointer user_data);
-+ static void pool_function(gpointer data, gpointer user_data);
- void main_loop();
- void remove(int task_id);
- };
diff --git a/ldconfig.patch b/ldconfig.patch
index 9ffe33e..e5c2eb2 100644
--- a/ldconfig.patch
+++ b/ldconfig.patch
@@ -4,8 +4,8 @@
# Check if PROJSO env is set and file exists, if not, try to handle this on our own
if [[ -z "${PROJSO}" ]]; then
# Set the PROJSO env variable so gdal can find proj cause it's using dlopen instead ld
-- TMPLOC=`ldconfig -p | grep libproj | awk '{printf $4;exit;}'`
-+ TMPLOC=`/sbin/ldconfig -p | grep libproj | awk '{printf $4;exit;}'`
+- TMPLOC=`ldconfig -p | grep libproj\.so | awk '{printf $4;exit;}'`
++ TMPLOC=`/sbin/ldconfig -p | grep libproj\.so | awk '{printf $4;exit;}'`
if [[ -f "$TMPLOC" ]]; then
echo "Found $TMPLOC"
export PROJSO=$TMPLOC
diff --git a/log_slow_queries.patch b/log_slow_queries.patch
index 4d4756a..a366b2f 100644
--- a/log_slow_queries.patch
+++ b/log_slow_queries.patch
@@ -4,8 +4,8 @@
self.server_profile.general_log_file_path = general_log_file_path or os.path.join(self.server_profile.datadir, hostname + '.log')
request_save_profile = True
-- slow_query_log_file = opts[config_section].get('log-slow-queries', '').strip(' "') if opts.has_key(config_section) else ''
-+ slow_query_log_file = (opts[config_section].get('log-slow-queries', '') or opts[config_section].get('log_slow_queries', '')).strip(' "') if opts.has_key(config_section) else ''
+- slow_query_log_file = opts[config_section].get('log-slow-queries', '').strip(' "') if config_section in opts else ''
++ slow_query_log_file = (opts[config_section].get('log-slow-queries', '') or opts[config_section].get('log-slow-queries', '').strip(' "')) if config_section in opts else ''
slow_query_log_file = normpath(slow_query_log_file) if slow_query_log_file else ''
if slow_query_log_file and self.server_profile.slow_log_file_path != slow_query_log_file:
self.server_profile.slow_log_file_path = slow_query_log_file or os.path.join(self.server_profile.datadir, hostname + '.slow')
diff --git a/mysql-version.patch b/mysql-version.patch
index 5b621aa..a057d43 100644
--- a/mysql-version.patch
+++ b/mysql-version.patch
@@ -25,11 +25,11 @@ UPDATE: as the fix did not work, just removing the 5.6.0 dependency for now
--- mysql-workbench-community-6.3.7-src/CMakeLists.txt~ 2016-06-08 15:51:42.000000000 +0300
+++ mysql-workbench-community-6.3.7-src/CMakeLists.txt 2016-06-21 16:58:48.408962855 +0300
@@ -105,7 +105,7 @@
- if(NOT PY_PARAMIKO)
- message(WARNING "Paramiko wasn't found, you can still build Workbench, but may not work properly.")
- endif()
+ find_program(PYTHON_EXEC "python3")
+ include(FindPackageHandleStandardArgs)
+
-find_package(MySQL 5.6.0 REQUIRED)
+find_package(MySQL REQUIRED)
- if (UNIX)
- set(MYSQL_DEFINITIONS "-DBIG_JOINS=1" "-fno-strict-aliasing")
- endif()
+ find_package(LibXml2 REQUIRED)
+
+
diff --git a/mysql-workbench-bug-78668.patch b/mysql-workbench-bug-78668.patch
deleted file mode 100644
index 336d7bc..0000000
--- a/mysql-workbench-bug-78668.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/library/forms/swig/mforms.i b/library/forms/swig/mforms.i
-index 3f5104f..cdcca30 100644
---- a/library/forms/swig/mforms.i
-+++ b/library/forms/swig/mforms.i
-@@ -533,7 +533,7 @@ inline boost::function<void (mforms::TextEntryAction)> pycall_void_entryaction_f
-
- #define SWIG_ADD_SIGNAL_BOOL_INT_CALLBACK(method, signal)\
- void add_##method(PyObject *callback) { signal->connect(pycall_bool_int_fun(callback)); }\
-- bool call_##method(int i) { return (*signal)(i); }
-+ bool call_##method(int i) { return *( (*signal)(i) ); }
-
- #define SWIG_ADD_SIGNAL_VOID_ENTRYACTION_CALLBACK(method, signal)\
- void add_##method(PyObject *callback) { signal->connect(pycall_void_entryaction_fun(callback)); }
-diff --git a/library/forms/view.cpp b/library/forms/view.cpp
-index ec49389..67ff486 100644
---- a/library/forms/view.cpp
-+++ b/library/forms/view.cpp
-@@ -512,7 +512,7 @@ DropPosition View::get_drop_position()
- bool View::mouse_leave()
- {
- if (_signal_mouse_leave.num_slots() > 0)
-- return _signal_mouse_leave();
-+ return *_signal_mouse_leave();
- return false;
- }
diff --git a/no-Werror.patch b/no-Werror.patch
deleted file mode 100644
index 3ac6c79..0000000
--- a/no-Werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mysql-workbench-community-6.3.10-src/CMakeLists.txt~ 2019-11-02 23:52:15.000000000 +0100
-+++ mysql-workbench-community-6.3.10-src/CMakeLists.txt 2019-11-02 23:52:44.896265071 +0100
-@@ -288,8 +288,8 @@
-
- # Add some common compiler flags. TODO: Shouldn't this be done checking if whatever compiler
- # we use supports each flag to allow for non-gcc compilers in Linux (as above)?
--set(WB_CXXFLAGS -Werror -Wall -Wextra -Wno-unused-parameter -Wno-deprecated -std=c++11)
--set(WB_CFLAGS -Werror -Wall -Wextra -Wno-unused-parameter -Wno-deprecated)
-+set(WB_CXXFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-deprecated -std=c++11)
-+set(WB_CFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-deprecated)
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
- message(FATAL_ERROR "Insufficient gcc version. You need gcc v4.7 or newer to build this project")
diff --git a/pld-profile.patch b/pld-profile.patch
index c5aa3af..97cd052 100644
--- a/pld-profile.patch
+++ b/pld-profile.patch
@@ -2,9 +2,9 @@
+++ mysql-workbench-community-6.1.4-nodocs-src/res/mysql.profiles/CMakeLists.txt 2014-05-04 00:23:21.709685131 +0300
@@ -8,6 +8,7 @@
"Linux_(Custom).xml"
- "MacOS_X_(MySQL_Package).xml"
+ "macOS_(MySQL_Package).xml"
"OpenSolaris_(MySQL_Package).xml"
+ "PLD_Linux_(MySQL_Package).xml"
"RHEL_(MySQL_Package).xml"
+ "RHEL_7_(MySQL_Package).xml"
"Oracle_Linux_6_(MySQL_Package).xml"
- "SLES_(MySQL_Package).xml"
diff --git a/stdint.patch b/stdint.patch
new file mode 100644
index 0000000..251a490
--- /dev/null
+++ b/stdint.patch
@@ -0,0 +1,30 @@
+--- mysql-workbench-community-8.0.34-src/library/cdbc/src/driver_manager.h~ 2023-07-13 14:52:08.000000000 +0200
++++ mysql-workbench-community-8.0.34-src/library/cdbc/src/driver_manager.h 2023-09-16 16:49:38.679479295 +0200
+@@ -27,6 +27,7 @@
+ #include "cppdbc_public_interface.h"
+
+ #include <cppconn/driver.h>
++#include <cstdint>
+ #include <memory>
+ #include <set>
+
+--- mysql-workbench-community-8.0.34-src/library/forms/mforms/treeview.h~ 2023-07-13 14:52:08.000000000 +0200
++++ mysql-workbench-community-8.0.34-src/library/forms/mforms/treeview.h 2023-09-16 16:52:45.258483636 +0200
+@@ -23,6 +23,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <mforms/view.h>
+
+ /**
+--- mysql-workbench-community-8.0.34-src/backend/wbpublic/sqlide/sqlide_generics_private.h~ 2023-07-13 14:52:08.000000000 +0200
++++ mysql-workbench-community-8.0.34-src/backend/wbpublic/sqlide/sqlide_generics_private.h 2023-09-16 16:59:52.762837702 +0200
+@@ -30,6 +30,7 @@
+ #include <sqlite/query.hpp>
+ #include <sqlite/execute.hpp>
+ #include <ctime>
++#include <cstdint>
+
+ namespace sqlide {
+
diff --git a/types.patch b/types.patch
index 1ff2858..86da5d9 100644
--- a/types.patch
+++ b/types.patch
@@ -2,10 +2,10 @@
+++ mysql-workbench-community-6.3.10-src/library/base/base/common.h 2018-03-08 18:11:20.498742204 +0100
@@ -95,6 +95,8 @@
- #ifdef __LP64__
- #define DEFINE_INT_FUNCTIONS
-+#else
-+#define DEFINE_UINT64_T_FUNCTIONS
- #endif
+ #ifdef __LP64__
+ #define DEFINE_INT_FUNCTIONS
++ #else
++ #define DEFINE_UINT64_T_FUNCTIONS
+ #endif
- #ifdef __APPLE__
+ #ifdef __APPLE__
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/e82e0b51929fcd3736ceb920f4eef19a26072181
More information about the pld-cvs-commit
mailing list