[arch-commits] Commit in mysql-workbench/trunk (0003-find-libssh.patch PKGBUILD)

[Christian Hesse]

    Date: Tuesday, April 20, 2021 @ 10:01:03
  Author: eworm
Revision: 920040

upgpkg: mysql-workbench 8.0.24-1: new upstream release

Modified:
  mysql-workbench/trunk/PKGBUILD
Deleted:
  mysql-workbench/trunk/0003-find-libssh.patch

------------------------+
 0003-find-libssh.patch |   13 -------------
 PKGBUILD               |   17 ++++++-----------
 2 files changed, 6 insertions(+), 24 deletions(-)

Deleted: 0003-find-libssh.patch
===================================================================
--- 0003-find-libssh.patch	2021-04-20 08:01:18 UTC (rev 920039)
+++ 0003-find-libssh.patch	2021-04-20 10:01:03 UTC (rev 920040)
@@ -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]+")

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-20 08:01:18 UTC (rev 920039)
+++ PKGBUILD	2021-04-20 10:01:03 UTC (rev 920040)
@@ -5,8 +5,8 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=mysql-workbench
-pkgver=8.0.23
-pkgrel=4
+pkgver=8.0.24
+pkgrel=1
 _mysql_version=${pkgver}
 _connector_version=${pkgver}
 _gdal_version=3.2.2
@@ -29,19 +29,17 @@
 	"https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2"
 	'0001-mysql-workbench-no-check-for-updates.patch'
 	'0002-disable-unsupported-operating-system-warning.patch'
-	'0003-find-libssh.patch'
 	'arch_linux_profile.xml')
-sha256sums=('832c1172d7664231cad8f4b91f965fa10eabdc6bc03da4307e4b923559ef120b'
+sha256sums=('1a482b7033e05f927e03017cc91a3a22dbea3a8717f96ac36c2239726c8d5e8f'
             'SKIP'
-            'd26cbbf9eccf8c8f14743c3e26c37a8ba71ebd45e8b2d66c6dd37790037bb787'
+            '9b3a39a5951877e45e9a7536071dc503cd2b623facdc2ba91dcccf9fbea8d959'
             'SKIP'
-            '9af06495a6a080fed62da70978f1cb0c66f058edd5ea9eda9345a64bf8ec688f'
+            '5a2058477e5abab7942cbd796fa6824dc4ad11c4e09744899376f2a5b9857954'
             'SKIP'
             'a7e1e414e5c405af48982bf4724a3da64a05770254f2ce8affb5f58a7604ca57'
             '4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402'
             'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
             '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
-            'ee1c65acf41c18842b5d94aeea785b10b68d4d4e5cf2ffc8b63a93484523477c'
             '3a59b46ac2e7c6a0a72733d71ca33ec85146e8399a3f23871cb3a965cd8e749e')
 
 prepare() {
@@ -54,9 +52,6 @@
 	# disable unsupported operating system warning
 	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
 	sed -i '/^set/s|-Werror -Wall|-Wall|' CMakeLists.txt
 
@@ -70,7 +65,7 @@
 	sed -i "/target_link_libraries/s|\\$|-L${srcdir}/install-bundle/usr/lib/ \\$|" backend/wbpublic/CMakeLists.txt
 
 	# 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
 }
 
 build() {