diff options
40 files changed, 612 insertions, 310 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index a640f65f0..33b5cc2a5 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55335 2011-09-10 01:42:32Z giovanni $ +# $Id: PKGBUILD 55511 2011-09-13 21:33:02Z ebelanger $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre pkgver=0.8.18 -pkgrel=1 +pkgrel=2 pkgdesc="Ebook management application" arch=('i686' 'x86_64') url="http://calibre-ebook.com/" diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD index 93e8496ed..2c5f9afb0 100644 --- a/community/cuneiform/PKGBUILD +++ b/community/cuneiform/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 45314 2011-04-19 21:30:46Z spupykin $ +# $Id: PKGBUILD 55513 2011-09-13 21:33:06Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Maxim Vuets <maxim.vuets@gmail.com> pkgname=cuneiform pkgver=1.1.0 _dpkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." arch=('i686' 'x86_64') url="https://launchpad.net/cuneiform-linux" license=('BSD') -depends=(imagemagick) -makedepends=(cmake) +depends=('imagemagick') +makedepends=('cmake') source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2) md5sums=('09fd160cdfc512f26442a7e91246598d') +_SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}" + build() { - _SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}" cd "${_SRC_ROOT}" sed -i 's#lib64#lib#' install_files.cmake mkdir builddir @@ -24,9 +25,12 @@ build() { cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr .. make +} + +package() { + cd "${_SRC_ROOT}"/builddir make DESTDIR="${pkgdir}" install - mkdir -p "${pkgdir}/usr/share/licenses/cuneiform" - cp "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \ - "${pkgdir}/usr/share/licenses/cuneiform" + install -Dm644 "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \ + "${pkgdir}/usr/share/licenses/cuneiform/license.txt" } diff --git a/community/gnucap/PKGBUILD b/community/gnucap/PKGBUILD index 48418b391..1b9e4fec5 100644 --- a/community/gnucap/PKGBUILD +++ b/community/gnucap/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 6388 2009-12-09 17:45:13Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 55492 2011-09-13 05:23:39Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jared Casper <jaredcasper@gmail.com> # Contributor: Georgij Kondratjev <smpuj@bk.ru> pkgname=gnucap pkgver=20091207 _pkgver=2009-12-07 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Circuit Analysis Package" arch=('i686' 'x86_64') url="http://gnucap.org/" license=('GPL') depends=('gcc-libs' 'readline') source=(http://gnucap.org/devel/$pkgname-$_pkgver.tar.gz) -md5sums=('30701d110a3e642c5826358c64d2fb1b') +sha1sums=('a64be626b3e971437d677f14bc72eda0df6e7e3a') build() { cd "$srcdir/$pkgname-$_pkgver" ./configure --prefix=/usr - make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$_pkgver" + + make make DESTDIR="$pkgdir" install } diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index 37192330a..7debef2fe 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 49787 2011-06-21 05:02:34Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 55487 2011-09-13 04:57:50Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=libmemcached -pkgver=0.50 +pkgver=0.52 pkgrel=1 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glibc') makedepends=('perl') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('c8627014a37cd821cf93317b8de6f9f8') +sha1sums=('5219e261c84b8960676add5968a913a12caccd4a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD index 51d32eadb..6ebe4ff88 100644 --- a/community/mashup/PKGBUILD +++ b/community/mashup/PKGBUILD @@ -2,16 +2,16 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=mashup -pkgver=3.0 +pkgver=3.1 pkgrel=1 pkgdesc="Adjusting images on a sheet of paper for printing" -url="http://kornelix.squarespace.com/printoxx" +url="http://kornelix.squarespace.com/$pkgname" arch=('i686' 'x86_64') license=('GPL3') depends=('gtk2') replaces=('printoxx') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('feb7f5557fce1a00c377d2c6b8a9e2fc') +md5sums=('f6a5afb0a5d410934cbbf4303b3b8a9b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/mms_client/PKGBUILD b/community/mms_client/PKGBUILD index fee06add1..14854aea0 100644 --- a/community/mms_client/PKGBUILD +++ b/community/mms_client/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55469 2011-09-13 01:01:58Z ebelanger $ +# $Id: PKGBUILD 55506 2011-09-13 21:16:22Z ebelanger $ # Contributor: William Rea <sillywilly@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -10,7 +10,8 @@ arch=('i686' 'x86_64') url="http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/" license=('GPL') depends=('glibc') -source=(http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/mms_client-0.0.3.tar.gz +#source=(http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/mms_client-0.0.3.tar.gz +source=(http://web.archive.org/web/20071011022352/http://geocities.com/majormms/mms_client-0.0.3.tar.gz mmsclient-0.0.3-fbsd.patch \ mmsclient-0.0.3-r1.patch) md5sums=('c91171a0bbbfb94290d362e907432787' diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 1648fc546..22c2e27d1 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -3,37 +3,29 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=1.8.3 +pkgver=2.0.0 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64') url='http://www.mongodb.org' license=('AGPL3') -depends=('boost-libs' 'js' 'pcre') +depends=('boost-libs') makedepends=('scons' 'boost') optdepends=('libpcap: needed for mongosniff') backup=('etc/mongodb.conf') install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' - 'mongodb.conf' - 'mongodb-1.8.0-spidermonkey-1.8.5-support.patch' - 'add-js185-support-to-SConstruct.diff') -md5sums=('662e7ad6ff9f8e4d16c72c038b4a0c60' - '85eaa28e349fdc6250f883624e624cca' - '4839fe1d638187ca3226e8267b947318' - '2e6409732fba887c9cfe81257b5260ad' - 'ca7e62be31389d951bfd8848b1675c1b') + 'mongodb.conf') +md5sums=('52763985c13e06d85bc125c7d3eb03d9' + '9c67e00f4626ad761a8f7d4e037a54d7' + '4839fe1d638187ca3226e8267b947318') build() { export SCONSFLAGS="$MAKEFLAGS" cd mongodb-src-r${pkgver} - # js185 support https://jira.mongodb.org/browse/SERVER-2887 - patch -Np1 -i ${srcdir}/mongodb-1.8.0-spidermonkey-1.8.5-support.patch - patch -Np0 -i ${srcdir}/add-js185-support-to-SConstruct.diff - scons \ all \ --full diff --git a/community/mongodb/mongodb.rc b/community/mongodb/mongodb.rc index 517258f63..30f2bbf79 100755 --- a/community/mongodb/mongodb.rc +++ b/community/mongodb/mongodb.rc @@ -4,7 +4,7 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof /usr/bin/mongod` +PID=$(pidof /usr/bin/mongod) case "$1" in start) stat_busy "Starting mongodb" @@ -18,7 +18,7 @@ case "$1" in ;; stop) stat_busy "Stopping mongodb" - [ ! -z "$PID" ] && kill $PID &> /dev/null + [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null if [ $? -gt 0 ]; then stat_fail else diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index 0bc1fcd14..b90bfdfed 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,93 +1,76 @@ -# $Id: PKGBUILD 54702 2011-08-23 11:42:16Z spupykin $ +# $Id: PKGBUILD 55503 2011-09-13 16:34:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20110823 +pkgver=20110913 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" arch=('i686' 'x86_64') license=('custom:LGPL') depends=('glib2' 'gettext' 'lua' 'libxext' 'libsm') -makedepends=('git' 'pkgconfig' +optdepends=('libxinerama' 'libxrandr') +makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr' 'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra') -conflicts=('ion3') provides=('libtu' 'libextl') - -_gitroot="git://notion.git.sourceforge.net/gitroot/notion/notion" -_gitname="notion" -_gitroot2="git://notion.git.sourceforge.net/gitroot/notion/libtu" -_gitname2="libtu" -_gitroot3="git://notion.git.sourceforge.net/gitroot/notion/libextl" -_gitname3="libextl" -_gitroot4="git://notion.git.sourceforge.net/gitroot/notion/notion-doc" -_gitname4="notion-doc" - -source=(doc-build-fix.patch) -md5sums=('68b348427d0531d2679a8a8d97d51c7d') +_gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion" + "git://notion.git.sourceforge.net/gitroot/notion/libtu" + "git://notion.git.sourceforge.net/gitroot/notion/libextl" + "git://notion.git.sourceforge.net/gitroot/notion/notion-doc" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr") build() { - cd ${srcdir} + cd ${srcdir} + # git clone + for _gitroot in ${_gitroots[@]}; do msg "Connecting to the git repository..." + _gitname=`basename ${_gitroot}` if [ -d ${srcdir}/${_gitname} ]; then - cd ${_gitname} + pushd ${srcdir}/${_gitname} git pull origin + popd else git clone --depth 1 ${_gitroot} - cd ${_gitname} fi - - if [ -d ${srcdir}/${_gitname}/${_gitname2} ]; then - echo - git pull origin - else - git clone --depth 1 ${_gitroot2} - echo - fi - - if [ -d ${srcdir}/${_gitname}/${_gitname3} ]; then - echo - git pull origin - else - git clone --depth 1 ${_gitroot3} - echo - fi - - if [ -d ${srcdir}/${_gitname}/${_gitname4} ]; then - echo - git pull origin - else - git clone --depth 1 ${_gitroot4} - echo - fi - msg "GIT checkout done or server timeout" + done - rm -rf ${srcdir}/${_gitname}-build - cp -r ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build - - cd ${srcdir}/${_gitname}-build - - msg "Starting make..." + # copy to notion-build + rm -rf ${srcdir}/notion-build + cp -r ${srcdir}/notion ${srcdir}/notion-build + for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + cp -r ${srcdir}/$i ${srcdir}/notion-build/ + done - sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \ - -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ - -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ - -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ - -i system.mk + # build + cd ${srcdir}/notion-build + msg "Starting make..." + sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \ + -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ + -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ + -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ + -i system.mk + make INCLUDES=-I${srcdir}/notion-build - make INCLUDES=-I${srcdir}/${_gitname}-build - (cd notion-doc && patch -p1 <$srcdir/doc-build-fix.patch) - (cd notion-doc && make -j1 TOPDIR=.. all) + for i in ioncore mod_tiling mod_query de mod_menu mod_dock mod_sp mod_statusbar; do + (cd $i && make _exports_doc) + done + for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + (cd $i && make -j1 TOPDIR=.. all) + done } package() { - cd ${srcdir}/${_gitname}-build - make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install - (cd notion-doc && make PREFIX=${pkgdir}/usr TOPDIR=.. install) - mkdir -p ${pkgdir}/usr/share/licenses/notion - cp LICENSE ${pkgdir}/usr/share/licenses/notion + cd ${srcdir}/notion-build + make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install + for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + (cd $i && make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion TOPDIR=.. install) + done + mkdir -p ${pkgdir}/usr/share/licenses/notion + cp LICENSE ${pkgdir}/usr/share/licenses/notion } diff --git a/community/ogle-gui/PKGBUILD b/community/ogle-gui/PKGBUILD index 60f5ef688..2c8d95b91 100644 --- a/community/ogle-gui/PKGBUILD +++ b/community/ogle-gui/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 8473 2010-01-20 08:14:50Z ebelanger $ -# Maintainer: Eric Belanger <belanger@astro.umontreal.ca> +# $Id: PKGBUILD 55509 2011-09-13 21:28:22Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Kritoke <kritoke@nospam.gamebox.net> pkgname=ogle-gui pkgver=0.9.2 -pkgrel=4 +pkgrel=5 pkgdesc="A gtk2 gui for ogle" arch=('i686' 'x86_64') url="http://www.dtek.chalmers.se/groups/dvd/" -license=("GPL") +license=('GPL') depends=('ogle' 'libglade') -source=(http://www.dtek.chalmers.se/groups/dvd/dist/ogle_gui-${pkgver}.tar.gz) +#source=(http://www.dtek.chalmers.se/groups/dvd/dist/ogle_gui-${pkgver}.tar.gz) +source=(ftp://ftp.archlinux.org/other/community/ogle-gui/ogle_gui-${pkgver}.tar.gz) md5sums=('e685aa3046f9da13532ede9300f2f794') sha1sums=('0d73ec30852b9cd2a9714b5088f6ab6deecf097d') build() { cd "${srcdir}/ogle_gui-${pkgver}" - ./configure --prefix=/usr --enable-gtk2 || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --enable-gtk2 + make +} + +package() { + cd "${srcdir}/ogle_gui-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 7a48e767d..20d072bfb 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52468 2011-07-25 20:19:33Z lcarlier $ +# $Id: PKGBUILD 55515 2011-09-13 21:33:10Z ebelanger $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=7 +pkgrel=8 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index a130f1d47..2255768f0 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=qbittorrent -pkgver=2.8.4 +pkgver=2.8.5 pkgrel=1 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('python2: needed for search' install='qbittorrent.install' source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz" 'python2.patch') -md5sums=('85bbc6fe250bf86e734e9891e7c06d6f' +md5sums=('5f081231537d53e4295483eb9a8f94b1' 'db0d79fee8ce3470ad3741d36b02a94c') build() { diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index 37c440cf4..097da624d 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48037 2011-05-27 16:21:40Z spupykin $ +# $Id: PKGBUILD 55517 2011-09-13 21:33:18Z ebelanger $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=6 +pkgrel=7 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64') url="http://rss-glx.sourceforge.net/" @@ -31,6 +31,10 @@ build() { --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers \ --enable-shared=yes --enable-static=no make CFLAGS="$CFLAGS -I/usr/include/ImageMagick" +} + +package() { + cd ${srcdir}/${pkgname}_${pkgver} make DESTDIR=${pkgdir} install # FS#18300 diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 6d3d8a7bc..d1f035081 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -8,15 +8,18 @@ pkgname=vtk pkgver=5.8.0 -pkgrel=1 +pkgrel=2 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' arch=('i686' 'x86_64') url='http://www.vtk.org' license=('BSD') -depends=('libpng' 'libtiff' 'freetype2' 'python2' 'java-runtime' 'tk' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql') -optdepends=('gnuplot: plotting tools' +depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql') +makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk') +optdepends=('python2: python bindings' + 'java-runtime: java bindings' + 'tk: tcl bindings' + 'gnuplot: plotting tools' 'graphviz: drawing tools') -makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa') source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" 'fixkernelversioncheck.diff') @@ -28,15 +31,9 @@ build() { cd VTK # fix compilation error: http://vtk.org/Bug/view.php?id=12568 - # remove next bunp + # remove next pkgver bump patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff - # fix for libpng 1.4 - remove next time version bump - for _FILE in `grep -Rl "png_set_gray_1_2_4_to_8" *` - do - sed -i 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' ${_FILE} - done - cd ${srcdir} rm -rf build @@ -80,8 +77,6 @@ build() { -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ ${srcdir}/VTK - # j1 is used because of a bug in building with multiple threads - #make -j1 make } diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD index 86b53662c..b98ddacc7 100644 --- a/extra/autogen/PKGBUILD +++ b/extra/autogen/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 54699 2009-10-11 18:34:42Z jgc $ +# $Id: PKGBUILD 137955 2011-09-13 05:19:48Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soufly.nl> # Contributor: Tor Krill pkgname=autogen -pkgver=5.9.9 +pkgver=5.12 pkgrel=1 pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://autogen.sourceforge.net/" license=('GPL3') -depends=('guile>=1.8.6' 'libxml2>=2.7.3' 'libtool>=2.2.6a') -options=('!libtool' '!makeflags') +depends=('guile' 'libxml2') +options=('!libtool') install=autogen.install -source=(http://downloads.sourceforge.net/autogen/${pkgname}-${pkgver}.tar.bz2) -md5sums=('da6c6185473d8b2d7c83e583f4213018') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('126e56be629cda747390e8ba9be71e4b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD index fa7a1d2f6..eb9f6f217 100644 --- a/extra/bluedevil/PKGBUILD +++ b/extra/bluedevil/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 132780 2011-07-26 07:20:57Z andrea $ +# $Id: PKGBUILD 137972 2011-09-13 10:41:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=bluedevil -pkgver=1.1.1 +pkgver=1.2 pkgrel=1 pkgdesc='KDE bluetooth framework' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b3764fb8ead502e2d410b0c0fc86ac6c') +md5sums=('09ed36095367dd51ab8c23e0705cf411') build(){ cd "${srcdir}" diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD index 8319202fc..db9b86fc5 100644 --- a/extra/bzr/PKGBUILD +++ b/extra/bzr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136739 2011-08-31 19:42:25Z eric $ +# $Id: PKGBUILD 138003 2011-09-14 02:50:25Z eric $ # Maintainer : # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=bzr -pkgver=2.4.0 +pkgver=2.4.1 pkgrel=1 pkgdesc="A decentralized revision control system (bazaar)" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('python2') optdepends=('python-paramiko: for sftp support') source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") -md5sums=('087c65e4b79f454b9e733c21607bdd56') +md5sums=('61068bfc1f0c9fb8a4b92bca204e0df8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD index d402220ce..0138bdec1 100644 --- a/extra/dvdauthor/PKGBUILD +++ b/extra/dvdauthor/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104015 2010-12-25 22:35:13Z giovanni $ +# $Id: PKGBUILD 137985 2011-09-13 21:30:02Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> @@ -6,7 +6,7 @@ pkgname=dvdauthor pkgver=0.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="DVD authoring tools" arch=('i686' 'x86_64') url="http://dvdauthor.sourceforge.net/" @@ -19,7 +19,11 @@ md5sums=('33a447fb98ab3293ac40f869eedc17ff') build() { cd "${srcdir}/${pkgname}" ./configure --prefix=/usr \ - --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index df9d68480..9ea40af59 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135954 2011-08-21 02:30:32Z eric $ +# $Id: PKGBUILD 137977 2011-09-13 15:26:07Z juergen $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs @@ -8,12 +8,12 @@ _minorver=a # upstream uses "23.3a", which is a bit silly and interpreted as alpha. pkgver=$_majorver.$_minorver _realver=$_majorver$_minorver -pkgrel=2 +pkgrel=3 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop) md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04' @@ -22,7 +22,7 @@ md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04' build() { cd "$srcdir"/$pkgname-$_majorver ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --without-sound --with-x-toolkit=gtk --with-xft + --localstatedir=/var --with-x-toolkit=gtk --with-xft make } diff --git a/extra/festival/PKGBUILD b/extra/festival/PKGBUILD index d6cc0b4f7..1124eb914 100644 --- a/extra/festival/PKGBUILD +++ b/extra/festival/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127865 2011-06-19 00:11:13Z eric $ +# $Id: PKGBUILD 137968 2011-09-13 09:17:12Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Simo Leone <neotuli@gmail.com> @@ -6,7 +6,7 @@ pkgname=festival pkgver=2.1 _suffix=release -pkgrel=2 +pkgrel=3 pkgdesc="A general multi-lingual speech synthesis system" arch=('i686' 'x86_64') url="http://www.cstr.ed.ac.uk/projects/festival/" @@ -15,115 +15,119 @@ depends=('perl') options=('!makeflags') source=("http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-${_suffix}.tar.gz" "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-${_suffix}.tar.gz" - "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz" - "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz" - "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz" - 'speechconfig.patch' - 'festconfig.patch') + "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz" + "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz" + "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz" + 'speechconfig.patch' + 'festconfig.patch' + 'festival-shared-build.patch') md5sums=('c93eb3e389ed171ab9abd46afe8897a8' '6920ddc75b042910a3bcfee3ab106938' '6a2ee4fed7c3ebedf197a3b8524ccb87' '84af32a914d996f57bc4cb36fe8cdc97' 'aa80f9250065b318325f16fdad3a4484' - '550abd77dc20e444673d6ecf87a60fe9' - '348cc033430aee7989463198818ae74c') + 'c30ae990baca40c9c2b1d5cd27502139' + '348cc033430aee7989463198818ae74c' + '46132b1cd86a982007312def49ab176a') build() { - # Build Speech Tools first - cd "$srcdir/speech_tools" - patch -Np1 -i "$srcdir/speechconfig.patch" + cd "$srcdir" + patch -Np0 -i "$srcdir/festival-shared-build.patch" - ./configure --prefix=/usr --sysconfdir=/etc - make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" + # Build Speech Tools first + cd "$srcdir/speech_tools" + patch -Np1 -i "$srcdir/speechconfig.patch" + ./configure --prefix=/usr --sysconfdir=/etc + make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" - # Build Festival itself - cd "$srcdir/festival" - patch -Np1 -i "$srcdir/festconfig.patch" + # Build Festival itself + cd "$srcdir/festival" + patch -Np1 -i "$srcdir/festconfig.patch" - # Avoid make failure on making scripts and docs - sed -i "s#examples bin doc#examples#" Makefile + # Avoid make failure on making scripts and docs + sed -i "s#examples bin doc#examples#" Makefile - ./configure --prefix=/usr --sysconfdir=/etc - make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" + ./configure --prefix=/usr --sysconfdir=/etc + make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" } package() { - # Install Speech Tools first - cd "$srcdir/speech_tools" - install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}} - - #binaries - #move binaries over wrappers (FS#7864) - for i in $(grep -l 'EST shared script' bin/*); do - cp -f main/$(basename $i) bin; - done - install -m755 -t "$pkgdir"/usr/bin bin/[a-z]* - rm -f "$pkgdir"/usr/bin/{est_gdb,est_examples,est_program} - - #libraries - install -m755 -t "$pkgdir"/usr/lib lib/lib*.so.* - ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so - ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so - install -m644 -t "$pkgdir"/usr/lib lib/lib*.a - - #headers - for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do - install -m644 -t "${pkgdir}"/usr/include/speech_tools/$dir include/$dir/*.h - done - - # Install Festival itself - cd "$srcdir"/festival - - #binaries - install -m755 src/main/festival "$pkgdir"/usr/bin/ - install -m755 src/main/festival_client "$pkgdir"/usr/bin/ - install -m755 examples/benchmark "$pkgdir"/usr/bin/ - install -m755 examples/dumpfeats "$pkgdir"/usr/bin/ - install -m755 examples/durmeanstd "$pkgdir"/usr/bin/ - install -m755 examples/latest "$pkgdir"/usr/bin/ - install -m755 examples/make_utts "$pkgdir"/usr/bin/ - install -m755 examples/powmeanstd "$pkgdir"/usr/bin/ - install -m755 examples/run-festival-script "$pkgdir"/usr/bin/ - install -m755 examples/saytime "$pkgdir"/usr/bin/ - install -m755 examples/scfg_parse_text "$pkgdir"/usr/bin/ - install -m755 examples/text2pos "$pkgdir"/usr/bin/ - install -m755 examples/text2wave "$pkgdir"/usr/bin - - #libraries - install -m644 src/lib/libFestival.a "$pkgdir"/usr/lib/ - - #headers - install -dm755 "$pkgdir"/usr/include/festival - install -m644 -t "$pkgdir"/usr/include/festival src/include/*.h - - mkdir -p "$pkgdir"/usr/share/festival - #install -m644 -t "$pkgdir"/usr/share/festival lib/*.scm - #need to clean up but requires knowing which files are actually needed... - cp -aR lib/* "$pkgdir"/usr/share/festival - rm -f $(find "$pkgdir"/usr/share/festival -name Makefile) - rm -f $(find "$pkgdir"/usr/bin -name Makefile) - - #create voices directory - install -dm755 "$pkgdir"/usr/share/festival/voices - - #licenses - install -D -m644 "$srcdir"/festival/COPYING \ - "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - install -D -m644 "$srcdir"/speech_tools/README \ - "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.other - - ################################################################# - # Ok now some general cleanups - for i in $(find "$pkgdir"/usr/include/ -type f); do - sed -i -e 's,"EST.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \ - -e 's,"siod.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \ - -e 's,"instantiate/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/instantiate/\",speech_tools/instantiate/,g' -e 's,"instantiate,instantiate,g' \ - -e 's,"ling_class/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/ling_class/\",speech_tools/ling_class/,g' -e 's,"ling_class,ling_class,g'\ - -e 's,"rxp/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/rxp/\",speech_tools/rxp/,g' -e 's,"rxp,rxp,g' \ - -e 's,"sigpr/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/sigpr/\",speech_tools/sigpr/,g' -e 's,"sigpr,sigpr,g' \ - -e 's,"unix/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/unix/\",speech_tools/unix/,g' -e 's,\.h\">,.h\>,g' -e 's,"unix,unix,g' \ - -e 's,"festival\.h",\<festival/festival.h\>,g' \ - -e 's,"ModuleDescription\.h",\<festival/ModuleDescription.h\>,g' \ - -e 's,"Phone\.h",\<festival/Phone.h\>,g' $i - done + # Install Speech Tools first + cd "$srcdir/speech_tools" + install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}} + + #binaries + #move binaries over wrappers (FS#7864) + for i in $(grep -l 'EST shared script' bin/*); do + cp -f main/$(basename $i) bin; + done + install -m755 -t "$pkgdir"/usr/bin bin/[a-z]* + rm -f "$pkgdir"/usr/bin/{est_gdb,est_examples,est_program} + + #libraries + install -m755 -t "$pkgdir"/usr/lib lib/lib*.so.* + ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so + ln -sf libestools.so.${pkgver}.1 "$pkgdir"/usr/lib/libestools.so + ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so + install -m644 -t "$pkgdir"/usr/lib lib/lib*.a + + #headers + for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do + install -m644 -t "${pkgdir}"/usr/include/speech_tools/$dir include/$dir/*.h + done + + # Install Festival itself + cd "$srcdir"/festival + + #binaries + install -m755 src/main/festival "$pkgdir"/usr/bin/ + install -m755 src/main/festival_client "$pkgdir"/usr/bin/ + install -m755 examples/benchmark "$pkgdir"/usr/bin/ + install -m755 examples/dumpfeats "$pkgdir"/usr/bin/ + install -m755 examples/durmeanstd "$pkgdir"/usr/bin/ + install -m755 examples/latest "$pkgdir"/usr/bin/ + install -m755 examples/make_utts "$pkgdir"/usr/bin/ + install -m755 examples/powmeanstd "$pkgdir"/usr/bin/ + install -m755 examples/run-festival-script "$pkgdir"/usr/bin/ + install -m755 examples/saytime "$pkgdir"/usr/bin/ + install -m755 examples/scfg_parse_text "$pkgdir"/usr/bin/ + install -m755 examples/text2pos "$pkgdir"/usr/bin/ + install -m755 examples/text2wave "$pkgdir"/usr/bin + + #libraries + install -m644 src/lib/libFestival.a "$pkgdir"/usr/lib/ + install -m755 src/lib/libFestival.so.* "$pkgdir"/usr/lib/ + ln -sf libFestival.so.2.1.0 "$pkgdir"/usr/lib/libFestival.so + + #headers + install -dm755 "$pkgdir"/usr/include/festival + install -m644 -t "$pkgdir"/usr/include/festival src/include/*.h + + mkdir -p "$pkgdir"/usr/share/festival + cp -aR lib/* "$pkgdir"/usr/share/festival + rm -f $(find "$pkgdir"/usr/share/festival -name Makefile) + rm -f $(find "$pkgdir"/usr/bin -name Makefile) + + #create voices directory + install -dm755 "$pkgdir"/usr/share/festival/voices + + #licenses + install -D -m644 "$srcdir"/festival/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + install -D -m644 "$srcdir"/speech_tools/README \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.other + + # Ok now some general cleanups + for i in $(find "$pkgdir"/usr/include/ -type f); do + sed -i -e 's,"EST.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \ + -e 's,"siod.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \ + -e 's,"instantiate/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/instantiate/\",speech_tools/instantiate/,g' -e 's,"instantiate,instantiate,g' \ + -e 's,"ling_class/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/ling_class/\",speech_tools/ling_class/,g' -e 's,"ling_class,ling_class,g' \ + -e 's,"rxp/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/rxp/\",speech_tools/rxp/,g' -e 's,"rxp,rxp,g' \ + -e 's,"sigpr/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/sigpr/\",speech_tools/sigpr/,g' -e 's,"sigpr,sigpr,g' \ + -e 's,"unix/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/unix/\",speech_tools/unix/,g' -e 's,\.h\">,.h\>,g' -e 's,"unix,unix,g' \ + -e 's,"festival\.h",\<festival/festival.h\>,g' \ + -e 's,"ModuleDescription\.h",\<festival/ModuleDescription.h\>,g' \ + -e 's,"Phone\.h",\<festival/Phone.h\>,g' $i + done } diff --git a/extra/festival/festival-shared-build.patch b/extra/festival/festival-shared-build.patch new file mode 100644 index 000000000..edfa38b17 --- /dev/null +++ b/extra/festival/festival-shared-build.patch @@ -0,0 +1,72 @@ +--- speech_tools/config/rules/defaults.mak.orig 2007-03-16 12:39:12.000000000 -0400 ++++ speech_tools/config/rules/defaults.mak 2007-03-16 12:39:19.000000000 -0400 +@@ -69,15 +69,21 @@ + MADE_FROM_ABOVE:=$(N) + endif + ++ifneq ($(SHARED),0) ++ LIBTYPE=so ++else ++ LIBTYPE=a ++endif ++ + ifndef PROJECT_LIBDEPS +- PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).a) ++ PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE)) + endif + ifndef PROJECT_LIBS + PROJECT_LIBS = $(foreach l,$(PROJECT_LIBRARIES),-L$(PROJECT_LIBRARY_DIR_$(l)) -l$(l)) + endif + + ifndef REQUIRED_LIBDEPS +- REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).a) ++ REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE)) + endif + ifndef REQUIRED_LIBS + REQUIRED_LIBS = $(foreach l,$(REQUIRED_LIBRARIES),-L$(REQUIRED_LIBRARY_DIR_$(l)) -l$(l)) +--- festival/config/project.mak.orig 2007-03-16 13:01:40.000000000 -0400 ++++ festival/config/project.mak 2007-03-16 13:02:24.000000000 -0400 +@@ -84,6 +84,8 @@ + PROJECT_LIBRARY_DIR_Festival = $(TOP)/src/lib + PROJECT_DEFAULT_LIBRARY = Festival + ++PROJECT_LIBRARY_VERSION_Festival = $(PROJECT_VERSION).0 ++ + # Libraries used from other projects + + REQUIRED_LIBRARIES = estools estbase eststring +diff -p -up festival/speech_tools/config/compilers/gcc_defaults.mak.bettersoname festival/speech_tools/config/compilers/gcc_defaults.mak +--- speech_tools/config/compilers/gcc_defaults.mak.bettersoname 2010-12-06 10:25:35.000000000 +0100 ++++ speech_tools/config/compilers/gcc_defaults.mak 2010-12-06 10:27:51.000000000 +0100 +@@ -78,7 +78,7 @@ SHARED_CXXFLAGS = -fPIC + SHARED_LINKFLAGS = + + ifndef GCC_MAKE_SHARED_LIB +- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX ++ MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX -Wl,-soname,YYY + else + MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) + endif +diff -p -up festival/speech_tools/config/rules/library.mak.bettersoname festival/speech_tools/config/rules/library.mak +--- speech_tools/config/rules/library.mak.bettersoname 2001-04-04 13:55:32.000000000 +0200 ++++ speech_tools/config/rules/library.mak 2010-12-06 10:25:35.000000000 +0100 +@@ -103,14 +103,14 @@ endif + ########################################################################### + + lib%.so : lib%.a +- @echo Make Shared Library $* ++ @echo Make Shared Library $(*F) + @if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi + @(cd shared_space ; $(AR) x ../$< ) +- @echo Link Shared Library $* +- if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ +- $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs ++ @echo Link Shared Library $(*F) ++ if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$(*F))" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ ++ $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$(*F)),$(subst YYY,$(@F).$(PROJECT_LIBRARY_VERSION_$(*F)),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$(*F):%=-L. -l%) $$libs + @$(RM) -f shared_space/*.o $@ +- @ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@ ++ @ln -s $(@F).$(PROJECT_LIBRARY_VERSION_$(*F)) $@ + + ########################################################################### + ## ## diff --git a/extra/festival/speechconfig.patch b/extra/festival/speechconfig.patch index f77b614e9..76756b1ae 100644 --- a/extra/festival/speechconfig.patch +++ b/extra/festival/speechconfig.patch @@ -44,7 +44,7 @@ diff -aur speech_tools.old//config/config.in speech_tools/config/config.in #DEBUG=1 # PROFILE=gprof -#SHARED=2 -+SHARED=1 ++SHARED=2 ## Directory specific selections which override the above diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 98a4821b6..0e68e5e44 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 136461 2011-08-29 20:24:07Z eric $ +# $Id: PKGBUILD 137987 2011-09-13 21:30:06Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.2.1 +pkgver=6.7.2.5 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" license=('custom') -depends=('libtool' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo') +depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo') makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -md5sums=('efa11515407ef0a22535d5f429668bcb' +md5sums=('ce0294e6bc7ca3ece03a432518143a29' 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('9e82c6926db62aa5dc547a029b49a593f5d4a991' +sha1sums=('0af2f0fb913f390b0b25bc4e57b344b0d54c3560' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 7a6af847c..abb468e30 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 130934 2011-07-09 05:54:52Z bisson $ +# $Id: PKGBUILD 137989 2011-09-13 21:30:09Z eric $ # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.2 -pkgrel=1 +pkgrel=2 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ optdepends=('pstoedit: latex formulas' 'python-lxml: some extensions and filters' 'uniconvertor: reading/writing to some proprietary formats') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3') install=install diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index e95119cfb..41737577b 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127685 2011-06-17 17:49:02Z andrea $ +# $Id: PKGBUILD 137991 2011-09-13 21:30:11Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ pkgname=obex-data-server pkgver=0.4.6 -pkgrel=1 +pkgrel=2 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64') url="http://wiki.muiline.com/obex-data-server" diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD index 0fb78ec8b..10aa041e6 100644 --- a/extra/psiconv/PKGBUILD +++ b/extra/psiconv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86765 2010-08-03 22:27:52Z ibiru $ +# $Id: PKGBUILD 137993 2011-09-13 21:30:15Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=psiconv pkgver=0.9.8 -pkgrel=7 +pkgrel=8 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats" arch=('i686' 'x86_64') url="http://software.frodo.looijaard.name/psiconv/" @@ -21,6 +21,10 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD index 3ab3c566e..32396dba4 100644 --- a/extra/pstoedit/PKGBUILD +++ b/extra/pstoedit/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 136892 2011-09-02 17:05:04Z ronald $ +# $Id: PKGBUILD 137995 2011-09-13 21:30:18Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tobias Powalowski <t.powa@gmx.de> pkgname=pstoedit pkgver=3.60 -pkgrel=1 +pkgrel=2 pkgdesc="Translates PostScript and PDF graphics into other vector formats" -arch=("i686" "x86_64") +arch=('i686' 'x86_64') url="http://www.pstoedit.net/" license=('GPL') depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick') diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 44c6305bd..0610b2920 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137496 2011-09-07 17:54:44Z andrea $ +# $Id: PKGBUILD 137970 2011-09-13 10:37:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.7.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://qt.nokia.com/' license=('GPL3' 'LGPL') @@ -19,7 +19,7 @@ source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' 'blacklist-diginotar-certs.diff') -md5sums=('ddf7d83f912cf1283aa066368464fa22' +md5sums=('9831cf1dfa8d0689a06c2c54c5c65aaf' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 403d93a39..a7e6a6530 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91207 2010-09-24 03:35:03Z eric $ +# $Id: PKGBUILD 137997 2011-09-13 21:30:20Z eric $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,22 +6,26 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.5 -pkgrel=5 +pkgrel=6 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64') url="http://tcforge.berlios.de/" license=('GPL') -depends=('imagemagick' 'lzo2' 'libdv' 'libdvdread' 'ffmpeg' 'mjpegtools' - 'libmpeg2' 'libtheora' 'libxaw' 'libxml2' 'libxv' 'a52dec' 'alsa-lib') -makedepends=('nasm' 'pkg-config') +depends=('imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' + 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') +makedepends=('nasm') options=('!libtool' '!makeflags') source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch) -md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' 'c0bd49a88f667c68c4430ad25bbed510'\ - 'af4056b7530a6f147594f676849e7c7b' 'c299cfc6c4be6a5512d1a129f04e5450') -sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'\ - '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977' '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2') +md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' + 'c0bd49a88f667c68c4430ad25bbed510' + 'af4056b7530a6f147594f676849e7c7b' + 'c299cfc6c4be6a5512d1a129f04e5450') +sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' + 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' + '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977' + '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/webkit-sharp/PKGBUILD b/extra/webkit-sharp/PKGBUILD index ecab9edcd..9d3179e53 100644 --- a/extra/webkit-sharp/PKGBUILD +++ b/extra/webkit-sharp/PKGBUILD @@ -5,14 +5,14 @@ pkgname=webkit-sharp pkgver=0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Mono/.NET bindings for the WebKit rendering engine" arch=('i686' 'x86_64') url="http://www.mono-project.com/" license=('custom:MIT') depends=('gtk-sharp-2' 'libwebkit>=1.4.0') makedepends=('pkgconfig>=0.9.0') -source=(ftp://ftp.novell.com/pub/mono/sources/$pkgname/${pkgname}-${pkgver}.tar.bz2) +source=(http://download.mono-project.com/sources/$pkgname/${pkgname}-${pkgver}.tar.bz2) md5sums=('21482f9d5eafb0ef4acc6e790482f934') build() { @@ -20,7 +20,7 @@ build() { mkdir -p "${MONO_SHARED_DIR}" cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's:webkit-1.0@LIB_PREFIX@.2@:libwebkitgtk-1.0@LIB_PREFIX@.0.7.0@:' sources/webkit-sharp.dll.config.in + sed -i 's:webkit-1.0@LIB_PREFIX@.2@:libwebkitgtk-1.0@LIB_PREFIX@.0@:' sources/webkit-sharp.dll.config.in ./configure --prefix=/usr make } diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD index 15d64aa92..fd49db451 100644 --- a/extra/x11vnc/PKGBUILD +++ b/extra/x11vnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 91112 2010-09-22 19:40:25Z bisson $ +# $Id: PKGBUILD 137979 2011-09-13 20:01:54Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=x11vnc -pkgver=0.9.12 +pkgver=0.9.13 pkgrel=1 pkgdesc='VNC server for real X displays' arch=('i686' 'x86_64') @@ -12,25 +12,25 @@ license=('GPL2') depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') optdepends=('tk: for GUI support') backup=('etc/conf.d/x11vnc') -source=("http://downloads.sourceforge.net/libvncserver/${pkgname}-${pkgver}.tar.gz" - 'x11vnc.rc' - 'x11vnc.conf') -sha1sums=('cf4e24bee5962b52d8f2a5442a7c44943a9cc0bb' - '3abb3fcadff32662ab847a9e772cd23cfdfe3d1a' - '11011cce06511e9ba61672a1c80bb63a3a187539') +source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'conf.d' + 'rc.d') +sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa' + '11011cce06511e9ba61672a1c80bb63a3a187539' + '477892cf0f0020043444b7493c80684762ded506') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver + rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver - install -D -m 755 "${srcdir}/x11vnc.rc" "${pkgdir}/etc/rc.d/x11vnc" - install -D -m 644 "${srcdir}/x11vnc.conf" "${pkgdir}/etc/conf.d/x11vnc" + install -D -m 755 "${srcdir}/rc.d" "${pkgdir}/etc/rc.d/x11vnc" + install -D -m 644 "${srcdir}/conf.d" "${pkgdir}/etc/conf.d/x11vnc" } diff --git a/extra/x11vnc/conf.d b/extra/x11vnc/conf.d new file mode 100644 index 000000000..8a81e3286 --- /dev/null +++ b/extra/x11vnc/conf.d @@ -0,0 +1,5 @@ +# +# Parameters to be passed to x11vnc +# + +X11VNC_ARGS="" diff --git a/extra/x11vnc/rc.d b/extra/x11vnc/rc.d new file mode 100644 index 000000000..b5f2a6464 --- /dev/null +++ b/extra/x11vnc/rc.d @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/x11vnc + +PID=$(pidof -o %PPID /usr/bin/x11vnc) +case "$1" in + start) + stat_busy "Starting x11vnc" + [[ -z "$PID" ]] && /usr/bin/x11vnc $X11VNC_ARGS &> /dev/null & + if [[ $? -gt 0 ]]; then + stat_fail + else + add_daemon x11vnc + stat_done + fi + ;; + stop) + stat_busy "Stopping x11vnc" + [[ ! -z "$PID" ]] && kill $PID &> /dev/null + if [[ $? -gt 0 ]]; then + stat_fail + else + rm_daemon x11vnc + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 15236bda8..86dda60c1 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137836 2011-09-11 23:43:47Z eric $ +# $Id: PKGBUILD 137999 2011-09-13 21:30:22Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.1.19 -pkgrel=4 +pkgrel=5 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" diff --git a/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch b/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch new file mode 100644 index 000000000..6ba35bc02 --- /dev/null +++ b/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch @@ -0,0 +1,41 @@ +From 1f85f89051e63b05e271b418687c242a83e2f296 Mon Sep 17 00:00:00 2001 +From: Philip Withnall <philip@tecnocode.co.uk> +Date: Mon, 12 Sep 2011 22:09:10 +0000 +Subject: Bug 658631 — crash at empathy startup + +In the case that a persona is removed and the individual containing that +persona is replaced by a different non-null individual which doesn't contain +that persona (because it's been removed), we need to set the persona's +individual pointer to null rather than the replacement individual. + +This stops us tripping the assertion in the setter for Persona.individual. + +Closes: bgo#658631 +--- +diff --git a/folks/individual.vala b/folks/individual.vala +index 3b6c12b..59548ee 100644 +--- a/folks/individual.vala ++++ b/folks/individual.vala +@@ -1510,7 +1510,19 @@ public class Folks.Individual : Object, + * aggregator's rewritten, it would be nice to fix this. */ + if (persona.individual == this) + { +- persona.individual = replacement_individual; ++ /* It may be the case that the persona's being removed from the ++ * individual (i.e. the replacement individual is non-null, but ++ * doesn't contain this persona). In this case, we need to set the ++ * persona's individual to null. */ ++ if (replacement_individual != null && ++ persona in replacement_individual.personas) ++ { ++ persona.individual = replacement_individual; ++ } ++ else ++ { ++ persona.individual = null; ++ } + } + } + +-- +cgit v0.9.0.2 diff --git a/gnome-unstable/folks/PKGBUILD b/gnome-unstable/folks/PKGBUILD index 13ff2b06c..b4e164e5c 100644 --- a/gnome-unstable/folks/PKGBUILD +++ b/gnome-unstable/folks/PKGBUILD @@ -1,21 +1,31 @@ -# $Id: PKGBUILD 137520 2011-09-08 18:28:46Z ibiru $ +# $Id: PKGBUILD 138001 2011-09-13 21:34:06Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=folks pkgver=0.6.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Library to aggregates people into metacontacts " arch=(i686 x86_64) url="http://telepathy.freedesktop.org/wiki/Folks" license=('LGPL2.1') depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb') -makedepends=('gobject-introspection' 'vala' 'intltool') +makedepends=('gobject-introspection' 'vala' 'intltool' 'libtracker-sparql') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3eda79a71890b51b6f723067b61c32ef25e9041a9e188b483d7f23e3dcd328ee') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz + Bug_658631_crash_at_empathy_startup.patch) +sha256sums=('3eda79a71890b51b6f723067b61c32ef25e9041a9e188b483d7f23e3dcd328ee' + '4ef4caaab73e799fe31e7a93ba1f3f088e99f66600e644828bbcc4fb966c1196') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + + # Fix a crash + patch -Np1 -i "$srcdir/Bug_658631_crash_at_empathy_startup.patch" + find . -name '*.stamp' -delete + + # Change tracker version + grep -lr sparql-0.10 . | xargs sed -i 's/sparql-0.10/sparql-0.12/g' + + ./configure --prefix=/usr --enable-tracker-backend make } diff --git a/gnome-unstable/gthumb/PKGBUILD b/gnome-unstable/gthumb/PKGBUILD new file mode 100644 index 000000000..315dc1fd9 --- /dev/null +++ b/gnome-unstable/gthumb/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 137983 2011-09-13 21:08:13Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=gthumb +pkgver=2.13.90 +pkgrel=1 +pkgdesc="Image browser and viewer for the GNOME Desktop" +arch=(i686 x86_64) +license=('GPL') +url="http://gthumb.sourceforge.net/" +depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2') +makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base') +optdepends=('gstreamer0.10-base: video support') +options=('!libtool' '!emptydirs') +install=gthumb.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('14d4dc212c9f924ff3161733842edccbf6b6ac5d829808ae11f8af29d10ac5de') +sha256sums=('d11f08bc7d513ea8c5340f5b36edd620b53e9ddfc0c8b31fcda284b720145e6a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gthumb "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/gthumb/gthumb.install b/gnome-unstable/gthumb/gthumb.install new file mode 100644 index 000000000..6046ebb6f --- /dev/null +++ b/gnome-unstable/gthumb/gthumb.install @@ -0,0 +1,24 @@ +pkgname=gthumb + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD new file mode 100644 index 000000000..fe72fa227 --- /dev/null +++ b/testing/curl/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 137981 2011-09-13 20:49:30Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=curl +pkgver=7.22.0 +pkgrel=1 +pkgdesc="An URL retrival utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2') +options=('!libtool') +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + curlbuild.h) +md5sums=('e8c36126d21c893f085aca233906b5cc' + '1b061c348b63ea3e90c3f2c3af6a08d6' + '751bd433ede935c8fae727377625a8ae') + + +case $(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unsupported architecture: %s" "$CARCH" + exit 1 + ;; +esac + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --with-random=/dev/urandom \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --enable-ipv6 \ + --disable-ldaps \ + --disable-ldap \ + --enable-manual \ + --enable-versioned-symbols \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ + --without-libidn \ + --enable-threaded-resolver + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" +} diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h new file mode 100644 index 000000000..b48862696 --- /dev/null +++ b/testing/curl/curlbuild.h @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif |