Date: Wednesday, March 18, 2015 @ 14:42:22 Author: eworm Revision: 129485
upgpkg: mysql-workbench 6.2.5-2 * fix when no gnome-keyring is installed * link against X11 (this broke with cmake 3.2.1-1) Added: mysql-workbench/trunk/0008-mysql-workbench-link-x11.patch mysql-workbench/trunk/0009-mysql-workbench-gnome-keyring.patch Modified: mysql-workbench/trunk/PKGBUILD ------------------------------------------+ 0008-mysql-workbench-link-x11.patch | 25 +++++++++++++++++++++++++ 0009-mysql-workbench-gnome-keyring.patch | 17 +++++++++++++++++ PKGBUILD | 12 +++++++++++- 3 files changed, 53 insertions(+), 1 deletion(-) Added: 0008-mysql-workbench-link-x11.patch =================================================================== --- 0008-mysql-workbench-link-x11.patch (rev 0) +++ 0008-mysql-workbench-link-x11.patch 2015-03-18 13:42:22 UTC (rev 129485) @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 76a886e..773d804 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,6 +32,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/cmake/Modu + + find_package(PkgConfig REQUIRED) + ++find_package(X11) ++ + find_package(GTK2 2.20 REQUIRED gtk gtkmm) + pkg_check_modules(GTHREAD REQUIRED gthread-2.0) + pkg_check_modules(GMODULE REQUIRED gmodule-2.0) +diff --git a/frontend/linux/workbench/CMakeLists.txt b/frontend/linux/workbench/CMakeLists.txt +index b9c16c8..d52c34a 100644 +--- a/frontend/linux/workbench/CMakeLists.txt ++++ b/frontend/linux/workbench/CMakeLists.txt +@@ -92,6 +92,7 @@ target_link_libraries(mysql-workbench-bin + mysqlparser + ${MYSQLCPPCONN_LIBRARIES} + ${CTEMPLATE_LIBRARIES} ++ ${X11_LIBRARIES} + ${GTK2_LIBRARIES} + ${SIGC++_LIBRARIES} + ${GRT_LIBRARIES} Added: 0009-mysql-workbench-gnome-keyring.patch =================================================================== --- 0009-mysql-workbench-gnome-keyring.patch (rev 0) +++ 0009-mysql-workbench-gnome-keyring.patch 2015-03-18 13:42:22 UTC (rev 129485) @@ -0,0 +1,17 @@ +diff --git a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbench/mysql-workbench.in +index 02a8061..f8176f6 100755 +--- a/frontend/linux/workbench/mysql-workbench.in ++++ b/frontend/linux/workbench/mysql-workbench.in +@@ -4,6 +4,12 @@ + # This will cause passwords to be stored only temporarily for the session. + #WB_NO_GNOME_KEYRING=1 + ++# Looks like WB expects gnome-keyring to be present as soon as XDG_RUNTIME_DIR ++# environment variable is set. Do an extra check here... ++if ! type gnome-keyring-daemon >/dev/null; then ++ WB_NO_GNOME_KEYRING=1 ++fi ++ + # force disable the Mac style single menu hack in Ubuntu Unity + export UBUNTU_MENUPROXY=0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-18 12:39:56 UTC (rev 129484) +++ PKGBUILD 2015-03-18 13:42:22 UTC (rev 129485) @@ -7,7 +7,7 @@ pkgname=mysql-workbench pkgver=6.2.5 -pkgrel=1 +pkgrel=2 pkgdesc='A cross-platform, visual database design tool developed by MySQL' arch=('i686' 'x86_64') url='https://www.mysql.com/products/workbench/' @@ -28,6 +28,8 @@ '0001-mysql-workbench-no-check-for-updates.patch' '0006-mysql-workbench-column-label.patch' '0007-mysql-workbench-no-set-gtid-purged.patch' + '0008-mysql-workbench-link-x11.patch' + '0009-mysql-workbench-gnome-keyring.patch' 'arch_linux_profile.xml') sha256sums=('40a5dbf72b55441ea3e9466dce2de47611777c88da2b65b748f10b06dfa0794e' 'SKIP' @@ -35,6 +37,8 @@ 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf' '701c7d9f68b1b0f63e8e8ece0b61cb57c2168f29e10b113c409f7ccfd68251e0' 'b49d4ea352d2c2013b9c5834668c44521a0a2c5f9c7e3fe746ad94ce0d2bb865' + 'bfa0752f08d4641eb475c87373593061a0fe1c872c0d0cc1ed45ea43cf23fa05' + 'aa98205e14ab617b3632a1efa8ef1f6b4032eb9240b57523e4c1e5aa11d6c6f0' '28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e') prepare() { @@ -50,6 +54,12 @@ # mysqldump from mariadb (currently 1.0.16) does not support --set-gtid-purged patch -Np1 < "${srcdir}"/0007-mysql-workbench-no-set-gtid-purged.patch + # link against X11 + patch -Np1 < "${srcdir}"/0008-mysql-workbench-link-x11.patch + + # fix gnome-keyring + patch -Np1 < "${srcdir}"/0009-mysql-workbench-gnome-keyring.patch + # fix GDAL sed -i '/#include/s|gdal/||' backend/wbpublic/grtui/geom_draw_box.h backend/wbpublic/grt/spatial_handler.h