archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-02-27 00:10:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

community/mysql-workbench to 6.3.10-6

Browse source
This commit is contained in:
Kevin Mihelich 2018-05-16 23:27:06 +00:00
parent 3ef06965af
commit 376ce8c25b
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
community/mysql-workbench/0007-mysql-connector-cpp-linking.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/FindMySQL.cmake b/FindMySQL.cmake
index c9d10c6..0df9683 100644
--- a/FindMySQL.cmake
+++ b/FindMySQL.cmake
@@ -700,8 +700,6 @@ endif()
# For dynamic linking use the built-in sys and strings
if(NOT MYSQLCLIENT_STATIC_LINKING)
- list(APPEND SYS_LIBRARIES "mysql_sys")
- list(APPEND SYS_LIBRARIES "mysql_strings")
list(APPEND SYS_LIBRARIES ${MYSQL_LIBRARIES})
SET(MYSQL_LIBRARIES ${SYS_LIBRARIES})

26
community/mysql-workbench/PKGBUILD
View file

@ -14,10 +14,10 @@ buildarch=28
pkgname=mysql-workbench pkgname=mysql-workbench
pkgver=6.3.10 pkgver=6.3.10
pkgrel=5 pkgrel=6
_mysql_version=5.7.22 _mysql_version=5.7.22
_connector_version=1.1.9 _connector_version=1.1.11
_gdal_version=2.2.4 _gdal_version=2.3.0
_boost_version=1.59.0 _boost_version=1.59.0
pkgdesc='A cross-platform, visual database design tool developed by MySQL' pkgdesc='A cross-platform, visual database design tool developed by MySQL'
arch=('x86_64') arch=('x86_64')
@ -43,14 +43,15 @@ source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community
'0004-fix-build-for-i686.patch' '0004-fix-build-for-i686.patch'
'0005-gdal-use-CPLFree.patch' '0005-gdal-use-CPLFree.patch'
'0006-mysql-include-my_dir.patch' '0006-mysql-include-my_dir.patch'
'0007-mysql-connector-cpp-linking.patch'
'arch_linux_profile.xml') 'arch_linux_profile.xml')
sha256sums=('b5593e439c6f8d50262a8950456a9ba3709b02d1dece0360d5f6e47e1b0d7dc3' sha256sums=('b5593e439c6f8d50262a8950456a9ba3709b02d1dece0360d5f6e47e1b0d7dc3'
'SKIP' 'SKIP'
'4eb8405b0a9acb0381eae94c1741b2850dfc6467742b24b676e62b566409cff2' '4eb8405b0a9acb0381eae94c1741b2850dfc6467742b24b676e62b566409cff2'
'SKIP' 'SKIP'
'3e31847a69a4e5c113b7c483731317ec4533858e3195d3a85026a0e2f509d2e4' '1962489c205bb86aa984e46a0a8a7702ea2ea25ee6e177973e6587cd92de6a65'
'SKIP' 'SKIP'
'441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278' '6f75e49aa30de140525ccb58688667efe3a2d770576feb7fbc91023b7f552aa2'
'727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca' '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca'
'9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7' '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf' 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
@ -59,6 +60,7 @@ sha256sums=('b5593e439c6f8d50262a8950456a9ba3709b02d1dece0360d5f6e47e1b0d7dc3'
'763925b336d9a398c15fdd757b6567a2f374a822090d32ffdefca018231128a4' '763925b336d9a398c15fdd757b6567a2f374a822090d32ffdefca018231128a4'
'0965b4f12a0ae26bea131f05c7383d4a9b068d556b092ad23e19e1d8f6895531' '0965b4f12a0ae26bea131f05c7383d4a9b068d556b092ad23e19e1d8f6895531'
'd97a1fec15e0dc4491e79ce380f6f994f1c4b387d960c13e178a18b0299c0436' 'd97a1fec15e0dc4491e79ce380f6f994f1c4b387d960c13e178a18b0299c0436'
'ea857f44f8e7abacec9a693ad0c4129aa9f93b238c26f4b53aa097a4bb42074a'
'2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af') '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
prepare() { prepare() {
@ -67,6 +69,11 @@ prepare() {
# fix build without server # fix build without server
patch -Np1 < "${srcdir}"/0006-mysql-include-my_dir.patch patch -Np1 < "${srcdir}"/0006-mysql-include-my_dir.patch
cd "${srcdir}/mysql-connector-c++-${_connector_version}/"
# fix linking
patch -Np1 < "${srcdir}"/0007-mysql-connector-cpp-linking.patch
cd "${srcdir}/mysql-workbench-community-${pkgver}-src/" cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
# Disable 'Help' -> 'Check for Updates' # Disable 'Help' -> 'Check for Updates'
@ -113,7 +120,6 @@ build() {
-DSYSCONFDIR=/etc/mysql \ -DSYSCONFDIR=/etc/mysql \
-DMYSQL_DATADIR=/var/lib/mysql \ -DMYSQL_DATADIR=/var/lib/mysql \
-DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}" -DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
make
make DESTDIR="${srcdir}/install-bundle/" install make DESTDIR="${srcdir}/install-bundle/" install
# Build mysql-connector-c++ # Build mysql-connector-c++
@ -125,9 +131,7 @@ build() {
-DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_LIBDIR=lib \
-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \ -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
-DMYSQL_DIR="${srcdir}/install-bundle/" \ -DMYSQL_DIR="${srcdir}/install-bundle/" \
-DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \ -DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config"
-DBOOST_ROOT:STRING="${srcdir}/boost_${_boost_version//./_}"
make DESTDIR="${srcdir}/install-bundle/" install make DESTDIR="${srcdir}/install-bundle/" install
# Build gdal # Build gdal
@ -139,8 +143,8 @@ build() {
--with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \ --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
--with-curl \ --with-curl \
--without-jasper --without-jasper
make make lib-target
make DESTDIR="${srcdir}/install-bundle/" install make DESTDIR="${srcdir}/install-bundle/" install-lib install-static-lib
# Build MySQL Workbench itself with bundled libs # Build MySQL Workbench itself with bundled libs
cd "${srcdir}/mysql-workbench-community-${pkgver}-src/" cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"