diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 11:02:07 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 11:02:07 -0300 |
commit | 8a3d4ee5105eefa2136eb7ae83e69d01f29864c3 (patch) | |
tree | 8be9a06d3b2d8cade4b5dba48e040c632bd33850 /community/mysql-workbench | |
parent | 404b7ff94ece6bb2ce0e9df042ac1fe798137c83 (diff) | |
parent | d1d87d2ac643e3dabc251f3cec7d3b00e29b282c (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/zathura/PKGBUILD
extra/gnome-desktop-sharp/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/libdvdread/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/postgresql/PKGBUILD
Diffstat (limited to 'community/mysql-workbench')
-rw-r--r-- | community/mysql-workbench/PKGBUILD | 19 | ||||
-rw-r--r-- | community/mysql-workbench/python27.patch | 9 |
2 files changed, 12 insertions, 16 deletions
diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD index 73dd0a9f3..ca0b9e19a 100644 --- a/community/mysql-workbench/PKGBUILD +++ b/community/mysql-workbench/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56797 2011-10-12 23:37:11Z ibiru $ +# $Id: PKGBUILD 60120 2011-12-05 17:20:12Z ibiru $ # Maintainer: # Contributor : Ionut Biru <ibiru@archlinux.org> # Contributor: totoloco <totoloco at gmail _dot_com> pkgname=mysql-workbench epoch=1 -pkgver=5.2.35 +pkgver=5.2.36 pkgrel=1 pkgdesc="A cross-platform, visual database design tool developed by MySQL" arch=('i686' 'x86_64' 'mips64el') @@ -17,10 +17,10 @@ makedepends=('boost' 'curl' 'mesa' 'python-sphinx') options=('!libtool') source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz ArchLinux.xml arch.patch python27.patch gcc46.patch) -md5sums=('e8b158d2ba0413f5659cda7da9cec63e' +md5sums=('7408d80ddb647a7d5a8749b0ecad9620' 'c2f986cd5737413d020c55db32713c48' '23430d24400fd65c9fd872bd8e2411e5' - '47bc4cdfaa035a0132392e94c462ebf7' + 'a3efb373bd85d876530a29bf1780fb6b' '43917ebc79794ba15a64f7ba820fa20b') build() { @@ -29,16 +29,11 @@ build() { cp "${srcdir}/ArchLinux.xml" res/mysql.profiles patch -Np1 -i ${srcdir}/arch.patch - patch -Np0 -i ${srcdir}/python27.patch + patch -Np1 -i ${srcdir}/python27.patch patch -Np1 -i ${srcdir}/gcc46.patch - #we use System provided libraries - rm -rf ext/curl - rm -rf ext/yassl - rm -rf ext/boost - rm -rf ext/libsigc++ - - ./autogen.sh --prefix=/usr --disable-debug --disable-static + ./autogen.sh --prefix=/usr --with-bundled-ctemplate \ + --disable-debug --disable-static make pushd ext/mysql-utilities diff --git a/community/mysql-workbench/python27.patch b/community/mysql-workbench/python27.patch index 5fb215cd0..4f70afe57 100644 --- a/community/mysql-workbench/python27.patch +++ b/community/mysql-workbench/python27.patch @@ -1,6 +1,7 @@ ---- configure.in.orig 2010-12-08 16:58:57.456378836 -0800 -+++ configure.in 2010-12-08 16:59:42.179715448 -0800 -@@ -280,13 +280,13 @@ +diff -Nur mysql-workbench-gpl-5.2.36-src.old/configure.in mysql-workbench-gpl-5.2.36-src/configure.in +--- mysql-workbench-gpl-5.2.36-src.old/configure.in 2011-12-05 15:04:56.894410445 +0000 ++++ mysql-workbench-gpl-5.2.36-src/configure.in 2011-12-05 15:05:45.818268997 +0000 +@@ -245,13 +245,13 @@ AC_CHECK_PROG(PYTHON27, python2.7, [yes]) # Python headers AC_MSG_CHECKING(for Python libraries) @@ -10,7 +11,7 @@ cfg=sysconfig.get_config_vars() lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY']) if os.path.exists(lib): - print lib")] + print \"-L\" + cfg['LIBDIR'] + \" -l\" + cfg['LDLIBRARY'].lstrip(\"lib\").rstrip(\".so\")")] -PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig +PYTHON_CFLAGS=[$(python2 -c "from distutils import sysconfig print sysconfig.get_python_inc()")] |