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

[Christian Hesse]

    Date: Monday, October 19, 2020 @ 15:28:08
  Author: eworm
Revision: 727175

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

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

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

Added: 0003-find-libssh.patch
===================================================================
--- 0003-find-libssh.patch	                        (rev 0)
+++ 0003-find-libssh.patch	2020-10-19 15:28:08 UTC (rev 727175)
@@ -0,0 +1,13 @@
+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	2020-10-19 15:26:40 UTC (rev 727174)
+++ PKGBUILD	2020-10-19 15:28:08 UTC (rev 727175)
@@ -5,12 +5,12 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=mysql-workbench
-pkgver=8.0.21
+pkgver=8.0.22
 pkgrel=1
 _mysql_version=${pkgver}
 _connector_version=${pkgver}
 _gdal_version=3.1.3
-_boost_version=1.72.0
+_boost_version=1.73.0
 pkgdesc='A cross-platform, visual database design tool developed by MySQL'
 arch=('x86_64')
 url='https://www.mysql.com/products/workbench/'
@@ -30,17 +30,19 @@
 	"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=('901055300315ec0797061d42bf9e2d7d7a6e5be1cb460b81b9deb8c55ac80f67'
+sha256sums=('56e0d6dde77a04867715c6946bf76922e7c1a0361a170156eba039a28727b853'
             'SKIP'
-            'ad56535eee03943adeef5f188e1df7a39729a7557d8b2179b1affd994b990034'
+            '9fd85bb243940ef8234d21384ef421a0962fd4d13406fc1420efa902115ce17a'
             'SKIP'
-            '70e11c81ee6f482f4d2954a0aa5c43ab35bb6b2a0f0cadcd37e246950201e423'
+            '74ff7662444dc214ec737baaf48a7f6c44f6e999549bf6930c2a97af24332b47'
             'SKIP'
             '161cf55371a143826f1d76ce566db1f0a666496eeb4371aed78b1642f219d51d'
-            '59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722'
+            '4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402'
             'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
             '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
+            'ee1c65acf41c18842b5d94aeea785b10b68d4d4e5cf2ffc8b63a93484523477c'
             '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
 
 prepare() {
@@ -53,6 +55,9 @@
 	# 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