community/mysql-workbench to 8.0.24-1

This commit is contained in:
Kevin Mihelich 2021-04-20 12:45:21 +00:00
parent dac89cc70f
commit 86c5756288
2 changed files with 8 additions and 26 deletions

View file

@ -1,13 +0,0 @@
diff --git a/build/cmake/Modules/FindLibSSH.cmake b/build/cmake/Modules/FindLibSSH.cmake
index 3d31ed3..acbe292 100644
--- a/build/cmake/Modules/FindLibSSH.cmake
+++ b/build/cmake/Modules/FindLibSSH.cmake
@@ -51,7 +51,7 @@ else()
find_library(LibSSH_LIBRARY NAMES ${LibSSH_NAMES})
endif()
-set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh.h)
+set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh_version.h)
file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MAJOR REGEX "#define LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
if (LibSSH_VERSION_LINE_MAJOR)
file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MINOR REGEX "#define LIBSSH_VERSION_MINOR[ ]+[0-9]+")

View file

@ -13,11 +13,11 @@ highmem=1
buildarch=12 buildarch=12
pkgname=mysql-workbench pkgname=mysql-workbench
pkgver=8.0.23 pkgver=8.0.24
pkgrel=3 pkgrel=1
_mysql_version=${pkgver} _mysql_version=${pkgver}
_connector_version=${pkgver} _connector_version=${pkgver}
_gdal_version=3.2.1 _gdal_version=3.2.2
_boost_version=1.73.0 _boost_version=1.73.0
_antlr4_version=4.9.2 _antlr4_version=4.9.2
pkgdesc='A cross-platform, visual database design tool developed by MySQL' pkgdesc='A cross-platform, visual database design tool developed by MySQL'
@ -37,21 +37,19 @@ source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community
"https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2" "https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2"
'0001-mysql-workbench-no-check-for-updates.patch' '0001-mysql-workbench-no-check-for-updates.patch'
'0002-disable-unsupported-operating-system-warning.patch' '0002-disable-unsupported-operating-system-warning.patch'
'0003-find-libssh.patch'
'0001-fix-buiild-for-32-bit.patch' '0001-fix-buiild-for-32-bit.patch'
'atomic.patch' 'atomic.patch'
'arch_linux_profile.xml') 'arch_linux_profile.xml')
sha256sums=('832c1172d7664231cad8f4b91f965fa10eabdc6bc03da4307e4b923559ef120b' sha256sums=('1a482b7033e05f927e03017cc91a3a22dbea3a8717f96ac36c2239726c8d5e8f'
'SKIP' 'SKIP'
'd26cbbf9eccf8c8f14743c3e26c37a8ba71ebd45e8b2d66c6dd37790037bb787' '9b3a39a5951877e45e9a7536071dc503cd2b623facdc2ba91dcccf9fbea8d959'
'SKIP' 'SKIP'
'9af06495a6a080fed62da70978f1cb0c66f058edd5ea9eda9345a64bf8ec688f' '5a2058477e5abab7942cbd796fa6824dc4ad11c4e09744899376f2a5b9857954'
'SKIP' 'SKIP'
'6c588b58fcb63ff3f288eb9f02d76791c0955ba9210d98c3abd879c770ae28ea' 'a7e1e414e5c405af48982bf4724a3da64a05770254f2ce8affb5f58a7604ca57'
'4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402' '4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402'
'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f' 'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
'2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18' '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
'ee1c65acf41c18842b5d94aeea785b10b68d4d4e5cf2ffc8b63a93484523477c'
'719501bbd1de673767007c429feed2fc48d1176d456161c4ba69cf3165c0438a' '719501bbd1de673767007c429feed2fc48d1176d456161c4ba69cf3165c0438a'
'17294a67637ab7ffff5c39262208e63d21acac72cc2492f616ef1d8e0ae9ac02' '17294a67637ab7ffff5c39262208e63d21acac72cc2492f616ef1d8e0ae9ac02'
'3a59b46ac2e7c6a0a72733d71ca33ec85146e8399a3f23871cb3a965cd8e749e') '3a59b46ac2e7c6a0a72733d71ca33ec85146e8399a3f23871cb3a965cd8e749e')
@ -66,9 +64,6 @@ prepare() {
# disable unsupported operating system warning # disable unsupported operating system warning
patch -Np1 < "${srcdir}"/0002-disable-unsupported-operating-system-warning.patch patch -Np1 < "${srcdir}"/0002-disable-unsupported-operating-system-warning.patch
# version macros moved to libssh/libssh_version.h
patch -Np1 < "${srcdir}"/0003-find-libssh.patch
# GCC 7.x introduced some new warnings, remove '-Werror' for the build to complete # GCC 7.x introduced some new warnings, remove '-Werror' for the build to complete
sed -i '/^set/s|-Werror -Wall|-Wall|' CMakeLists.txt sed -i '/^set/s|-Werror -Wall|-Wall|' CMakeLists.txt
@ -82,7 +77,7 @@ prepare() {
sed -i "/target_link_libraries/s|\\$|-L${srcdir}/install-bundle/usr/lib/ \\$|" backend/wbpublic/CMakeLists.txt sed -i "/target_link_libraries/s|\\$|-L${srcdir}/install-bundle/usr/lib/ \\$|" backend/wbpublic/CMakeLists.txt
# be happy with more recent antlr # be happy with more recent antlr
sed -i "/set(ANTLR_JAR_FILENAME/s/4.7.1/${_antlr4_version}/" CMakeLists.txt sed -i "/set(ANTLR_JAR_FILENAME/s/4.9.1/${_antlr4_version}/" CMakeLists.txt
# remove -Wno-deprecated-copy # remove -Wno-deprecated-copy
sed -i 's|-Wno-deprecated-copy||' CMakeLists.txt sed -i 's|-Wno-deprecated-copy||' CMakeLists.txt