[arch-commits] Commit in mysql-workbench/repos (12 files)

Christian Hesse eworm at archlinux.org
Mon Feb 6 13:25:58 UTC 2017


    Date: Monday, February 6, 2017 @ 13:25:58
  Author: eworm
Revision: 210466

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 210465, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
  mysql-workbench/repos/community-i686/PKGBUILD
    (from rev 210465, mysql-workbench/trunk/PKGBUILD)
  mysql-workbench/repos/community-i686/arch_linux_profile.xml
    (from rev 210465, mysql-workbench/trunk/arch_linux_profile.xml)
  mysql-workbench/repos/community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
    (from rev 210465, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
  mysql-workbench/repos/community-x86_64/PKGBUILD
    (from rev 210465, mysql-workbench/trunk/PKGBUILD)
  mysql-workbench/repos/community-x86_64/arch_linux_profile.xml
    (from rev 210465, 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/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/PKGBUILD
  mysql-workbench/repos/community-x86_64/arch_linux_profile.xml

------------------------------------------------------------------+
 /0001-mysql-workbench-no-check-for-updates.patch                 |   42 +
 /PKGBUILD                                                        |  282 ++++++++++
 community-i686/0001-mysql-workbench-no-check-for-updates.patch   |   21 
 community-i686/PKGBUILD                                          |  141 -----
 community-x86_64/0001-mysql-workbench-no-check-for-updates.patch |   21 
 community-x86_64/PKGBUILD                                        |  141 -----
 6 files changed, 324 insertions(+), 324 deletions(-)

Deleted: community-i686/0001-mysql-workbench-no-check-for-updates.patch
===================================================================
--- community-i686/0001-mysql-workbench-no-check-for-updates.patch	2017-02-06 13:25:40 UTC (rev 210465)
+++ community-i686/0001-mysql-workbench-no-check-for-updates.patch	2017-02-06 13:25:58 UTC (rev 210466)
@@ -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 210465, 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	2017-02-06 13:25:58 UTC (rev 210466)
@@ -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/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-02-06 13:25:40 UTC (rev 210465)
+++ community-i686/PKGBUILD	2017-02-06 13:25:58 UTC (rev 210466)
@@ -1,141 +0,0 @@
-# $Id$
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Contributor: Alexandre Boily <alexandreboily at gmail.com>
-# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
-# Contributor: totoloco <totoloco at gmail _dot_com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=mysql-workbench
-pkgver=6.3.8
-pkgrel=6
-_mysql_version=5.7.17
-_connector_version=1.1.8
-_gdal_version=2.1.2
-_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=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
-	"https://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
-	"https://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'
-            'cebf23e858aee11e354c57d30de7a079754bdc2ef85eb684782458332a4b9651'
-            'SKIP'
-            '85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963'
-            'SKIP'
-            'b597f36bd29a2b4368998ddd32b28c8cdf3c8192237a81b99af83cc17d7fa374'
-            '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 \
-		--without-jasper
-	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 210465, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-02-06 13:25:58 UTC (rev 210466)
@@ -0,0 +1,141 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Alexandre Boily <alexandreboily at gmail.com>
+# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=mysql-workbench
+pkgver=6.3.8
+pkgrel=7
+_mysql_version=5.7.17
+_connector_version=1.1.8
+_gdal_version=2.1.2
+_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=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
+	"https://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
+	"https://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'
+            'cebf23e858aee11e354c57d30de7a079754bdc2ef85eb684782458332a4b9651'
+            'SKIP'
+            '85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963'
+            'SKIP'
+            'b597f36bd29a2b4368998ddd32b28c8cdf3c8192237a81b99af83cc17d7fa374'
+            '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 \
+		--without-jasper
+	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 210465, 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	2017-02-06 13:25:40 UTC (rev 210465)
+++ community-x86_64/0001-mysql-workbench-no-check-for-updates.patch	2017-02-06 13:25:58 UTC (rev 210466)
@@ -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 210465, 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	2017-02-06 13:25:58 UTC (rev 210466)
@@ -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/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-02-06 13:25:40 UTC (rev 210465)
+++ community-x86_64/PKGBUILD	2017-02-06 13:25:58 UTC (rev 210466)
@@ -1,141 +0,0 @@
-# $Id$
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Contributor: Alexandre Boily <alexandreboily at gmail.com>
-# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
-# Contributor: totoloco <totoloco at gmail _dot_com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=mysql-workbench
-pkgver=6.3.8
-pkgrel=6
-_mysql_version=5.7.17
-_connector_version=1.1.8
-_gdal_version=2.1.2
-_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=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
-	"https://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
-	"https://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'
-            'cebf23e858aee11e354c57d30de7a079754bdc2ef85eb684782458332a4b9651'
-            'SKIP'
-            '85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963'
-            'SKIP'
-            'b597f36bd29a2b4368998ddd32b28c8cdf3c8192237a81b99af83cc17d7fa374'
-            '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 \
-		--without-jasper
-	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 210465, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-02-06 13:25:58 UTC (rev 210466)
@@ -0,0 +1,141 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Alexandre Boily <alexandreboily at gmail.com>
+# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=mysql-workbench
+pkgver=6.3.8
+pkgrel=7
+_mysql_version=5.7.17
+_connector_version=1.1.8
+_gdal_version=2.1.2
+_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=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
+	"https://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
+	"https://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'
+            'cebf23e858aee11e354c57d30de7a079754bdc2ef85eb684782458332a4b9651'
+            'SKIP'
+            '85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963'
+            'SKIP'
+            'b597f36bd29a2b4368998ddd32b28c8cdf3c8192237a81b99af83cc17d7fa374'
+            '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 \
+		--without-jasper
+	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 210465, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)



More information about the arch-commits mailing list