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

[Christian Hesse]

    Date: Friday, November 10, 2017 @ 14:20:56
  Author: eworm
Revision: 266113

fix loading libproj.so

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

--------------------+
 0007-libproj.patch |   13 +++++++++++++
 PKGBUILD           |    5 +++++
 2 files changed, 18 insertions(+)

Added: 0007-libproj.patch
===================================================================
--- 0007-libproj.patch	                        (rev 0)
+++ 0007-libproj.patch	2017-11-10 14:20:56 UTC (rev 266113)
@@ -0,0 +1,13 @@
+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-10 14:15:17 UTC (rev 266112)
+++ PKGBUILD	2017-11-10 14:20:56 UTC (rev 266113)
@@ -38,6 +38,7 @@
 	'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'
             'SKIP'
@@ -53,6 +54,7 @@
             '3c9097af599f08388c471d6fd02f40ea72e5759eaa89f731e662852a5e67feea'
             '0965b4f12a0ae26bea131f05c7383d4a9b068d556b092ad23e19e1d8f6895531'
             'd97a1fec15e0dc4491e79ce380f6f994f1c4b387d960c13e178a18b0299c0436'
+            'b3b753cdf0028102922077d234d61874a71b597a753bcf4cb7333e6df9b579df'
             '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
 
 prepare() {
@@ -76,6 +78,9 @@
 	# 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