Date: Friday, October 21, 2016 @ 13:05:17
Author: eworm
Revision: 192861
archrelease: copy trunk to community-i686, community-x86_64
Added:
mysql-workbench/repos/community-i686/0001-mysql-workbench-no-check-for-updates.patch
(from rev 192860,
mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
mysql-workbench/repos/community-i686/0002-fix-compilation-with-gcc-6.2.1.patch
(from rev 192860,
mysql-workbench/trunk/0002-fix-compilation-with-gcc-6.2.1.patch)
mysql-workbench/repos/community-i686/PKGBUILD
(from rev 192860, mysql-workbench/trunk/PKGBUILD)
mysql-workbench/repos/community-i686/arch_linux_profile.xml
(from rev 192860, mysql-workbench/trunk/arch_linux_profile.xml)
mysql-workbench/repos/community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
(from rev 192860,
mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
mysql-workbench/repos/community-x86_64/0002-fix-compilation-with-gcc-6.2.1.patch
(from rev 192860,
mysql-workbench/trunk/0002-fix-compilation-with-gcc-6.2.1.patch)
mysql-workbench/repos/community-x86_64/PKGBUILD
(from rev 192860, mysql-workbench/trunk/PKGBUILD)
mysql-workbench/repos/community-x86_64/arch_linux_profile.xml
(from rev 192860, mysql-workbench/trunk/arch_linux_profile.xml)
Deleted:
mysql-workbench/repos/community-i686/0001-mysql-workbench-no-check-for-updates.patch
mysql-workbench/repos/community-i686/0002-fix-compilation-with-gcc-6.2.1.patch
mysql-workbench/repos/community-i686/PKGBUILD
mysql-workbench/repos/community-i686/arch_linux_profile.xml
mysql-workbench/repos/community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
mysql-workbench/repos/community-x86_64/0002-fix-compilation-with-gcc-6.2.1.patch
mysql-workbench/repos/community-x86_64/PKGBUILD
mysql-workbench/repos/community-x86_64/arch_linux_profile.xml
------------------------------------------------------------------+
/0001-mysql-workbench-no-check-for-updates.patch | 42 +
/0002-fix-compilation-with-gcc-6.2.1.patch | 124 ++++
/PKGBUILD | 280
++++++++++
community-i686/0001-mysql-workbench-no-check-for-updates.patch | 21
community-i686/0002-fix-compilation-with-gcc-6.2.1.patch | 62 --
community-i686/PKGBUILD | 145 -----
community-x86_64/0001-mysql-workbench-no-check-for-updates.patch | 21
community-x86_64/0002-fix-compilation-with-gcc-6.2.1.patch | 62 --
community-x86_64/PKGBUILD | 145 -----
9 files changed, 446 insertions(+), 456 deletions(-)
Deleted: community-i686/0001-mysql-workbench-no-check-for-updates.patch
===================================================================
--- community-i686/0001-mysql-workbench-no-check-for-updates.patch
2016-10-21 13:05:10 UTC (rev 192860)
+++ community-i686/0001-mysql-workbench-no-check-for-updates.patch
2016-10-21 13:05:17 UTC (rev 192861)
@@ -1,21 +0,0 @@
-diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
-index a32256c..08d9a21 100644
---- a/res/wbdata/main_menu.xml
-+++ b/res/wbdata/main_menu.xml
-@@ -2900,6 +2900,7 @@ value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.view.fkhili
- <value type="string" key="itemType">action</value>
- </value>
-
-+ <!-- We build a package that should be updated via pacman, so disable
this check.
- <value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.separator.help.checkver">
- <value type="string" key="itemType">separator</value>
- </value>
-@@ -2910,7 +2911,7 @@ value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.view.fkhili
- <value type="string" key="name">checkUpdate</value>
- <value type="string"
key="command">plugin:wb.tools.checkForUpdates</value>
- <value type="string" key="itemType">action</value>
-- </value>
-+ </value> //-->
-
- <value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.separator.help.report_a_bug">
- <value type="string" key="itemType">separator</value>
Copied:
mysql-workbench/repos/community-i686/0001-mysql-workbench-no-check-for-updates.patch
(from rev 192860,
mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- community-i686/0001-mysql-workbench-no-check-for-updates.patch
(rev 0)
+++ community-i686/0001-mysql-workbench-no-check-for-updates.patch
2016-10-21 13:05:17 UTC (rev 192861)
@@ -0,0 +1,21 @@
+diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
+index a32256c..08d9a21 100644
+--- a/res/wbdata/main_menu.xml
++++ b/res/wbdata/main_menu.xml
+@@ -2900,6 +2900,7 @@ value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.view.fkhili
+ <value type="string" key="itemType">action</value>
+ </value>
+
++ <!-- We build a package that should be updated via pacman, so disable
this check.
+ <value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.separator.help.checkver">
+ <value type="string" key="itemType">separator</value>
+ </value>
+@@ -2910,7 +2911,7 @@ value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.view.fkhili
+ <value type="string" key="name">checkUpdate</value>
+ <value type="string"
key="command">plugin:wb.tools.checkForUpdates</value>
+ <value type="string" key="itemType">action</value>
+- </value>
++ </value> //-->
+
+ <value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.separator.help.report_a_bug">
+ <value type="string" key="itemType">separator</value>
Deleted: community-i686/0002-fix-compilation-with-gcc-6.2.1.patch
===================================================================
--- community-i686/0002-fix-compilation-with-gcc-6.2.1.patch 2016-10-21
13:05:10 UTC (rev 192860)
+++ community-i686/0002-fix-compilation-with-gcc-6.2.1.patch 2016-10-21
13:05:17 UTC (rev 192861)
@@ -1,62 +0,0 @@
-From 743c9cfb9d95f4dfcf2d4e1dc412fd5495100aac Mon Sep 17 00:00:00 2001
-From: Christian Hesse <[email protected]>
-Date: Thu, 13 Oct 2016 10:56:55 +0200
-Subject: [PATCH 1/1] fix compilation with gcc 6.2.1
-
-Compilation fails with recent versions of gcc with:
-
-error: cannot convert 'Glib::RefPtr<Gdk::Colormap>' to 'bool' in
-assignment
-
-and
-
-error: no match for 'operator!=' (operand types are
-'Glib::RefPtr<Gdk::Window>' and 'int')
-
-This fixes compilation with gcc 6.2.1.
-
-Signed-off-by: Christian Hesse <[email protected]>
----
- library/forms/gtk/src/lf_popover.cpp | 4 ++--
- library/forms/gtk/src/lf_popup.cpp | 3 ++-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/library/forms/gtk/src/lf_popover.cpp
b/library/forms/gtk/src/lf_popover.cpp
-index 1a659a6..7502811 100644
---- a/library/forms/gtk/src/lf_popover.cpp
-+++ b/library/forms/gtk/src/lf_popover.cpp
-@@ -380,7 +380,7 @@ void PopoverWidget::show_popover(const int rx, const int
ry, const mforms::Start
- if (_style == mforms::PopoverStyleTooltip)
- {
- Glib::RefPtr<Gdk::Window> wnd = this->get_window();
-- if (wnd != 0)
-+ if (wnd)
- {
- int xx;
- int yy;
-@@ -396,7 +396,7 @@ void PopoverWidget::show_popover(const int rx, const int
ry, const mforms::Start
- {
- Gdk::ModifierType mask;
- Glib::RefPtr<Gdk::Display> dsp = Gdk::Display::get_default();
-- if (dsp != 0)
-+ if (dsp)
- dsp->get_pointer(x, y, mask);
- }
-
-diff --git a/library/forms/gtk/src/lf_popup.cpp
b/library/forms/gtk/src/lf_popup.cpp
-index 289c511..5de3b49 100644
---- a/library/forms/gtk/src/lf_popup.cpp
-+++ b/library/forms/gtk/src/lf_popup.cpp
-@@ -81,7 +81,8 @@ void PopupImpl::on_screen_changed(const
Glib::RefPtr<Gdk::Screen>& screen)
- {
- d("\n");
- Glib::RefPtr<Gdk::Colormap> colormap = screen->get_rgba_colormap();
-- _have_rgba = colormap;
-+ if (colormap)
-+ _have_rgba = true;
-
- if (!_have_rgba)
- colormap = screen->get_rgb_colormap();
---
-2.10.0
-
Copied:
mysql-workbench/repos/community-i686/0002-fix-compilation-with-gcc-6.2.1.patch
(from rev 192860,
mysql-workbench/trunk/0002-fix-compilation-with-gcc-6.2.1.patch)
===================================================================
--- community-i686/0002-fix-compilation-with-gcc-6.2.1.patch
(rev 0)
+++ community-i686/0002-fix-compilation-with-gcc-6.2.1.patch 2016-10-21
13:05:17 UTC (rev 192861)
@@ -0,0 +1,62 @@
+From 743c9cfb9d95f4dfcf2d4e1dc412fd5495100aac Mon Sep 17 00:00:00 2001
+From: Christian Hesse <[email protected]>
+Date: Thu, 13 Oct 2016 10:56:55 +0200
+Subject: [PATCH 1/1] fix compilation with gcc 6.2.1
+
+Compilation fails with recent versions of gcc with:
+
+error: cannot convert 'Glib::RefPtr<Gdk::Colormap>' to 'bool' in
+assignment
+
+and
+
+error: no match for 'operator!=' (operand types are
+'Glib::RefPtr<Gdk::Window>' and 'int')
+
+This fixes compilation with gcc 6.2.1.
+
+Signed-off-by: Christian Hesse <[email protected]>
+---
+ library/forms/gtk/src/lf_popover.cpp | 4 ++--
+ library/forms/gtk/src/lf_popup.cpp | 3 ++-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/library/forms/gtk/src/lf_popover.cpp
b/library/forms/gtk/src/lf_popover.cpp
+index 1a659a6..7502811 100644
+--- a/library/forms/gtk/src/lf_popover.cpp
++++ b/library/forms/gtk/src/lf_popover.cpp
+@@ -380,7 +380,7 @@ void PopoverWidget::show_popover(const int rx, const int
ry, const mforms::Start
+ if (_style == mforms::PopoverStyleTooltip)
+ {
+ Glib::RefPtr<Gdk::Window> wnd = this->get_window();
+- if (wnd != 0)
++ if (wnd)
+ {
+ int xx;
+ int yy;
+@@ -396,7 +396,7 @@ void PopoverWidget::show_popover(const int rx, const int
ry, const mforms::Start
+ {
+ Gdk::ModifierType mask;
+ Glib::RefPtr<Gdk::Display> dsp = Gdk::Display::get_default();
+- if (dsp != 0)
++ if (dsp)
+ dsp->get_pointer(x, y, mask);
+ }
+
+diff --git a/library/forms/gtk/src/lf_popup.cpp
b/library/forms/gtk/src/lf_popup.cpp
+index 289c511..5de3b49 100644
+--- a/library/forms/gtk/src/lf_popup.cpp
++++ b/library/forms/gtk/src/lf_popup.cpp
+@@ -81,7 +81,8 @@ void PopupImpl::on_screen_changed(const
Glib::RefPtr<Gdk::Screen>& screen)
+ {
+ d("\n");
+ Glib::RefPtr<Gdk::Colormap> colormap = screen->get_rgba_colormap();
+- _have_rgba = colormap;
++ if (colormap)
++ _have_rgba = true;
+
+ if (!_have_rgba)
+ colormap = screen->get_rgb_colormap();
+--
+2.10.0
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-10-21 13:05:10 UTC (rev 192860)
+++ community-i686/PKGBUILD 2016-10-21 13:05:17 UTC (rev 192861)
@@ -1,145 +0,0 @@
-# $Id$
-# Maintainer: Christian Hesse <[email protected]>
-# Contributor: Alexandre Boily <[email protected]>
-# Contributor: Illarion Kovalchuk <[email protected]>
-# Contributor: totoloco <totoloco at gmail _dot_com>
-# Contributor: Ionut Biru <[email protected]>
-
-pkgname=mysql-workbench
-pkgver=6.3.7
-pkgrel=4
-_mysql_version=5.7.16
-_connector_version=1.1.7
-_gdal_version=2.1.1
-_boost_version=1.59.0
-pkgdesc='A cross-platform, visual database design tool developed by MySQL'
-arch=('i686' 'x86_64')
-url='https://www.mysql.com/products/workbench/'
-license=('GPL2')
-depends=('cairo' 'ctemplate' 'desktop-file-utils' 'freetype2' 'gtkmm'
- 'hicolor-icon-theme' 'libgl' 'libgnome-keyring' 'libiodbc' 'libxml2'
- 'libzip' 'mysql-python' 'pcre' 'python2' 'python2-cairo'
'python2-paramiko'
- 'python2-pexpect' 'tinyxml' 'unixodbc' 'vsqlite++')
-optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password
manager'
- 'python2-pyodbc: database migration')
-makedepends=('cmake' 'boost' 'mesa' 'swig' 'imagemagick')
-validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
-source=("http://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
-
"http://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
-
"http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}.tar.gz"{,.asc}
-
"http://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.xz";
-
"https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2";
- '0001-mysql-workbench-no-check-for-updates.patch'
- '0002-fix-compilation-with-gcc-6.2.1.patch'
- 'arch_linux_profile.xml')
-sha256sums=('84941f6dc33674a245d53a21bc14c5f0c192e370940147ddc7c236a61c0193ec'
- 'SKIP'
- '4935b59974edb275629f6724a0fcf72265a5845faf1e30eeb50ed4b6528318a5'
- 'SKIP'
- '5b353fbcd26f607a2a0987ce78a4b811f8971813d46b0f4ae6fa07887e9fc763'
- 'SKIP'
- '87ce516ce757ad1edf1e21f007fbe232ed2e932af422e9893f40199711c41f92'
- '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca'
- 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
- '2c429fc1d02e5bae38ef51da7b4b27c5f82571b43b04b0d2a414189c8fdb6db9'
- '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
-
-prepare() {
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
-
- # Disable 'Help' -> 'Check for Updates'
- # Updates are provided via Arch Linux packages
- patch -Np1 < "${srcdir}"/0001-mysql-workbench-no-check-for-updates.patch
-
- # fix compilation with gcc 6.2.1
- patch -Np1 < "${srcdir}"/0002-fix-compilation-with-gcc-6.2.1.patch
-
- # we need python 2.x
- sed -i '/^FIND_PROGRAM(PYTHON_EXEC /c FIND_PROGRAM(PYTHON_EXEC
"python2")' \
- CMakeLists.txt
-}
-
-build() {
- # this uses deprecated auto_ptr...
- # we known that, so do not flood the logs
- CXXFLAGS="${CXXFLAGS} -Wno-deprecated-declarations"
-
- # Build mysql
- cd "${srcdir}/mysql-${_mysql_version}"
- cmake . \
- -DBUILD_CONFIG=mysql_release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DSYSCONFDIR=/etc/mysql \
- -DMYSQL_DATADIR=/var/lib/mysql \
- -DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
- make
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build mysql-connector-c++
- cd "${srcdir}/mysql-connector-c++-${_connector_version}/"
- cmake . \
- -Wno-dev \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
- -DMYSQL_DIR="${srcdir}/install-bundle/" \
-
-DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \
- -DBOOST_ROOT:STRING="${srcdir}/boost_${_boost_version//./_}"
-
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build gdal
- cd "${srcdir}/gdal-${_gdal_version}/"
- ./configure \
- --prefix=/usr \
- --includedir=/usr/include/gdal \
- --with-sqlite3 \
- --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
- --with-curl
- make
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build MySQL Workbench itself with bundled libs
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
- cmake . \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_CXX_FLAGS="-std=c++11" \
- -DCMAKE_BUILD_TYPE=Release \
-
-DMySQL_CONFIG_PATH="${srcdir}/install-bundle/usr/bin/mysql_config" \
- -DMYSQLCPPCONN_LIBRARY="-L${srcdir}/install-bundle/usr/lib
-lmysqlcppconn" \
-
-DMYSQLCPPCONN_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
- -DGDAL_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
- -DGDAL_LIBRARY="${srcdir}/install-bundle/usr/lib/libgdal.so" \
- -DUSE_BUNDLED_MYSQLDUMP=1
- make
-}
-
-package() {
- # install bundled libraries files and files
- for LIBRARY in $(find "${srcdir}/install-bundle/usr/lib/" -type f
-regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
- install -D -m0755 "${LIBRARY}"
"${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${LIBRARY}")"
- done
- for SYMLINK in $(find "${srcdir}/install-bundle/usr/lib/" -type l
-regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
- ln -s "$(readlink "${SYMLINK}")"
"${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${SYMLINK}")"
- done
- install -m0755 "${srcdir}/install-bundle/usr/bin/mysql"{,dump}
"${pkgdir}"/usr/lib/mysql-workbench/
-
- # install MySQL Workbench itself
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
-
- make DESTDIR="${pkgdir}" install
-
- # icons
- for SIZE in 16 24 32 48 64 96 128; do
- convert -scale ${SIZE} \
- images/icons/linux/128x128/apps/mysql-workbench.png \
- ${srcdir}/mysql-workbench.png
- install -D -m0644 ${srcdir}/mysql-workbench.png
"${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png"
- done
-
- install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
-
"${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB\).xml
-}
-
Copied: mysql-workbench/repos/community-i686/PKGBUILD (from rev 192860,
mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-10-21 13:05:17 UTC (rev 192861)
@@ -0,0 +1,140 @@
+# $Id$
+# Maintainer: Christian Hesse <[email protected]>
+# Contributor: Alexandre Boily <[email protected]>
+# Contributor: Illarion Kovalchuk <[email protected]>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <[email protected]>
+
+pkgname=mysql-workbench
+pkgver=6.3.8
+pkgrel=1
+_mysql_version=5.7.16
+_connector_version=1.1.7
+_gdal_version=2.1.1
+_boost_version=1.59.0
+pkgdesc='A cross-platform, visual database design tool developed by MySQL'
+arch=('i686' 'x86_64')
+url='https://www.mysql.com/products/workbench/'
+license=('GPL2')
+depends=('cairo' 'ctemplate' 'desktop-file-utils' 'freetype2' 'gtkmm'
+ 'hicolor-icon-theme' 'libgl' 'libgnome-keyring' 'libiodbc' 'libxml2'
+ 'libzip' 'mysql-python' 'pcre' 'python2' 'python2-cairo'
'python2-paramiko'
+ 'python2-pexpect' 'tinyxml' 'unixodbc' 'vsqlite++')
+optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password
manager'
+ 'python2-pyodbc: database migration')
+makedepends=('cmake' 'boost' 'mesa' 'swig' 'imagemagick')
+validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
+source=("http://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
+
"http://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
+
"http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}.tar.gz"{,.asc}
+
"http://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.xz";
+
"https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2";
+ '0001-mysql-workbench-no-check-for-updates.patch'
+ 'arch_linux_profile.xml')
+sha256sums=('6a263e072b17c682330d559519205fbaa168f30e902bd44cf595ab6c9140adaf'
+ 'SKIP'
+ '4935b59974edb275629f6724a0fcf72265a5845faf1e30eeb50ed4b6528318a5'
+ 'SKIP'
+ '5b353fbcd26f607a2a0987ce78a4b811f8971813d46b0f4ae6fa07887e9fc763'
+ 'SKIP'
+ '87ce516ce757ad1edf1e21f007fbe232ed2e932af422e9893f40199711c41f92'
+ '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca'
+ 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
+ '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
+
+prepare() {
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ # Disable 'Help' -> 'Check for Updates'
+ # Updates are provided via Arch Linux packages
+ patch -Np1 < "${srcdir}"/0001-mysql-workbench-no-check-for-updates.patch
+
+ # we need python 2.x
+ sed -i '/^FIND_PROGRAM(PYTHON_EXEC /c FIND_PROGRAM(PYTHON_EXEC
"python2")' \
+ CMakeLists.txt
+}
+
+build() {
+ # this uses deprecated auto_ptr...
+ # we known that, so do not flood the logs
+ CXXFLAGS="${CXXFLAGS} -Wno-deprecated-declarations"
+
+ # Build mysql
+ cd "${srcdir}/mysql-${_mysql_version}"
+ cmake . \
+ -DBUILD_CONFIG=mysql_release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DSYSCONFDIR=/etc/mysql \
+ -DMYSQL_DATADIR=/var/lib/mysql \
+ -DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
+ make
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build mysql-connector-c++
+ cd "${srcdir}/mysql-connector-c++-${_connector_version}/"
+ cmake . \
+ -Wno-dev \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
+ -DMYSQL_DIR="${srcdir}/install-bundle/" \
+
-DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ -DBOOST_ROOT:STRING="${srcdir}/boost_${_boost_version//./_}"
+
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build gdal
+ cd "${srcdir}/gdal-${_gdal_version}/"
+ ./configure \
+ --prefix=/usr \
+ --includedir=/usr/include/gdal \
+ --with-sqlite3 \
+ --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ --with-curl
+ make
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build MySQL Workbench itself with bundled libs
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+ cmake . \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_CXX_FLAGS="-std=c++11" \
+ -DCMAKE_BUILD_TYPE=Release \
+
-DMySQL_CONFIG_PATH="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ -DMYSQLCPPCONN_LIBRARY="-L${srcdir}/install-bundle/usr/lib
-lmysqlcppconn" \
+
-DMYSQLCPPCONN_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
+ -DGDAL_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
+ -DGDAL_LIBRARY="${srcdir}/install-bundle/usr/lib/libgdal.so" \
+ -DUSE_BUNDLED_MYSQLDUMP=1
+ make
+}
+
+package() {
+ # install bundled libraries files and files
+ for LIBRARY in $(find "${srcdir}/install-bundle/usr/lib/" -type f
-regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
+ install -D -m0755 "${LIBRARY}"
"${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${LIBRARY}")"
+ done
+ for SYMLINK in $(find "${srcdir}/install-bundle/usr/lib/" -type l
-regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
+ ln -s "$(readlink "${SYMLINK}")"
"${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${SYMLINK}")"
+ done
+ install -m0755 "${srcdir}/install-bundle/usr/bin/mysql"{,dump}
"${pkgdir}"/usr/lib/mysql-workbench/
+
+ # install MySQL Workbench itself
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ make DESTDIR="${pkgdir}" install
+
+ # icons
+ for SIZE in 16 24 32 48 64 96 128; do
+ convert -scale ${SIZE} \
+ images/icons/linux/128x128/apps/mysql-workbench.png \
+ ${srcdir}/mysql-workbench.png
+ install -D -m0644 ${srcdir}/mysql-workbench.png
"${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png"
+ done
+
+ install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
+
"${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB\).xml
+}
+
Deleted: community-i686/arch_linux_profile.xml
===================================================================
(Binary files differ)
Copied: mysql-workbench/repos/community-i686/arch_linux_profile.xml (from rev
192860, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)
Deleted: community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
===================================================================
--- community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
2016-10-21 13:05:10 UTC (rev 192860)
+++ community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
2016-10-21 13:05:17 UTC (rev 192861)
@@ -1,21 +0,0 @@
-diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
-index a32256c..08d9a21 100644
---- a/res/wbdata/main_menu.xml
-+++ b/res/wbdata/main_menu.xml
-@@ -2900,6 +2900,7 @@ value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.view.fkhili
- <value type="string" key="itemType">action</value>
- </value>
-
-+ <!-- We build a package that should be updated via pacman, so disable
this check.
- <value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.separator.help.checkver">
- <value type="string" key="itemType">separator</value>
- </value>
-@@ -2910,7 +2911,7 @@ value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.view.fkhili
- <value type="string" key="name">checkUpdate</value>
- <value type="string"
key="command">plugin:wb.tools.checkForUpdates</value>
- <value type="string" key="itemType">action</value>
-- </value>
-+ </value> //-->
-
- <value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.separator.help.report_a_bug">
- <value type="string" key="itemType">separator</value>
Copied:
mysql-workbench/repos/community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
(from rev 192860,
mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
(rev 0)
+++ community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
2016-10-21 13:05:17 UTC (rev 192861)
@@ -0,0 +1,21 @@
+diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
+index a32256c..08d9a21 100644
+--- a/res/wbdata/main_menu.xml
++++ b/res/wbdata/main_menu.xml
+@@ -2900,6 +2900,7 @@ value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.view.fkhili
+ <value type="string" key="itemType">action</value>
+ </value>
+
++ <!-- We build a package that should be updated via pacman, so disable
this check.
+ <value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.separator.help.checkver">
+ <value type="string" key="itemType">separator</value>
+ </value>
+@@ -2910,7 +2911,7 @@ value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.view.fkhili
+ <value type="string" key="name">checkUpdate</value>
+ <value type="string"
key="command">plugin:wb.tools.checkForUpdates</value>
+ <value type="string" key="itemType">action</value>
+- </value>
++ </value> //-->
+
+ <value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.separator.help.report_a_bug">
+ <value type="string" key="itemType">separator</value>
Deleted: community-x86_64/0002-fix-compilation-with-gcc-6.2.1.patch
===================================================================
--- community-x86_64/0002-fix-compilation-with-gcc-6.2.1.patch 2016-10-21
13:05:10 UTC (rev 192860)
+++ community-x86_64/0002-fix-compilation-with-gcc-6.2.1.patch 2016-10-21
13:05:17 UTC (rev 192861)
@@ -1,62 +0,0 @@
-From 743c9cfb9d95f4dfcf2d4e1dc412fd5495100aac Mon Sep 17 00:00:00 2001
-From: Christian Hesse <[email protected]>
-Date: Thu, 13 Oct 2016 10:56:55 +0200
-Subject: [PATCH 1/1] fix compilation with gcc 6.2.1
-
-Compilation fails with recent versions of gcc with:
-
-error: cannot convert 'Glib::RefPtr<Gdk::Colormap>' to 'bool' in
-assignment
-
-and
-
-error: no match for 'operator!=' (operand types are
-'Glib::RefPtr<Gdk::Window>' and 'int')
-
-This fixes compilation with gcc 6.2.1.
-
-Signed-off-by: Christian Hesse <[email protected]>
----
- library/forms/gtk/src/lf_popover.cpp | 4 ++--
- library/forms/gtk/src/lf_popup.cpp | 3 ++-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/library/forms/gtk/src/lf_popover.cpp
b/library/forms/gtk/src/lf_popover.cpp
-index 1a659a6..7502811 100644
---- a/library/forms/gtk/src/lf_popover.cpp
-+++ b/library/forms/gtk/src/lf_popover.cpp
-@@ -380,7 +380,7 @@ void PopoverWidget::show_popover(const int rx, const int
ry, const mforms::Start
- if (_style == mforms::PopoverStyleTooltip)
- {
- Glib::RefPtr<Gdk::Window> wnd = this->get_window();
-- if (wnd != 0)
-+ if (wnd)
- {
- int xx;
- int yy;
-@@ -396,7 +396,7 @@ void PopoverWidget::show_popover(const int rx, const int
ry, const mforms::Start
- {
- Gdk::ModifierType mask;
- Glib::RefPtr<Gdk::Display> dsp = Gdk::Display::get_default();
-- if (dsp != 0)
-+ if (dsp)
- dsp->get_pointer(x, y, mask);
- }
-
-diff --git a/library/forms/gtk/src/lf_popup.cpp
b/library/forms/gtk/src/lf_popup.cpp
-index 289c511..5de3b49 100644
---- a/library/forms/gtk/src/lf_popup.cpp
-+++ b/library/forms/gtk/src/lf_popup.cpp
-@@ -81,7 +81,8 @@ void PopupImpl::on_screen_changed(const
Glib::RefPtr<Gdk::Screen>& screen)
- {
- d("\n");
- Glib::RefPtr<Gdk::Colormap> colormap = screen->get_rgba_colormap();
-- _have_rgba = colormap;
-+ if (colormap)
-+ _have_rgba = true;
-
- if (!_have_rgba)
- colormap = screen->get_rgb_colormap();
---
-2.10.0
-
Copied:
mysql-workbench/repos/community-x86_64/0002-fix-compilation-with-gcc-6.2.1.patch
(from rev 192860,
mysql-workbench/trunk/0002-fix-compilation-with-gcc-6.2.1.patch)
===================================================================
--- community-x86_64/0002-fix-compilation-with-gcc-6.2.1.patch
(rev 0)
+++ community-x86_64/0002-fix-compilation-with-gcc-6.2.1.patch 2016-10-21
13:05:17 UTC (rev 192861)
@@ -0,0 +1,62 @@
+From 743c9cfb9d95f4dfcf2d4e1dc412fd5495100aac Mon Sep 17 00:00:00 2001
+From: Christian Hesse <[email protected]>
+Date: Thu, 13 Oct 2016 10:56:55 +0200
+Subject: [PATCH 1/1] fix compilation with gcc 6.2.1
+
+Compilation fails with recent versions of gcc with:
+
+error: cannot convert 'Glib::RefPtr<Gdk::Colormap>' to 'bool' in
+assignment
+
+and
+
+error: no match for 'operator!=' (operand types are
+'Glib::RefPtr<Gdk::Window>' and 'int')
+
+This fixes compilation with gcc 6.2.1.
+
+Signed-off-by: Christian Hesse <[email protected]>
+---
+ library/forms/gtk/src/lf_popover.cpp | 4 ++--
+ library/forms/gtk/src/lf_popup.cpp | 3 ++-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/library/forms/gtk/src/lf_popover.cpp
b/library/forms/gtk/src/lf_popover.cpp
+index 1a659a6..7502811 100644
+--- a/library/forms/gtk/src/lf_popover.cpp
++++ b/library/forms/gtk/src/lf_popover.cpp
+@@ -380,7 +380,7 @@ void PopoverWidget::show_popover(const int rx, const int
ry, const mforms::Start
+ if (_style == mforms::PopoverStyleTooltip)
+ {
+ Glib::RefPtr<Gdk::Window> wnd = this->get_window();
+- if (wnd != 0)
++ if (wnd)
+ {
+ int xx;
+ int yy;
+@@ -396,7 +396,7 @@ void PopoverWidget::show_popover(const int rx, const int
ry, const mforms::Start
+ {
+ Gdk::ModifierType mask;
+ Glib::RefPtr<Gdk::Display> dsp = Gdk::Display::get_default();
+- if (dsp != 0)
++ if (dsp)
+ dsp->get_pointer(x, y, mask);
+ }
+
+diff --git a/library/forms/gtk/src/lf_popup.cpp
b/library/forms/gtk/src/lf_popup.cpp
+index 289c511..5de3b49 100644
+--- a/library/forms/gtk/src/lf_popup.cpp
++++ b/library/forms/gtk/src/lf_popup.cpp
+@@ -81,7 +81,8 @@ void PopupImpl::on_screen_changed(const
Glib::RefPtr<Gdk::Screen>& screen)
+ {
+ d("\n");
+ Glib::RefPtr<Gdk::Colormap> colormap = screen->get_rgba_colormap();
+- _have_rgba = colormap;
++ if (colormap)
++ _have_rgba = true;
+
+ if (!_have_rgba)
+ colormap = screen->get_rgb_colormap();
+--
+2.10.0
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-10-21 13:05:10 UTC (rev 192860)
+++ community-x86_64/PKGBUILD 2016-10-21 13:05:17 UTC (rev 192861)
@@ -1,145 +0,0 @@
-# $Id$
-# Maintainer: Christian Hesse <[email protected]>
-# Contributor: Alexandre Boily <[email protected]>
-# Contributor: Illarion Kovalchuk <[email protected]>
-# Contributor: totoloco <totoloco at gmail _dot_com>
-# Contributor: Ionut Biru <[email protected]>
-
-pkgname=mysql-workbench
-pkgver=6.3.7
-pkgrel=4
-_mysql_version=5.7.16
-_connector_version=1.1.7
-_gdal_version=2.1.1
-_boost_version=1.59.0
-pkgdesc='A cross-platform, visual database design tool developed by MySQL'
-arch=('i686' 'x86_64')
-url='https://www.mysql.com/products/workbench/'
-license=('GPL2')
-depends=('cairo' 'ctemplate' 'desktop-file-utils' 'freetype2' 'gtkmm'
- 'hicolor-icon-theme' 'libgl' 'libgnome-keyring' 'libiodbc' 'libxml2'
- 'libzip' 'mysql-python' 'pcre' 'python2' 'python2-cairo'
'python2-paramiko'
- 'python2-pexpect' 'tinyxml' 'unixodbc' 'vsqlite++')
-optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password
manager'
- 'python2-pyodbc: database migration')
-makedepends=('cmake' 'boost' 'mesa' 'swig' 'imagemagick')
-validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
-source=("http://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
-
"http://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
-
"http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}.tar.gz"{,.asc}
-
"http://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.xz";
-
"https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2";
- '0001-mysql-workbench-no-check-for-updates.patch'
- '0002-fix-compilation-with-gcc-6.2.1.patch'
- 'arch_linux_profile.xml')
-sha256sums=('84941f6dc33674a245d53a21bc14c5f0c192e370940147ddc7c236a61c0193ec'
- 'SKIP'
- '4935b59974edb275629f6724a0fcf72265a5845faf1e30eeb50ed4b6528318a5'
- 'SKIP'
- '5b353fbcd26f607a2a0987ce78a4b811f8971813d46b0f4ae6fa07887e9fc763'
- 'SKIP'
- '87ce516ce757ad1edf1e21f007fbe232ed2e932af422e9893f40199711c41f92'
- '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca'
- 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
- '2c429fc1d02e5bae38ef51da7b4b27c5f82571b43b04b0d2a414189c8fdb6db9'
- '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
-
-prepare() {
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
-
- # Disable 'Help' -> 'Check for Updates'
- # Updates are provided via Arch Linux packages
- patch -Np1 < "${srcdir}"/0001-mysql-workbench-no-check-for-updates.patch
-
- # fix compilation with gcc 6.2.1
- patch -Np1 < "${srcdir}"/0002-fix-compilation-with-gcc-6.2.1.patch
-
- # we need python 2.x
- sed -i '/^FIND_PROGRAM(PYTHON_EXEC /c FIND_PROGRAM(PYTHON_EXEC
"python2")' \
- CMakeLists.txt
-}
-
-build() {
- # this uses deprecated auto_ptr...
- # we known that, so do not flood the logs
- CXXFLAGS="${CXXFLAGS} -Wno-deprecated-declarations"
-
- # Build mysql
- cd "${srcdir}/mysql-${_mysql_version}"
- cmake . \
- -DBUILD_CONFIG=mysql_release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DSYSCONFDIR=/etc/mysql \
- -DMYSQL_DATADIR=/var/lib/mysql \
- -DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
- make
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build mysql-connector-c++
- cd "${srcdir}/mysql-connector-c++-${_connector_version}/"
- cmake . \
- -Wno-dev \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
- -DMYSQL_DIR="${srcdir}/install-bundle/" \
-
-DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \
- -DBOOST_ROOT:STRING="${srcdir}/boost_${_boost_version//./_}"
-
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build gdal
- cd "${srcdir}/gdal-${_gdal_version}/"
- ./configure \
- --prefix=/usr \
- --includedir=/usr/include/gdal \
- --with-sqlite3 \
- --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
- --with-curl
- make
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build MySQL Workbench itself with bundled libs
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
- cmake . \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_CXX_FLAGS="-std=c++11" \
- -DCMAKE_BUILD_TYPE=Release \
-
-DMySQL_CONFIG_PATH="${srcdir}/install-bundle/usr/bin/mysql_config" \
- -DMYSQLCPPCONN_LIBRARY="-L${srcdir}/install-bundle/usr/lib
-lmysqlcppconn" \
-
-DMYSQLCPPCONN_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
- -DGDAL_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
- -DGDAL_LIBRARY="${srcdir}/install-bundle/usr/lib/libgdal.so" \
- -DUSE_BUNDLED_MYSQLDUMP=1
- make
-}
-
-package() {
- # install bundled libraries files and files
- for LIBRARY in $(find "${srcdir}/install-bundle/usr/lib/" -type f
-regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
- install -D -m0755 "${LIBRARY}"
"${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${LIBRARY}")"
- done
- for SYMLINK in $(find "${srcdir}/install-bundle/usr/lib/" -type l
-regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
- ln -s "$(readlink "${SYMLINK}")"
"${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${SYMLINK}")"
- done
- install -m0755 "${srcdir}/install-bundle/usr/bin/mysql"{,dump}
"${pkgdir}"/usr/lib/mysql-workbench/
-
- # install MySQL Workbench itself
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
-
- make DESTDIR="${pkgdir}" install
-
- # icons
- for SIZE in 16 24 32 48 64 96 128; do
- convert -scale ${SIZE} \
- images/icons/linux/128x128/apps/mysql-workbench.png \
- ${srcdir}/mysql-workbench.png
- install -D -m0644 ${srcdir}/mysql-workbench.png
"${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png"
- done
-
- install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
-
"${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB\).xml
-}
-
Copied: mysql-workbench/repos/community-x86_64/PKGBUILD (from rev 192860,
mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-10-21 13:05:17 UTC (rev 192861)
@@ -0,0 +1,140 @@
+# $Id$
+# Maintainer: Christian Hesse <[email protected]>
+# Contributor: Alexandre Boily <[email protected]>
+# Contributor: Illarion Kovalchuk <[email protected]>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <[email protected]>
+
+pkgname=mysql-workbench
+pkgver=6.3.8
+pkgrel=1
+_mysql_version=5.7.16
+_connector_version=1.1.7
+_gdal_version=2.1.1
+_boost_version=1.59.0
+pkgdesc='A cross-platform, visual database design tool developed by MySQL'
+arch=('i686' 'x86_64')
+url='https://www.mysql.com/products/workbench/'
+license=('GPL2')
+depends=('cairo' 'ctemplate' 'desktop-file-utils' 'freetype2' 'gtkmm'
+ 'hicolor-icon-theme' 'libgl' 'libgnome-keyring' 'libiodbc' 'libxml2'
+ 'libzip' 'mysql-python' 'pcre' 'python2' 'python2-cairo'
'python2-paramiko'
+ 'python2-pexpect' 'tinyxml' 'unixodbc' 'vsqlite++')
+optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password
manager'
+ 'python2-pyodbc: database migration')
+makedepends=('cmake' 'boost' 'mesa' 'swig' 'imagemagick')
+validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
+source=("http://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
+
"http://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
+
"http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}.tar.gz"{,.asc}
+
"http://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.xz";
+
"https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2";
+ '0001-mysql-workbench-no-check-for-updates.patch'
+ 'arch_linux_profile.xml')
+sha256sums=('6a263e072b17c682330d559519205fbaa168f30e902bd44cf595ab6c9140adaf'
+ 'SKIP'
+ '4935b59974edb275629f6724a0fcf72265a5845faf1e30eeb50ed4b6528318a5'
+ 'SKIP'
+ '5b353fbcd26f607a2a0987ce78a4b811f8971813d46b0f4ae6fa07887e9fc763'
+ 'SKIP'
+ '87ce516ce757ad1edf1e21f007fbe232ed2e932af422e9893f40199711c41f92'
+ '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca'
+ 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
+ '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
+
+prepare() {
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ # Disable 'Help' -> 'Check for Updates'
+ # Updates are provided via Arch Linux packages
+ patch -Np1 < "${srcdir}"/0001-mysql-workbench-no-check-for-updates.patch
+
+ # we need python 2.x
+ sed -i '/^FIND_PROGRAM(PYTHON_EXEC /c FIND_PROGRAM(PYTHON_EXEC
"python2")' \
+ CMakeLists.txt
+}
+
+build() {
+ # this uses deprecated auto_ptr...
+ # we known that, so do not flood the logs
+ CXXFLAGS="${CXXFLAGS} -Wno-deprecated-declarations"
+
+ # Build mysql
+ cd "${srcdir}/mysql-${_mysql_version}"
+ cmake . \
+ -DBUILD_CONFIG=mysql_release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DSYSCONFDIR=/etc/mysql \
+ -DMYSQL_DATADIR=/var/lib/mysql \
+ -DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
+ make
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build mysql-connector-c++
+ cd "${srcdir}/mysql-connector-c++-${_connector_version}/"
+ cmake . \
+ -Wno-dev \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
+ -DMYSQL_DIR="${srcdir}/install-bundle/" \
+
-DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ -DBOOST_ROOT:STRING="${srcdir}/boost_${_boost_version//./_}"
+
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build gdal
+ cd "${srcdir}/gdal-${_gdal_version}/"
+ ./configure \
+ --prefix=/usr \
+ --includedir=/usr/include/gdal \
+ --with-sqlite3 \
+ --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ --with-curl
+ make
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build MySQL Workbench itself with bundled libs
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+ cmake . \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_CXX_FLAGS="-std=c++11" \
+ -DCMAKE_BUILD_TYPE=Release \
+
-DMySQL_CONFIG_PATH="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ -DMYSQLCPPCONN_LIBRARY="-L${srcdir}/install-bundle/usr/lib
-lmysqlcppconn" \
+
-DMYSQLCPPCONN_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
+ -DGDAL_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
+ -DGDAL_LIBRARY="${srcdir}/install-bundle/usr/lib/libgdal.so" \
+ -DUSE_BUNDLED_MYSQLDUMP=1
+ make
+}
+
+package() {
+ # install bundled libraries files and files
+ for LIBRARY in $(find "${srcdir}/install-bundle/usr/lib/" -type f
-regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
+ install -D -m0755 "${LIBRARY}"
"${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${LIBRARY}")"
+ done
+ for SYMLINK in $(find "${srcdir}/install-bundle/usr/lib/" -type l
-regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
+ ln -s "$(readlink "${SYMLINK}")"
"${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${SYMLINK}")"
+ done
+ install -m0755 "${srcdir}/install-bundle/usr/bin/mysql"{,dump}
"${pkgdir}"/usr/lib/mysql-workbench/
+
+ # install MySQL Workbench itself
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ make DESTDIR="${pkgdir}" install
+
+ # icons
+ for SIZE in 16 24 32 48 64 96 128; do
+ convert -scale ${SIZE} \
+ images/icons/linux/128x128/apps/mysql-workbench.png \
+ ${srcdir}/mysql-workbench.png
+ install -D -m0644 ${srcdir}/mysql-workbench.png
"${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png"
+ done
+
+ install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
+
"${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB\).xml
+}
+
Deleted: community-x86_64/arch_linux_profile.xml
===================================================================
(Binary files differ)
Copied: mysql-workbench/repos/community-x86_64/arch_linux_profile.xml (from rev
192860, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)
