From 87fbcb30b652672a7e110b66a4c15342e27df826 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 27 Mar 2013 00:05:42 -0700 Subject: Wed Mar 27 00:05:42 PDT 2013 --- extra/boost/PKGBUILD | 159 ++++++++++++++++----------------- extra/boost/boost-1.52.0-python3.patch | 96 ++++++++++++++++++++ 2 files changed, 171 insertions(+), 84 deletions(-) create mode 100644 extra/boost/boost-1.52.0-python3.patch (limited to 'extra/boost') diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 15d67acac..cd61d1341 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176283 2013-01-28 16:48:15Z stephane $ +# $Id: PKGBUILD 180800 2013-03-26 11:49:27Z foutrelis $ # Maintainer: Stéphane Gaudreault # Maintainer: Ionut Biru # Contributor: kevin @@ -10,106 +10,97 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.52.0 _boostver=${pkgver//./_} -pkgrel=1 -arch=('i686' 'x86_64') +pkgrel=2 url="http://www.boost.org/" -makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) +arch=('i686' 'x86_64') license=('custom') -sha1sums=('1120430030315b0a94b6d63fc04662960db2444c') +makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') +source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz + boost-1.52.0-python3.patch) +sha1sums=('1120430030315b0a94b6d63fc04662960db2444c' + '34026072a7cb2534164f20e77bb71a5c75093307') _stagedir="${srcdir}/stagedir" build() { - # set python path for bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools" - echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam - echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> build/v2/user-config.jam - echo "using mpi ;" >> build/v2/user-config.jam - - cd "${srcdir}"/${pkgbase}_${_boostver} - - # build bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" - ./build.sh cc - - _bindir="bin.linuxx86" - [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" - - install -d "${_stagedir}"/usr/bin - install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam - - # build tools - cd "${srcdir}/${pkgbase}_${_boostver}/tools/" - "${_stagedir}"/usr/bin/bjam --toolset=gcc - - # copy the tools - cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin" - for i in *;do - install -m755 "${i}" "${_stagedir}/usr/bin/${i}" - done - - #boostbook needed by quickbook - cd "${srcdir}/${pkgbase}_${_boostver}/dist/" - cp -r share "${_stagedir}" - - # build libs - cd "${srcdir}/${pkgbase}_${_boostver}" - - # default "minimal" install: "release link=shared,static - # runtime-link=shared threading=single,multi" - # --layout=tagged will add the "-mt" suffix for multithreaded libraries - # and installs includes in /usr/include/boost. - # --layout=system no longer adds the -mt suffix for multi-threaded libs. - # install to ${_stagedir} in preparation for split packaging - - "${_stagedir}"/usr/bin/bjam \ - release debug-symbols=off threading=multi \ - runtime-link=shared link=shared,static \ - cflags=-fno-strict-aliasing \ + local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" + + cd "${srcdir}/${pkgbase}_${_boostver}" + + # Fix build errors with python 3 + sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh + patch -Np1 -i ../boost-1.52.0-python3.patch + + # Shut up strict aliasing warnings + echo "using gcc : : : -fno-strict-aliasing ;" >> ./tools/build/v2/user-config.jam + # Add an extra python version. This does not replace anything and python 2.x need to be the default. + echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> ./tools/build/v2/user-config.jam + # Support for OpenMPI + echo "using mpi ;" >> ./tools/build/v2/user-config.jam + + ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2 + + _bindir="bin.linuxx86" + [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" + + install -d -m 755 "${_stagedir}"/bin + install "${srcdir}"/${pkgbase}_${_boostver}/tools/build/v2/engine/${_bindir}/bjam "${_stagedir}"/bin/bjam + + pushd tools + for _tool in bcp inspect quickbook compiler_status process_jam_log wave; do + "${_stagedir}"/bin/bjam --toolset=gcc $_tool + done + "${_stagedir}"/bin/bjam --toolset=gcc cflags="-std=gnu++11" library_status + popd + cp -a dist/bin/* "${_stagedir}"/bin + + #boostbook is needed by quickbook + install -d -m 755 "${_stagedir}"/share/boostbook + cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/ + + # default "minimal" install: "release link=shared,static + # runtime-link=shared threading=single,multi" + # --layout=tagged will add the "-mt" suffix for multithreaded libraries + # and installs includes in /usr/include/boost. + # --layout=system no longer adds the -mt suffix for multi-threaded libs. + # install to ${_stagedir} in preparation for split packaging + "${_stagedir}"/bin/bjam \ + release \ + debug-symbols=off \ + threading=multi \ + runtime-link=shared \ + link=shared \ toolset=gcc \ - --prefix="${_stagedir}" \ - -sTOOLS=gcc \ --layout=system \ - ${MAKEFLAGS} \ + --prefix="${_stagedir}" \ + ${JOBS} \ install + + find ${_stagedir} -name \*.a -exec rm -f {} \; } package_boost() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Development" - depends=("boost-libs=${pkgver}") - optdepends=('python: for python3 bindings' - 'python2: for python2 bindings' - 'boost-build: to use boost jam for building your project.') - - install -d "${pkgdir}"/usr/{include,lib,share} - # headers/source files - cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ - - # static libs - cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ - - # utilities (bjam, bcp, pyste) - cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/ + pkgdesc="Free peer-reviewed portable C++ source libraries - Development" + depends=("boost-libs=${pkgver}") + optdepends=('python: for python bindings' + 'python2: for python2 bindings' + 'boost-build: to use boost jam for building your project.') - #boostbook - cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share + install -d -m 755 "${pkgdir}"/usr + cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt + install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt } package_boost-libs() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" - depends=('gcc-libs' 'bzip2' 'zlib' 'icu') - optdepends=('openmpi: for mpi support') + pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" + depends=('bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') - install -d "${pkgdir}/usr/lib" - #shared libs - cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/" + install -d -m 755 "${pkgdir}"/usr + cp -a "${_stagedir}"/lib "${pkgdir}"/usr - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt + install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt } diff --git a/extra/boost/boost-1.52.0-python3.patch b/extra/boost/boost-1.52.0-python3.patch new file mode 100644 index 000000000..8d2f59269 --- /dev/null +++ b/extra/boost/boost-1.52.0-python3.patch @@ -0,0 +1,96 @@ +diff -Naur boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp boost_1_53_0/libs/mpi/src/python/datatypes.cpp +--- boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp 2007-11-25 13:38:02.000000000 -0500 ++++ boost_1_53_0/libs/mpi/src/python/datatypes.cpp 2013-03-11 20:59:57.171732691 -0400 +@@ -13,6 +13,10 @@ + #include + #include + ++#if PY_MAJOR_VERSION >= 3 ++#define PyInt_Type PyLong_Type ++#endif ++ + namespace boost { namespace mpi { namespace python { + + void export_datatypes() +diff -Naur boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp boost_1_53_0/libs/mpi/src/python/py_environment.cpp +--- boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp 2007-11-25 13:38:02.000000000 -0500 ++++ boost_1_53_0/libs/mpi/src/python/py_environment.cpp 2013-03-11 21:02:12.961737401 -0400 +@@ -11,6 +11,9 @@ + * This file reflects the Boost.MPI "environment" class into Python + * methods at module level. + */ ++ ++#include ++#include + #include + #include + +@@ -50,11 +53,65 @@ + + // If anything changed, convert C-style argc/argv into Python argv + if (mpi_argv != my_argv) ++ { ++#if PY_MAJOR_VERSION >= 3 ++ // Code stolen from py3k/Modules/python.c. ++ ++ wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc); ++ /* We need a second copies, as Python might modify the first one. */ ++ wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc); ++ ++ if (!argv_copy || !argv_copy2) { ++ fprintf(stderr, "out of memory\n"); ++ return false; ++ } ++ ++ std::locale mylocale; ++ mbstate_t mystate; ++ ++ const std::codecvt& myfacet = ++ std::use_facet >(mylocale); ++ ++ for (int i = 0; i < mpi_argc; i++) ++ { ++ size_t length = strlen(mpi_argv[i]); ++ ++ wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1)); ++ ++ const char *from_next; ++ wchar_t *to_next; ++ ++ std::codecvt::result myresult = ++ myfacet.out(mystate, ++ mpi_argv[i], mpi_argv[i] + length + 1, from_next, ++ dest, dest+length+1, to_next); ++ ++ if (myresult != std::codecvt::ok ) ++ { ++ fprintf(stderr, "failure translating argv\n"); ++ return 1; ++ } ++ ++ argv_copy2[i] = argv_copy[i] = dest; ++ if (!argv_copy[i]) ++ return false; ++ } ++ ++ PySys_SetArgv(mpi_argc, argv_copy); ++ ++ for (int i = 0; i < mpi_argc; i++) { ++ PyMem_Free(argv_copy2[i]); ++ } ++ PyMem_Free(argv_copy); ++ PyMem_Free(argv_copy2); ++#else + PySys_SetArgv(mpi_argc, mpi_argv); ++#endif ++ } + +- for (int arg = 0; arg < my_argc; ++arg) +- free(my_argv[arg]); +- delete [] my_argv; ++ for (int arg = 0; arg < mpi_argc; ++arg) ++ free(mpi_argv[arg]); ++ delete [] mpi_argv; + + return true; + } -- cgit v1.2.3-54-g00ecf From 0fbe25a10dce8ec16455854ed6929b688f98cb36 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 28 Mar 2013 00:05:06 -0700 Subject: Thu Mar 28 00:05:05 PDT 2013 --- community/erlang/PKGBUILD | 8 ++-- community/haskell-syb/PKGBUILD | 6 +-- community/haskell-x11-xft/PKGBUILD | 6 +-- community/haskell-x11/PKGBUILD | 6 +-- community/libbsd/LICENSE | 28 ----------- community/libbsd/PKGBUILD | 30 ------------ community/libdbi-drivers/PKGBUILD | 15 +++--- community/libdbi/PKGBUILD | 8 ++-- community/python-matplotlib/PKGBUILD | 18 ++----- .../python-matplotlib/python-matplotlib-tk.patch | 35 -------------- community/python-sqlalchemy/PKGBUILD | 13 +++-- community/qtractor/PKGBUILD | 12 ++--- community/qupzilla/PKGBUILD | 15 ++---- community/ruby-cairo/PKGBUILD | 8 ++-- ...tps-github.com-ruby-gnome2-ruby-gnome2-co.patch | 55 ---------------------- community/ruby-gtk2/PKGBUILD | 27 ++--------- community/sage-mathematics/PKGBUILD | 6 ++- community/tmux/PKGBUILD | 6 +-- community/wings3d/PKGBUILD | 46 +++++++++--------- community/wings3d/wings3d.sh | 2 + community/xmonad-contrib/PKGBUILD | 6 +-- community/xmonad/PKGBUILD | 6 +-- core/diffutils/PKGBUILD | 9 ++-- core/file/PKGBUILD | 6 +-- core/libffi/PKGBUILD | 6 +-- extra/boost/PKGBUILD | 13 ++--- extra/libbsd/LICENSE | 28 +++++++++++ extra/libbsd/PKGBUILD | 30 ++++++++++++ extra/libmtp/PKGBUILD | 6 +-- extra/vim/PKGBUILD | 8 ++-- extra/vlc/PKGBUILD | 7 +-- 31 files changed, 183 insertions(+), 292 deletions(-) delete mode 100644 community/libbsd/LICENSE delete mode 100644 community/libbsd/PKGBUILD delete mode 100644 community/python-matplotlib/python-matplotlib-tk.patch delete mode 100644 community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch create mode 100644 community/wings3d/wings3d.sh create mode 100644 extra/libbsd/LICENSE create mode 100644 extra/libbsd/PKGBUILD (limited to 'extra/boost') diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index ab8979d97..1790e90e0 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86449 2013-03-17 11:12:15Z arodseth $ +# $Id: PKGBUILD 87122 2013-03-27 15:53:26Z arodseth $ # Maintainer: Lukas Fleischer # Maintainer: Alexander Rødseth # Contributor: Vesa Kaihlavirta @@ -9,11 +9,11 @@ pkgbase=erlang pkgname=('erlang' 'erlang-unixodbc') pkgver=R16B -pkgrel=2 +pkgrel=3 arch=('x86_64' 'i686') url='http://www.erlang.org/' license=('custom') -makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk') +makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'wxgtk2.9') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") sha256sums=('f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd' @@ -28,7 +28,7 @@ build() { package_erlang() { pkgdesc='General-purpose concurrent functional programming language developed by Ericsson' - depends=('ncurses' 'glu' 'wxgtk' 'openssl') + depends=('ncurses' 'glu' 'wxgtk' 'wxgtk2.9' 'openssl') optdepends=('erlang-unixodbc: database support' 'java-environment: for Java support' 'lksctp-tools: for SCTP support') diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD index 57fb85526..d1c237978 100644 --- a/community/haskell-syb/PKGBUILD +++ b/community/haskell-syb/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Arch Haskell Team _hkgname=syb pkgname=haskell-syb -pkgver=0.3.7 -pkgrel=2 +pkgver=0.4.0 +pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') @@ -12,7 +12,7 @@ depends=('ghc=7.6.2-1' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('fa653976a4ee43918cc7546089f94b60') +md5sums=('ec2719d444a6561b2424dcef10b4fe34') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD index d7d5aabf4..3bb202d51 100644 --- a/community/haskell-x11-xft/PKGBUILD +++ b/community/haskell-x11-xft/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 86595 2013-03-20 11:05:22Z jelle $ +# $Id: PKGBUILD 87100 2013-03-27 07:08:13Z jelle $ # Maintainer: Sergej Pupykin _hkgname=X11-xft pkgname=haskell-x11-xft pkgver=0.3.1 -pkgrel=7 +pkgrel=8 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts" url="http://hackage.haskell.org/package/${_hkgname}" license=('LGPL') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'haskell-x11=1.6.0.2-2' 'haskell-utf8-string=0.3.7-4' 'libxft') +depends=('ghc=7.6.2-1' 'haskell-x11=1.6.1.1-2' 'haskell-utf8-string=0.3.7-4' 'libxft') options=('strip') install=haskell-x11-xft.install source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD index 56333d024..46d68bf10 100644 --- a/community/haskell-x11/PKGBUILD +++ b/community/haskell-x11/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86594 2013-03-20 11:05:21Z jelle $ +# $Id: PKGBUILD 87099 2013-03-27 07:08:12Z jelle $ # Maintainer: Sergej Pupykin # Contributor: shild # Maintainer: Vesa Kaihlavirta @@ -6,13 +6,13 @@ _hkgname=X11 pkgname=haskell-x11 pkgver=1.6.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A Haskell binding to the X11 graphics library." arch=(i686 x86_64) url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11" license=('custom:BSD3') options=('strip') -depends=("ghc=7.6.2-1" "haskell-syb=0.3.7-2" 'libx11' 'libxinerama' 'libxrandr' 'haskell-data-default') +depends=("ghc=7.6.2-1" "libx11" "libxinerama" "libxrandr" "haskell-data-default") conflicts=(haskell-x11-extras) install=hsmod.install source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz) diff --git a/community/libbsd/LICENSE b/community/libbsd/LICENSE deleted file mode 100644 index 7dcbfc2ba..000000000 --- a/community/libbsd/LICENSE +++ /dev/null @@ -1,28 +0,0 @@ -/*- - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ diff --git a/community/libbsd/PKGBUILD b/community/libbsd/PKGBUILD deleted file mode 100644 index 86850d37f..000000000 --- a/community/libbsd/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 75426 2012-08-23 01:07:04Z svenstaro $ -# Maintainer: Sven-Hendrik Haase -# Contributor: Gerardo Exequiel Pozzi - -pkgname=libbsd -pkgver=0.4.2 -pkgrel=1 -pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" -arch=('i686' 'x86_64') -url="http://libbsd.freedesktop.org" -license=('custom') -depends=('glibc') -source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) -md5sums=('591fc9de4ca22f78cf87a94e648a92f4') - -build() { - cd $srcdir/$pkgname-$pkgver - - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE -} - -# vim:set ts=2 sw=2 et: diff --git a/community/libdbi-drivers/PKGBUILD b/community/libdbi-drivers/PKGBUILD index 9f9413c56..d69d86823 100644 --- a/community/libdbi-drivers/PKGBUILD +++ b/community/libdbi-drivers/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 87088 2013-03-26 19:05:37Z bpiotrowski $ +# $Id: PKGBUILD 87120 2013-03-27 15:21:01Z ttoepper $ # Maintainer: Thorsten Töpper # Contributor: Olivier Médoc # Contributor: Ashok `ScriptDevil` Gautham pkgname=libdbi-drivers -pkgver=0.8.3_1 -_pkgver=0.8.3-1 -pkgrel=4 +pkgver=0.9.0 +pkgrel=1 pkgdesc="Database drivers for libdbi (MySQL, PostgreSQL, and SQLite)" url="http://libdbi-drivers.sourceforge.net/" license=('GPL') @@ -19,11 +18,11 @@ optdepends=("postgresql-libs: To work with postgresql using libdbdpgsql " "sqlite2: To work with sqlite2 using libdbdsqlite") options=(!libtool) install=libdbi-drivers.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}/${pkgname}-${_pkgver}/${pkgname}-${_pkgver}.tar.gz") -md5sums=('4de79b323162a5a7652b65b608eca6cd') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('8472875d30c216540d48d591b442e40ba4f7df5d') build() { - cd "${srcdir}/${pkgname}-${_pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --disable-docs \ --with-libdbi \ @@ -35,7 +34,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${_pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install } diff --git a/community/libdbi/PKGBUILD b/community/libdbi/PKGBUILD index 317215e4e..e0c031534 100644 --- a/community/libdbi/PKGBUILD +++ b/community/libdbi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59571 2011-11-28 08:58:19Z ttopper $ +# $Id: PKGBUILD 87114 2013-03-27 13:46:18Z ttoepper $ # Maintainer: Thorsten Töpper # Contributor: Carl Flippin pkgname=libdbi -pkgver=0.8.4 -pkgrel=2 +pkgver=0.9.0 +pkgrel=1 pkgdesc="A database independant abstraction layer for C" url="http://libdbi.sourceforge.net" license=('LGPL') @@ -13,7 +13,7 @@ depends=('glibc') options=(!libtool) install=libdbi.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('c5f15407ef7b07ba854cd8c9b15b88ff') +sha1sums=('6c1ecfb78f43a921d5f914299304bd6c82cb0e23') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD index f34697d7a..e13097334 100644 --- a/community/python-matplotlib/PKGBUILD +++ b/community/python-matplotlib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81606 2012-12-25 00:34:11Z foutrelis $ +# $Id: PKGBUILD 87092 2013-03-27 01:38:02Z stephane $ # Maintainer: Stéphane Gaudreault # Contributor: Stefan Husmann # Contributor: Angel 'angvp' Velasquez @@ -6,8 +6,8 @@ pkgbase=python-matplotlib pkgname=('python2-matplotlib' 'python-matplotlib') -pkgver=1.2.0 -pkgrel=8 +pkgver=1.2.1 +pkgrel=1 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64') url='http://matplotlib.org' @@ -20,16 +20,12 @@ optdepends=('pygtk: for use with the GTK or GTKAgg backend' 'tk: used by the TkAgg backend' 'ghostscript: usetex dependencies' 'texlive-bin: usetex dependencies') -source=("https://github.com/downloads/matplotlib/matplotlib/matplotlib-${pkgver}.tar.gz" - python-matplotlib-tk.patch) -sha1sums=('1d0c319b2bc545f1a7002f56768e5730fe573518' - '6f27ff74a7752700758d081d3235a61a89b8ea95') +source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz") +sha1sums=('82fc44d0047a713c1b0b1b4ea2503e6a41c57f98') build() { cd "${srcdir}"/matplotlib-${pkgver} - patch -Np1 -i ../python-matplotlib-tk.patch - # use system python-six rm lib/six.py @@ -37,10 +33,6 @@ build() { rm -r lib/matplotlib/pyparsing_py{2,3}.py sed -i -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' lib/matplotlib/{mathtext,fontconfig_pattern}.py - # For numpy 1.7 - sed -i '/include/s/numpy\/arrayobject.h/numpy\/oldnumeric.h/g' \ - src/*.{c,cpp,h} lib/matplotlib/delaunay/*.{cpp,h} lib/matplotlib/tri/*.h - cd .. cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3 diff --git a/community/python-matplotlib/python-matplotlib-tk.patch b/community/python-matplotlib/python-matplotlib-tk.patch deleted file mode 100644 index 10480195a..000000000 --- a/community/python-matplotlib/python-matplotlib-tk.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py ---- matplotlib-1.2.0/setupext.py.orig 2012-11-23 14:50:48.954715965 -0200 -+++ matplotlib-1.2.0/setupext.py 2012-11-23 14:55:53.731727636 -0200 -@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib - - tcl_poss = [tcl_lib_dir, - os.path.normpath(os.path.join(tcl_lib_dir, '..')), -- "/usr/lib/tcl"+str(Tkinter.TclVersion), -- "/usr/lib"] -+ "@@libdir@@/tcl"+str(Tkinter.TclVersion), -+ "@@lib@@"] - tk_poss = [tk_lib_dir, - os.path.normpath(os.path.join(tk_lib_dir, '..')), -- "/usr/lib/tk"+str(Tkinter.TkVersion), -- "/usr/lib"] -+ "@@libdir@@/tk"+str(Tkinter.TkVersion), -+ "@@libdir@@"] - for ptcl, ptk in zip(tcl_poss, tk_poss): - tcl_config = os.path.join(ptcl, "tclConfig.sh") - tk_config = os.path.join(ptk, "tkConfig.sh") -@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib - return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver - - def hardcoded_tcl_config(): -- tcl_inc = "/usr/local/include" -- tk_inc = "/usr/local/include" -- tcl_lib = "/usr/local/lib" -- tk_lib = "/usr/local/lib" -+ tcl_inc = "/usr/include" -+ tk_inc = "/usr/include" -+ tcl_lib = "@@libdir@@" -+ tk_lib = "@@libdir@@" - return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk' - - def add_tk_flags(module): diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD index 764bfd0b4..d8cfc3057 100644 --- a/community/python-sqlalchemy/PKGBUILD +++ b/community/python-sqlalchemy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 78255 2012-10-17 10:27:16Z allan $ +# $Id: PKGBUILD 87107 2013-03-27 11:07:21Z jelle $ # Maintainer: Angel Velasquez # Contributor: Sébastien Luttringer pkgbase=python-sqlalchemy pkgname=('python-sqlalchemy' 'python2-sqlalchemy') -pkgver=0.7.9 +pkgver=0.8.0 pkgrel=1 arch=('i686' 'x86_64') # python2 package contain .so url="http://www.sqlalchemy.org/" license=('custom: MIT') makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'python-nose' 'python2-nose') source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz") -md5sums=('c4852d586d95a59fbc9358f4467875d5') +md5sums=('3fb0b62e5d6ef4a022414f4233519ee2') build() { cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver @@ -21,6 +21,13 @@ build() { python2 setup.py build } +check() { + cd SQLAlchemy-${pkgver} + python setup.py check + python2 setup.py check + +} + package_python-sqlalchemy() { pkgdesc='Python SQL toolkit and Object Relational Mapper' depends=('python') diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index 3e7de010f..8df244ddb 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 85406 2013-03-01 10:39:31Z andrea $ +# $Id: PKGBUILD 87090 2013-03-26 23:07:30Z schiv $ # Maintainer: Ray Rashif # Contributor: Philipp Überbacher pkgname=qtractor -pkgver=0.5.7 -pkgrel=2 +pkgver=0.5.8 +pkgrel=1 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64') url="http://qtractor.sourceforge.net/" license=('GPL') -depends=('qt4' 'jack' 'suil' 'lilv' 'libmad' - 'libsamplerate' 'rubberband' 'liblo' 'shared-mime-info') +depends=('qt4' 'suil' 'lilv' 'libmad' 'liblo' + 'rubberband' 'shared-mime-info') makedepends=('ladspa' 'dssi') [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support') install=qtractor.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('a3f42dc1125d6ec0bd88286fe7738f04') +md5sums=('22abf4de4d5736f794e174ef06fe3a3c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD index 645e744fc..516da13b9 100644 --- a/community/qupzilla/PKGBUILD +++ b/community/qupzilla/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86204 2013-03-13 01:33:35Z speps $ +# $Id: PKGBUILD 87097 2013-03-27 02:25:04Z speps $ # Maintainer: speps _name=QupZilla -_commit=93d22ec # fixes https://github.com/QupZilla/qupzilla/issues/793 +_commit=953ca72 # pkgname=qupzilla -pkgver=1.4.0_git20130312 +pkgver=1.4.1_git20130326 pkgrel=1 pkgdesc="Cross-platform QtWebKit browser" arch=(i686 x86_64) @@ -14,7 +14,7 @@ depends=('qtwebkit' 'hunspell') optdepends=('bash-completion: bash completion support') install="$pkgname.install" source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/$_commit") -md5sums=('8fa69f60a26b55d68bfac2d7ec812bf8') +md5sums=('1b1b94a53a422436975b19f9ca05f006') build() { cd "$srcdir/$_name-$pkgname-"* @@ -22,9 +22,6 @@ build() { # enable webgl support export USE_WEBGL=true - # manually install bash completion - sed -i '/bashcompletion/d' src/install.pri - qmake-qt4 QUPZILLA_PREFIX=/usr/ make } @@ -33,10 +30,6 @@ package() { cd "$srcdir/$_name-$pkgname-"* make INSTALL_ROOT="$pkgdir/" install - # bash completion - install -Dm644 linux/completion/bash_completion.sh \ - "$pkgdir/usr/share/bash-completion/completions/$pkgname" - # zsh completion install -Dm644 linux/completion/zsh_completion.sh \ "$pkgdir/usr/share/zsh/site-functions/_$pkgname" diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD index 6de3283cc..4351ecd02 100644 --- a/community/ruby-cairo/PKGBUILD +++ b/community/ruby-cairo/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 86931 2013-03-24 23:46:23Z arodseth $ +# $Id: PKGBUILD 87111 2013-03-27 11:45:17Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Brad Fanella +# Contributor: Jeremy pkgname=ruby-cairo pkgver=1.12.2 -pkgrel=5 +pkgrel=6 pkgdesc='Ruby bindings for cairo' arch=('x86_64' 'i686') -# http://cairographics.org/releases/ url='http://cairographics.org/rcairo/' license=('GPL') depends=('ruby' 'cairo') @@ -26,6 +26,8 @@ package() { cd "$srcdir/rcairo-$pkgver" make DESTDIR="$pkgdir" install + install -Dm644 ext/cairo/cairo.so \ + "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$arch-linux/cairo.so" } # vim:set ts=2 sw=2 et: diff --git a/community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch b/community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch deleted file mode 100644 index 6e0088ea4..000000000 --- a/community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 5b083ff67f69a8ab6fc6732131954482b468a880 Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic -Date: Sun, 10 Mar 2013 08:51:02 -0700 -Subject: [PATCH] backport - https://github.com/ruby-gnome2/ruby-gnome2/commit/03be2d663730119036c9d70d4fc7b52523ae40df - to fix syntax errors with NIL_P - ---- - gtk2/ext/gtk2/rbgdkevent.c | 2 +- - gtk2/ext/gtk2/rbgdkscreen.c | 2 +- - gtk2/ext/gtk2/rbgtkcalendar.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gtk2/ext/gtk2/rbgdkevent.c b/gtk2/ext/gtk2/rbgdkevent.c -index 783ec72..63b1502 100644 ---- a/gtk2/ext/gtk2/rbgdkevent.c -+++ b/gtk2/ext/gtk2/rbgdkevent.c -@@ -387,7 +387,7 @@ gdkevent_s_setting_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self) - VALUE value; - - rb_scan_args(argc, argv, "11", &name, &type); -- if NIL_P(type) -+ if (NIL_P(type)) - gtype = G_TYPE_STRING; - else - gtype = CLASS2GTYPE(type); -diff --git a/gtk2/ext/gtk2/rbgdkscreen.c b/gtk2/ext/gtk2/rbgdkscreen.c -index 243ed92..3095e38 100644 ---- a/gtk2/ext/gtk2/rbgdkscreen.c -+++ b/gtk2/ext/gtk2/rbgdkscreen.c -@@ -210,7 +210,7 @@ rg_get_setting(int argc, VALUE *argv, VALUE self) - VALUE value; - - rb_scan_args(argc, argv, "11", &name, &type); -- if NIL_P(type) -+ if (NIL_P(type)) - gtype = G_TYPE_STRING; - else - gtype = CLASS2GTYPE(type); -diff --git a/gtk2/ext/gtk2/rbgtkcalendar.c b/gtk2/ext/gtk2/rbgtkcalendar.c -index e895f81..f9b0666 100644 ---- a/gtk2/ext/gtk2/rbgtkcalendar.c -+++ b/gtk2/ext/gtk2/rbgtkcalendar.c -@@ -105,7 +105,7 @@ rg_display_options(int argc, VALUE *argv, VALUE self) - VALUE flags; - rb_scan_args(argc, argv, "01", &flags); - -- if NIL_P(flags){ -+ if (NIL_P(flags)){ - #if GTK_CHECK_VERSION(2,4,0) - return GFLAGS2RVAL(gtk_calendar_get_display_options(_SELF(self)), - GTK_TYPE_CALENDAR_DISPLAY_OPTIONS); --- -1.8.1.5 - diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 9f4751445..23608ec6c 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86880 2013-03-23 23:10:43Z td123 $ +# $Id: PKGBUILD 87134 2013-03-27 19:44:03Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -8,29 +8,24 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=1.2.2 -pkgrel=2 +pkgver=1.2.5 +pkgrel=1 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') -source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz" - '0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch') -sha256sums=('f99ff4888fc69317e1dae61c9ca684bf2f38a20534f1f1b4b3b182c66247910c' - '9180b6b8d146b815de63bd2c4f0e215ab7591e3ebaca913120ae962695f3c388') +source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") +sha256sums=('9b956468446361b930bb5b10a518e1c59b4ce2dd2ea04ccc600d0259f1490429') build() { cd "$srcdir/ruby-gtk2-$pkgver" - #patch -Np1 -i ${srcdir}/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch LANG="en_US.UTF-8" \ ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor mkdir -p "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" mkdir -p "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" - #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" - #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" make } @@ -39,8 +34,6 @@ package_ruby-atk() { depends=("ruby-glib2=$pkgver" 'atk') cd "$srcdir/ruby-gtk2-$pkgver/atk" - #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" - #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" make includedir="/usr/include" DESTDIR="$pkgdir" install } @@ -49,8 +42,6 @@ package_ruby-gdkpixbuf2() { depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2') cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2" - #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" - #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" make includedir="/usr/include" DESTDIR="$pkgdir" install } @@ -59,8 +50,6 @@ package_ruby-gio2() { depends=("ruby-glib2=$pkgver") cd "$srcdir/ruby-gtk2-$pkgver/gio2" - #export CXXFLAGS="$CXXFLAGS -lglib-2.0" - #export CFLAGS="$CFLAGS -lglib-2.0" make includedir="/usr/include" DESTDIR="$pkgdir/" install } @@ -69,8 +58,6 @@ package_ruby-glib2() { depends=('glib2' 'ruby') cd "$srcdir/ruby-gtk2-$pkgver/glib2" - #export CXXFLAGS="$CXXFLAGS -lglib-2.0" - #export CFLAGS="$CFLAGS -lglib-2.0" make includedir="/usr/include" DESTDIR="$pkgdir/" install } @@ -80,8 +67,6 @@ package_ruby-gtk2() { "ruby-gdkpixbuf2=$pkgver") cd "$srcdir/ruby-gtk2-$pkgver/gtk2" - #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" - #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" make includedir="/usr/include" DESTDIR="$pkgdir/" install } @@ -90,8 +75,6 @@ package_ruby-pango() { depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango') cd "$srcdir/ruby-gtk2-$pkgver/pango" - #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" - #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" make includedir="/usr/include" DESTDIR="$pkgdir/" install } diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 6f3e05b99..27c573cb0 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84793 2013-02-24 16:59:02Z dwallace $ +# $Id: PKGBUILD 87136 2013-03-27 19:52:53Z dwallace $ # Maintainer: Daniel Wallace # Contributor: Antonio Rojas < nqn1976 @ gmail.com > # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=5.7 +pkgver=5.8 pkgrel=1 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' @@ -98,3 +98,5 @@ package() { } # vim :set ts=2 sw=2 et: +md5sums=('b91d6c20798f396a9c875527c78b3587' + 'b82f94383829eee26648feb977e2d89b') diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD index eb7d55a06..7a7744ce8 100644 --- a/community/tmux/PKGBUILD +++ b/community/tmux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77704 2012-10-13 15:48:59Z bpiotrowski $ +# $Id: PKGBUILD 87109 2013-03-27 11:16:29Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: TDY # Contributor: Grigorios Bouzakis pkgname=tmux -pkgver=1.7 +pkgver=1.8 pkgrel=1 pkgdesc='A terminal multiplexer' url='http://tmux.sourceforge.net/' @@ -13,7 +13,7 @@ license=('BSD') depends=('ncurses' 'libevent') source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz LICENSE) -md5sums=('2c48fb9beb22eedba7a5de3b78dd0c03' +md5sums=('b9477de2fe660244cbc6e6d7e668ea0e' '71601bc37fa44e4395580b321963018e') build() { diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD index 4a3e9d65d..dd72f80de 100644 --- a/community/wings3d/PKGBUILD +++ b/community/wings3d/PKGBUILD @@ -1,52 +1,50 @@ -# $Id: PKGBUILD 86005 2013-03-10 23:35:35Z arodseth $ +# $Id: PKGBUILD 87126 2013-03-27 16:37:11Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: kappa pkgname=wings3d _pkgname=wings pkgver=1.4.1 -pkgrel=16 +pkgrel=17 pkgdesc='3D modeling program' arch=('x86_64' 'i686') url='http://www.wings3d.com/' license=('GPL') -depends=('erlang' 'erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils') -makedepends=('setconf' 'gendesk') +depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang') +makedepends=('gendesk') optdepends=('povray: rendering support via POV-Ray') install=$pkgname.install -options=('!emptydirs') -_genericname=('3D Modeler') -# Using the i686-only binary release -# Would prefer using a source release, if there is one that compiles -source=("http://sourceforge.net/projects/$_pkgname/files/$_pkgname/$pkgver/$_pkgname-$pkgver-linux.bzip2.run.gz" +source=("$pkgname-$pkgver.tar.gz::https://github.com/dgud/wings/archive/master.tar.gz" + "$pkgname.sh" "$pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png") -sha256sums=('760e19fa4973ed0fc75057897135a8efa241e834b078fc05c28786672137b322' +sha256sums=('5fe17aa7bd26c031ca242f17b24eaa8f6fa9fe4c38b37a9669953c03e9e89b83' + '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e' '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a') -if [ "$CARCH" == "x86_64" ] -then - depends=('lib32-libgl' 'lib32-glu' 'lib32-sdl' 'lib32-ncurses') -fi +_genericname=('3D Modeler') +_categories=('Graphics;3DGraphics') build() { cd "$srcdir" gendesk - setconf "$pkgname.desktop" Categories "Graphics;3DGraphics;" - chmod +x "$_pkgname-$pkgver-linux.bzip2.run" - "./$_pkgname-$pkgver-linux.bzip2.run" --nox11 --nochown --tar xf > /dev/null - setconf install_wings INSTALL_DIR "$pkgdir/opt/$pkgname-$pkgver" + cd "$_pkgname-master" + export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*) + make + make lang } package() { - cd "$srcdir" - ./install_wings + cd "$srcdir/$_pkgname-master" - cd "$pkgdir" - setconf "opt/$pkgname-$pkgver/$_pkgname" ROOTDIR "/opt/$pkgname-$pkgver" - install -Dm755 "opt/$pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$pkgname" + mkdir -p "$pkgdir/usr/lib/$pkgname" + for subdir in ebin fonts patches plugins shaders textures; do + cp -r "$srcdir/$_pkgname-master/$subdir/" "$pkgdir/usr/lib/$pkgname" + done - cd "$srcdir" install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd "$srcdir" + install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname" install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" install -Dm644 "$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" diff --git a/community/wings3d/wings3d.sh b/community/wings3d/wings3d.sh new file mode 100644 index 000000000..c0fd3b2fb --- /dev/null +++ b/community/wings3d/wings3d.sh @@ -0,0 +1,2 @@ +#!/bin/sh +erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"} diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index 60978f58e..62e077b8f 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 86597 2013-03-20 11:05:24Z jelle $ +# $Id: PKGBUILD 87102 2013-03-27 07:08:16Z jelle $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta # Contributor: orbisvicis pkgname=xmonad-contrib pkgver=0.11 -pkgrel=5 +pkgrel=6 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.6.2-1' 'xmonad=0.11-4' 'sh' 'haskell-x11=1.6.1.1-1' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7-4' 'haskell-random=1.0.1.1-4') +depends=('ghc=7.6.2-1' 'xmonad=0.11-5' 'sh' 'haskell-x11=1.6.1.1-2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7-4' 'haskell-random=1.0.1.1-4') install='xmonad-contrib.install' source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-remove-getatomname.patch) diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD index f77222015..357b8a5e9 100644 --- a/community/xmonad/PKGBUILD +++ b/community/xmonad/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 86596 2013-03-20 11:05:23Z jelle $ +# $Id: PKGBUILD 87101 2013-03-27 07:08:15Z jelle $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta # Contributor: shild pkgname=xmonad pkgver=0.11 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight X11 tiled window manager written in Haskell" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.6.2-1' 'gmp' 'haskell-x11=1.6.1.1-1' 'sh' 'haskell-mtl=2.1.2-2' 'haskell-utf8-string=0.3.7-4' 'haskell-extensible-exceptions=0.1.1.4-4') +depends=('ghc=7.6.2-1' 'gmp' 'haskell-x11=1.6.1.1-2' 'sh' 'haskell-mtl=2.1.2-2' 'haskell-utf8-string=0.3.7-4' 'haskell-extensible-exceptions=0.1.1.4-4') makedepends=('gendesk') optdepends=('xorg-xmessage: for displaying visual error messages') install='xmonad.install' diff --git a/core/diffutils/PKGBUILD b/core/diffutils/PKGBUILD index 44b02060d..0ed2f9049 100644 --- a/core/diffutils/PKGBUILD +++ b/core/diffutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137084 2011-09-06 04:35:05Z allan $ +# $Id: PKGBUILD 180850 2013-03-27 01:10:49Z allan $ # Maintainer: Allan McRae # Contributor: Andreas Radke pkgname=diffutils -pkgver=3.2 +pkgver=3.3 pkgrel=1 pkgdesc="Utility programs used for creating patch files" arch=('i686' 'x86_64') @@ -12,8 +12,9 @@ license=('GPL3') groups=('base') depends=('glibc' 'sh') install=diffutils.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('26ff64c332429c830c154be46b393382') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('99180208ec2a82ce71f55b0d7389f1b3' + '203a2f2101dfcc09cdac655be353fd78') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index 7fc5bcdba..0850834ba 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179540 2013-03-06 10:50:29Z allan $ +# $Id: PKGBUILD 180851 2013-03-27 01:10:50Z allan $ # Maintainer: Allan McRae # Contributor: Andreas Radke pkgname=file -pkgver=5.13 +pkgver=5.14 pkgrel=1 pkgdesc="File type identification utility" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('d60c1364ba956eff7d21f8250808fc6d') +md5sums=('c26625f1d6773ad4bc5a87c0e315632c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD index 11fc7e27d..14633e682 100644 --- a/core/libffi/PKGBUILD +++ b/core/libffi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180006 2013-03-14 11:52:23Z stephane $ +# $Id: PKGBUILD 180905 2013-03-27 21:58:17Z stephane $ # Maintainer: Stéphane Gaudreault # Contributor: Jan de Groot pkgname=libffi -pkgver=3.0.12 +pkgver=3.0.13 pkgrel=1 pkgdesc="A portable, high level programming interface to various calling conventions" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ checkdepends=('dejagnu') options=('!libtool') install=libffi.install source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) -sha1sums=('463dcb4ae9aea4c52bba12b67fbe4d91ed1e21fd') +sha1sums=('f5230890dc0be42fb5c58fbf793da253155de106') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index cd61d1341..4ca50f46f 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180800 2013-03-26 11:49:27Z foutrelis $ +# $Id: PKGBUILD 180862 2013-03-27 13:30:16Z stephane $ # Maintainer: Stéphane Gaudreault # Maintainer: Ionut Biru # Contributor: kevin @@ -10,13 +10,13 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.52.0 _boostver=${pkgver//./_} -pkgrel=2 +pkgrel=3 url="http://www.boost.org/" arch=('i686' 'x86_64') license=('custom') makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz - boost-1.52.0-python3.patch) + boost-1.52.0-python3.patch) sha1sums=('1120430030315b0a94b6d63fc04662960db2444c' '34026072a7cb2534164f20e77bb71a5c75093307') @@ -24,7 +24,7 @@ _stagedir="${srcdir}/stagedir" build() { local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" - + cd "${srcdir}/${pkgbase}_${_boostver}" # Fix build errors with python 3 @@ -53,7 +53,7 @@ build() { "${_stagedir}"/bin/bjam --toolset=gcc cflags="-std=gnu++11" library_status popd cp -a dist/bin/* "${_stagedir}"/bin - + #boostbook is needed by quickbook install -d -m 755 "${_stagedir}"/share/boostbook cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/ @@ -65,12 +65,13 @@ build() { # --layout=system no longer adds the -mt suffix for multi-threaded libs. # install to ${_stagedir} in preparation for split packaging "${_stagedir}"/bin/bjam \ - release \ + variant=release \ debug-symbols=off \ threading=multi \ runtime-link=shared \ link=shared \ toolset=gcc \ + python=2.7 \ --layout=system \ --prefix="${_stagedir}" \ ${JOBS} \ diff --git a/extra/libbsd/LICENSE b/extra/libbsd/LICENSE new file mode 100644 index 000000000..7dcbfc2ba --- /dev/null +++ b/extra/libbsd/LICENSE @@ -0,0 +1,28 @@ +/*- + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD new file mode 100644 index 000000000..7bc5012be --- /dev/null +++ b/extra/libbsd/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 180872 2013-03-27 14:45:32Z tpowa $ +# Maintainer: Sven-Hendrik Haase +# Contributor: Gerardo Exequiel Pozzi + +pkgname=libbsd +pkgver=0.4.2 +pkgrel=1 +pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" +arch=('i686' 'x86_64') +url="http://libbsd.freedesktop.org" +license=('custom') +depends=('glibc') +source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) +md5sums=('591fc9de4ca22f78cf87a94e648a92f4') + +build() { + cd $srcdir/$pkgname-$pkgver + + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install + install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index 97169c70c..7e1d664aa 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166960 2012-09-23 11:44:00Z tomegun $ +# $Id: PKGBUILD 180848 2013-03-26 23:07:40Z tomegun $ # Maintainer: Tom Gundersen # Contributor: damir # Contributor: Kevin Edmonds pkgname=libmtp -pkgver=1.1.5 +pkgver=1.1.6 pkgrel=1 pkgdesc="Library implementation of the Media Transfer Protocol" arch=("i686" "x86_64") @@ -24,4 +24,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('f80e45c0e6e5798c434bb1c26a7b602d') +md5sums=('87835626dbcf39e62bfcdd4ae6da2063') diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index cdec798df..b4dc7a492 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=834 -__hgrev=ad7bbe9ea65b +_patchlevel=875 +__hgrev=acf7368a2acc _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('f50a7f4e07ae991db324f0c4b3dcad3d' - '57e197f51fbbd22944bfc51041ab89d1' +md5sums=('4d71e8b9ef6a214b3651d69be19fadec' + 'ac2bfed9586c987f0b8435c91be3f18a' '6e7adfbd5d26c1d161030ec203a7f243' '20fceda56badf201695c57999b0bc609' '10353a61aadc3f276692d0e17db1478e' diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 670a8db19..8d59dc785 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 179005 2013-03-01 10:26:55Z andrea $ +# $Id: PKGBUILD 180898 2013-03-27 20:10:16Z guillaume $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=2.0.5 -pkgrel=4 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -84,7 +84,8 @@ build() { --enable-upnp \ --enable-opus \ --enable-sftp \ - LUAC=luac5.1 + LUAC=luac5.1 \ + RCC=/usr/bin/rcc-qt4 make } -- cgit v1.2.3-54-g00ecf