diff options
author | root <root@rshg047.dnsready.net> | 2011-05-05 19:02:44 +0000 |
---|---|---|
committer | root <root@rshg047.dnsready.net> | 2011-05-05 19:02:44 +0000 |
commit | ef61aa5a9cead170fa18dba44609c32bbf18306a (patch) | |
tree | 82af53ec1018f58868b80cdf680a9c4ec5df1538 /community | |
parent | ab1410d33401cf1fc4a384bb0b2d9901c8fe8d14 (diff) |
Thu May 5 19:02:44 UTC 2011
Diffstat (limited to 'community')
-rwxr-xr-x | community/e-modules-extra-svn/PKGBUILD | 21 | ||||
-rwxr-xr-x | community/e-svn/PKGBUILD | 11 | ||||
-rwxr-xr-x | community/e_dbus-svn/PKGBUILD | 4 | ||||
-rwxr-xr-x | community/ecore-svn/PKGBUILD | 4 | ||||
-rwxr-xr-x | community/edje-svn/PKGBUILD | 4 | ||||
-rwxr-xr-x | community/eet-svn/PKGBUILD | 4 | ||||
-rw-r--r-- | community/eeze-svn/PKGBUILD | 2 | ||||
-rwxr-xr-x | community/efreet-svn/PKGBUILD | 4 | ||||
-rwxr-xr-x | community/eina-svn/PKGBUILD | 4 | ||||
-rw-r--r-- | community/elementary-svn/PKGBUILD | 2 | ||||
-rwxr-xr-x | community/embryo-svn/PKGBUILD | 4 | ||||
-rwxr-xr-x | community/evas-svn/PKGBUILD | 4 | ||||
-rw-r--r-- | community/go/PKGBUILD | 8 | ||||
-rw-r--r-- | community/haskell-hslogger/PKGBUILD | 7 | ||||
-rw-r--r-- | community/libev/PKGBUILD | 8 | ||||
-rw-r--r-- | community/mlt/PKGBUILD | 8 | ||||
-rw-r--r-- | community/mumble/PKGBUILD | 6 | ||||
-rw-r--r-- | community/mysql-workbench/PKGBUILD | 26 | ||||
-rw-r--r-- | community/mysql-workbench/gcc46.patch | 113 | ||||
-rw-r--r-- | community/openlierox/PKGBUILD | 4 | ||||
-rw-r--r-- | community/perl-datetime/PKGBUILD | 21 | ||||
-rw-r--r-- | community/recoll/PKGBUILD | 13 | ||||
-rw-r--r-- | community/scponly/PKGBUILD | 24 | ||||
-rwxr-xr-x | community/scponly/setup_chroot.sh | 7 |
24 files changed, 218 insertions, 95 deletions
diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD index 3ecdfe102..7bfb26aad 100755 --- a/community/e-modules-extra-svn/PKGBUILD +++ b/community/e-modules-extra-svn/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-modules-extra-svn -pkgver=57516 +pkgver=59120 pkgrel=1 pkgdesc="Extra gadgets for e17" arch=('i686' 'x86_64') groups=('e17-extra-svn') url="http://www.enlightenment.org" license=('BSD') -depends=('e-svn' 'libxkbfile' 'emprint-svn' 'libmpd' 'hal' 'efreet-svn' 'e_dbus-svn') +depends=('e-svn' 'libxkbfile' 'emprint-svn' 'libmpd' 'efreet-svn' 'e_dbus-svn') makedepends=('subversion') conflicts=('e-modules-extra') provides=('e-modules-extra') @@ -40,10 +40,11 @@ build() { sed -i 's|efreet/Efreet.h|efreet-0/Efreet.h|' winlist-ng/src/e_mod_main.h || return 1 # weather fails to compile on September 7th 2010 -for i in alarm calendar cpu deskshow diskio efm_path efm_pathbar efm_nav\ - empris eooorg everything-mpris everything-pidgin everything-places everything-tracker \ - everything-wallpaper everything-websearch \ - execwatch flame forecasts iiirk itask itask-ng language mail mem \ +# xkbswitch fails to compile on May 4th 2011 +for i in alarm calendar comp-scale cpu deskshow diskio efm_path efm_pathbar efm_nav\ + empris engage eooorg everything-mpris everything-pidgin everything-places \ + everything-tracker everything-wallpaper everything-websearch \ + execwatch flame forecasts iiirk itask language mail mem \ moon mpdule net news notification penguins photo places quickaccess \ rain screenshot slideshow snow taskbar tclock tiling uptime \ winlist-ng winselector wlan; do @@ -59,10 +60,10 @@ package() { cd $srcdir/$_svnmod-build # weather fails to compile on September 7th 2010 -for i in alarm calendar cpu deskshow diskio efm_path efm_pathbar efm_nav\ - empris eooorg everything-mpris everything-pidgin everything-places everything-tracker \ - everything-wallpaper everything-websearch \ - execwatch flame forecasts iiirk itask itask-ng language mail mem \ +for i in alarm calendar comp-scale cpu deskshow diskio efm_path efm_pathbar efm_nav\ + empris engage eooorg everything-mpris everything-pidgin everything-places \ + everything-tracker everything-wallpaper everything-websearch \ + execwatch flame forecasts iiirk itask language mail mem \ moon mpdule net news notification penguins photo places quickaccess \ rain screenshot slideshow snow taskbar tclock tiling uptime \ winlist-ng winselector wlan; do diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index 82098dae9..48ef4531c 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 41234 2011-03-04 22:18:13Z rvanharen $ +# $Id: PKGBUILD 46198 2011-05-04 10:12:25Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-svn -pkgver=57517 +pkgver=58940 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') @@ -17,9 +17,8 @@ conflicts=('e') provides=('e') backup=('etc/enlightenment/sysactions.conf') options=('!libtool') -source=('e-applications.menu' 'sysactions.patch') -sha1sums=('e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' - '1bbe1bb1ba8c10098c3c30dc5a97734158abb2c7') +source=('e-applications.menu') +sha1sums=('e08cc63cb8a188a06705b42d03e032b9fcfa7ee5') _svntrunk="http://svn.enlightenment.org/svn/e/trunk/e" _svnmod="e" @@ -41,7 +40,7 @@ msg "Connecting to $_svntrunk SVN server...." cd $_svnmod-build # set default suspend/hibernate commands in config file - patch -Np0 -i ${srcdir}/sysactions.patch +# patch -Np0 -i ${srcdir}/sysactions.patch ./autogen.sh --prefix=/usr --sysconfdir=/etc --enable-pam make diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index 04bd34faa..929de691d 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 41229 2011-03-04 22:17:26Z rvanharen $ +# $Id: PKGBUILD 46193 2011-05-04 10:10:41Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e_dbus-svn -pkgver=57317 +pkgver=58954 pkgrel=1 pkgdesc="dbus abstraction layer for e17" arch=('i686' 'x86_64') diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index ffe223a9d..d1592bbb5 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 41205 2011-03-04 22:13:31Z rvanharen $ +# $Id: PKGBUILD 46172 2011-05-04 10:03:34Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ecore-svn -pkgver=57503 +pkgver=58945 pkgrel=1 pkgdesc="Ecore is an abstraction layer for e17" arch=('i686' 'x86_64') diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index 0430881fc..6ebf925ae 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 41219 2011-03-04 22:15:51Z rvanharen $ +# $Id: PKGBUILD 46185 2011-05-04 10:07:59Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=edje-svn -pkgver=57412 +pkgver=58887 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64') diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index 8a8dc86cf..5e2430d82 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40537 2011-02-25 09:37:13Z rvanharen $ +# $Id: PKGBUILD 46164 2011-05-04 10:00:51Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet-svn -pkgver=57246 +pkgver=58955 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD index f74e198c4..5f54563fd 100644 --- a/community/eeze-svn/PKGBUILD +++ b/community/eeze-svn/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: bluebugs pkgname=eeze-svn -pkgver=57501 +pkgver=58668 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index bb595d66b..c00133004 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 41224 2011-03-04 22:16:41Z rvanharen $ +# $Id: PKGBUILD 46188 2011-05-04 10:08:58Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=efreet-svn -pkgver=57435 +pkgver=58672 pkgrel=1 pkgdesc="freedesktop.org specifications for e17" arch=('i686' 'x86_64') diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 92c574303..7a67482ed 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 41191 2011-03-04 22:11:05Z rvanharen $ +# $Id: PKGBUILD 46161 2011-05-04 09:59:52Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina-svn -pkgver=57387 +pkgver=58920 pkgrel=1 pkgdesc="E17 file chunk reading/writing library" arch=('i686' 'x86_64') diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD index 8b106b94f..a31116bb0 100644 --- a/community/elementary-svn/PKGBUILD +++ b/community/elementary-svn/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=elementary-svn -pkgver=57515 +pkgver=58962 pkgrel=1 pkgdesc="Enlightenment's basic widget set" arch=('i686' 'x86_64') diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD index 0bb1463a5..d1ad7817d 100755 --- a/community/embryo-svn/PKGBUILD +++ b/community/embryo-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40593 2011-02-25 15:01:57Z rvanharen $ +# $Id: PKGBUILD 46180 2011-05-04 10:06:17Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo-svn -pkgver=57246 +pkgver=58829 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64') diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index 1f2dae2aa..6ec7762c2 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 41200 2011-03-04 22:12:36Z rvanharen $ +# $Id: PKGBUILD 46169 2011-05-04 10:02:34Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas-svn -pkgver=57457 +pkgver=58958 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64') diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index fc6229e0a..97495a871 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Christian Himpel <chressie at gmail dot com> pkgname=go -pkgver=r56 +pkgver=r57.1 pkgrel=1 epoch=1 pkgdesc='Google Go compiler and tools (release version)' @@ -75,10 +75,4 @@ package() { install -Dm644 src/pkg/runtime/cgocall.h $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h install $srcdir/go.sh $pkgdir/etc/profile.d/ - - # Point Python scripts to the python2 binary - cd $pkgdir/usr/share/go/misc/dashboard - sed -i 's/python$/\02/' {buildcontrol,googlecode_upload}.py godashboard/app.yaml - sed -i 's/python"/python2"/' builder/main.go - sed -i 's/python /python2 /' builder.sh } diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD index 115e42e89..7b6e112b6 100644 --- a/community/haskell-hslogger/PKGBUILD +++ b/community/haskell-hslogger/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41263 2011-03-04 22:40:08Z remy $ +# $Id: PKGBUILD 46145 2011-05-04 08:33:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=hslogger pkgname=haskell-hslogger pkgver=1.1.0 -pkgrel=3.1 +pkgrel=4 pkgdesc="Versatile logging framework" url="http://hackage.haskell.org/package/${_hkgname}" license=('LGPL') @@ -19,7 +19,8 @@ md5sums=('8039e079338dae19e1273bbd73332014') build() { cd ${srcdir}/${_hkgname}-${pkgver} runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \ - --enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid + --enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \ + --enable-library-profiling runhaskell Setup build runhaskell Setup haddock runhaskell Setup register --gen-script diff --git a/community/libev/PKGBUILD b/community/libev/PKGBUILD index 4ab23a1ef..652d1d0e2 100644 --- a/community/libev/PKGBUILD +++ b/community/libev/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 32688 2010-11-16 16:50:22Z lcarlier $ +# $Id: PKGBUILD 46270 2011-05-04 12:13:34Z rvanharen $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Thomas Haider <t.haider@vcnc.org> pkgname=libev -pkgver=4.01 +pkgver=4.04 pkgrel=1 pkgdesc="A full-featured and high-performance event loop" arch=('i686' 'x86_64') url="http://software.schmorp.de/pkg/libev.html" license=('BSD') depends=('glibc') -options=('!libtool' 'force') +options=('!libtool') source=(http://dist.schmorp.de/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('2a6e0d3d7eda7d54b39f3800b8279707') +sha1sums=('7768c2bcce30dbf76672e51642a655479dd45772') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index 099421f6a..a98de1ccb 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44159 2011-04-04 10:37:36Z bluewind $ +# $Id: PKGBUILD 46148 2011-05-04 08:34:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -7,8 +7,8 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') -pkgver=0.7.0 -pkgrel=3 +pkgver=0.7.2 +pkgrel=1 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64') url="http://www.mltframework.org" @@ -16,7 +16,7 @@ license=('GPL') makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg' 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('06dd5bd6f00ae8fec64d45f0b74cac88') +md5sums=('3adeace6642a5ee0db0715b6bd7b7a52') build() { # mlt diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD index 1bf5bad2e..7628a460b 100644 --- a/community/mumble/PKGBUILD +++ b/community/mumble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 40148 2011-02-20 17:41:47Z svenstaro $ +# $Id: PKGBUILD 46129 2011-05-04 05:39:59Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lauri Niskanen <ape@ape3000.com> # Contributor: Sebastian.Salich@gmx.de @@ -9,7 +9,7 @@ pkgname=mumble pkgver=1.2.3 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') pkgdesc="A voice chat application similar to TeamSpeak" license=('GPL') @@ -30,7 +30,7 @@ build() { # Building mumble /usr/bin/qmake main.pro \ CONFIG+="bundled-celt no-bundled-speex no-speechd no-g15 no-xevie no-server \ - no-embed-qt-translations packaged" \ + no-embed-qt-translations no-update packaged" \ DEFINES+="PLUGIN_PATH=/usr/lib/mumble" make release } diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD index 7022c11b8..e38e78997 100644 --- a/community/mysql-workbench/PKGBUILD +++ b/community/mysql-workbench/PKGBUILD @@ -1,32 +1,36 @@ -# $Id: PKGBUILD 42510 2011-03-17 12:19:39Z andrea $ +# $Id: PKGBUILD 46305 2011-05-04 18:56:20Z andrea $ # Maintainer: # Contributor : Ionut Biru <ibiru@archlinux.org> # Contributor: totoloco <totoloco at gmail _dot_com> pkgname=mysql-workbench -pkgver=5.2.33 -pkgrel=2 +epoch=1 +pkgver=5.2.33b +pkgrel=1 pkgdesc="A cross-platform, visual database design tool developed by MySQL" arch=('i686' 'x86_64') -url="http://dev.mysql.com/workbench/" +url="http://wb.mysql.com/" license=('GPL2') -depends=('libgnome' 'libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libglade' 'libgl' 'libsigc++' 'python-paramiko' 'python-pexpect') +depends=('libgnome' 'libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libglade' 'libgl' + 'libsigc++' 'python-paramiko' 'python-pexpect') makedepends=('boost' 'curl' 'mesa') options=('!libtool') source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz - ArchLinux.xml arch.patch python27.patch) -md5sums=('d97a1512c8c8ad54ae83441f8ea5c4b8' + ArchLinux.xml arch.patch python27.patch gcc46.patch) +md5sums=('850e081eeaea87a88c408483817e4b1f' 'c2f986cd5737413d020c55db32713c48' '23430d24400fd65c9fd872bd8e2411e5' - '47bc4cdfaa035a0132392e94c462ebf7') + '47bc4cdfaa035a0132392e94c462ebf7' + '8e7a6d5aa59b73727e862724f115d90a') build() { - cd "${srcdir}/${pkgname}-gpl-${pkgver}-src" + cd "${srcdir}/${pkgname}-gpl-5.2.33-src" cp "${srcdir}/ArchLinux.xml" res/mysql.profiles patch -Np1 -i ${srcdir}/arch.patch patch -Np0 -i ${srcdir}/python27.patch + patch -p1 -i ${srcdir}/gcc46.patch #we use System provided libraries rm -rf ext/curl @@ -35,14 +39,14 @@ build() { rm -rf ext/libsigc++ export CPPFLAGS=$(pkg-config --cflags sigc++-2.0) - unset LDFLAGS + export CXXFLAGS="$CXXFLAGS -fpermissive" ./autogen.sh --prefix=/usr --disable-debug --disable-static make } package() { - cd "${srcdir}/${pkgname}-gpl-${pkgver}-src" + cd "${srcdir}/${pkgname}-gpl-5.2.33-src" make DESTDIR="${pkgdir}" install sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" $pkgdir/usr/share/mysql-workbench/sshtunnel.py diff --git a/community/mysql-workbench/gcc46.patch b/community/mysql-workbench/gcc46.patch new file mode 100644 index 000000000..9daa162c8 --- /dev/null +++ b/community/mysql-workbench/gcc46.patch @@ -0,0 +1,113 @@ +diff -up mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp +--- mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46 2011-03-23 17:05:33.000000000 +0100 ++++ mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp 2011-03-23 17:06:02.000000000 +0100 +@@ -23,7 +23,7 @@ + #include "grts/structs.workbench.model.reporting.h"
+ #include "grts/structs.workbench.physical.h"
+
+-
++namespace wb {
+ void register_all_metaclasses()
+ {
+ register_structs_app_xml();
+@@ -46,3 +46,6 @@ void register_all_metaclasses()
+ register_structs_workbench_model_reporting_xml();
+ register_structs_workbench_physical_xml();
+ }
++// end of namespace wb
++}
++
+diff -up mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp +--- mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 2011-03-23 16:56:16.000000000 +0100 ++++ mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp 2011-03-23 17:07:36.000000000 +0100 +@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo + } + + Glib::RefPtr<Gtk::ListStore> model= Gtk::ListStore::create(*color_combo_columns); +- Gtk::ComboBox *combo= new Gtk::ComboBox(model); ++ Gtk::ComboBox *combo= new Gtk::ComboBox((Glib::RefPtr<Gtk::TreeModel> &)model); + + combo->pack_start(color_combo_columns->image); + +diff -up mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp +--- mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46 2011-03-23 17:04:17.000000000 +0100 ++++ mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp 2011-03-23 17:04:40.000000000 +0100 +@@ -32,10 +32,11 @@ + #include <math.h> + #include "base/log.h" + ENABLE_LOG("mforms.utils") +- + using namespace mforms; + ++namespace mforms { + GThread *_mforms_main_thread=0; ++} + + static std::map<std::string, int> remembered_message_answers; + static std::string remembered_message_answer_file; +diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp +--- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46 2011-03-17 13:48:45.000000000 +0100 ++++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp 2011-03-23 16:44:22.000000000 +0100 +@@ -1909,6 +1909,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_GROUP + + //============================================================================ + ++namespace grt { ++ + static void myx_grt_shell_show_command_help_print(grt::GRT *grt, const char *group_name, const char *cmd) + { + MYX_GRT_SHELL_COMMAND_HELP_GROUP help_group; +@@ -2097,3 +2099,6 @@ void myx_grt_shell_show_help(grt::GRT *g + } + } + ++// End of namspace grt ++} ++ +diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp +--- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46 2011-03-17 13:48:41.000000000 +0100 ++++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp 2011-03-23 16:44:22.000000000 +0100 +@@ -187,7 +187,7 @@ NL + }; + + +-void grt_shell_show_python_help(grt::GRT *grt, const char *command) ++void grt::grt_shell_show_python_help(grt::GRT *grt, const char *command) + { + if (!command || !*command) + grt->send_output( +diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h +--- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46 2011-03-17 13:48:39.000000000 +0100 ++++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h 2011-03-23 16:44:22.000000000 +0100 +@@ -21,6 +21,8 @@ + #ifndef __grtpp_shell_python_help_h__ + #define __grtpp_shell_python_help_h__ + ++namespace grt { + void grt_shell_show_python_help(grt::GRT *grt, const char *command); ++} + +-#endif /* __grtpp_shell_python_help_h__ */ +\ Pas de fin de ligne à la fin du fichier. ++#endif /* __grtpp_shell_python_help_h__ */ +diff -up mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h +--- mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 2011-03-23 16:51:30.000000000 +0100 ++++ mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h 2011-03-23 16:52:33.000000000 +0100 +@@ -10,6 +10,7 @@ + #include "config.h" + #endif + ++#include <cstddef> + #include "ctemplate/template.h" + + #include "grt/common.h" +--- mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in~ 2011-05-04 00:57:31.029029610 -0700 ++++ mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in 2011-05-04 00:57:45.162361700 -0700 +@@ -54,6 +54,7 @@ + #include <map> + #include <string> + #include <vector> ++#include <cstddef> + #include <ctemplate/template_dictionary_interface.h> + #include <ctemplate/template_string.h> + #include <ctemplate/template_modifiers.h> diff --git a/community/openlierox/PKGBUILD b/community/openlierox/PKGBUILD index c9fa2ff3d..f0ece7215 100644 --- a/community/openlierox/PKGBUILD +++ b/community/openlierox/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 29214 2010-10-11 15:58:28Z svenstaro $ +# $Id: PKGBUILD 46134 2011-05-04 07:37:58Z andrea $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=openlierox pkgver=0.58_rc3 -pkgrel=2 +pkgrel=3 pkgdesc="A real-time excessive Worms-clone" arch=('i686' 'x86_64') url="http://www.openlierox.net/" diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index 439c11cb6..c25f27d05 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 35604 2010-12-21 22:55:11Z tdziedzic $ +# $Id: PKGBUILD 46151 2011-05-04 08:34:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime -pkgver=0.66 -pkgrel=2 +pkgver=0.69 +pkgrel=1 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DateTime" @@ -12,18 +12,25 @@ license=('GPL' 'PerlArtistic') depends=('perl-datetime-timezone>=0.59' 'perl-datetime-locale>=0.41' 'perl-params-validate>=0.76') LC_NUMERIC=C provides=("perl-datetime=`printf %.4f $pkgver`") -options=('!emptydirs' 'force') +options=('!emptydirs') source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('9399b5b430da65ac0b9056c0182a805b') +md5sums=('d14c4439bd0b81446e54504db68fd64f') build() { cd $srcdir/DateTime-$pkgver - perl Build.PL installdirs=vendor destdir="$pkgdir/" ./Build +} + +check() { + cd $srcdir/DateTime-$pkgver # ./Build test - ./Build install + true +} +package() { + cd $srcdir/DateTime-$pkgver + ./Build install find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete } diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 3c892d148..ecde3d2d9 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 41903 2011-03-10 21:36:50Z ebelanger $ +# $Id: PKGBUILD 46293 2011-05-04 15:27:19Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Vladimir Chizhov <jagoterr@gmail.com> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=recoll -pkgver=1.15.7 +pkgver=1.15.8 pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" arch=('i686' 'x86_64') @@ -24,8 +25,7 @@ optdepends=('unzip: for the OpenOffice.org documents' 'python2: for using some filters') install=recoll.install source=(http://www.lesbonscomptes.com/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('649ebef60a1920dc2a195211993b3489') -sha1sums=('2494d71e4218df5a7e6a9715ef8dcee82e977ff8') +md5sums=('ca08ff6b8898587c120effd98cc9c85a') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -34,9 +34,9 @@ build() { for file in filters/{rclchm,rclexecm.py,rclics,rclpython,rclzip,rclaudio,rclinfo,rclkar,rcllatinclass.py} doc/user/usermanual.html; do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' desktop/hotrecoll.py + sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' desktop/hotrecoll.py - ./configure \ + ./configure \ --prefix=/usr \ --mandir=/usr/share/man @@ -45,6 +45,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install } diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD index cb4e89b14..96d07c175 100644 --- a/community/scponly/PKGBUILD +++ b/community/scponly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 3564 2009-10-06 07:22:09Z spupykin $ +# $Id: PKGBUILD 46261 2011-05-04 11:37:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=scponly pkgver=4.8 -pkgrel=6 +pkgrel=7 pkgdesc="A limited shell for ssh/scp" arch=(i686 x86_64) url="http://www.sublimation.org/scponly/" @@ -14,22 +14,22 @@ options=(docs) source=(http://downloads.sourceforge.net/sourceforge/scponly/scponly-$pkgver.tgz setup_chroot.sh) md5sums=('139ac9abd7f3b8dbc5c5520745318f8a' - '3318e648c106b1e7ed7826296c296d1a') + 'a5e26c355cf4f127a1f2fdf2fb1582cc') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc \ --enable-scp-compat --enable-winscp-compat --enable-chrooted-binary - sed -i 's|^#elif|#else|' helper.c + make +} - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - - install -D -m0644 COPYING $startdir/pkg/usr/share/licenses/scponly/COPYING && \ - mv $pkgdir/usr/man $pkgdir/usr/share/ || return 1 - - mkdir -p $pkgdir/usr/share/doc/scponly && \ +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + install -D -m0644 COPYING $pkgdir/usr/share/licenses/scponly/COPYING + mv $pkgdir/usr/man $pkgdir/usr/share/ + mkdir -p $pkgdir/usr/share/doc/scponly cp $srcdir/setup_chroot.sh config.h $pkgdir/usr/share/doc/scponly/ } diff --git a/community/scponly/setup_chroot.sh b/community/scponly/setup_chroot.sh index cd1a260eb..1af9807e0 100755 --- a/community/scponly/setup_chroot.sh +++ b/community/scponly/setup_chroot.sh @@ -79,7 +79,7 @@ fi # # we also need to add some form of ld.so, here are some good guesses. # -LDSO_LIST="/lib/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 /usr/libexec/ld.so /lib64/ld-linux-x86-64.so.2 /lib/ld-linux.so.2 /usr/libexec/ld-elf.so.1" +LDSO_LIST="/lib/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 /usr/libexec/ld.so /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2 /lib/ld-linux.so.2 /usr/libexec/ld-elf.so.1" for lib in $LDSO_LIST; do if [ -f $lib ]; then LDSOFOUND=1; @@ -95,6 +95,11 @@ if [ $? -eq 0 ]; then LIB_LIST="$LIB_LIST /lib/libnss_compat*" fi +ls /lib/libnss_files* > /dev/null 2>&1 +if [ $? -eq 0 ]; then + LIB_LIST="$LIB_LIST /lib/libnss_files*" +fi + # check that the configure options are correct for chrooted operation: if [ x/usr/sbin/useradd = x ]; then |