[arch-commits] Commit in mysql-workbench/trunk (0007-libproj.patch PKGBUILD)

[Christian Hesse]

    Date: Thursday, November 16, 2017 @ 15:58:53
  Author: eworm
Revision: 267002

upgpkg: mysql-workbench 6.3.10-1

new upstream release

Modified:
  mysql-workbench/trunk/PKGBUILD
Deleted:
  mysql-workbench/trunk/0007-libproj.patch

--------------------+
 0007-libproj.patch |   13 -------------
 PKGBUILD           |   11 +++--------
 2 files changed, 3 insertions(+), 21 deletions(-)

Deleted: 0007-libproj.patch
===================================================================
--- 0007-libproj.patch	2017-11-16 15:53:59 UTC (rev 267001)
+++ 0007-libproj.patch	2017-11-16 15:58:53 UTC (rev 267002)
@@ -1,13 +0,0 @@
-diff --git a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbench/mysql-workbench.in
-index 6e85f19..4db5edc 100755
---- a/frontend/linux/workbench/mysql-workbench.in
-+++ b/frontend/linux/workbench/mysql-workbench.in
-@@ -22,7 +22,7 @@ wblibdir="$destdir at WB_INSTALL_LIB_DIR@"
- 
- # Set the PROJSO env variable so gdal can find proj cause it's using dlopen instead ld 
- PROJLOC=""
--for lib in libproj.so.0 libproj.so.9
-+for lib in libproj.so.0 libproj.so.9 libproj.so.12
- do
-   for loc in /usr/lib /usr/lib64 /usr/lib/x86_64-linux-gnu
-   do

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-16 15:53:59 UTC (rev 267001)
+++ PKGBUILD	2017-11-16 15:58:53 UTC (rev 267002)
@@ -6,8 +6,8 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=mysql-workbench
-pkgver=6.3.9
-pkgrel=8
+pkgver=6.3.10
+pkgrel=1
 _mysql_version=5.7.20
 _connector_version=1.1.9
 _gdal_version=2.2.2
@@ -35,9 +35,8 @@
 	'0003-add-option-to-hide-nonstandard-server-warning.patch'
 	'0005-gdal-use-CPLFree.patch'
 	'0006-mysql-include-my_dir.patch'
-	'0007-libproj.patch'
 	'arch_linux_profile.xml')
-sha256sums=('607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951'
+sha256sums=('b5593e439c6f8d50262a8950456a9ba3709b02d1dece0360d5f6e47e1b0d7dc3'
             'SKIP'
             '5397549bb7c238f396c123db2df4cad2191b11adf8986de7fe63bff8e2786487'
             'SKIP'
@@ -51,7 +50,6 @@
             '3c9097af599f08388c471d6fd02f40ea72e5759eaa89f731e662852a5e67feea'
             '0965b4f12a0ae26bea131f05c7383d4a9b068d556b092ad23e19e1d8f6895531'
             'd97a1fec15e0dc4491e79ce380f6f994f1c4b387d960c13e178a18b0299c0436'
-            'b3b753cdf0028102922077d234d61874a71b597a753bcf4cb7333e6df9b579df'
             '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
 
 prepare() {
@@ -75,9 +73,6 @@
 	# gdal: use CPLFree()
 	patch -Np1 < "${srcdir}"/0005-gdal-use-CPLFree.patch
 
-	# fix loading libproj.so
-	patch -Np1 < "${srcdir}"/0007-libproj.patch
-
 	# GCC 7.x introduced some new warnings, remove '-Werror' for the build to complete
 	sed -i '/^set/s|-Werror -Wall|-Wall|' CMakeLists.txt